notaz.gp2x.de / picodrive.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
region detection, cd states wip, fixes, stuff
[picodrive.git] / Pico / cd / LC89510.c
diff --git a/Pico/cd/LC89510.c b/Pico/cd/LC89510.c
index de11f90..f877171 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->cdd.CDC_Decode_Reg_Read = 0;\r
        Pico_mcd->scd.Status_CDC &= ~0x08;\r
 }\r
 \r
@@ -65,15 +63,14 @@ void LC89510_Reset(void)
        CDD_Reset();\r
        CDC_Reset();\r
 \r
-       Pico_mcd->cdc.Host_Data = 0;\r
-       Pico_mcd->cdc.DMA_Adr = 0;\r
-       Pico_mcd->cdc.Stop_Watch = 0;\r
+       // clear DMA_Adr & Stop_Watch\r
+       memset(Pico_mcd->s68k_regs + 0xA, 0, 4);\r
 }\r
 \r
 \r
 void Update_CDC_TRansfer(int which)\r
 {\r
-       unsigned int dep, length, len;\r
+       unsigned int DMA_Adr, dep, length, len;\r
        unsigned short *dest;\r
        unsigned char  *src;\r
 \r
@@ -101,17 +98,17 @@ void Update_CDC_TRansfer(int which)
 \r
        // TODO: dst bounds checking? DAC.N alignment?\r
        src = Pico_mcd->cdc.Buffer + Pico_mcd->cdc.DAC.N;\r
-\r
+       DMA_Adr = (Pico_mcd->s68k_regs[0xA]<<8) | Pico_mcd->s68k_regs[0xB];\r
 \r
        if (which == 7) // WORD RAM\r
        {\r
                if (Pico_mcd->s68k_regs[3] & 4)\r
                {\r
-                       dep = ((Pico_mcd->cdc.DMA_Adr & 0x3FFF) << 3);\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 = ((Pico_mcd->cdc.DMA_Adr & 0x3FFF) << 4);\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
 \r
@@ -120,7 +117,7 @@ void Update_CDC_TRansfer(int which)
                }\r
                else\r
                {\r
-                       dep = ((Pico_mcd->cdc.DMA_Adr & 0x7FFF) << 3);\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
@@ -133,14 +130,14 @@ void Update_CDC_TRansfer(int which)
        {\r
 #if 0\r
                        dest = (unsigned char *) Ram_PCM;\r
-                       dep = ((Pico_mcd->cdc.DMA_Adr & 0x03FF) << 2) + PCM_Chip.Bank;\r
+                       dep = ((DMA_Adr & 0x03FF) << 2) + PCM_Chip.Bank;\r
 #else\r
-                       cdprintf("TODO: PCM Dma");\r
+                       cdprintf("CD DMA # %04x -> PCD TODO", Pico_mcd->cdc.DAC.N);\r
 #endif\r
        }\r
        else if (which == 5) // PRG RAM\r
        {\r
-               dep = (Pico_mcd->cdc.DMA_Adr & 0xFFFF) << 3;\r
+               dep = DMA_Adr << 3;\r
                dest = (unsigned short *) (Pico_mcd->prg_ram + dep);\r
                cdprintf("CD DMA # %04x -> prg_ram # %06x, len=%i",\r
                                Pico_mcd->cdc.DAC.N, dep, length);\r
@@ -260,7 +257,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->cdd.CDC_Decode_Reg_Read |= (1 << 1);          // Reg 1 (decoding)\r
                        Pico_mcd->s68k_regs[5] = 0x2;\r
                        return Pico_mcd->cdc.IFSTAT;\r
 \r
@@ -279,42 +276,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->cdd.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->cdd.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->cdd.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->cdd.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->cdd.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->cdd.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
@@ -333,21 +330,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->cdd.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->cdd.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->cdd.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
@@ -358,7 +355,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->cdd.CDC_Decode_Reg_Read & 0x73F2) == 0x73F2)\r
                                        Pico_mcd->cdc.STAT.B.B3 = 0x80;\r
                        }\r
                        return ret;\r
@@ -425,7 +422,7 @@ void CDC_Write_Reg(unsigned char Data)
 \r
                                cdprintf("************** Starting Data Transfer ***********");\r
                                cdprintf("RS0 = %.4X  DAC = %.4X  DBC = %.4X  DMA adr = %.4X\n\n", Pico_mcd->s68k_regs[4]<<8,\r
-                                       Pico_mcd->cdc.DAC.N, Pico_mcd->cdc.DBC.N, Pico_mcd->cdc.DMA_Adr);\r
+                                       Pico_mcd->cdc.DAC.N, Pico_mcd->cdc.DBC.N, (Pico_mcd->s68k_regs[0xA]<<8) | Pico_mcd->s68k_regs[0xB]);\r
                        }\r
                        break;\r
 \r
fast MegaDrive/MegaCD/32X emulator