X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2Fcd%2FMemory.c;h=92c6060ce991fc0be765c0fbbc8b1c1a044b4f7e;hb=9a8ffeeeea54301c5289fd510aece552175ce13d;hp=e0b5d08e74c94cd7b09ab1d4ddd0e4ee4c0309f5;hpb=0af33fe0ef24a3e3b65217ad0d7aa2db03d16fc1;p=picodrive.git

diff --git a/Pico/cd/Memory.c b/Pico/cd/Memory.c
index e0b5d08..92c6060 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
@@ -405,7 +407,7 @@ static void OtherWrite8End(u32 a, u32 d, int realsize)
   dprintf("m68k FIXME: strange w%i: [%06x], %08x @%06x", realsize, a&0xffffff, d, SekPc);
 }
 
-
+#define _CD_MEMORY_C
 #undef _ASM_MEMORY_C
 #include "../MemoryCmn.c"
 #include "cell_map.c"
@@ -641,7 +643,7 @@ static void PicoWriteM68k8(u32 a,u8 d)
     return;
   }
 
-  OtherWrite8(a,d,8);
+  OtherWrite8(a,d);
 }
 #endif
 
@@ -1454,7 +1456,7 @@ static u32 PicoCheckPcS68k(u32 pc)
 #endif
 
 
-void PicoMemSetupCD()
+PICO_INTERNAL void PicoMemSetupCD(void)
 {
   dprintf("PicoMemSetupCD()");
 #ifdef EMU_C68K