X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2Fcd%2FMemory.c;h=a6267fed6326c4677a95b28abf11ab7807adeb74;hb=fb9bec948efc6c7edca8f5463bc0c3522f96c165;hp=44f84d82db49e335269a6ff1448bb9db726d912e;hpb=6cadc2da0070781cf2d8fcff84265d3ca1f423b9;p=picodrive.git

diff --git a/Pico/cd/Memory.c b/Pico/cd/Memory.c
index 44f84d8..a6267fe 100644
--- a/Pico/cd/Memory.c
+++ b/Pico/cd/Memory.c
@@ -8,16 +8,18 @@
 
 #include "../PicoInt.h"
 
-#include "../sound/sound.h"
 #include "../sound/ym2612.h"
 #include "../sound/sn76496.h"
 
 #include "gfx_cd.h"
 #include "pcm.h"
 
+#ifndef UTYPES_DEFINED
 typedef unsigned char  u8;
 typedef unsigned short u16;
 typedef unsigned int   u32;
+#define UTYPES_DEFINED
+#endif
 
 //#define __debug_io
 //#define __debug_io2
@@ -417,9 +419,9 @@ static void OtherWrite8End(u32 a, u32 d, int realsize)
 
 //u8 PicoReadM68k8_(u32 a);
 #ifdef _ASM_CD_MEMORY_C
-u8 PicoReadM68k8(u32 a);
+u32 PicoReadM68k8(u32 a);
 #else
-static u8 PicoReadM68k8(u32 a)
+static u32 PicoReadM68k8(u32 a)
 {
   u32 d=0;
 
@@ -468,17 +470,17 @@ static u8 PicoReadM68k8(u32 a)
 #ifdef __debug_io
   dprintf("r8 : %06x,   %02x @%06x", a&0xffffff, (u8)d, SekPc);
 #endif
-  return (u8)d;
+  return d;
 }
 #endif
 
 
 #ifdef _ASM_CD_MEMORY_C
-u16 PicoReadM68k16(u32 a);
+u32 PicoReadM68k16(u32 a);
 #else
-static u16 PicoReadM68k16(u32 a)
+static u32 PicoReadM68k16(u32 a)
 {
-  u16 d=0;
+  u32 d=0;
 
   if ((a&0xe00000)==0xe00000) { d=*(u16 *)(Pico.ram+(a&0xfffe)); goto end; } // Ram
 
@@ -515,7 +517,7 @@ static u16 PicoReadM68k16(u32 a)
   if ((a&0xffffc0)==0xa12000)
     rdprintf("m68k_regs r16: [%02x] @%06x", a&0x3f, SekPc);
 
-  d = (u16)OtherRead16(a, 16);
+  d = OtherRead16(a, 16);
 
   if ((a&0xffffc0)==0xa12000)
     rdprintf("ret = %04x", d);
@@ -641,7 +643,7 @@ static void PicoWriteM68k8(u32 a,u8 d)
     return;
   }
 
-  OtherWrite8(a,d,8);
+  OtherWrite8(a,d);
 }
 #endif
 
@@ -778,9 +780,9 @@ static void PicoWriteM68k32(u32 a,u32 d)
 // -----------------------------------------------------------------
 
 #ifdef _ASM_CD_MEMORY_C
-u8 PicoReadS68k8(u32 a);
+u32 PicoReadS68k8(u32 a);
 #else
-static u8 PicoReadS68k8(u32 a)
+static u32 PicoReadS68k8(u32 a)
 {
   u32 d=0;
 
@@ -868,16 +870,15 @@ static u8 PicoReadS68k8(u32 a)
 #ifdef __debug_io2
   dprintf("s68k r8 : %06x,   %02x @%06x", a&0xffffff, (u8)d, SekPcS68k);
 #endif
-  return (u8)d;
+  return d;
 }
 #endif
 
 
-//u16 PicoReadS68k16_(u32 a);
 #ifdef _ASM_CD_MEMORY_C
-u16 PicoReadS68k16(u32 a);
+u32 PicoReadS68k16(u32 a);
 #else
-static u16 PicoReadS68k16(u32 a)
+static u32 PicoReadS68k16(u32 a)
 {
   u32 d=0;
 
@@ -1455,7 +1456,7 @@ static u32 PicoCheckPcS68k(u32 pc)
 #endif
 
 
-void PicoMemSetupCD()
+PICO_INTERNAL void PicoMemSetupCD(void)
 {
   dprintf("PicoMemSetupCD()");
 #ifdef EMU_C68K