X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2Fcd%2Fcd_sys.c;h=6d4cb430eeef9d3e4af1fa5520601124a33aaf9b;hb=5c69a605aeaa09798db62a4cfcce7bba4f9dc2b6;hp=2c70ea2685f20b6f8a0ed77af5dc421f5d74f68f;hpb=c459aefdad169c97b6fb93a20c1219a76aa07505;p=picodrive.git

diff --git a/Pico/cd/cd_sys.c b/Pico/cd/cd_sys.c
index 2c70ea2..6d4cb43 100644
--- a/Pico/cd/cd_sys.c
+++ b/Pico/cd/cd_sys.c
@@ -28,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
 
 
 
@@ -46,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;						\
 }
@@ -63,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;						\
 }
@@ -105,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;
 }
@@ -134,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;
 }
 
 
@@ -156,31 +152,29 @@ void Check_CD_Command(void)
 {
 	cdprintf("CHECK CD COMMAND");
 
-	// Check CDD
-
-	if (CDD_Complete)
-	{
-		CDD_Complete = 0;
-
-		CDD_Export_Status();
-	}
-
 	// Check CDC
-
 	if (Pico_mcd->scd.Status_CDC & 1)			// CDC is reading data ...
 	{
 		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)
@@ -200,8 +194,6 @@ void Check_CD_Command(void)
 
 int Init_CD_Driver(void)
 {
-	FILE_Init();
-
 	return 0;
 }
 
@@ -216,8 +208,10 @@ void Reset_CD(void)
 {
 	Pico_mcd->scd.Cur_Track = 0;
 	Pico_mcd->scd.Cur_LBA = -150;
+	Pico_mcd->scd.Status_CDC &= ~1;
 	Pico_mcd->scd.Status_CDD = READY;
-	CDD_Complete = 0;
+	Pico_mcd->scd.CDD_Complete = 0;
+	Pico_mcd->scd.File_Add_Delay = 0;
 }
 
 
@@ -267,7 +261,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;
 }
@@ -290,7 +284,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;
 }
@@ -322,7 +316,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;
 }
@@ -356,7 +350,7 @@ int Get_Track_Pos_CDD_c21(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;
 }
@@ -385,7 +379,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;
 }
@@ -404,18 +398,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;
 }
@@ -433,15 +421,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;
 }
@@ -466,17 +451,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;
 }
 
@@ -513,9 +498,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
 	}
@@ -534,7 +519,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;
 }
 
@@ -562,7 +547,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
 
@@ -571,7 +556,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;
 }
@@ -594,7 +579,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;
 }
@@ -618,7 +603,7 @@ int Resume_CDD_c7(void)
 	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
 	}
@@ -637,7 +622,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;
 }
 
@@ -657,7 +642,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;
 }
@@ -678,7 +663,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;
 }
@@ -712,7 +697,7 @@ int Close_Tray_CDD_cC(void)
 		Pico_mcd->cdd.Ext = 0;
 	}
 
-	CDD_Complete = 1;
+	Pico_mcd->scd.CDD_Complete = 1;
 
 	return 0;
 }
@@ -735,7 +720,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;
 }
@@ -756,7 +741,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;
 }