X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2Fcd%2Fcd_sys.c;h=5bcd3cf119885d4df2ea4d228dbda7807af070d0;hb=721cd3963fa4ba82ca218345e8f543703dc46c90;hp=d7544247c28297811fb357ecc58d9c83bc412aac;hpb=51a902ae2512cffdb3ac7751988c1bde4a641be4;p=picodrive.git

diff --git a/Pico/cd/cd_sys.c b/Pico/cd/cd_sys.c
index d754424..5bcd3cf 100644
--- a/Pico/cd/cd_sys.c
+++ b/Pico/cd/cd_sys.c
@@ -101,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;
 }
@@ -130,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;
 }
 
 
@@ -152,23 +152,13 @@ void Check_CD_Command(void)
 {
 	cdprintf("CHECK CD COMMAND");
 
-	// Check CDD
-
-	if (Pico_mcd->scd.CDD_Complete)
-	{
-		Pico_mcd->scd.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
 
@@ -179,6 +169,14 @@ void Check_CD_Command(void)
 		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)
 	{
 		Pico_mcd->scd.Cur_LBA += 10;
@@ -196,8 +194,6 @@ void Check_CD_Command(void)
 
 int Init_CD_Driver(void)
 {
-	FILE_Init();
-
 	return 0;
 }
 
@@ -212,8 +208,10 @@ void Reset_CD(void)
 {
 	Pico_mcd->scd.Cur_Track = 0;
 	Pico_mcd->scd.Cur_LBA = -150;
-	Pico_mcd->scd.Status_CDD = READY;
+	Pico_mcd->scd.Status_CDC &= ~1;
+	Pico_mcd->scd.Status_CDD = CD_Present ? READY : NOCD;
 	Pico_mcd->scd.CDD_Complete = 0;
+	Pico_mcd->scd.File_Add_Delay = 0;
 }
 
 
@@ -225,12 +223,15 @@ int Insert_CD(char *iso_name, int is_bin)
 //	memset(CD_Audio_Buffer_R, 0, 4096 * 4);
 
 	CD_Present = 0;
+	Pico_mcd->scd.Status_CDD = NOCD;
 
 	if (iso_name != NULL)
 	{
 		ret = Load_ISO(iso_name, is_bin);
-		if (ret == 0)
+		if (ret == 0) {
 			CD_Present = 1;
+			Pico_mcd->scd.Status_CDD = READY;
+		}
 	}
 
 	return ret;
@@ -400,17 +401,11 @@ 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;
-
 	Pico_mcd->scd.CDD_Complete = 1;
 
 	return 0;
@@ -429,14 +424,11 @@ 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;
-
 	Pico_mcd->scd.CDD_Complete = 1;
 
 	return 0;
@@ -462,15 +454,15 @@ 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
 
 	Pico_mcd->scd.CDD_Complete = 1;
 	return 0;
@@ -511,7 +503,7 @@ int Play_CDD_c3(void)
 
 	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
 	}
@@ -558,7 +550,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
 
@@ -614,7 +606,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
 	}
@@ -682,31 +674,23 @@ int Fast_Rewind_CDD_c9(void)
 
 int Close_Tray_CDD_cC(void)
 {
+	CD_Present = 0;
 	//Clear_Sound_Buffer();
 
 	Pico_mcd->scd.Status_CDC &= ~1;			// Stop CDC read
 
-	{
-#if 0 // TODO
-		char new_iso[1024];
+	printf("tray close\n");
 
-		memset(new_iso, 0, 1024);
+	if (PicoMCDcloseTray != NULL)
+		CD_Present = PicoMCDcloseTray();
 
-		while (!Change_File_L(new_iso, Rom_Dir, "Load SegaCD image file", "SegaCD image file\0*.bin;*.iso;*.raw\0All files\0*.*\0\0", ""));
-		Reload_SegaCD(new_iso);
-
-		CD_Present = 1;
-#else
-		CD_Present = 0;
-#endif
-		Pico_mcd->scd.Status_CDD = STOPPED;
-		Pico_mcd->cdd.Status = 0x0000;
+	Pico_mcd->scd.Status_CDD = CD_Present ? STOPPED : NOCD;
+	Pico_mcd->cdd.Status = 0x0000;
 
-		Pico_mcd->cdd.Minute = 0;
-		Pico_mcd->cdd.Seconde = 0;
-		Pico_mcd->cdd.Frame = 0;
-		Pico_mcd->cdd.Ext = 0;
-	}
+	Pico_mcd->cdd.Minute = 0;
+	Pico_mcd->cdd.Seconde = 0;
+	Pico_mcd->cdd.Frame = 0;
+	Pico_mcd->cdd.Ext = 0;
 
 	Pico_mcd->scd.CDD_Complete = 1;
 
@@ -720,9 +704,14 @@ int Open_Tray_CDD_cD(void)
 
 	Pico_mcd->scd.Status_CDC &= ~1;			// Stop CDC read
 
+	printf("tray open\n");
+
 	Unload_ISO();
 	CD_Present = 0;
 
+	if (PicoMCDopenTray != NULL)
+		PicoMCDopenTray();
+
 	Pico_mcd->scd.Status_CDD = TRAY_OPEN;
 	Pico_mcd->cdd.Status = 0x0E00;
 
@@ -771,193 +760,3 @@ int CDD_Def(void)
 }
 
 
-
-
-/***************************
- *   Others CD functions   *
- **************************/
-
-
-// do we need them?
-#if 0
-void Write_CD_Audio(short *Buf, int rate, int channel, int lenght)
-{
-	unsigned int lenght_src, lenght_dst;
-	unsigned int pos_src, pas_src;
-
-	if (rate == 0) return;
-	if (Sound_Rate == 0) return;
-
-	if (CD_Audio_Starting)
-	{
-		CD_Audio_Starting = 0;
-		memset(CD_Audio_Buffer_L, 0, 4096 * 4);
-		memset(CD_Audio_Buffer_R, 0, 4096 * 4);
-		CD_Audio_Buffer_Write_Pos = (CD_Audio_Buffer_Read_Pos + 2000) & 0xFFF;
-	}
-
-	lenght_src = rate / 75;				// 75th of a second
-	lenght_dst = Sound_Rate / 75;		// 75th of a second
-
-	pas_src = (lenght_src << 16) / lenght_dst;
-	pos_src = 0;
-
-#ifdef DEBUG_CD
-	fprintf(debug_SCD_file, "\n*********  Write Pos = %d    ", CD_Audio_Buffer_Write_Pos);
-#endif
-
-	if (channel == 2)
-	{
-		__asm
-		{
-			mov edi, CD_Audio_Buffer_Write_Pos
-			mov ebx, Buf
-			xor esi, esi
-			mov ecx, lenght_dst
-			xor eax, eax
-			mov edx, pas_src
-			dec ecx
-			jmp short loop_stereo
-
-align 16
-
-loop_stereo:
-			movsx eax, word ptr [ebx + esi * 4]
-			mov CD_Audio_Buffer_L[edi * 4], eax
-			movsx eax, word ptr [ebx + esi * 4 + 2]
-			mov CD_Audio_Buffer_R[edi * 4], eax
-			mov esi, dword ptr pos_src
-			inc edi
-			add esi, edx
-			and edi, 0xFFF
-			mov dword ptr pos_src, esi
-			shr esi, 16
-			dec ecx
-			jns short loop_stereo
-
-			mov CD_Audio_Buffer_Write_Pos, edi
-		}
-	}
-	else
-	{
-		__asm
-		{
-			mov edi, CD_Audio_Buffer_Write_Pos
-			mov ebx, Buf
-			xor esi, esi
-			mov ecx, lenght_dst
-			xor eax, eax
-			mov edx, pas_src
-			dec ecx
-			jmp short loop_mono
-
-align 16
-
-loop_mono:
-			movsx eax, word ptr [ebx + esi * 2]
-			mov CD_Audio_Buffer_L[edi * 4], eax
-			mov CD_Audio_Buffer_R[edi * 4], eax
-			mov esi, dword ptr pos_src
-			inc edi
-			add esi, edx
-			and edi, 0xFFF
-			mov dword ptr pos_src, esi
-			shr esi, 16
-			dec ecx
-			jns short loop_mono
-
-			mov CD_Audio_Buffer_Write_Pos, edi
-		}
-	}
-
-#ifdef DEBUG_CD
-	fprintf(debug_SCD_file, "Write Pos 2 = %d\n\n", CD_Audio_Buffer_Write_Pos);
-#endif
-}
-
-
-void Update_CD_Audio(int **buf, int lenght)
-{
-	int *Buf_L, *Buf_R;
-	int diff;
-
-	Buf_L = buf[0];
-	Buf_R = buf[1];
-
-	if (Pico_mcd->s68k_regs[0x36] & 0x01) return;
-	if (!(Pico_mcd->scd.Status_CDC & 1))  return;
-	if (CD_Audio_Starting) return;
-
-#ifdef DEBUG_CD
-	fprintf(debug_SCD_file, "\n*********  Read Pos Normal = %d     ", CD_Audio_Buffer_Read_Pos);
-#endif
-
-	if (CD_Audio_Buffer_Write_Pos < CD_Audio_Buffer_Read_Pos)
-	{
-		diff = CD_Audio_Buffer_Write_Pos + (4096) - CD_Audio_Buffer_Read_Pos;
-	}
-	else
-	{
-		diff = CD_Audio_Buffer_Write_Pos - CD_Audio_Buffer_Read_Pos;
-	}
-
-	if (diff < 500) CD_Audio_Buffer_Read_Pos -= 2000;
-	else if (diff > 3500) CD_Audio_Buffer_Read_Pos += 2000;
-
-#ifdef DEBUG_CD
-	else fprintf(debug_SCD_file, " pas de modifs   ");
-#endif
-
-	CD_Audio_Buffer_Read_Pos &= 0xFFF;
-
-#ifdef DEBUG_CD
-	fprintf(debug_SCD_file, "Read Pos = %d   ", CD_Audio_Buffer_Read_Pos);
-#endif
-
-	if (CDDA_Enable)
-	{
-		__asm
-		{
-			mov ecx, lenght
-			mov esi, CD_Audio_Buffer_Read_Pos
-			mov edi, Buf_L
-			dec ecx
-
-loop_L:
-			mov eax, CD_Audio_Buffer_L[esi * 4]
-			add [edi], eax
-			inc esi
-			add edi, 4
-			and esi, 0xFFF
-			dec ecx
-			jns short loop_L
-
-			mov ecx, lenght
-			mov esi, CD_Audio_Buffer_Read_Pos
-			mov edi, Buf_R
-			dec ecx
-
-loop_R:
-			mov eax, CD_Audio_Buffer_R[esi * 4]
-			add [edi], eax
-			inc esi
-			add edi, 4
-			and esi, 0xFFF
-			dec ecx
-			jns short loop_R
-
-			mov CD_Audio_Buffer_Read_Pos, esi
-		}
-	}
-	else
-	{
-		CD_Audio_Buffer_Read_Pos += lenght;
-		CD_Audio_Buffer_Read_Pos &= 0xFFF;
-	}
-
-#ifdef DEBUG_CD
-	fprintf(debug_SCD_file, "Read Pos 2 = %d\n\n", CD_Audio_Buffer_Read_Pos);
-#endif
-}
-#endif
-