\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
void Check_CD_Command(void)\r
{\r
- cdprintf("CHECK CD COMMAND\n");\r
+ cdprintf("CHECK CD COMMAND");\r
\r
// Check CDD\r
\r
- if (CDD_Complete)\r
+ if (Pico_mcd->scd.CDD_Complete)\r
{\r
- CDD_Complete = 0;\r
+ Pico_mcd->scd.CDD_Complete = 0;\r
\r
CDD_Export_Status();\r
}\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
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
if (Pico_mcd->scd.Status_CDD == FAST_FOW)\r
Pico_mcd->scd.Cur_Track = 0;\r
Pico_mcd->scd.Cur_LBA = -150;\r
Pico_mcd->scd.Status_CDD = READY;\r
- CDD_Complete = 0;\r
+ Pico_mcd->scd.CDD_Complete = 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
// 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
// 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
\r
if (Pico_mcd->scd.TOC.Tracks[track_number - Pico_mcd->scd.TOC.First_Track].Type) Pico_mcd->cdd.Frame |= 0x0800;\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
{\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
{\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
\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