amalgamation

[picodrive.git] / Pico / cd / LC89510.c

diff --git a/Pico/cd/LC89510.c b/Pico/cd/LC89510.c
index 1f00607..31c3f64 100644 (file)
--- a/Pico/cd/LC89510.c
+++ b/Pico/cd/LC89510.c
@@ -1,9 +1,9 @@
 /***********************************************************\r
  *                                                         *\r
- * This source is taken from the Gens project              *\r
+ * This source was taken from the Gens project             *\r
  * Written by Stéphane Dallongeville                       *\r
  * Copyright (c) 2002 by Stéphane Dallongeville            *\r
- * Modified/adapted for Picodrive by notaz, 2007           *\r
+ * Modified/adapted for PicoDrive by notaz, 2007           *\r
  *                                                         *\r
  ***********************************************************/\r
 \r
@@ -37,9 +37,7 @@ static void CDC_Reset(void)
 {\r
        // Reseting CDC\r
 \r
-       memset(Pico_mcd->cdc.Buffer, 0, (16 * 1024 * 2) + 2352);\r
-\r
-       CDC_Update_Header();\r
+       memset(Pico_mcd->cdc.Buffer, 0, sizeof(Pico_mcd->cdc.Buffer));\r
 \r
        Pico_mcd->cdc.COMIN = 0;\r
        Pico_mcd->cdc.IFSTAT = 0xFF;\r
@@ -58,7 +56,7 @@ static void CDC_Reset(void)
 }\r
 \r
 \r
-void LC89510_Reset(void)\r
+PICO_INTERNAL void LC89510_Reset(void)\r
 {\r
        CDD_Reset();\r
        CDC_Reset();\r
@@ -68,9 +66,9 @@ void LC89510_Reset(void)
 }\r
 \r
 \r
-void Update_CDC_TRansfer(int which)\r
+PICO_INTERNAL void Update_CDC_TRansfer(int which)\r
 {\r
-       unsigned int DMA_Adr, dep, length, len;\r
+       unsigned int DMA_Adr, dep, length;\r
        unsigned short *dest;\r
        unsigned char  *src;\r
 \r
@@ -96,7 +94,7 @@ void Update_CDC_TRansfer(int which)
        else length = CDC_DMA_SPEED;\r
 \r
 \r
-       // TODO: dst bounds checking? DAC.N alignment?\r
+       // TODO: dst bounds checking?\r
        src = Pico_mcd->cdc.Buffer + Pico_mcd->cdc.DAC.N;\r
        DMA_Adr = (Pico_mcd->s68k_regs[0xA]<<8) | Pico_mcd->s68k_regs[0xB];\r
 \r
@@ -112,16 +110,14 @@ void Update_CDC_TRansfer(int which)
 \r
                        dest = (unsigned short *) (Pico_mcd->word_ram1M[bank] + dep);\r
 \r
-                       // TODO: bswapcpy\r
-                       for (len = length; len > 0; len--, src+=2, dest++)\r
-                               *dest = (src[0]<<8) | src[1];\r
+                       memcpy16bswap(dest, src, length);\r
 \r
-                       { // debug\r
+                       /*{ // debug\r
                                unsigned char *b1 = Pico_mcd->word_ram1M[bank] + dep;\r
-                               unsigned char *b2 = (unsigned char *)dest - 8;\r
+                               unsigned char *b2 = (unsigned char *)(dest+length) - 8;\r
                                dprintf("%02x %02x %02x %02x .. %02x %02x %02x %02x",\r
                                        b1[0], b1[1], b1[4], b1[5], b2[0], b2[1], b2[4], b2[5]);\r
-                       }\r
+                       }*/\r
                }\r
                else\r
                {\r
@@ -130,25 +126,26 @@ void Update_CDC_TRansfer(int which)
                                        Pico_mcd->cdc.DAC.N, dep, length);\r
                        dest = (unsigned short *) (Pico_mcd->word_ram2M + dep);\r
 \r
-                       for (len = length; len > 0; len--, src+=2, dest++)\r
-                               *dest = (src[0]<<8) | src[1];\r
+                       memcpy16bswap(dest, src, length);\r
 \r
-                       { // debug\r
+                       /*{ // debug\r
                                unsigned char *b1 = Pico_mcd->word_ram2M + dep;\r
-                               unsigned char *b2 = (unsigned char *)dest - 4;\r
+                               unsigned char *b2 = (unsigned char *)(dest+length) - 4;\r
                                dprintf("%02x %02x %02x %02x .. %02x %02x %02x %02x",\r
                                        b1[0], b1[1], b1[2], b1[3], b2[0], b2[1], b2[2], b2[3]);\r
-                       }\r
+                       }*/\r
                }\r
        }\r
-       else if (which == 4) // PCM RAM\r
+       else if (which == 4) // PCM RAM (check: popful Mail)\r
        {\r
-#if 0\r
-                       dest = (unsigned char *) Ram_PCM;\r
-                       dep = ((DMA_Adr & 0x03FF) << 2) + PCM_Chip.Bank;\r
-#else\r
-                       dprintf("FIXME: CD DMA # %04x -> PCM", Pico_mcd->cdc.DAC.N);\r
-#endif\r
+               dep = (DMA_Adr & 0x03FF) << 2;\r
+               dprintf("CD DMA # %04x -> PCM[%i] # %04x, len=%i",\r
+                       Pico_mcd->cdc.DAC.N, Pico_mcd->pcm.bank, dep, length);\r
+               dest = (unsigned short *) (Pico_mcd->pcm_ram_b[Pico_mcd->pcm.bank] + dep);\r
+\r
+               if (Pico_mcd->cdc.DAC.N & 1) /* unaligned src? */\r
+                       memcpy(dest, src, length*2);\r
+               else    memcpy16(dest, (unsigned short *) src, length);\r
        }\r
        else if (which == 5) // PRG RAM\r
        {\r
@@ -157,15 +154,14 @@ void Update_CDC_TRansfer(int which)
                cdprintf("CD DMA # %04x -> prg_ram # %06x, len=%i",\r
                                Pico_mcd->cdc.DAC.N, dep, length);\r
 \r
-               for (len = length; len > 0; len--, src+=2, dest++)\r
-                       *dest = (src[0]<<8) | src[1];\r
+               memcpy16bswap(dest, src, length);\r
 \r
-               { // debug\r
+               /*{ // debug\r
                        unsigned char *b1 = Pico_mcd->prg_ram + dep;\r
-                       unsigned char *b2 = (unsigned char *)dest - 4;\r
+                       unsigned char *b2 = (unsigned char *)(dest+length) - 4;\r
                        dprintf("%02x %02x %02x %02x .. %02x %02x %02x %02x",\r
                                b1[0], b1[1], b1[2], b1[3], b2[0], b2[1], b2[2], b2[3]);\r
-               }\r
+               }*/\r
        }\r
 \r
        length <<= 1;\r
@@ -182,7 +178,7 @@ void Update_CDC_TRansfer(int which)
 }\r
 \r
 \r
-unsigned short Read_CDC_Host(int is_sub)\r
+PICO_INTERNAL_ASM unsigned short Read_CDC_Host(int is_sub)\r
 {\r
        int addr;\r
 \r
@@ -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);\r
 \r
        return (Pico_mcd->cdc.Buffer[addr]<<8) | Pico_mcd->cdc.Buffer[addr+1];\r
-\r
-#if 0\r
-       __asm\r
-       {\r
-               mov esi, Pico_mcd->cdc.DAC.N\r
-               lea ebx, Pico_mcd->cdc.Buffer\r
-//                             and esi, 0x3FFF\r
-               mov ax, [ebx + esi]\r
-               add esi, 2\r
-               rol ax, 8\r
-               mov Pico_mcd->cdc.DAC.N, esi\r
-               mov val, ax\r
-       }\r
-#endif\r
 }\r
 \r
 \r
-void CDC_Update_Header(void)\r
+PICO_INTERNAL void CDC_Update_Header(void)\r
 {\r
        if (Pico_mcd->cdc.CTRL.B.B1 & 0x01)             // Sub-Header wanted ?\r
        {\r
@@ -271,7 +253,7 @@ void CDC_Update_Header(void)
 }\r
 \r
 \r
-unsigned char CDC_Read_Reg(void)\r
+PICO_INTERNAL unsigned char CDC_Read_Reg(void)\r
 {\r
        unsigned char ret;\r
 \r
@@ -394,7 +376,7 @@ unsigned char CDC_Read_Reg(void)
 }\r
 \r
 \r
-void CDC_Write_Reg(unsigned char Data)\r
+PICO_INTERNAL void CDC_Write_Reg(unsigned char Data)\r
 {\r
        cdprintf("CDC write reg%02d = %.2X", Pico_mcd->s68k_regs[5] & 0xF, Data);\r
 \r
@@ -512,7 +494,7 @@ static int bswapwrite(int a, unsigned short d)
        return d + (d >> 8);\r
 }\r
 \r
-void CDD_Export_Status(void)\r
+PICO_INTERNAL void CDD_Export_Status(void)\r
 {\r
        unsigned int csum;\r
 \r
@@ -542,7 +524,7 @@ void CDD_Export_Status(void)
 }\r
 \r
 \r
-void CDD_Import_Command(void)\r
+PICO_INTERNAL void CDD_Import_Command(void)\r
 {\r
 //     cdprintf("CDD importing command\n");\r
        cdprintf("in:  Command=%.4X, Minute=%.4X, Second=%.4X, Frame=%.4X  Checksum=%.4X",\r