X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=Pico%2Fcd%2Fcd_sys.c;h=a482b7eb8afc424334356fc839faf2f6d77ae6c9;hb=7a93adeb29f01f5867ff36606cd73a382b6ee0e3;hp=833680b1bc81d4972e7723540e7f440119df15dc;hpb=bf098bc53228f6b5016cb4a6126f4466bfba4e00;p=picodrive.git

diff --git a/Pico/cd/cd_sys.c b/Pico/cd/cd_sys.c
index 833680b..a482b7e 100644
--- a/Pico/cd/cd_sys.c
+++ b/Pico/cd/cd_sys.c
@@ -4,8 +4,9 @@
 
 #include "../PicoInt.h"
 
-#define cdprintf printf
+#define cdprintf dprintf
 //#define cdprintf(x...)
+#define DEBUG_CD
 
 #define TRAY_OPEN	0x0500		// TRAY OPEN CDD status
 #define NOCD		0x0000		// CD removed CDD status
@@ -27,11 +28,7 @@ int CD_Audio_Starting;
 */
 
 static int CD_Present = 0;
-int CD_Timer_Counter = 0; // TODO: check refs
-
-static int CDD_Complete;
-
-static int File_Add_Delay = 0;
+// int CD_Timer_Counter = 0; // TODO: check refs
 
 
 
@@ -45,7 +42,7 @@ if (Pico_mcd->scd.Status_CDD == TRAY_OPEN)	\
 	Pico_mcd->cdd.Frame = 0;					\
 	Pico_mcd->cdd.Ext = 0;					\
 									\
-	CDD_Complete = 1;				\
+	Pico_mcd->scd.CDD_Complete = 1;				\
 									\
 	return 2;						\
 }
@@ -62,7 +59,7 @@ if (!CD_Present)					\
 	Pico_mcd->cdd.Frame = 0;					\
 	Pico_mcd->cdd.Ext = 0;					\
 									\
-	CDD_Complete = 1;				\
+	Pico_mcd->scd.CDD_Complete = 1;				\
 									\
 	return 3;						\
 }
@@ -104,19 +101,19 @@ static unsigned int MSF_to_Track(_msf *MSF)
 
 	Start = (MSF->M << 16) + (MSF->S << 8) + MSF->F;
 
-	for(i = Pico_mcd->scd.TOC.First_Track; i <= (Pico_mcd->scd.TOC.Last_Track + 1); i++)
+	for(i = 1; i <= (Pico_mcd->TOC.Last_Track + 1); i++)
 	{
-		Cur = Pico_mcd->scd.TOC.Tracks[i - Pico_mcd->scd.TOC.First_Track].MSF.M << 16;
-		Cur += Pico_mcd->scd.TOC.Tracks[i - Pico_mcd->scd.TOC.First_Track].MSF.S << 8;
-		Cur += Pico_mcd->scd.TOC.Tracks[i - Pico_mcd->scd.TOC.First_Track].MSF.F;
+		Cur = Pico_mcd->TOC.Tracks[i - 1].MSF.M << 16;
+		Cur += Pico_mcd->TOC.Tracks[i - 1].MSF.S << 8;
+		Cur += Pico_mcd->TOC.Tracks[i - 1].MSF.F;
 
 		if (Cur > Start) break;
 	}
 
 	--i;
 
-	if (i > Pico_mcd->scd.TOC.Last_Track) return 100;
-	if (i < Pico_mcd->scd.TOC.First_Track) i = Pico_mcd->scd.TOC.First_Track;
+	if (i > Pico_mcd->TOC.Last_Track) return 100;
+	else if (i < 1) i = 1;
 
 	return (unsigned) i;
 }
@@ -133,12 +130,12 @@ static unsigned int LBA_to_Track(int lba)
 
 static void Track_to_MSF(int track, _msf *MSF)
 {
-	if (track < Pico_mcd->scd.TOC.First_Track) track = Pico_mcd->scd.TOC.First_Track;
-	else if (track > Pico_mcd->scd.TOC.Last_Track) track = Pico_mcd->scd.TOC.Last_Track;
+	if (track < 1) track = 1;
+	else if (track > Pico_mcd->TOC.Last_Track) track = Pico_mcd->TOC.Last_Track;
 
-	MSF->M = Pico_mcd->scd.TOC.Tracks[track - Pico_mcd->scd.TOC.First_Track].MSF.M;
-	MSF->S = Pico_mcd->scd.TOC.Tracks[track - Pico_mcd->scd.TOC.First_Track].MSF.S;
-	MSF->F = Pico_mcd->scd.TOC.Tracks[track - Pico_mcd->scd.TOC.First_Track].MSF.F;
+	MSF->M = Pico_mcd->TOC.Tracks[track - 1].MSF.M;
+	MSF->S = Pico_mcd->TOC.Tracks[track - 1].MSF.S;
+	MSF->F = Pico_mcd->TOC.Tracks[track - 1].MSF.F;
 }
 
 
@@ -153,33 +150,31 @@ int Track_to_LBA(int track)
 
 void Check_CD_Command(void)
 {
-	cdprintf("CHECK CD COMMAND\n");
-
-	// Check CDD
-
-	if (CDD_Complete)
-	{
-		CDD_Complete = 0;
-
-		CDD_Export_Status();
-	}
+	cdprintf("CHECK CD COMMAND");
 
 	// Check CDC
-
 	if (Pico_mcd->scd.Status_CDC & 1)			// CDC is reading data ...
 	{
-		cdprintf("Sending a read command\n");
+		cdprintf("Got a read command");
 
 		// DATA ?
-		if (Pico_mcd->scd.TOC.Tracks[Pico_mcd->scd.Cur_Track - Pico_mcd->scd.TOC.First_Track].Type)
+		if (Pico_mcd->scd.Cur_Track == 1)
 		     Pico_mcd->s68k_regs[0x36] |=  0x01;
 		else Pico_mcd->s68k_regs[0x36] &= ~0x01;			// AUDIO
 
-		if (File_Add_Delay == 0)
+		if (Pico_mcd->scd.File_Add_Delay == 0)
 		{
 			FILE_Read_One_LBA_CDC();
 		}
-		else File_Add_Delay--;
+		else Pico_mcd->scd.File_Add_Delay--;
+	}
+
+	// Check CDD
+	if (Pico_mcd->scd.CDD_Complete)
+	{
+		Pico_mcd->scd.CDD_Complete = 0;
+
+		CDD_Export_Status();
 	}
 
 	if (Pico_mcd->scd.Status_CDD == FAST_FOW)
@@ -199,8 +194,6 @@ void Check_CD_Command(void)
 
 int Init_CD_Driver(void)
 {
-	FILE_Init();
-
 	return 0;
 }
 
@@ -216,7 +209,7 @@ void Reset_CD(void)
 	Pico_mcd->scd.Cur_Track = 0;
 	Pico_mcd->scd.Cur_LBA = -150;
 	Pico_mcd->scd.Status_CDD = READY;
-	CDD_Complete = 0;
+	Pico_mcd->scd.CDD_Complete = 0;
 }
 
 
@@ -256,7 +249,7 @@ void Change_CD(void)
 
 int Get_Status_CDD_c0(void)
 {
-	cdprintf("Status command : Cur LBA = %d\n", Pico_mcd->scd.Cur_LBA);
+	cdprintf("Status command : Cur LBA = %d", Pico_mcd->scd.Cur_LBA);
 
 	// Clear immediat status
 	if ((Pico_mcd->cdd.Status & 0x0F00) == 0x0200)
@@ -266,7 +259,7 @@ int Get_Status_CDD_c0(void)
 	else if ((Pico_mcd->cdd.Status & 0x0F00) == 0x0E00)
 		Pico_mcd->cdd.Status = (Pico_mcd->scd.Status_CDD & 0xFF00) | (Pico_mcd->cdd.Status & 0x00FF);
 
-	CDD_Complete = 1;
+	Pico_mcd->scd.CDD_Complete = 1;
 
 	return 0;
 }
@@ -289,7 +282,7 @@ int Stop_CDD_c1(void)
 	Pico_mcd->cdd.Frame = 0;
 	Pico_mcd->cdd.Ext = 0;
 
-	CDD_Complete = 1;
+	Pico_mcd->scd.CDD_Complete = 1;
 
 	return 0;
 }
@@ -299,7 +292,7 @@ int Get_Pos_CDD_c20(void)
 {
 	_msf MSF;
 
-	cdprintf("command 200 : Cur LBA = %d\n", Pico_mcd->scd.Cur_LBA);
+	cdprintf("command 200 : Cur LBA = %d", Pico_mcd->scd.Cur_LBA);
 
 	CHECK_TRAY_OPEN
 
@@ -312,7 +305,7 @@ int Get_Pos_CDD_c20(void)
 //	else if (!(CDC.CTRL.B.B0 & 0x80)) Pico_mcd->cdd.Status |= Pico_mcd->scd.Status_CDD;
 	Pico_mcd->cdd.Status |= Pico_mcd->scd.Status_CDD;
 
-	cdprintf("Status CDD = %.4X  Status = %.4X\n", Pico_mcd->scd.Status_CDD, Pico_mcd->cdd.Status);
+	cdprintf("Status CDD = %.4X  Status = %.4X", Pico_mcd->scd.Status_CDD, Pico_mcd->cdd.Status);
 
 	LBA_to_MSF(Pico_mcd->scd.Cur_LBA, &MSF);
 
@@ -321,7 +314,7 @@ int Get_Pos_CDD_c20(void)
 	Pico_mcd->cdd.Frame = INT_TO_BCDW(MSF.F);
 	Pico_mcd->cdd.Ext = 0;
 
-	CDD_Complete = 1;
+	Pico_mcd->scd.CDD_Complete = 1;
 
 	return 0;
 }
@@ -348,14 +341,14 @@ 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));
 	LBA_to_MSF(elapsed_time - 150, &MSF);
 
-	cdprintf("   elapsed = %d\n", elapsed_time);
+	cdprintf("   elapsed = %d", elapsed_time);
 
 	Pico_mcd->cdd.Minute = INT_TO_BCDW(MSF.M);
 	Pico_mcd->cdd.Seconde = INT_TO_BCDW(MSF.S);
 	Pico_mcd->cdd.Frame = INT_TO_BCDW(MSF.F);
 	Pico_mcd->cdd.Ext = 0;
 
-	CDD_Complete = 1;
+	Pico_mcd->scd.CDD_Complete = 1;
 
 	return 0;
 }
@@ -363,7 +356,7 @@ int Get_Track_Pos_CDD_c21(void)
 
 int Get_Current_Track_CDD_c22(void)
 {
-	cdprintf("Status CDD = %.4X  Status = %.4X\n", Pico_mcd->scd.Status_CDD, Pico_mcd->cdd.Status);
+	cdprintf("Status CDD = %.4X  Status = %.4X", Pico_mcd->scd.Status_CDD, Pico_mcd->cdd.Status);
 
 	CHECK_TRAY_OPEN
 
@@ -384,7 +377,7 @@ int Get_Current_Track_CDD_c22(void)
 	Pico_mcd->cdd.Frame = 0;
 	Pico_mcd->cdd.Ext = 0;
 
-	CDD_Complete = 1;
+	Pico_mcd->scd.CDD_Complete = 1;
 
 	return 0;
 }
@@ -403,18 +396,12 @@ int Get_Total_Lenght_CDD_c23(void)
 //	else if (!(CDC.CTRL.B.B0 & 0x80)) Pico_mcd->cdd.Status |= Pico_mcd->scd.Status_CDD;
 	Pico_mcd->cdd.Status |= Pico_mcd->scd.Status_CDD;
 
-	Pico_mcd->cdd.Minute = INT_TO_BCDW(Pico_mcd->scd.TOC.Tracks[Pico_mcd->scd.TOC.Last_Track -
-				Pico_mcd->scd.TOC.First_Track + 1].MSF.M);
-	Pico_mcd->cdd.Seconde = INT_TO_BCDW(Pico_mcd->scd.TOC.Tracks[Pico_mcd->scd.TOC.Last_Track -
-				Pico_mcd->scd.TOC.First_Track + 1].MSF.S);
-	Pico_mcd->cdd.Frame = INT_TO_BCDW(Pico_mcd->scd.TOC.Tracks[Pico_mcd->scd.TOC.Last_Track -
-				Pico_mcd->scd.TOC.First_Track + 1].MSF.F);
+	Pico_mcd->cdd.Minute = INT_TO_BCDW(Pico_mcd->TOC.Tracks[Pico_mcd->TOC.Last_Track].MSF.M);
+	Pico_mcd->cdd.Seconde = INT_TO_BCDW(Pico_mcd->TOC.Tracks[Pico_mcd->TOC.Last_Track].MSF.S);
+	Pico_mcd->cdd.Frame = INT_TO_BCDW(Pico_mcd->TOC.Tracks[Pico_mcd->TOC.Last_Track].MSF.F);
 	Pico_mcd->cdd.Ext = 0;
 
-// FIXME: remove
-//Pico_mcd->cdd.Seconde = 2;
-
-	CDD_Complete = 1;
+	Pico_mcd->scd.CDD_Complete = 1;
 
 	return 0;
 }
@@ -432,15 +419,12 @@ int Get_First_Last_Track_CDD_c24(void)
 //	else if (!(CDC.CTRL.B.B0 & 0x80)) Pico_mcd->cdd.Status |= Pico_mcd->scd.Status_CDD;
 	Pico_mcd->cdd.Status |= Pico_mcd->scd.Status_CDD;
 
-	Pico_mcd->cdd.Minute = INT_TO_BCDW(Pico_mcd->scd.TOC.First_Track);
-	Pico_mcd->cdd.Seconde = INT_TO_BCDW(Pico_mcd->scd.TOC.Last_Track);
+	Pico_mcd->cdd.Minute = INT_TO_BCDW(1);
+	Pico_mcd->cdd.Seconde = INT_TO_BCDW(Pico_mcd->TOC.Last_Track);
 	Pico_mcd->cdd.Frame = 0;
 	Pico_mcd->cdd.Ext = 0;
 
-// FIXME: remove
-//Pico_mcd->cdd.Minute = Pico_mcd->cdd.Seconde = 1;
-
-	CDD_Complete = 1;
+	Pico_mcd->scd.CDD_Complete = 1;
 
 	return 0;
 }
@@ -465,17 +449,17 @@ int Get_Track_Adr_CDD_c25(void)
 //	else if (!(CDC.CTRL.B.B0 & 0x80)) Pico_mcd->cdd.Status |= Pico_mcd->scd.Status_CDD;
 	Pico_mcd->cdd.Status |= Pico_mcd->scd.Status_CDD;
 
-	if (track_number > Pico_mcd->scd.TOC.Last_Track) track_number = Pico_mcd->scd.TOC.Last_Track;
-	else if (track_number < Pico_mcd->scd.TOC.First_Track) track_number = Pico_mcd->scd.TOC.First_Track;
+	if (track_number > Pico_mcd->TOC.Last_Track) track_number = Pico_mcd->TOC.Last_Track;
+	else if (track_number < 1) track_number = 1;
 
-	Pico_mcd->cdd.Minute = INT_TO_BCDW(Pico_mcd->scd.TOC.Tracks[track_number - Pico_mcd->scd.TOC.First_Track].MSF.M);
-	Pico_mcd->cdd.Seconde = INT_TO_BCDW(Pico_mcd->scd.TOC.Tracks[track_number - Pico_mcd->scd.TOC.First_Track].MSF.S);
-	Pico_mcd->cdd.Frame = INT_TO_BCDW(Pico_mcd->scd.TOC.Tracks[track_number - Pico_mcd->scd.TOC.First_Track].MSF.F);
+	Pico_mcd->cdd.Minute = INT_TO_BCDW(Pico_mcd->TOC.Tracks[track_number - 1].MSF.M);
+	Pico_mcd->cdd.Seconde = INT_TO_BCDW(Pico_mcd->TOC.Tracks[track_number - 1].MSF.S);
+	Pico_mcd->cdd.Frame = INT_TO_BCDW(Pico_mcd->TOC.Tracks[track_number - 1].MSF.F);
 	Pico_mcd->cdd.Ext = track_number % 10;
 
-	if (Pico_mcd->scd.TOC.Tracks[track_number - Pico_mcd->scd.TOC.First_Track].Type) Pico_mcd->cdd.Frame |= 0x0800;
+	if (track_number == 1) Pico_mcd->cdd.Frame |= 0x0800; // data track
 
-	CDD_Complete = 1;
+	Pico_mcd->scd.CDD_Complete = 1;
 	return 0;
 }
 
@@ -504,7 +488,7 @@ int Play_CDD_c3(void)
 	Pico_mcd->scd.Cur_LBA = new_lba;
 	CDC_Update_Header();
 
-	cdprintf("Read : Cur LBA = %d, M=%d, S=%d, F=%d\n", Pico_mcd->scd.Cur_LBA, MSF.M, MSF.S, MSF.F);
+	cdprintf("Read : Cur LBA = %d, M=%d, S=%d, F=%d", Pico_mcd->scd.Cur_LBA, MSF.M, MSF.S, MSF.F);
 
 	if (Pico_mcd->scd.Status_CDD != PLAYING) delay += 20;
 
@@ -512,9 +496,9 @@ int Play_CDD_c3(void)
 	Pico_mcd->cdd.Status = 0x0102;
 //	Pico_mcd->cdd.Status = COMM_OK;
 
-	if (File_Add_Delay == 0) File_Add_Delay = delay;
+	if (Pico_mcd->scd.File_Add_Delay == 0) Pico_mcd->scd.File_Add_Delay = delay;
 
-	if (Pico_mcd->scd.TOC.Tracks[Pico_mcd->scd.Cur_Track - Pico_mcd->scd.TOC.First_Track].Type)
+	if (Pico_mcd->scd.Cur_Track == 1)
 	{
 		Pico_mcd->s68k_regs[0x36] |=  0x01;				// DATA
 	}
@@ -533,7 +517,7 @@ int Play_CDD_c3(void)
 
 	Pico_mcd->scd.Status_CDC |= 1;			// Read data with CDC
 
-	CDD_Complete = 1;
+	Pico_mcd->scd.CDD_Complete = 1;
 	return 0;
 }
 
@@ -561,7 +545,7 @@ int Seek_CDD_c4(void)
 	Pico_mcd->cdd.Status = 0x0200;
 
 	// DATA ?
-	if (Pico_mcd->scd.TOC.Tracks[Pico_mcd->scd.Cur_Track - Pico_mcd->scd.TOC.First_Track].Type)
+	if (Pico_mcd->scd.Cur_Track == 1)
 	     Pico_mcd->s68k_regs[0x36] |=  0x01;
 	else Pico_mcd->s68k_regs[0x36] &= ~0x01;		// AUDIO
 
@@ -570,7 +554,7 @@ int Seek_CDD_c4(void)
 	Pico_mcd->cdd.Frame = 0;
 	Pico_mcd->cdd.Ext = 0;
 
-	CDD_Complete = 1;
+	Pico_mcd->scd.CDD_Complete = 1;
 
 	return 0;
 }
@@ -593,7 +577,7 @@ int Pause_CDD_c6(void)
 	Pico_mcd->cdd.Frame = 0;
 	Pico_mcd->cdd.Ext = 0;
 
-	CDD_Complete = 1;
+	Pico_mcd->scd.CDD_Complete = 1;
 
 	return 0;
 }
@@ -610,14 +594,14 @@ int Resume_CDD_c7(void)
 	{
 		_msf MSF;
 		LBA_to_MSF(Pico_mcd->scd.Cur_LBA, &MSF);
-		cdprintf("Resume read : Cur LBA = %d, M=%d, S=%d, F=%d\n", Pico_mcd->scd.Cur_LBA, MSF.M, MSF.S, MSF.F);
+		cdprintf("Resume read : Cur LBA = %d, M=%d, S=%d, F=%d", Pico_mcd->scd.Cur_LBA, MSF.M, MSF.S, MSF.F);
 	}
 #endif
 
 	Pico_mcd->scd.Status_CDD = PLAYING;
 	Pico_mcd->cdd.Status = 0x0102;
 
-	if (Pico_mcd->scd.TOC.Tracks[Pico_mcd->scd.Cur_Track - Pico_mcd->scd.TOC.First_Track].Type)
+	if (Pico_mcd->scd.Cur_Track == 1)
 	{
 		Pico_mcd->s68k_regs[0x36] |=  0x01;				// DATA
 	}
@@ -636,7 +620,7 @@ int Resume_CDD_c7(void)
 
 	Pico_mcd->scd.Status_CDC |= 1;			// Read data with CDC
 
-	CDD_Complete = 1;
+	Pico_mcd->scd.CDD_Complete = 1;
 	return 0;
 }
 
@@ -656,7 +640,7 @@ int Fast_Foward_CDD_c8(void)
 	Pico_mcd->cdd.Frame = 0;
 	Pico_mcd->cdd.Ext = 0;
 
-	CDD_Complete = 1;
+	Pico_mcd->scd.CDD_Complete = 1;
 
 	return 0;
 }
@@ -677,7 +661,7 @@ int Fast_Rewind_CDD_c9(void)
 	Pico_mcd->cdd.Frame = 0;
 	Pico_mcd->cdd.Ext = 0;
 
-	CDD_Complete = 1;
+	Pico_mcd->scd.CDD_Complete = 1;
 
 	return 0;
 }
@@ -711,7 +695,7 @@ int Close_Tray_CDD_cC(void)
 		Pico_mcd->cdd.Ext = 0;
 	}
 
-	CDD_Complete = 1;
+	Pico_mcd->scd.CDD_Complete = 1;
 
 	return 0;
 }
@@ -734,7 +718,7 @@ int Open_Tray_CDD_cD(void)
 	Pico_mcd->cdd.Frame = 0;
 	Pico_mcd->cdd.Ext = 0;
 
-	CDD_Complete = 1;
+	Pico_mcd->scd.CDD_Complete = 1;
 
 	return 0;
 }
@@ -755,7 +739,7 @@ int CDD_cA(void)
 	Pico_mcd->cdd.Frame = INT_TO_BCDW(1);
 	Pico_mcd->cdd.Ext = 0;
 
-	CDD_Complete = 1;
+	Pico_mcd->scd.CDD_Complete = 1;
 
 	return 0;
 }