amalgamation

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

diff --git a/Pico/cd/cd_sys.c b/Pico/cd/cd_sys.c
index 390c309..c0001d2 100644 (file)
--- a/Pico/cd/cd_sys.c
+++ b/Pico/cd/cd_sys.c
@@ -8,10 +8,10 @@
  ***********************************************************/\r
 \r
 #include <stdio.h>\r
-#include "cd_sys.h"\r
-#include "cd_file.h"\r
 \r
 #include "../PicoInt.h"\r
+#include "cd_sys.h"\r
+#include "cd_file.h"\r
 \r
 #define cdprintf dprintf\r
 //#define cdprintf(x...)\r
@@ -68,7 +68,7 @@ static int MSF_to_LBA(_msf *MSF)
 }\r
 \r
 \r
-void LBA_to_MSF(int lba, _msf *MSF)\r
+PICO_INTERNAL void LBA_to_MSF(int lba, _msf *MSF)\r
 {\r
        if (lba < -150) lba = 0;\r
        else lba += 150;\r
@@ -122,7 +122,7 @@ static void Track_to_MSF(int track, _msf *MSF)
 }\r
 \r
 \r
-int Track_to_LBA(int track)\r
+PICO_INTERNAL int Track_to_LBA(int track)\r
 {\r
        _msf MSF;\r
 \r
@@ -131,7 +131,7 @@ int Track_to_LBA(int track)
 }\r
 \r
 \r
-void Check_CD_Command(void)\r
+PICO_INTERNAL void Check_CD_Command(void)\r
 {\r
        cdprintf("CHECK CD COMMAND");\r
 \r
@@ -175,19 +175,19 @@ void Check_CD_Command(void)
 }\r
 \r
 \r
-int Init_CD_Driver(void)\r
+PICO_INTERNAL int Init_CD_Driver(void)\r
 {\r
        return 0;\r
 }\r
 \r
 \r
-void End_CD_Driver(void)\r
+PICO_INTERNAL void End_CD_Driver(void)\r
 {\r
-       FILE_End();\r
+       Unload_ISO();\r
 }\r
 \r
 \r
-void Reset_CD(void)\r
+PICO_INTERNAL void Reset_CD(void)\r
 {\r
        Pico_mcd->scd.Cur_Track = 0;\r
        Pico_mcd->scd.Cur_LBA = -150;\r
@@ -202,9 +202,6 @@ int Insert_CD(char *iso_name, int is_bin)
 {\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
        CD_Present = 0;\r
        Pico_mcd->scd.Status_CDD = NOCD;\r
 \r
@@ -228,14 +225,15 @@ void Stop_CD(void)
 }\r
 \r
 \r
-void Change_CD(void)\r
+/*\r
+PICO_INTERNAL void Change_CD(void)\r
 {\r
        if (Pico_mcd->scd.Status_CDD == TRAY_OPEN) Close_Tray_CDD_cC();\r
        else Open_Tray_CDD_cD();\r
 }\r
+*/\r
 \r
-\r
-int Get_Status_CDD_c0(void)\r
+PICO_INTERNAL int Get_Status_CDD_c0(void)\r
 {\r
        cdprintf("Status command : Cur LBA = %d", Pico_mcd->scd.Cur_LBA);\r
 \r
@@ -253,7 +251,7 @@ int Get_Status_CDD_c0(void)
 }\r
 \r
 \r
-int Stop_CDD_c1(void)\r
+PICO_INTERNAL int Stop_CDD_c1(void)\r
 {\r
        CHECK_TRAY_OPEN\r
 \r
@@ -276,7 +274,7 @@ int Stop_CDD_c1(void)
 }\r
 \r
 \r
-int Get_Pos_CDD_c20(void)\r
+PICO_INTERNAL int Get_Pos_CDD_c20(void)\r
 {\r
        _msf MSF;\r
 \r
@@ -308,7 +306,7 @@ int Get_Pos_CDD_c20(void)
 }\r
 \r
 \r
-int Get_Track_Pos_CDD_c21(void)\r
+PICO_INTERNAL int Get_Track_Pos_CDD_c21(void)\r
 {\r
        int elapsed_time;\r
        _msf MSF;\r
@@ -342,7 +340,7 @@ int Get_Track_Pos_CDD_c21(void)
 }\r
 \r
 \r
-int Get_Current_Track_CDD_c22(void)\r
+PICO_INTERNAL int Get_Current_Track_CDD_c22(void)\r
 {\r
        cdprintf("Status CDD = %.4X  Status = %.4X", Pico_mcd->scd.Status_CDD, Pico_mcd->cdd.Status);\r
 \r
@@ -371,7 +369,7 @@ int Get_Current_Track_CDD_c22(void)
 }\r
 \r
 \r
-int Get_Total_Lenght_CDD_c23(void)\r
+PICO_INTERNAL int Get_Total_Lenght_CDD_c23(void)\r
 {\r
        CHECK_TRAY_OPEN\r
 \r
@@ -395,7 +393,7 @@ int Get_Total_Lenght_CDD_c23(void)
 }\r
 \r
 \r
-int Get_First_Last_Track_CDD_c24(void)\r
+PICO_INTERNAL int Get_First_Last_Track_CDD_c24(void)\r
 {\r
        CHECK_TRAY_OPEN\r
 \r
@@ -418,7 +416,7 @@ int Get_First_Last_Track_CDD_c24(void)
 }\r
 \r
 \r
-int Get_Track_Adr_CDD_c25(void)\r
+PICO_INTERNAL int Get_Track_Adr_CDD_c25(void)\r
 {\r
        int track_number;\r
 \r
@@ -452,7 +450,7 @@ int Get_Track_Adr_CDD_c25(void)
 }\r
 \r
 \r
-int Play_CDD_c3(void)\r
+PICO_INTERNAL int Play_CDD_c3(void)\r
 {\r
        _msf MSF;\r
        int delay, new_lba;\r
@@ -510,7 +508,7 @@ int Play_CDD_c3(void)
 }\r
 \r
 \r
-int Seek_CDD_c4(void)\r
+PICO_INTERNAL int Seek_CDD_c4(void)\r
 {\r
        _msf MSF;\r
 \r
@@ -548,7 +546,7 @@ int Seek_CDD_c4(void)
 }\r
 \r
 \r
-int Pause_CDD_c6(void)\r
+PICO_INTERNAL int Pause_CDD_c6(void)\r
 {\r
        CHECK_TRAY_OPEN\r
        CHECK_CD_PRESENT\r
@@ -571,7 +569,7 @@ int Pause_CDD_c6(void)
 }\r
 \r
 \r
-int Resume_CDD_c7(void)\r
+PICO_INTERNAL int Resume_CDD_c7(void)\r
 {\r
        CHECK_TRAY_OPEN\r
        CHECK_CD_PRESENT\r
@@ -613,7 +611,7 @@ int Resume_CDD_c7(void)
 }\r
 \r
 \r
-int Fast_Foward_CDD_c8(void)\r
+PICO_INTERNAL int Fast_Foward_CDD_c8(void)\r
 {\r
        CHECK_TRAY_OPEN\r
        CHECK_CD_PRESENT\r
@@ -634,7 +632,7 @@ int Fast_Foward_CDD_c8(void)
 }\r
 \r
 \r
-int Fast_Rewind_CDD_c9(void)\r
+PICO_INTERNAL int Fast_Rewind_CDD_c9(void)\r
 {\r
        CHECK_TRAY_OPEN\r
        CHECK_CD_PRESENT\r
@@ -655,7 +653,7 @@ int Fast_Rewind_CDD_c9(void)
 }\r
 \r
 \r
-int Close_Tray_CDD_cC(void)\r
+PICO_INTERNAL int Close_Tray_CDD_cC(void)\r
 {\r
        CD_Present = 0;\r
        //Clear_Sound_Buffer();\r
@@ -681,7 +679,7 @@ int Close_Tray_CDD_cC(void)
 }\r
 \r
 \r
-int Open_Tray_CDD_cD(void)\r
+PICO_INTERNAL int Open_Tray_CDD_cD(void)\r
 {\r
        CHECK_TRAY_OPEN\r
 \r
@@ -709,7 +707,7 @@ int Open_Tray_CDD_cD(void)
 }\r
 \r
 \r
-int CDD_cA(void)\r
+PICO_INTERNAL int CDD_cA(void)\r
 {\r
        CHECK_TRAY_OPEN\r
        CHECK_CD_PRESENT\r
@@ -730,7 +728,7 @@ int CDD_cA(void)
 }\r
 \r
 \r
-int CDD_Def(void)\r
+PICO_INTERNAL int CDD_Def(void)\r
 {\r
        Pico_mcd->cdd.Status = Pico_mcd->scd.Status_CDD;\r
 \r