notaz.gp2x.de / picodrive.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
fast dma
[picodrive.git] / Pico / cd / LC89510.c
diff --git a/Pico/cd/LC89510.c b/Pico/cd/LC89510.c
index a6503ca..2549fa8 100644 (file)
--- a/Pico/cd/LC89510.c
+++ b/Pico/cd/LC89510.c
@@ -15,8 +15,6 @@
 \r
 #define CDC_DMA_SPEED 256\r
 \r
-int CDC_Decode_Reg_Read; // 2 context?\r
-\r
 \r
 static void CDD_Reset(void)\r
 {\r
@@ -55,7 +53,7 @@ static void CDC_Reset(void)
        Pico_mcd->cdc.IFCTRL = 0;\r
        Pico_mcd->cdc.CTRL.N = 0;\r
 \r
-       CDC_Decode_Reg_Read = 0;\r
+       Pico_mcd->cdc.Decode_Reg_Read = 0;\r
        Pico_mcd->scd.Status_CDC &= ~0x08;\r
 }\r
 \r
@@ -116,6 +114,13 @@ void Update_CDC_TRansfer(int which)
 \r
                        for (len = length; len > 0; len--, src+=2, dest+=2)\r
                                *dest = (src[0]<<8) | src[1];\r
+\r
+                       { // debug\r
+                               unsigned char *b1 = Pico_mcd->word_ram + dep;\r
+                               unsigned char *b2 = (unsigned char *)dest - 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
@@ -126,6 +131,13 @@ void Update_CDC_TRansfer(int which)
 \r
                        for (len = length; len > 0; len--, src+=2, dest++)\r
                                *dest = (src[0]<<8) | src[1];\r
+\r
+                       { // debug\r
+                               unsigned char *b1 = Pico_mcd->word_ram + dep;\r
+                               unsigned char *b2 = (unsigned char *)dest - 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
@@ -134,7 +146,7 @@ void Update_CDC_TRansfer(int which)
                        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
+                       cdprintf("CD DMA # %04x -> PCM TODO", Pico_mcd->cdc.DAC.N);\r
 #endif\r
        }\r
        else if (which == 5) // PRG RAM\r
@@ -146,12 +158,26 @@ void Update_CDC_TRansfer(int which)
 \r
                for (len = length; len > 0; len--, src+=2, dest++)\r
                        *dest = (src[0]<<8) | src[1];\r
+\r
+               { // debug\r
+                       unsigned char *b1 = Pico_mcd->prg_ram + dep;\r
+                       unsigned char *b2 = (unsigned char *)dest - 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
@@ -259,7 +285,7 @@ unsigned char CDC_Read_Reg(void)
                case 0x1: // IFSTAT\r
                        cdprintf("CDC read reg 01 = %.2X", Pico_mcd->cdc.IFSTAT);\r
 \r
-                       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
@@ -278,42 +304,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
-                       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
-                       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
-                       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
-                       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
-                       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
-                       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
@@ -332,21 +358,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
-                       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
-                       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
-                       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
@@ -357,7 +383,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 ((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