Cyclone poll detection problem fixed

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

diff --git a/Pico/cd/LC89510.c b/Pico/cd/LC89510.c
index a78488b..05ac5d1 100644 (file)
--- a/Pico/cd/LC89510.c
+++ b/Pico/cd/LC89510.c
@@ -1,6 +1,6 @@
 /***********************************************************\r
  *                                                         *\r
- * This source was 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
@@ -9,8 +9,7 @@
 \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
@@ -139,7 +138,7 @@ void Update_CDC_TRansfer(int which)
        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
@@ -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
@@ -230,7 +229,7 @@ unsigned short Read_CDC_Host(int is_sub)
 }\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
@@ -253,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
@@ -376,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
@@ -494,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
@@ -510,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
@@ -524,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