notaz.gp2x.de / picodrive.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
bugfixes in cd/Memory.s, poll loop detection
[picodrive.git] / Pico / cd / LC89510.c
diff --git a/Pico/cd/LC89510.c b/Pico/cd/LC89510.c
index f877171..e821c61 100644 (file)
--- a/Pico/cd/LC89510.c
+++ b/Pico/cd/LC89510.c
@@ -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
@@ -53,7 +51,7 @@ static void CDC_Reset(void)
        Pico_mcd->cdc.IFCTRL = 0;\r
        Pico_mcd->cdc.CTRL.N = 0;\r
 \r
-       Pico_mcd->cdd.CDC_Decode_Reg_Read = 0;\r
+       Pico_mcd->cdc.Decode_Reg_Read = 0;\r
        Pico_mcd->scd.Status_CDC &= ~0x08;\r
 }\r
 \r
@@ -70,7 +68,7 @@ void LC89510_Reset(void)
 \r
 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
@@ -104,36 +102,50 @@ void Update_CDC_TRansfer(int which)
        {\r
                if (Pico_mcd->s68k_regs[3] & 4)\r
                {\r
+                       // test: Final Fight\r
+                       int bank = !(Pico_mcd->s68k_regs[3]&1);\r
                        dep = ((DMA_Adr & 0x3FFF) << 3);\r
                        cdprintf("CD DMA # %04x -> word_ram1M # %06x, len=%i",\r
                                        Pico_mcd->cdc.DAC.N, dep, length);\r
 \r
-                       dep = ((DMA_Adr & 0x3FFF) << 4);\r
-                       if (!(Pico_mcd->s68k_regs[3]&1)) dep += 2;\r
-                       dest = (unsigned short *) (Pico_mcd->word_ram + dep);\r
+                       dest = (unsigned short *) (Pico_mcd->word_ram1M[bank] + dep);\r
+\r
+                       memcpy16bswap(dest, src, length);\r
 \r
-                       for (len = length; len > 0; len--, src+=2, dest+=2)\r
-                               *dest = (src[0]<<8) | src[1];\r
+                       { // debug\r
+                               unsigned char *b1 = Pico_mcd->word_ram1M[bank] + dep;\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
                else\r
                {\r
                        dep = ((DMA_Adr & 0x7FFF) << 3);\r
                        cdprintf("CD DMA # %04x -> word_ram2M # %06x, len=%i",\r
                                        Pico_mcd->cdc.DAC.N, dep, length);\r
-                       dest = (unsigned short *) (Pico_mcd->word_ram + dep);\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
+                               unsigned char *b1 = Pico_mcd->word_ram2M + dep;\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
-       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
-                       cdprintf("CD DMA # %04x -> PCD TODO", 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
@@ -142,14 +154,27 @@ 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
+                       unsigned char *b1 = Pico_mcd->prg_ram + dep;\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
        length <<= 1;\r
        Pico_mcd->cdc.DAC.N = (Pico_mcd->cdc.DAC.N + length) & 0xFFFF;\r
        if (Pico_mcd->scd.Status_CDC & 0x08) Pico_mcd->cdc.DBC.N -= length;\r
        else Pico_mcd->cdc.DBC.N = 0;\r
+\r
+       // update DMA_Adr\r
+       length >>= 2;\r
+       if (which != 4) length >>= 1;\r
+       DMA_Adr += length;\r
+       Pico_mcd->s68k_regs[0xA] = DMA_Adr >> 8;\r
+       Pico_mcd->s68k_regs[0xB] = DMA_Adr;\r
 }\r
 \r
 \r
@@ -160,7 +185,7 @@ unsigned short Read_CDC_Host(int is_sub)
        if (!(Pico_mcd->scd.Status_CDC & 0x08))\r
        {\r
                // Transfer data disabled\r
-               cdprintf("Read_CDC_Host: Transfer data disabled");\r
+               cdprintf("Read_CDC_Host FIXME: Transfer data disabled");\r
                return 0;\r
        }\r
 \r
@@ -168,7 +193,7 @@ unsigned short Read_CDC_Host(int is_sub)
                (!is_sub && (Pico_mcd->s68k_regs[4] & 7) != 2))\r
        {\r
                // Wrong setting\r
-               cdprintf("Read_CDC_Host: Wrong setting");\r
+               cdprintf("Read_CDC_Host FIXME: Wrong setting");\r
                return 0;\r
        }\r
 \r
@@ -257,7 +282,7 @@ unsigned char CDC_Read_Reg(void)
                case 0x1: // IFSTAT\r
                        cdprintf("CDC read reg 01 = %.2X", Pico_mcd->cdc.IFSTAT);\r
 \r
-                       Pico_mcd->cdd.CDC_Decode_Reg_Read |= (1 << 1);          // Reg 1 (decoding)\r
+                       Pico_mcd->cdc.Decode_Reg_Read |= (1 << 1);              // Reg 1 (decoding)\r
                        Pico_mcd->s68k_regs[5] = 0x2;\r
                        return Pico_mcd->cdc.IFSTAT;\r
 \r
@@ -276,42 +301,42 @@ unsigned char CDC_Read_Reg(void)
                case 0x4: // HEAD0\r
                        cdprintf("CDC read reg 04 = %.2X", Pico_mcd->cdc.HEAD.B.B0);\r
 \r
-                       Pico_mcd->cdd.CDC_Decode_Reg_Read |= (1 << 4);          // Reg 4 (decoding)\r
+                       Pico_mcd->cdc.Decode_Reg_Read |= (1 << 4);              // Reg 4 (decoding)\r
                        Pico_mcd->s68k_regs[5] = 0x5;\r
                        return Pico_mcd->cdc.HEAD.B.B0;\r
 \r
                case 0x5: // HEAD1\r
                        cdprintf("CDC read reg 05 = %.2X", Pico_mcd->cdc.HEAD.B.B1);\r
 \r
-                       Pico_mcd->cdd.CDC_Decode_Reg_Read |= (1 << 5);          // Reg 5 (decoding)\r
+                       Pico_mcd->cdc.Decode_Reg_Read |= (1 << 5);              // Reg 5 (decoding)\r
                        Pico_mcd->s68k_regs[5] = 0x6;\r
                        return Pico_mcd->cdc.HEAD.B.B1;\r
 \r
                case 0x6: // HEAD2\r
                        cdprintf("CDC read reg 06 = %.2X", Pico_mcd->cdc.HEAD.B.B2);\r
 \r
-                       Pico_mcd->cdd.CDC_Decode_Reg_Read |= (1 << 6);          // Reg 6 (decoding)\r
+                       Pico_mcd->cdc.Decode_Reg_Read |= (1 << 6);              // Reg 6 (decoding)\r
                        Pico_mcd->s68k_regs[5] = 0x7;\r
                        return Pico_mcd->cdc.HEAD.B.B2;\r
 \r
                case 0x7: // HEAD3\r
                        cdprintf("CDC read reg 07 = %.2X", Pico_mcd->cdc.HEAD.B.B3);\r
 \r
-                       Pico_mcd->cdd.CDC_Decode_Reg_Read |= (1 << 7);          // Reg 7 (decoding)\r
+                       Pico_mcd->cdc.Decode_Reg_Read |= (1 << 7);              // Reg 7 (decoding)\r
                        Pico_mcd->s68k_regs[5] = 0x8;\r
                        return Pico_mcd->cdc.HEAD.B.B3;\r
 \r
                case 0x8: // PTL\r
                        cdprintf("CDC read reg 08 = %.2X", Pico_mcd->cdc.PT.B.L);\r
 \r
-                       Pico_mcd->cdd.CDC_Decode_Reg_Read |= (1 << 8);          // Reg 8 (decoding)\r
+                       Pico_mcd->cdc.Decode_Reg_Read |= (1 << 8);              // Reg 8 (decoding)\r
                        Pico_mcd->s68k_regs[5] = 0x9;\r
                        return Pico_mcd->cdc.PT.B.L;\r
 \r
                case 0x9: // PTH\r
                        cdprintf("CDC read reg 09 = %.2X", Pico_mcd->cdc.PT.B.H);\r
 \r
-                       Pico_mcd->cdd.CDC_Decode_Reg_Read |= (1 << 9);          // Reg 9 (decoding)\r
+                       Pico_mcd->cdc.Decode_Reg_Read |= (1 << 9);              // Reg 9 (decoding)\r
                        Pico_mcd->s68k_regs[5] = 0xA;\r
                        return Pico_mcd->cdc.PT.B.H;\r
 \r
@@ -330,21 +355,21 @@ unsigned char CDC_Read_Reg(void)
                case 0xC: // STAT0\r
                        cdprintf("CDC read reg 12 = %.2X", Pico_mcd->cdc.STAT.B.B0);\r
 \r
-                       Pico_mcd->cdd.CDC_Decode_Reg_Read |= (1 << 12);         // Reg 12 (decoding)\r
+                       Pico_mcd->cdc.Decode_Reg_Read |= (1 << 12);             // Reg 12 (decoding)\r
                        Pico_mcd->s68k_regs[5] = 0xD;\r
                        return Pico_mcd->cdc.STAT.B.B0;\r
 \r
                case 0xD: // STAT1\r
                        cdprintf("CDC read reg 13 = %.2X", Pico_mcd->cdc.STAT.B.B1);\r
 \r
-                       Pico_mcd->cdd.CDC_Decode_Reg_Read |= (1 << 13);         // Reg 13 (decoding)\r
+                       Pico_mcd->cdc.Decode_Reg_Read |= (1 << 13);             // Reg 13 (decoding)\r
                        Pico_mcd->s68k_regs[5] = 0xE;\r
                        return Pico_mcd->cdc.STAT.B.B1;\r
 \r
                case 0xE: // STAT2\r
                        cdprintf("CDC read reg 14 = %.2X", Pico_mcd->cdc.STAT.B.B2);\r
 \r
-                       Pico_mcd->cdd.CDC_Decode_Reg_Read |= (1 << 14);         // Reg 14 (decoding)\r
+                       Pico_mcd->cdc.Decode_Reg_Read |= (1 << 14);             // Reg 14 (decoding)\r
                        Pico_mcd->s68k_regs[5] = 0xF;\r
                        return Pico_mcd->cdc.STAT.B.B2;\r
 \r
@@ -355,7 +380,7 @@ unsigned char CDC_Read_Reg(void)
                        Pico_mcd->cdc.IFSTAT |= 0x20;                   // decoding interrupt flag cleared\r
                        if ((Pico_mcd->cdc.CTRL.B.B0 & 0x80) && (Pico_mcd->cdc.IFCTRL & 0x20))\r
                        {\r
-                               if ((Pico_mcd->cdd.CDC_Decode_Reg_Read & 0x73F2) == 0x73F2)\r
+                               if ((Pico_mcd->cdc.Decode_Reg_Read & 0x73F2) == 0x73F2)\r
                                        Pico_mcd->cdc.STAT.B.B3 = 0x80;\r
                        }\r
                        return ret;\r
fast MegaDrive/MegaCD/32X emulator