\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
*/\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
+// int CD_Timer_Counter = 0; // TODO: check refs\r
\r
\r
\r
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
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
\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
\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
\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
FILE_Read_One_LBA_CDC();\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
\r
int Init_CD_Driver(void)\r
{\r
- FILE_Init();\r
-\r
return 0;\r
}\r
\r
{\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
\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
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
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
_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
// 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
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
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
\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
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
// 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
// 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
// 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
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
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
\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
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
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
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
_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
\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
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
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
Pico_mcd->cdd.Ext = 0;\r
}\r
\r
- CDD_Complete = 1;\r
+ Pico_mcd->scd.CDD_Complete = 1;\r
\r
return 0;\r
}\r
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
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