z80 timing change

[picodrive.git] / Pico / cd / cd_sys.c

diff --git a/Pico/cd/cd_sys.c b/Pico/cd/cd_sys.c
index c0199e8..6d4cb43 100644 (file)
--- a/Pico/cd/cd_sys.c
+++ b/Pico/cd/cd_sys.c
@@ -152,17 +152,7 @@ void Check_CD_Command(void)
 {\r
        cdprintf("CHECK CD COMMAND");\r
 \r
-       // Check CDD\r
-\r
-       if (Pico_mcd->scd.CDD_Complete)\r
-       {\r
-               Pico_mcd->scd.CDD_Complete = 0;\r
-\r
-               CDD_Export_Status();\r
-       }\r
-\r
        // Check CDC\r
-\r
        if (Pico_mcd->scd.Status_CDC & 1)                       // CDC is reading data ...\r
        {\r
                cdprintf("Got a read command");\r
@@ -179,6 +169,14 @@ void Check_CD_Command(void)
                else Pico_mcd->scd.File_Add_Delay--;\r
        }\r
 \r
+       // Check CDD\r
+       if (Pico_mcd->scd.CDD_Complete)\r
+       {\r
+               Pico_mcd->scd.CDD_Complete = 0;\r
+\r
+               CDD_Export_Status();\r
+       }\r
+\r
        if (Pico_mcd->scd.Status_CDD == FAST_FOW)\r
        {\r
                Pico_mcd->scd.Cur_LBA += 10;\r
@@ -210,8 +208,10 @@ void Reset_CD(void)
 {\r
        Pico_mcd->scd.Cur_Track = 0;\r
        Pico_mcd->scd.Cur_LBA = -150;\r
+       Pico_mcd->scd.Status_CDC &= ~1;\r
        Pico_mcd->scd.Status_CDD = READY;\r
        Pico_mcd->scd.CDD_Complete = 0;\r
+       Pico_mcd->scd.File_Add_Delay = 0;\r
 }\r
 \r
 \r