X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2Fcd%2FLC89510.c;h=31c3f64ca245f0cdd7a288607eafbe787e674438;hb=32826a1a22fd3e6203310bba855d8c2b6f3c403a;hp=1f00607392d7dffd031c00a286422ecd8e247cf7;hpb=fa1e5e2948e9b06dec3353081081173f7ae4d742;p=picodrive.git diff --git a/Pico/cd/LC89510.c b/Pico/cd/LC89510.c index 1f00607..31c3f64 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 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,9 +66,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; @@ -96,7 +94,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]; @@ -112,16 +110,14 @@ void Update_CDC_TRansfer(int which) dest = (unsigned short *) (Pico_mcd->word_ram1M[bank] + dep); - // TODO: bswapcpy - for (len = length; len > 0; len--, src+=2, dest++) - *dest = (src[0]<<8) | src[1]; + memcpy16bswap(dest, src, length); - { // debug + /*{ // debug unsigned char *b1 = Pico_mcd->word_ram1M[bank] + dep; - unsigned char *b2 = (unsigned char *)dest - 8; + 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,25 +126,26 @@ void Update_CDC_TRansfer(int which) Pico_mcd->cdc.DAC.N, dep, length); dest = (unsigned short *) (Pico_mcd->word_ram2M + dep); - for (len = length; len > 0; len--, src+=2, dest++) - *dest = (src[0]<<8) | src[1]; + memcpy16bswap(dest, src, length); - { // debug + /*{ // debug unsigned char *b1 = Pico_mcd->word_ram2M + dep; - unsigned char *b2 = (unsigned char *)dest - 4; + 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 - dprintf("FIXME: CD DMA # %04x -> PCM", Pico_mcd->cdc.DAC.N); -#endif + dep = (DMA_Adr & 0x03FF) << 2; + dprintf("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 { @@ -157,15 +154,14 @@ 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 + /*{ // debug unsigned char *b1 = Pico_mcd->prg_ram + dep; - unsigned char *b2 = (unsigned char *)dest - 4; + 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; @@ -182,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; @@ -231,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 ? { @@ -271,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; @@ -394,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); @@ -512,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; @@ -542,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",