1.10 release

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

diff --git a/Pico/cd/cd_sys.c b/Pico/cd/cd_sys.c
index 72d6c0e..2c70ea2 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
@@ -45,8 +34,6 @@ static int CDD_Complete;
 \r
 static int File_Add_Delay = 0;\r
 \r
-//_scd SCD;\r
-\r
 \r
 \r
 #define CHECK_TRAY_OPEN                                \\r
@@ -167,7 +154,7 @@ int Track_to_LBA(int track)
 \r
 void Check_CD_Command(void)\r
 {\r
-       cdprintf("CHECK CD COMMAND\n");\r
+       cdprintf("CHECK CD COMMAND");\r
 \r
        // Check CDD\r
 \r
@@ -182,7 +169,7 @@ void Check_CD_Command(void)
 \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
@@ -191,9 +178,7 @@ void Check_CD_Command(void)
 \r
                if (File_Add_Delay == 0)\r
                {\r
-#if 0 // TODO\r
                        FILE_Read_One_LBA_CDC();\r
-#endif\r
                }\r
                else File_Add_Delay--;\r
        }\r
@@ -215,9 +200,7 @@ 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
@@ -225,9 +208,7 @@ int Init_CD_Driver(void)
 \r
 void End_CD_Driver(void)\r
 {\r
-#if 0 // TODO\r
        FILE_End();\r
-#endif\r
 }\r
 \r
 \r
@@ -240,33 +221,29 @@ void Reset_CD(void)
 }\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 +257,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
@@ -323,7 +300,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 +313,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
@@ -372,7 +349,7 @@ 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
@@ -387,7 +364,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
@@ -436,7 +413,7 @@ int Get_Total_Lenght_CDD_c23(void)
        Pico_mcd->cdd.Ext = 0;\r
 \r
 // FIXME: remove\r
-Pico_mcd->cdd.Seconde = 2;\r
+//Pico_mcd->cdd.Seconde = 2;\r
 \r
        CDD_Complete = 1;\r
 \r
@@ -462,7 +439,7 @@ int Get_First_Last_Track_CDD_c24(void)
        Pico_mcd->cdd.Ext = 0;\r
 \r
 // FIXME: remove\r
-Pico_mcd->cdd.Minute = Pico_mcd->cdd.Seconde = 1;\r
+//Pico_mcd->cdd.Minute = Pico_mcd->cdd.Seconde = 1;\r
 \r
        CDD_Complete = 1;\r
 \r
@@ -528,7 +505,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
@@ -546,9 +523,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
@@ -636,7 +611,7 @@ 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
@@ -651,9 +626,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
@@ -669,7 +642,7 @@ int Resume_CDD_c7(void)
 }\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
@@ -690,7 +663,7 @@ int Fast_Foward_CDD_c8(void)
 }\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
@@ -751,9 +724,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