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 72d6c0e..6d4cb43 100644 (file)
--- a/Pico/cd/cd_sys.c
+++ b/Pico/cd/cd_sys.c
@@ -1,11 +1,12 @@
 #include <stdio.h>\r
 #include "cd_sys.h"\r
-//#include "cd_file.h"\r
+#include "cd_file.h"\r
 \r
 #include "../PicoInt.h"\r
 \r
-#define cdprintf printf\r
+#define cdprintf dprintf\r
 //#define cdprintf(x...)\r
+#define DEBUG_CD\r
 \r
 #define TRAY_OPEN      0x0500          // TRAY OPEN CDD status\r
 #define NOCD           0x0000          // CD removed CDD status\r
@@ -15,18 +16,6 @@
 #define FAST_REV       0x10300         // FAST REVERSE track CDD status\r
 #define PLAYING                0x0100          // PLAYING audio track CDD status\r
 \r
-/*\r
-#include "gens.h"\r
-#include "G_dsound.h"\r
-#include "cdda_mp3.h"\r
-#include "lc89510.h"\r
-#include "Star_68k.h"\r
-#include "Mem_M68K.h"\r
-#include "Mem_S68K.h"\r
-#include "save.h"\r
-#include "misc.h"\r
-*/\r
-\r
 \r
 /*\r
 int CDDA_Enable;\r
@@ -39,13 +28,7 @@ int CD_Audio_Starting;
 */\r
 \r
 static int CD_Present = 0;\r
-int CD_Timer_Counter = 0; // TODO: check refs\r
-\r
-static int CDD_Complete;\r
-\r
-static int File_Add_Delay = 0;\r
-\r
-//_scd SCD;\r
+// int CD_Timer_Counter = 0; // TODO: check refs\r
 \r
 \r
 \r
@@ -59,7 +42,7 @@ if (Pico_mcd->scd.Status_CDD == TRAY_OPEN)    \
        Pico_mcd->cdd.Frame = 0;                                        \\r
        Pico_mcd->cdd.Ext = 0;                                  \\r
                                                                        \\r
-       CDD_Complete = 1;                               \\r
+       Pico_mcd->scd.CDD_Complete = 1;                         \\r
                                                                        \\r
        return 2;                                               \\r
 }\r
@@ -76,7 +59,7 @@ if (!CD_Present)                                      \
        Pico_mcd->cdd.Frame = 0;                                        \\r
        Pico_mcd->cdd.Ext = 0;                                  \\r
                                                                        \\r
-       CDD_Complete = 1;                               \\r
+       Pico_mcd->scd.CDD_Complete = 1;                         \\r
                                                                        \\r
        return 3;                                               \\r
 }\r
@@ -118,19 +101,19 @@ static unsigned int MSF_to_Track(_msf *MSF)
 \r
        Start = (MSF->M << 16) + (MSF->S << 8) + MSF->F;\r
 \r
-       for(i = Pico_mcd->scd.TOC.First_Track; i <= (Pico_mcd->scd.TOC.Last_Track + 1); i++)\r
+       for(i = 1; i <= (Pico_mcd->TOC.Last_Track + 1); i++)\r
        {\r
-               Cur = Pico_mcd->scd.TOC.Tracks[i - Pico_mcd->scd.TOC.First_Track].MSF.M << 16;\r
-               Cur += Pico_mcd->scd.TOC.Tracks[i - Pico_mcd->scd.TOC.First_Track].MSF.S << 8;\r
-               Cur += Pico_mcd->scd.TOC.Tracks[i - Pico_mcd->scd.TOC.First_Track].MSF.F;\r
+               Cur = Pico_mcd->TOC.Tracks[i - 1].MSF.M << 16;\r
+               Cur += Pico_mcd->TOC.Tracks[i - 1].MSF.S << 8;\r
+               Cur += Pico_mcd->TOC.Tracks[i - 1].MSF.F;\r
 \r
                if (Cur > Start) break;\r
        }\r
 \r
        --i;\r
 \r
-       if (i > Pico_mcd->scd.TOC.Last_Track) return 100;\r
-       if (i < Pico_mcd->scd.TOC.First_Track) i = Pico_mcd->scd.TOC.First_Track;\r
+       if (i > Pico_mcd->TOC.Last_Track) return 100;\r
+       else if (i < 1) i = 1;\r
 \r
        return (unsigned) i;\r
 }\r
@@ -147,12 +130,12 @@ static unsigned int LBA_to_Track(int lba)
 \r
 static void Track_to_MSF(int track, _msf *MSF)\r
 {\r
-       if (track < Pico_mcd->scd.TOC.First_Track) track = Pico_mcd->scd.TOC.First_Track;\r
-       else if (track > Pico_mcd->scd.TOC.Last_Track) track = Pico_mcd->scd.TOC.Last_Track;\r
+       if (track < 1) track = 1;\r
+       else if (track > Pico_mcd->TOC.Last_Track) track = Pico_mcd->TOC.Last_Track;\r
 \r
-       MSF->M = Pico_mcd->scd.TOC.Tracks[track - Pico_mcd->scd.TOC.First_Track].MSF.M;\r
-       MSF->S = Pico_mcd->scd.TOC.Tracks[track - Pico_mcd->scd.TOC.First_Track].MSF.S;\r
-       MSF->F = Pico_mcd->scd.TOC.Tracks[track - Pico_mcd->scd.TOC.First_Track].MSF.F;\r
+       MSF->M = Pico_mcd->TOC.Tracks[track - 1].MSF.M;\r
+       MSF->S = Pico_mcd->TOC.Tracks[track - 1].MSF.S;\r
+       MSF->F = Pico_mcd->TOC.Tracks[track - 1].MSF.F;\r
 }\r
 \r
 \r
@@ -167,35 +150,31 @@ int Track_to_LBA(int track)
 \r
 void Check_CD_Command(void)\r
 {\r
-       cdprintf("CHECK CD COMMAND\n");\r
-\r
-       // Check CDD\r
-\r
-       if (CDD_Complete)\r
-       {\r
-               CDD_Complete = 0;\r
-\r
-               CDD_Export_Status();\r
-       }\r
+       cdprintf("CHECK CD COMMAND");\r
 \r
        // Check CDC\r
-\r
        if (Pico_mcd->scd.Status_CDC & 1)                       // CDC is reading data ...\r
        {\r
-               cdprintf("Sending a read command\n");\r
+               cdprintf("Got a read command");\r
 \r
                // DATA ?\r
-               if (Pico_mcd->scd.TOC.Tracks[Pico_mcd->scd.Cur_Track - Pico_mcd->scd.TOC.First_Track].Type)\r
+               if (Pico_mcd->scd.Cur_Track == 1)\r
                     Pico_mcd->s68k_regs[0x36] |=  0x01;\r
                else Pico_mcd->s68k_regs[0x36] &= ~0x01;                        // AUDIO\r
 \r
-               if (File_Add_Delay == 0)\r
+               if (Pico_mcd->scd.File_Add_Delay == 0)\r
                {\r
-#if 0 // TODO\r
                        FILE_Read_One_LBA_CDC();\r
-#endif\r
                }\r
-               else File_Add_Delay--;\r
+               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
@@ -215,19 +194,13 @@ void Check_CD_Command(void)
 \r
 int Init_CD_Driver(void)\r
 {\r
-#if 0 // TODO\r
-       FILE_Init();\r
-#endif\r
-\r
        return 0;\r
 }\r
 \r
 \r
 void End_CD_Driver(void)\r
 {\r
-#if 0 // TODO\r
        FILE_End();\r
-#endif\r
 }\r
 \r
 \r
@@ -235,38 +208,36 @@ 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
-       CDD_Complete = 0;\r
+       Pico_mcd->scd.CDD_Complete = 0;\r
+       Pico_mcd->scd.File_Add_Delay = 0;\r
 }\r
 \r
 \r
-int Insert_CD(char *buf, char *iso_name)\r
+int Insert_CD(char *iso_name, int is_bin)\r
 {\r
+       int ret = 0;\r
+\r
 //     memset(CD_Audio_Buffer_L, 0, 4096 * 4);\r
 //     memset(CD_Audio_Buffer_R, 0, 4096 * 4);\r
 \r
-       if (iso_name == NULL)\r
-       {\r
-               CD_Present = 0;\r
-       }\r
-       else\r
+       CD_Present = 0;\r
+\r
+       if (iso_name != NULL)\r
        {\r
-#if 0 // TODO\r
-               Load_ISO(buf, iso_name);\r
-               CD_Present = 1;\r
-#endif\r
-               return 0;\r
+               ret = Load_ISO(iso_name, is_bin);\r
+               if (ret == 0)\r
+                       CD_Present = 1;\r
        }\r
 \r
-       return 0;\r
+       return ret;\r
 }\r
 \r
 \r
 void Stop_CD(void)\r
 {\r
-#if 0 // TODO\r
        Unload_ISO();\r
-#endif\r
        CD_Present = 0;\r
 }\r
 \r
@@ -280,7 +251,7 @@ void Change_CD(void)
 \r
 int Get_Status_CDD_c0(void)\r
 {\r
-       cdprintf("Status command : Cur LBA = %d\n", Pico_mcd->scd.Cur_LBA);\r
+       cdprintf("Status command : Cur LBA = %d", Pico_mcd->scd.Cur_LBA);\r
 \r
        // Clear immediat status\r
        if ((Pico_mcd->cdd.Status & 0x0F00) == 0x0200)\r
@@ -290,7 +261,7 @@ int Get_Status_CDD_c0(void)
        else if ((Pico_mcd->cdd.Status & 0x0F00) == 0x0E00)\r
                Pico_mcd->cdd.Status = (Pico_mcd->scd.Status_CDD & 0xFF00) | (Pico_mcd->cdd.Status & 0x00FF);\r
 \r
-       CDD_Complete = 1;\r
+       Pico_mcd->scd.CDD_Complete = 1;\r
 \r
        return 0;\r
 }\r
@@ -313,7 +284,7 @@ int Stop_CDD_c1(void)
        Pico_mcd->cdd.Frame = 0;\r
        Pico_mcd->cdd.Ext = 0;\r
 \r
-       CDD_Complete = 1;\r
+       Pico_mcd->scd.CDD_Complete = 1;\r
 \r
        return 0;\r
 }\r
@@ -323,7 +294,7 @@ int Get_Pos_CDD_c20(void)
 {\r
        _msf MSF;\r
 \r
-       cdprintf("command 200 : Cur LBA = %d\n", Pico_mcd->scd.Cur_LBA);\r
+       cdprintf("command 200 : Cur LBA = %d", Pico_mcd->scd.Cur_LBA);\r
 \r
        CHECK_TRAY_OPEN\r
 \r
@@ -336,7 +307,7 @@ int Get_Pos_CDD_c20(void)
 //     else if (!(CDC.CTRL.B.B0 & 0x80)) Pico_mcd->cdd.Status |= Pico_mcd->scd.Status_CDD;\r
        Pico_mcd->cdd.Status |= Pico_mcd->scd.Status_CDD;\r
 \r
-       cdprintf("Status CDD = %.4X  Status = %.4X\n", Pico_mcd->scd.Status_CDD, Pico_mcd->cdd.Status);\r
+       cdprintf("Status CDD = %.4X  Status = %.4X", Pico_mcd->scd.Status_CDD, Pico_mcd->cdd.Status);\r
 \r
        LBA_to_MSF(Pico_mcd->scd.Cur_LBA, &MSF);\r
 \r
@@ -345,7 +316,7 @@ int Get_Pos_CDD_c20(void)
        Pico_mcd->cdd.Frame = INT_TO_BCDW(MSF.F);\r
        Pico_mcd->cdd.Ext = 0;\r
 \r
-       CDD_Complete = 1;\r
+       Pico_mcd->scd.CDD_Complete = 1;\r
 \r
        return 0;\r
 }\r
@@ -372,14 +343,14 @@ int Get_Track_Pos_CDD_c21(void)
        elapsed_time = Pico_mcd->scd.Cur_LBA - Track_to_LBA(LBA_to_Track(Pico_mcd->scd.Cur_LBA));\r
        LBA_to_MSF(elapsed_time - 150, &MSF);\r
 \r
-       cdprintf("   elapsed = %d\n", elapsed_time);\r
+       cdprintf("   elapsed = %d", elapsed_time);\r
 \r
        Pico_mcd->cdd.Minute = INT_TO_BCDW(MSF.M);\r
        Pico_mcd->cdd.Seconde = INT_TO_BCDW(MSF.S);\r
        Pico_mcd->cdd.Frame = INT_TO_BCDW(MSF.F);\r
        Pico_mcd->cdd.Ext = 0;\r
 \r
-       CDD_Complete = 1;\r
+       Pico_mcd->scd.CDD_Complete = 1;\r
 \r
        return 0;\r
 }\r
@@ -387,7 +358,7 @@ int Get_Track_Pos_CDD_c21(void)
 \r
 int Get_Current_Track_CDD_c22(void)\r
 {\r
-       cdprintf("Status CDD = %.4X  Status = %.4X\n", Pico_mcd->scd.Status_CDD, Pico_mcd->cdd.Status);\r
+       cdprintf("Status CDD = %.4X  Status = %.4X", Pico_mcd->scd.Status_CDD, Pico_mcd->cdd.Status);\r
 \r
        CHECK_TRAY_OPEN\r
 \r
@@ -408,7 +379,7 @@ int Get_Current_Track_CDD_c22(void)
        Pico_mcd->cdd.Frame = 0;\r
        Pico_mcd->cdd.Ext = 0;\r
 \r
-       CDD_Complete = 1;\r
+       Pico_mcd->scd.CDD_Complete = 1;\r
 \r
        return 0;\r
 }\r
@@ -427,18 +398,12 @@ int Get_Total_Lenght_CDD_c23(void)
 //     else if (!(CDC.CTRL.B.B0 & 0x80)) Pico_mcd->cdd.Status |= Pico_mcd->scd.Status_CDD;\r
        Pico_mcd->cdd.Status |= Pico_mcd->scd.Status_CDD;\r
 \r
-       Pico_mcd->cdd.Minute = INT_TO_BCDW(Pico_mcd->scd.TOC.Tracks[Pico_mcd->scd.TOC.Last_Track -\r
-                               Pico_mcd->scd.TOC.First_Track + 1].MSF.M);\r
-       Pico_mcd->cdd.Seconde = INT_TO_BCDW(Pico_mcd->scd.TOC.Tracks[Pico_mcd->scd.TOC.Last_Track -\r
-                               Pico_mcd->scd.TOC.First_Track + 1].MSF.S);\r
-       Pico_mcd->cdd.Frame = INT_TO_BCDW(Pico_mcd->scd.TOC.Tracks[Pico_mcd->scd.TOC.Last_Track -\r
-                               Pico_mcd->scd.TOC.First_Track + 1].MSF.F);\r
+       Pico_mcd->cdd.Minute = INT_TO_BCDW(Pico_mcd->TOC.Tracks[Pico_mcd->TOC.Last_Track].MSF.M);\r
+       Pico_mcd->cdd.Seconde = INT_TO_BCDW(Pico_mcd->TOC.Tracks[Pico_mcd->TOC.Last_Track].MSF.S);\r
+       Pico_mcd->cdd.Frame = INT_TO_BCDW(Pico_mcd->TOC.Tracks[Pico_mcd->TOC.Last_Track].MSF.F);\r
        Pico_mcd->cdd.Ext = 0;\r
 \r
-// FIXME: remove\r
-Pico_mcd->cdd.Seconde = 2;\r
-\r
-       CDD_Complete = 1;\r
+       Pico_mcd->scd.CDD_Complete = 1;\r
 \r
        return 0;\r
 }\r
@@ -456,15 +421,12 @@ int Get_First_Last_Track_CDD_c24(void)
 //     else if (!(CDC.CTRL.B.B0 & 0x80)) Pico_mcd->cdd.Status |= Pico_mcd->scd.Status_CDD;\r
        Pico_mcd->cdd.Status |= Pico_mcd->scd.Status_CDD;\r
 \r
-       Pico_mcd->cdd.Minute = INT_TO_BCDW(Pico_mcd->scd.TOC.First_Track);\r
-       Pico_mcd->cdd.Seconde = INT_TO_BCDW(Pico_mcd->scd.TOC.Last_Track);\r
+       Pico_mcd->cdd.Minute = INT_TO_BCDW(1);\r
+       Pico_mcd->cdd.Seconde = INT_TO_BCDW(Pico_mcd->TOC.Last_Track);\r
        Pico_mcd->cdd.Frame = 0;\r
        Pico_mcd->cdd.Ext = 0;\r
 \r
-// FIXME: remove\r
-Pico_mcd->cdd.Minute = Pico_mcd->cdd.Seconde = 1;\r
-\r
-       CDD_Complete = 1;\r
+       Pico_mcd->scd.CDD_Complete = 1;\r
 \r
        return 0;\r
 }\r
@@ -489,17 +451,17 @@ int Get_Track_Adr_CDD_c25(void)
 //     else if (!(CDC.CTRL.B.B0 & 0x80)) Pico_mcd->cdd.Status |= Pico_mcd->scd.Status_CDD;\r
        Pico_mcd->cdd.Status |= Pico_mcd->scd.Status_CDD;\r
 \r
-       if (track_number > Pico_mcd->scd.TOC.Last_Track) track_number = Pico_mcd->scd.TOC.Last_Track;\r
-       else if (track_number < Pico_mcd->scd.TOC.First_Track) track_number = Pico_mcd->scd.TOC.First_Track;\r
+       if (track_number > Pico_mcd->TOC.Last_Track) track_number = Pico_mcd->TOC.Last_Track;\r
+       else if (track_number < 1) track_number = 1;\r
 \r
-       Pico_mcd->cdd.Minute = INT_TO_BCDW(Pico_mcd->scd.TOC.Tracks[track_number - Pico_mcd->scd.TOC.First_Track].MSF.M);\r
-       Pico_mcd->cdd.Seconde = INT_TO_BCDW(Pico_mcd->scd.TOC.Tracks[track_number - Pico_mcd->scd.TOC.First_Track].MSF.S);\r
-       Pico_mcd->cdd.Frame = INT_TO_BCDW(Pico_mcd->scd.TOC.Tracks[track_number - Pico_mcd->scd.TOC.First_Track].MSF.F);\r
+       Pico_mcd->cdd.Minute = INT_TO_BCDW(Pico_mcd->TOC.Tracks[track_number - 1].MSF.M);\r
+       Pico_mcd->cdd.Seconde = INT_TO_BCDW(Pico_mcd->TOC.Tracks[track_number - 1].MSF.S);\r
+       Pico_mcd->cdd.Frame = INT_TO_BCDW(Pico_mcd->TOC.Tracks[track_number - 1].MSF.F);\r
        Pico_mcd->cdd.Ext = track_number % 10;\r
 \r
-       if (Pico_mcd->scd.TOC.Tracks[track_number - Pico_mcd->scd.TOC.First_Track].Type) Pico_mcd->cdd.Frame |= 0x0800;\r
+       if (track_number == 1) Pico_mcd->cdd.Frame |= 0x0800; // data track\r
 \r
-       CDD_Complete = 1;\r
+       Pico_mcd->scd.CDD_Complete = 1;\r
        return 0;\r
 }\r
 \r
@@ -528,7 +490,7 @@ int Play_CDD_c3(void)
        Pico_mcd->scd.Cur_LBA = new_lba;\r
        CDC_Update_Header();\r
 \r
-       cdprintf("Read : Cur LBA = %d, M=%d, S=%d, F=%d\n", Pico_mcd->scd.Cur_LBA, MSF.M, MSF.S, MSF.F);\r
+       cdprintf("Read : Cur LBA = %d, M=%d, S=%d, F=%d", Pico_mcd->scd.Cur_LBA, MSF.M, MSF.S, MSF.F);\r
 \r
        if (Pico_mcd->scd.Status_CDD != PLAYING) delay += 20;\r
 \r
@@ -536,9 +498,9 @@ int Play_CDD_c3(void)
        Pico_mcd->cdd.Status = 0x0102;\r
 //     Pico_mcd->cdd.Status = COMM_OK;\r
 \r
-       if (File_Add_Delay == 0) File_Add_Delay = delay;\r
+       if (Pico_mcd->scd.File_Add_Delay == 0) Pico_mcd->scd.File_Add_Delay = delay;\r
 \r
-       if (Pico_mcd->scd.TOC.Tracks[Pico_mcd->scd.Cur_Track - Pico_mcd->scd.TOC.First_Track].Type)\r
+       if (Pico_mcd->scd.Cur_Track == 1)\r
        {\r
                Pico_mcd->s68k_regs[0x36] |=  0x01;                             // DATA\r
        }\r
@@ -546,9 +508,7 @@ int Play_CDD_c3(void)
        {\r
                Pico_mcd->s68k_regs[0x36] &= ~0x01;                             // AUDIO\r
                //CD_Audio_Starting = 1;\r
-#if 0 // TODO\r
                FILE_Play_CD_LBA();\r
-#endif\r
        }\r
 \r
        if (Pico_mcd->scd.Cur_Track == 100) Pico_mcd->cdd.Minute = 0x0A02;\r
@@ -559,7 +519,7 @@ int Play_CDD_c3(void)
 \r
        Pico_mcd->scd.Status_CDC |= 1;                  // Read data with CDC\r
 \r
-       CDD_Complete = 1;\r
+       Pico_mcd->scd.CDD_Complete = 1;\r
        return 0;\r
 }\r
 \r
@@ -587,7 +547,7 @@ int Seek_CDD_c4(void)
        Pico_mcd->cdd.Status = 0x0200;\r
 \r
        // DATA ?\r
-       if (Pico_mcd->scd.TOC.Tracks[Pico_mcd->scd.Cur_Track - Pico_mcd->scd.TOC.First_Track].Type)\r
+       if (Pico_mcd->scd.Cur_Track == 1)\r
             Pico_mcd->s68k_regs[0x36] |=  0x01;\r
        else Pico_mcd->s68k_regs[0x36] &= ~0x01;                // AUDIO\r
 \r
@@ -596,7 +556,7 @@ int Seek_CDD_c4(void)
        Pico_mcd->cdd.Frame = 0;\r
        Pico_mcd->cdd.Ext = 0;\r
 \r
-       CDD_Complete = 1;\r
+       Pico_mcd->scd.CDD_Complete = 1;\r
 \r
        return 0;\r
 }\r
@@ -619,7 +579,7 @@ int Pause_CDD_c6(void)
        Pico_mcd->cdd.Frame = 0;\r
        Pico_mcd->cdd.Ext = 0;\r
 \r
-       CDD_Complete = 1;\r
+       Pico_mcd->scd.CDD_Complete = 1;\r
 \r
        return 0;\r
 }\r
@@ -636,14 +596,14 @@ int Resume_CDD_c7(void)
        {\r
                _msf MSF;\r
                LBA_to_MSF(Pico_mcd->scd.Cur_LBA, &MSF);\r
-               cdprintf("Resume read : Cur LBA = %d, M=%d, S=%d, F=%d\n", Pico_mcd->scd.Cur_LBA, MSF.M, MSF.S, MSF.F);\r
+               cdprintf("Resume read : Cur LBA = %d, M=%d, S=%d, F=%d", Pico_mcd->scd.Cur_LBA, MSF.M, MSF.S, MSF.F);\r
        }\r
 #endif\r
 \r
        Pico_mcd->scd.Status_CDD = PLAYING;\r
        Pico_mcd->cdd.Status = 0x0102;\r
 \r
-       if (Pico_mcd->scd.TOC.Tracks[Pico_mcd->scd.Cur_Track - Pico_mcd->scd.TOC.First_Track].Type)\r
+       if (Pico_mcd->scd.Cur_Track == 1)\r
        {\r
                Pico_mcd->s68k_regs[0x36] |=  0x01;                             // DATA\r
        }\r
@@ -651,9 +611,7 @@ int Resume_CDD_c7(void)
        {\r
                Pico_mcd->s68k_regs[0x36] &= ~0x01;                             // AUDIO\r
                //CD_Audio_Starting = 1;\r
-#if 0 // TODO\r
                FILE_Play_CD_LBA();\r
-#endif\r
        }\r
 \r
        if (Pico_mcd->scd.Cur_Track == 100) Pico_mcd->cdd.Minute = 0x0A02;\r
@@ -664,12 +622,12 @@ int Resume_CDD_c7(void)
 \r
        Pico_mcd->scd.Status_CDC |= 1;                  // Read data with CDC\r
 \r
-       CDD_Complete = 1;\r
+       Pico_mcd->scd.CDD_Complete = 1;\r
        return 0;\r
 }\r
 \r
 \r
-int    Fast_Foward_CDD_c8(void)\r
+int Fast_Foward_CDD_c8(void)\r
 {\r
        CHECK_TRAY_OPEN\r
        CHECK_CD_PRESENT\r
@@ -684,13 +642,13 @@ int       Fast_Foward_CDD_c8(void)
        Pico_mcd->cdd.Frame = 0;\r
        Pico_mcd->cdd.Ext = 0;\r
 \r
-       CDD_Complete = 1;\r
+       Pico_mcd->scd.CDD_Complete = 1;\r
 \r
        return 0;\r
 }\r
 \r
 \r
-int    Fast_Rewind_CDD_c9(void)\r
+int Fast_Rewind_CDD_c9(void)\r
 {\r
        CHECK_TRAY_OPEN\r
        CHECK_CD_PRESENT\r
@@ -705,7 +663,7 @@ int Fast_Rewind_CDD_c9(void)
        Pico_mcd->cdd.Frame = 0;\r
        Pico_mcd->cdd.Ext = 0;\r
 \r
-       CDD_Complete = 1;\r
+       Pico_mcd->scd.CDD_Complete = 1;\r
 \r
        return 0;\r
 }\r
@@ -739,7 +697,7 @@ int Close_Tray_CDD_cC(void)
                Pico_mcd->cdd.Ext = 0;\r
        }\r
 \r
-       CDD_Complete = 1;\r
+       Pico_mcd->scd.CDD_Complete = 1;\r
 \r
        return 0;\r
 }\r
@@ -751,9 +709,7 @@ int Open_Tray_CDD_cD(void)
 \r
        Pico_mcd->scd.Status_CDC &= ~1;                 // Stop CDC read\r
 \r
-#if 0 // TODO\r
        Unload_ISO();\r
-#endif\r
        CD_Present = 0;\r
 \r
        Pico_mcd->scd.Status_CDD = TRAY_OPEN;\r
@@ -764,7 +720,7 @@ int Open_Tray_CDD_cD(void)
        Pico_mcd->cdd.Frame = 0;\r
        Pico_mcd->cdd.Ext = 0;\r
 \r
-       CDD_Complete = 1;\r
+       Pico_mcd->scd.CDD_Complete = 1;\r
 \r
        return 0;\r
 }\r
@@ -785,7 +741,7 @@ int CDD_cA(void)
        Pico_mcd->cdd.Frame = INT_TO_BCDW(1);\r
        Pico_mcd->cdd.Ext = 0;\r
 \r
-       CDD_Complete = 1;\r
+       Pico_mcd->scd.CDD_Complete = 1;\r
 \r
        return 0;\r
 }\r