Cyclone poll detection problem fixed

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

diff --git a/Pico/cd/LC89510.c b/Pico/cd/LC89510.c
index e821c61..05ac5d1 100644 (file)
--- a/Pico/cd/LC89510.c
+++ b/Pico/cd/LC89510.c
@@ -1,16 +1,15 @@
 /***********************************************************\r
  *                                                         *\r
- * This source is taken from the Gens project              *\r
+ * This source file 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
 #include "../PicoInt.h"\r
 \r
-#define cdprintf dprintf\r
-//#define cdprintf(x...)\r
+#define cdprintf(x...)\r
 \r
 \r
 #define CDC_DMA_SPEED 256\r
@@ -56,7 +55,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
@@ -66,7 +65,7 @@ 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;\r
        unsigned short *dest;\r
@@ -86,7 +85,7 @@ void Update_CDC_TRansfer(int which)
 \r
                        if (Pico_mcd->s68k_regs[0x33] & (1<<5))\r
                        {\r
-                               dprintf("cdc DTE irq 5");\r
+                               elprintf(EL_INTS, "cdc DTE irq 5");\r
                                SekInterruptS68k(5);\r
                        }\r
                }\r
@@ -112,12 +111,12 @@ void Update_CDC_TRansfer(int which)
 \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+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
@@ -128,18 +127,18 @@ void Update_CDC_TRansfer(int which)
 \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+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 (check: popful Mail)\r
        {\r
                dep = (DMA_Adr & 0x03FF) << 2;\r
-               dprintf("CD DMA # %04x -> PCM[%i] # %04x, len=%i",\r
+               cdprintf("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
@@ -156,12 +155,12 @@ void Update_CDC_TRansfer(int which)
 \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+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
@@ -178,7 +177,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
@@ -212,7 +211,7 @@ unsigned short Read_CDC_Host(int is_sub)
                        Pico_mcd->cdc.IFSTAT &= ~0x40;\r
 \r
                        if (Pico_mcd->s68k_regs[0x33]&(1<<5)) {\r
-                               dprintf("m68k: s68k irq 5");\r
+                               elprintf(EL_INTS, "m68k: s68k irq 5");\r
                                SekInterruptS68k(5);\r
                        }\r
 \r
@@ -227,24 +226,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
@@ -267,7 +252,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
@@ -390,7 +375,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
@@ -508,7 +493,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
@@ -524,7 +509,7 @@ void CDD_Export_Status(void)
 \r
        if (Pico_mcd->s68k_regs[0x33] & (1<<4))\r
        {\r
-               dprintf("cdd export irq 4");\r
+               elprintf(EL_INTS, "cdd export irq 4");\r
                SekInterruptS68k(4);\r
        }\r
 \r
@@ -538,7 +523,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