\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
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
\r
int Init_CD_Driver(void)\r
{\r
- FILE_Init();\r
-\r
return 0;\r
}\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
Pico_mcd->scd.CDD_Complete = 1;\r
\r
return 0;\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
Pico_mcd->scd.CDD_Complete = 1;\r
\r
return 0;\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
Pico_mcd->scd.CDD_Complete = 1;\r
return 0;\r
\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
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->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