Sonic CD shows Sega logo

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

diff --git a/Pico/cd/LC89510.c b/Pico/cd/LC89510.c
index de11f90..a6503ca 100644 (file)
--- a/Pico/cd/LC89510.c
+++ b/Pico/cd/LC89510.c
@@ -65,15 +65,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 +100,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 +119,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 +132,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
@@ -425,7 +424,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