X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2Fcd%2FLC89510.c;h=9abc253b4690c5bca0c3f56a1b14ae5f6827836a;hb=ea08c2967b1c61e3b81c911dfd5eb7a0e72a28bf;hp=09344567e665609747dbcf4124edd364340522f7;hpb=0a051f558c6585c94d06dbe670e70bcac4e0aadd;p=picodrive.git

diff --git a/Pico/cd/LC89510.c b/Pico/cd/LC89510.c
index 0934456..9abc253 100644
--- a/Pico/cd/LC89510.c
+++ b/Pico/cd/LC89510.c
@@ -1,9 +1,9 @@
 /***********************************************************
  *                                                         *
- * This source is taken from the Gens project              *
+ * 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           *
+ * Modified/adapted for PicoDrive by notaz, 2007           *
  *                                                         *
  ***********************************************************/
 
@@ -37,9 +37,7 @@ static void CDC_Reset(void)
 {
 	// Reseting CDC
 
-	memset(Pico_mcd->cdc.Buffer, 0, (16 * 1024 * 2) + 2352);
-
-	CDC_Update_Header();
+	memset(Pico_mcd->cdc.Buffer, 0, sizeof(Pico_mcd->cdc.Buffer));
 
 	Pico_mcd->cdc.COMIN = 0;
 	Pico_mcd->cdc.IFSTAT = 0xFF;
@@ -58,7 +56,7 @@ static void CDC_Reset(void)
 }
 
 
-void LC89510_Reset(void)
+PICO_INTERNAL void LC89510_Reset(void)
 {
 	CDD_Reset();
 	CDC_Reset();
@@ -68,7 +66,7 @@ void LC89510_Reset(void)
 }
 
 
-void Update_CDC_TRansfer(int which)
+PICO_INTERNAL void Update_CDC_TRansfer(int which)
 {
 	unsigned int DMA_Adr, dep, length;
 	unsigned short *dest;
@@ -114,12 +112,12 @@ void Update_CDC_TRansfer(int which)
 
 			memcpy16bswap(dest, src, length);
 
-			{ // debug
+			/*{ // debug
 				unsigned char *b1 = Pico_mcd->word_ram1M[bank] + dep;
 				unsigned char *b2 = (unsigned char *)(dest+length) - 8;
 				dprintf("%02x %02x %02x %02x .. %02x %02x %02x %02x",
 					b1[0], b1[1], b1[4], b1[5], b2[0], b2[1], b2[4], b2[5]);
-			}
+			}*/
 		}
 		else
 		{
@@ -130,12 +128,12 @@ void Update_CDC_TRansfer(int which)
 
 			memcpy16bswap(dest, src, length);
 
-			{ // debug
+			/*{ // debug
 				unsigned char *b1 = Pico_mcd->word_ram2M + dep;
 				unsigned char *b2 = (unsigned char *)(dest+length) - 4;
 				dprintf("%02x %02x %02x %02x .. %02x %02x %02x %02x",
 					b1[0], b1[1], b1[2], b1[3], b2[0], b2[1], b2[2], b2[3]);
-			}
+			}*/
 		}
 	}
 	else if (which == 4) // PCM RAM (check: popful Mail)
@@ -158,12 +156,12 @@ void Update_CDC_TRansfer(int which)
 
 		memcpy16bswap(dest, src, length);
 
-		{ // debug
+		/*{ // debug
 			unsigned char *b1 = Pico_mcd->prg_ram + dep;
 			unsigned char *b2 = (unsigned char *)(dest+length) - 4;
 			dprintf("%02x %02x %02x %02x .. %02x %02x %02x %02x",
 				b1[0], b1[1], b1[2], b1[3], b2[0], b2[1], b2[2], b2[3]);
-		}
+		}*/
 	}
 
 	length <<= 1;
@@ -180,7 +178,7 @@ void Update_CDC_TRansfer(int which)
 }
 
 
-unsigned short Read_CDC_Host(int is_sub)
+PICO_INTERNAL_ASM unsigned short Read_CDC_Host(int is_sub)
 {
 	int addr;
 
@@ -229,24 +227,10 @@ unsigned short Read_CDC_Host(int is_sub)
 		(Pico_mcd->cdc.Buffer[addr]<<8) | Pico_mcd->cdc.Buffer[addr+1], Pico_mcd->cdc.DAC.N, Pico_mcd->cdc.DBC.N);
 
 	return (Pico_mcd->cdc.Buffer[addr]<<8) | Pico_mcd->cdc.Buffer[addr+1];
-
-#if 0
-	__asm
-	{
-		mov esi, Pico_mcd->cdc.DAC.N
-		lea ebx, Pico_mcd->cdc.Buffer
-//				and esi, 0x3FFF
-		mov ax, [ebx + esi]
-		add esi, 2
-		rol ax, 8
-		mov Pico_mcd->cdc.DAC.N, esi
-		mov val, ax
-	}
-#endif
 }
 
 
-void CDC_Update_Header(void)
+PICO_INTERNAL void CDC_Update_Header(void)
 {
 	if (Pico_mcd->cdc.CTRL.B.B1 & 0x01)		// Sub-Header wanted ?
 	{
@@ -269,7 +253,7 @@ void CDC_Update_Header(void)
 }
 
 
-unsigned char CDC_Read_Reg(void)
+PICO_INTERNAL unsigned char CDC_Read_Reg(void)
 {
 	unsigned char ret;
 
@@ -392,7 +376,7 @@ unsigned char CDC_Read_Reg(void)
 }
 
 
-void CDC_Write_Reg(unsigned char Data)
+PICO_INTERNAL void CDC_Write_Reg(unsigned char Data)
 {
 	cdprintf("CDC write reg%02d = %.2X", Pico_mcd->s68k_regs[5] & 0xF, Data);
 
@@ -510,7 +494,7 @@ static int bswapwrite(int a, unsigned short d)
 	return d + (d >> 8);
 }
 
-void CDD_Export_Status(void)
+PICO_INTERNAL void CDD_Export_Status(void)
 {
 	unsigned int csum;
 
@@ -540,7 +524,7 @@ void CDD_Export_Status(void)
 }
 
 
-void CDD_Import_Command(void)
+PICO_INTERNAL void CDD_Import_Command(void)
 {
 //	cdprintf("CDD importing command\n");
 	cdprintf("in:  Command=%.4X, Minute=%.4X, Second=%.4X, Frame=%.4X  Checksum=%.4X",