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

diff --git a/Pico/cd/cd_sys.c b/Pico/cd/cd_sys.c
index 5bcd3cf..03bf0d2 100644
--- a/Pico/cd/cd_sys.c
+++ b/Pico/cd/cd_sys.c
@@ -1,11 +1,18 @@
+/***********************************************************
+ *                                                         *
+ * This source file was taken from the Gens project        *
+ * Written by Stéphane Dallongeville                       *
+ * Copyright (c) 2002 by Stéphane Dallongeville            *
+ * Modified/adapted for PicoDrive by notaz, 2007           *
+ *                                                         *
+ ***********************************************************/
+
 #include <stdio.h>
-#include "cd_sys.h"
-#include "cd_file.h"
 
 #include "../PicoInt.h"
+#include "cd_sys.h"
+#include "cd_file.h"
 
-#define cdprintf dprintf
-//#define cdprintf(x...)
 #define DEBUG_CD
 
 #define TRAY_OPEN	0x0500		// TRAY OPEN CDD status
@@ -17,19 +24,7 @@
 #define PLAYING		0x0100		// PLAYING audio track CDD status
 
 
-/*
-int CDDA_Enable;
-
-int CD_Audio_Buffer_L[8192];
-int CD_Audio_Buffer_R[8192];
-int CD_Audio_Buffer_Read_Pos = 0;
-int CD_Audio_Buffer_Write_Pos = 2000;
-int CD_Audio_Starting;
-*/
-
 static int CD_Present = 0;
-// int CD_Timer_Counter = 0; // TODO: check refs
-
 
 
 #define CHECK_TRAY_OPEN				\
@@ -65,27 +60,13 @@ if (!CD_Present)					\
 }
 
 
-#if 0
-static void MSB2DWORD(unsigned int *d, unsigned char *b)
-{
-	unsigned int  retVal;
-
-	retVal = (unsigned int )b[0];
-	retVal = (retVal<<8) + (unsigned int )b[1];
-	retVal = (retVal<<8) + (unsigned int )b[2];
-	retVal = (retVal<<8) + (unsigned int )b[3];
-
-	*d = retVal;
-}
-#endif
-
 static int MSF_to_LBA(_msf *MSF)
 {
 	return (MSF->M * 60 * 75) + (MSF->S * 75) + MSF->F - 150;
 }
 
 
-void LBA_to_MSF(int lba, _msf *MSF)
+PICO_INTERNAL void LBA_to_MSF(int lba, _msf *MSF)
 {
 	if (lba < -150) lba = 0;
 	else lba += 150;
@@ -139,7 +120,7 @@ static void Track_to_MSF(int track, _msf *MSF)
 }
 
 
-int Track_to_LBA(int track)
+PICO_INTERNAL int Track_to_LBA(int track)
 {
 	_msf MSF;
 
@@ -148,7 +129,7 @@ int Track_to_LBA(int track)
 }
 
 
-void Check_CD_Command(void)
+PICO_INTERNAL void Check_CD_Command(void)
 {
 	cdprintf("CHECK CD COMMAND");
 
@@ -192,19 +173,19 @@ void Check_CD_Command(void)
 }
 
 
-int Init_CD_Driver(void)
+PICO_INTERNAL int Init_CD_Driver(void)
 {
 	return 0;
 }
 
 
-void End_CD_Driver(void)
+PICO_INTERNAL void End_CD_Driver(void)
 {
-	FILE_End();
+	Unload_ISO();
 }
 
 
-void Reset_CD(void)
+PICO_INTERNAL void Reset_CD(void)
 {
 	Pico_mcd->scd.Cur_Track = 0;
 	Pico_mcd->scd.Cur_LBA = -150;
@@ -215,19 +196,16 @@ void Reset_CD(void)
 }
 
 
-int Insert_CD(char *iso_name, int is_bin)
+int Insert_CD(char *cdimg_name, int type)
 {
-	int ret = 0;
-
-//	memset(CD_Audio_Buffer_L, 0, 4096 * 4);
-//	memset(CD_Audio_Buffer_R, 0, 4096 * 4);
+	int ret = 1;
 
 	CD_Present = 0;
 	Pico_mcd->scd.Status_CDD = NOCD;
 
-	if (iso_name != NULL)
+	if (cdimg_name != NULL && type != CIT_NOT_CD)
 	{
-		ret = Load_ISO(iso_name, is_bin);
+		ret = Load_CD_Image(cdimg_name, type);
 		if (ret == 0) {
 			CD_Present = 1;
 			Pico_mcd->scd.Status_CDD = READY;
@@ -245,14 +223,15 @@ void Stop_CD(void)
 }
 
 
-void Change_CD(void)
+/*
+PICO_INTERNAL void Change_CD(void)
 {
 	if (Pico_mcd->scd.Status_CDD == TRAY_OPEN) Close_Tray_CDD_cC();
 	else Open_Tray_CDD_cD();
 }
+*/
 
-
-int Get_Status_CDD_c0(void)
+PICO_INTERNAL int Get_Status_CDD_c0(void)
 {
 	cdprintf("Status command : Cur LBA = %d", Pico_mcd->scd.Cur_LBA);
 
@@ -270,7 +249,7 @@ int Get_Status_CDD_c0(void)
 }
 
 
-int Stop_CDD_c1(void)
+PICO_INTERNAL int Stop_CDD_c1(void)
 {
 	CHECK_TRAY_OPEN
 
@@ -293,7 +272,7 @@ int Stop_CDD_c1(void)
 }
 
 
-int Get_Pos_CDD_c20(void)
+PICO_INTERNAL int Get_Pos_CDD_c20(void)
 {
 	_msf MSF;
 
@@ -325,7 +304,7 @@ int Get_Pos_CDD_c20(void)
 }
 
 
-int Get_Track_Pos_CDD_c21(void)
+PICO_INTERNAL int Get_Track_Pos_CDD_c21(void)
 {
 	int elapsed_time;
 	_msf MSF;
@@ -359,7 +338,7 @@ int Get_Track_Pos_CDD_c21(void)
 }
 
 
-int Get_Current_Track_CDD_c22(void)
+PICO_INTERNAL int Get_Current_Track_CDD_c22(void)
 {
 	cdprintf("Status CDD = %.4X  Status = %.4X", Pico_mcd->scd.Status_CDD, Pico_mcd->cdd.Status);
 
@@ -388,7 +367,7 @@ int Get_Current_Track_CDD_c22(void)
 }
 
 
-int Get_Total_Lenght_CDD_c23(void)
+PICO_INTERNAL int Get_Total_Lenght_CDD_c23(void)
 {
 	CHECK_TRAY_OPEN
 
@@ -412,7 +391,7 @@ int Get_Total_Lenght_CDD_c23(void)
 }
 
 
-int Get_First_Last_Track_CDD_c24(void)
+PICO_INTERNAL int Get_First_Last_Track_CDD_c24(void)
 {
 	CHECK_TRAY_OPEN
 
@@ -435,7 +414,7 @@ int Get_First_Last_Track_CDD_c24(void)
 }
 
 
-int Get_Track_Adr_CDD_c25(void)
+PICO_INTERNAL int Get_Track_Adr_CDD_c25(void)
 {
 	int track_number;
 
@@ -469,7 +448,7 @@ int Get_Track_Adr_CDD_c25(void)
 }
 
 
-int Play_CDD_c3(void)
+PICO_INTERNAL int Play_CDD_c3(void)
 {
 	_msf MSF;
 	int delay, new_lba;
@@ -510,8 +489,7 @@ int Play_CDD_c3(void)
 	else
 	{
 		Pico_mcd->s68k_regs[0x36] &= ~0x01;				// AUDIO
-		//CD_Audio_Starting = 1;
-		FILE_Play_CD_LBA();
+		cdda_start_play();
 	}
 
 	if (Pico_mcd->scd.Cur_Track == 100) Pico_mcd->cdd.Minute = 0x0A02;
@@ -527,7 +505,7 @@ int Play_CDD_c3(void)
 }
 
 
-int Seek_CDD_c4(void)
+PICO_INTERNAL int Seek_CDD_c4(void)
 {
 	_msf MSF;
 
@@ -565,7 +543,7 @@ int Seek_CDD_c4(void)
 }
 
 
-int Pause_CDD_c6(void)
+PICO_INTERNAL int Pause_CDD_c6(void)
 {
 	CHECK_TRAY_OPEN
 	CHECK_CD_PRESENT
@@ -588,7 +566,7 @@ int Pause_CDD_c6(void)
 }
 
 
-int Resume_CDD_c7(void)
+PICO_INTERNAL int Resume_CDD_c7(void)
 {
 	CHECK_TRAY_OPEN
 	CHECK_CD_PRESENT
@@ -613,8 +591,7 @@ int Resume_CDD_c7(void)
 	else
 	{
 		Pico_mcd->s68k_regs[0x36] &= ~0x01;				// AUDIO
-		//CD_Audio_Starting = 1;
-		FILE_Play_CD_LBA();
+		cdda_start_play();
 	}
 
 	if (Pico_mcd->scd.Cur_Track == 100) Pico_mcd->cdd.Minute = 0x0A02;
@@ -630,7 +607,7 @@ int Resume_CDD_c7(void)
 }
 
 
-int Fast_Foward_CDD_c8(void)
+PICO_INTERNAL int Fast_Foward_CDD_c8(void)
 {
 	CHECK_TRAY_OPEN
 	CHECK_CD_PRESENT
@@ -651,7 +628,7 @@ int Fast_Foward_CDD_c8(void)
 }
 
 
-int Fast_Rewind_CDD_c9(void)
+PICO_INTERNAL int Fast_Rewind_CDD_c9(void)
 {
 	CHECK_TRAY_OPEN
 	CHECK_CD_PRESENT
@@ -672,14 +649,14 @@ int Fast_Rewind_CDD_c9(void)
 }
 
 
-int Close_Tray_CDD_cC(void)
+PICO_INTERNAL int Close_Tray_CDD_cC(void)
 {
 	CD_Present = 0;
 	//Clear_Sound_Buffer();
 
 	Pico_mcd->scd.Status_CDC &= ~1;			// Stop CDC read
 
-	printf("tray close\n");
+	elprintf(EL_STATUS, "tray close\n");
 
 	if (PicoMCDcloseTray != NULL)
 		CD_Present = PicoMCDcloseTray();
@@ -698,13 +675,13 @@ int Close_Tray_CDD_cC(void)
 }
 
 
-int Open_Tray_CDD_cD(void)
+PICO_INTERNAL int Open_Tray_CDD_cD(void)
 {
 	CHECK_TRAY_OPEN
 
 	Pico_mcd->scd.Status_CDC &= ~1;			// Stop CDC read
 
-	printf("tray open\n");
+	elprintf(EL_STATUS, "tray open\n");
 
 	Unload_ISO();
 	CD_Present = 0;
@@ -726,7 +703,7 @@ int Open_Tray_CDD_cD(void)
 }
 
 
-int CDD_cA(void)
+PICO_INTERNAL int CDD_cA(void)
 {
 	CHECK_TRAY_OPEN
 	CHECK_CD_PRESENT
@@ -747,7 +724,7 @@ int CDD_cA(void)
 }
 
 
-int CDD_Def(void)
+PICO_INTERNAL int CDD_Def(void)
 {
 	Pico_mcd->cdd.Status = Pico_mcd->scd.Status_CDD;