X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2Fcd%2FLC89510.c;h=efad0055d9045fd9a694f66eb93cdcb070626baf;hb=dca310c413517d278898b967cfe610574310acd8;hp=a6503ca6aed7596951b79fcaa548a2be4e358d70;hpb=cb4a513a96b173624619686ca21360d556557ec3;p=picodrive.git

diff --git a/Pico/cd/LC89510.c b/Pico/cd/LC89510.c
index a6503ca..efad005 100644
--- a/Pico/cd/LC89510.c
+++ b/Pico/cd/LC89510.c
@@ -1,22 +1,16 @@
 /***********************************************************
  *                                                         *
- * 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           *
  *                                                         *
  ***********************************************************/
 
 #include "../PicoInt.h"
 
-#define cdprintf dprintf
-//#define cdprintf(x...)
-
-
 #define CDC_DMA_SPEED 256
 
-int CDC_Decode_Reg_Read; // 2 context?
-
 
 static void CDD_Reset(void)
 {
@@ -39,9 +33,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;
@@ -55,12 +47,12 @@ static void CDC_Reset(void)
 	Pico_mcd->cdc.IFCTRL = 0;
 	Pico_mcd->cdc.CTRL.N = 0;
 
-	CDC_Decode_Reg_Read = 0;
+	Pico_mcd->cdc.Decode_Reg_Read = 0;
 	Pico_mcd->scd.Status_CDC &= ~0x08;
 }
 
 
-void LC89510_Reset(void)
+PICO_INTERNAL void LC89510_Reset(void)
 {
 	CDD_Reset();
 	CDC_Reset();
@@ -70,9 +62,9 @@ void LC89510_Reset(void)
 }
 
 
-void Update_CDC_TRansfer(int which)
+PICO_INTERNAL void Update_CDC_TRansfer(int which)
 {
-	unsigned int DMA_Adr, dep, length, len;
+	unsigned int DMA_Adr, dep, length;
 	unsigned short *dest;
 	unsigned char  *src;
 
@@ -90,7 +82,7 @@ void Update_CDC_TRansfer(int which)
 
 			if (Pico_mcd->s68k_regs[0x33] & (1<<5))
 			{
-				dprintf("cdc DTE irq 5");
+				elprintf(EL_INTS, "cdc DTE irq 5");
 				SekInterruptS68k(5);
 			}
 		}
@@ -98,7 +90,7 @@ void Update_CDC_TRansfer(int which)
 	else length = CDC_DMA_SPEED;
 
 
-	// TODO: dst bounds checking? DAC.N alignment?
+	// TODO: dst bounds checking?
 	src = Pico_mcd->cdc.Buffer + Pico_mcd->cdc.DAC.N;
 	DMA_Adr = (Pico_mcd->s68k_regs[0xA]<<8) | Pico_mcd->s68k_regs[0xB];
 
@@ -106,36 +98,50 @@ void Update_CDC_TRansfer(int which)
 	{
 		if (Pico_mcd->s68k_regs[3] & 4)
 		{
+			// test: Final Fight
+			int bank = !(Pico_mcd->s68k_regs[3]&1);
 			dep = ((DMA_Adr & 0x3FFF) << 3);
 			cdprintf("CD DMA # %04x -> word_ram1M # %06x, len=%i",
 					Pico_mcd->cdc.DAC.N, dep, length);
 
-			dep = ((DMA_Adr & 0x3FFF) << 4);
-			if (!(Pico_mcd->s68k_regs[3]&1)) dep += 2;
-			dest = (unsigned short *) (Pico_mcd->word_ram + dep);
+			dest = (unsigned short *) (Pico_mcd->word_ram1M[bank] + dep);
+
+			memcpy16bswap(dest, src, length);
 
-			for (len = length; len > 0; len--, src+=2, dest+=2)
-				*dest = (src[0]<<8) | src[1];
+			/*{ // 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
 		{
 			dep = ((DMA_Adr & 0x7FFF) << 3);
 			cdprintf("CD DMA # %04x -> word_ram2M # %06x, len=%i",
 					Pico_mcd->cdc.DAC.N, dep, length);
-			dest = (unsigned short *) (Pico_mcd->word_ram + dep);
+			dest = (unsigned short *) (Pico_mcd->word_ram2M + dep);
+
+			memcpy16bswap(dest, src, length);
 
-			for (len = length; len > 0; len--, src+=2, dest++)
-				*dest = (src[0]<<8) | src[1];
+			/*{ // 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
+	else if (which == 4) // PCM RAM (check: popful Mail)
 	{
-#if 0
-			dest = (unsigned char *) Ram_PCM;
-			dep = ((DMA_Adr & 0x03FF) << 2) + PCM_Chip.Bank;
-#else
-			cdprintf("CD DMA # %04x -> PCD TODO", Pico_mcd->cdc.DAC.N);
-#endif
+		dep = (DMA_Adr & 0x03FF) << 2;
+		cdprintf("CD DMA # %04x -> PCM[%i] # %04x, len=%i",
+			Pico_mcd->cdc.DAC.N, Pico_mcd->pcm.bank, dep, length);
+		dest = (unsigned short *) (Pico_mcd->pcm_ram_b[Pico_mcd->pcm.bank] + dep);
+
+		if (Pico_mcd->cdc.DAC.N & 1) /* unaligned src? */
+			memcpy(dest, src, length*2);
+		else	memcpy16(dest, (unsigned short *) src, length);
 	}
 	else if (which == 5) // PRG RAM
 	{
@@ -144,25 +150,38 @@ void Update_CDC_TRansfer(int which)
 		cdprintf("CD DMA # %04x -> prg_ram # %06x, len=%i",
 				Pico_mcd->cdc.DAC.N, dep, length);
 
-		for (len = length; len > 0; len--, src+=2, dest++)
-			*dest = (src[0]<<8) | src[1];
+		memcpy16bswap(dest, src, length);
+
+		/*{ // 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;
 	Pico_mcd->cdc.DAC.N = (Pico_mcd->cdc.DAC.N + length) & 0xFFFF;
 	if (Pico_mcd->scd.Status_CDC & 0x08) Pico_mcd->cdc.DBC.N -= length;
 	else Pico_mcd->cdc.DBC.N = 0;
+
+	// update DMA_Adr
+	length >>= 2;
+	if (which != 4) length >>= 1;
+	DMA_Adr += length;
+	Pico_mcd->s68k_regs[0xA] = DMA_Adr >> 8;
+	Pico_mcd->s68k_regs[0xB] = DMA_Adr;
 }
 
 
-unsigned short Read_CDC_Host(int is_sub)
+PICO_INTERNAL_ASM unsigned short Read_CDC_Host(int is_sub)
 {
 	int addr;
 
 	if (!(Pico_mcd->scd.Status_CDC & 0x08))
 	{
 		// Transfer data disabled
-		cdprintf("Read_CDC_Host: Transfer data disabled");
+		cdprintf("Read_CDC_Host FIXME: Transfer data disabled");
 		return 0;
 	}
 
@@ -170,7 +189,7 @@ unsigned short Read_CDC_Host(int is_sub)
 		(!is_sub && (Pico_mcd->s68k_regs[4] & 7) != 2))
 	{
 		// Wrong setting
-		cdprintf("Read_CDC_Host: Wrong setting");
+		cdprintf("Read_CDC_Host FIXME: Wrong setting");
 		return 0;
 	}
 
@@ -189,7 +208,7 @@ unsigned short Read_CDC_Host(int is_sub)
 			Pico_mcd->cdc.IFSTAT &= ~0x40;
 
 			if (Pico_mcd->s68k_regs[0x33]&(1<<5)) {
-				dprintf("m68k: s68k irq 5");
+				elprintf(EL_INTS, "m68k: s68k irq 5");
 				SekInterruptS68k(5);
 			}
 
@@ -204,24 +223,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 ?
 	{
@@ -244,7 +249,7 @@ void CDC_Update_Header(void)
 }
 
 
-unsigned char CDC_Read_Reg(void)
+PICO_INTERNAL unsigned char CDC_Read_Reg(void)
 {
 	unsigned char ret;
 
@@ -259,7 +264,7 @@ unsigned char CDC_Read_Reg(void)
 		case 0x1: // IFSTAT
 			cdprintf("CDC read reg 01 = %.2X", Pico_mcd->cdc.IFSTAT);
 
-			CDC_Decode_Reg_Read |= (1 << 1);		// Reg 1 (decoding)
+			Pico_mcd->cdc.Decode_Reg_Read |= (1 << 1);		// Reg 1 (decoding)
 			Pico_mcd->s68k_regs[5] = 0x2;
 			return Pico_mcd->cdc.IFSTAT;
 
@@ -278,42 +283,42 @@ unsigned char CDC_Read_Reg(void)
 		case 0x4: // HEAD0
 			cdprintf("CDC read reg 04 = %.2X", Pico_mcd->cdc.HEAD.B.B0);
 
-			CDC_Decode_Reg_Read |= (1 << 4);		// Reg 4 (decoding)
+			Pico_mcd->cdc.Decode_Reg_Read |= (1 << 4);		// Reg 4 (decoding)
 			Pico_mcd->s68k_regs[5] = 0x5;
 			return Pico_mcd->cdc.HEAD.B.B0;
 
 		case 0x5: // HEAD1
 			cdprintf("CDC read reg 05 = %.2X", Pico_mcd->cdc.HEAD.B.B1);
 
-			CDC_Decode_Reg_Read |= (1 << 5);		// Reg 5 (decoding)
+			Pico_mcd->cdc.Decode_Reg_Read |= (1 << 5);		// Reg 5 (decoding)
 			Pico_mcd->s68k_regs[5] = 0x6;
 			return Pico_mcd->cdc.HEAD.B.B1;
 
 		case 0x6: // HEAD2
 			cdprintf("CDC read reg 06 = %.2X", Pico_mcd->cdc.HEAD.B.B2);
 
-			CDC_Decode_Reg_Read |= (1 << 6);		// Reg 6 (decoding)
+			Pico_mcd->cdc.Decode_Reg_Read |= (1 << 6);		// Reg 6 (decoding)
 			Pico_mcd->s68k_regs[5] = 0x7;
 			return Pico_mcd->cdc.HEAD.B.B2;
 
 		case 0x7: // HEAD3
 			cdprintf("CDC read reg 07 = %.2X", Pico_mcd->cdc.HEAD.B.B3);
 
-			CDC_Decode_Reg_Read |= (1 << 7);		// Reg 7 (decoding)
+			Pico_mcd->cdc.Decode_Reg_Read |= (1 << 7);		// Reg 7 (decoding)
 			Pico_mcd->s68k_regs[5] = 0x8;
 			return Pico_mcd->cdc.HEAD.B.B3;
 
 		case 0x8: // PTL
 			cdprintf("CDC read reg 08 = %.2X", Pico_mcd->cdc.PT.B.L);
 
-			CDC_Decode_Reg_Read |= (1 << 8);		// Reg 8 (decoding)
+			Pico_mcd->cdc.Decode_Reg_Read |= (1 << 8);		// Reg 8 (decoding)
 			Pico_mcd->s68k_regs[5] = 0x9;
 			return Pico_mcd->cdc.PT.B.L;
 
 		case 0x9: // PTH
 			cdprintf("CDC read reg 09 = %.2X", Pico_mcd->cdc.PT.B.H);
 
-			CDC_Decode_Reg_Read |= (1 << 9);		// Reg 9 (decoding)
+			Pico_mcd->cdc.Decode_Reg_Read |= (1 << 9);		// Reg 9 (decoding)
 			Pico_mcd->s68k_regs[5] = 0xA;
 			return Pico_mcd->cdc.PT.B.H;
 
@@ -332,21 +337,21 @@ unsigned char CDC_Read_Reg(void)
 		case 0xC: // STAT0
 			cdprintf("CDC read reg 12 = %.2X", Pico_mcd->cdc.STAT.B.B0);
 
-			CDC_Decode_Reg_Read |= (1 << 12);		// Reg 12 (decoding)
+			Pico_mcd->cdc.Decode_Reg_Read |= (1 << 12);		// Reg 12 (decoding)
 			Pico_mcd->s68k_regs[5] = 0xD;
 			return Pico_mcd->cdc.STAT.B.B0;
 
 		case 0xD: // STAT1
 			cdprintf("CDC read reg 13 = %.2X", Pico_mcd->cdc.STAT.B.B1);
 
-			CDC_Decode_Reg_Read |= (1 << 13);		// Reg 13 (decoding)
+			Pico_mcd->cdc.Decode_Reg_Read |= (1 << 13);		// Reg 13 (decoding)
 			Pico_mcd->s68k_regs[5] = 0xE;
 			return Pico_mcd->cdc.STAT.B.B1;
 
 		case 0xE: // STAT2
 			cdprintf("CDC read reg 14 = %.2X", Pico_mcd->cdc.STAT.B.B2);
 
-			CDC_Decode_Reg_Read |= (1 << 14);		// Reg 14 (decoding)
+			Pico_mcd->cdc.Decode_Reg_Read |= (1 << 14);		// Reg 14 (decoding)
 			Pico_mcd->s68k_regs[5] = 0xF;
 			return Pico_mcd->cdc.STAT.B.B2;
 
@@ -357,7 +362,7 @@ unsigned char CDC_Read_Reg(void)
 			Pico_mcd->cdc.IFSTAT |= 0x20;			// decoding interrupt flag cleared
 			if ((Pico_mcd->cdc.CTRL.B.B0 & 0x80) && (Pico_mcd->cdc.IFCTRL & 0x20))
 			{
-				if ((CDC_Decode_Reg_Read & 0x73F2) == 0x73F2)
+				if ((Pico_mcd->cdc.Decode_Reg_Read & 0x73F2) == 0x73F2)
 					Pico_mcd->cdc.STAT.B.B3 = 0x80;
 			}
 			return ret;
@@ -367,7 +372,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);
 
@@ -485,7 +490,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;
 
@@ -501,7 +506,7 @@ void CDD_Export_Status(void)
 
 	if (Pico_mcd->s68k_regs[0x33] & (1<<4))
 	{
-		dprintf("cdd export irq 4");
+		elprintf(EL_INTS, "cdd export irq 4");
 		SekInterruptS68k(4);
 	}
 
@@ -515,7 +520,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",