X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2Fcd%2FMemory.c;h=b404ae7eb370f2878dc50260808b4448f5390e5d;hb=2b1f0e25193de382c6578fcf8e5edeaa37a21555;hp=b1faacdfa25b5a69468a85fa8af60ef07fe7d60e;hpb=dca310c413517d278898b967cfe610574310acd8;p=picodrive.git

diff --git a/Pico/cd/Memory.c b/Pico/cd/Memory.c
index b1faacd..b404ae7 100644
--- a/Pico/cd/Memory.c
+++ b/Pico/cd/Memory.c
@@ -501,10 +501,8 @@ u32 PicoReadM68k8(u32 a)
     case 0xd0>>1: case 0xd2>>1: case 0xd4>>1: case 0xd6>>1:
     case 0xd8>>1: case 0xda>>1: case 0xdc>>1: case 0xde>>1:
       // VDP
-      if ((a&0xe700e0)==0xc00000) {
-        d=PicoVideoRead(a);
-        if ((a&1)==0) d>>=8;
-      }
+      if ((a&0xe700e0)==0xc00000)
+        d=PicoVideoRead8(a);
       break;
     case 0xe0>>1: case 0xe2>>1: case 0xe4>>1: case 0xe6>>1:
     case 0xe8>>1: case 0xea>>1: case 0xec>>1: case 0xee>>1:
@@ -1636,6 +1634,10 @@ void PicoMemResetCD(int r3)
 }
 #endif
 
+#ifdef EMU_M68K
+static void m68k_mem_setup_cd(void);
+#endif
+
 PICO_INTERNAL void PicoMemSetupCD(void)
 {
   // additional handlers for common code
@@ -1702,6 +1704,9 @@ PICO_INTERNAL void PicoMemSetupCD(void)
     // PicoMemResetCD() will setup word ram for both
   }
 #endif
+#ifdef EMU_M68K
+  m68k_mem_setup_cd();
+#endif
 
   // m68k_poll_addr = m68k_poll_cnt = 0;
   s68k_poll_adclk = s68k_poll_cnt = 0;
@@ -1709,27 +1714,27 @@ PICO_INTERNAL void PicoMemSetupCD(void)
 
 
 #ifdef EMU_M68K
-unsigned char  PicoReadCD8w (unsigned int a) {
+static unsigned int PicoReadCD8w (unsigned int a) {
 	return m68ki_cpu_p == &PicoCpuMS68k ? PicoReadS68k8(a) : PicoReadM68k8(a);
 }
-unsigned short PicoReadCD16w(unsigned int a) {
+static unsigned int PicoReadCD16w(unsigned int a) {
 	return m68ki_cpu_p == &PicoCpuMS68k ? PicoReadS68k16(a) : PicoReadM68k16(a);
 }
-unsigned int   PicoReadCD32w(unsigned int a) {
+static unsigned int PicoReadCD32w(unsigned int a) {
 	return m68ki_cpu_p == &PicoCpuMS68k ? PicoReadS68k32(a) : PicoReadM68k32(a);
 }
-void PicoWriteCD8w (unsigned int a, unsigned char d) {
+static void PicoWriteCD8w (unsigned int a, unsigned char d) {
 	if (m68ki_cpu_p == &PicoCpuMS68k) PicoWriteS68k8(a, d); else PicoWriteM68k8(a, d);
 }
-void PicoWriteCD16w(unsigned int a, unsigned short d) {
+static void PicoWriteCD16w(unsigned int a, unsigned short d) {
 	if (m68ki_cpu_p == &PicoCpuMS68k) PicoWriteS68k16(a, d); else PicoWriteM68k16(a, d);
 }
-void PicoWriteCD32w(unsigned int a, unsigned int d) {
+static void PicoWriteCD32w(unsigned int a, unsigned int d) {
 	if (m68ki_cpu_p == &PicoCpuMS68k) PicoWriteS68k32(a, d); else PicoWriteM68k32(a, d);
 }
 
 // these are allowed to access RAM
-unsigned int  m68k_read_pcrelative_CD8 (unsigned int a)
+static unsigned int  m68k_read_pcrelative_CD8 (unsigned int a)
 {
   a&=0xffffff;
   if(m68ki_cpu_p == &PicoCpuMS68k) {
@@ -1756,7 +1761,7 @@ unsigned int  m68k_read_pcrelative_CD8 (unsigned int a)
   }
   return 0;//(u8)  lastread_d;
 }
-unsigned int  m68k_read_pcrelative_CD16(unsigned int a)
+static unsigned int  m68k_read_pcrelative_CD16(unsigned int a)
 {
   a&=0xffffff;
   if(m68ki_cpu_p == &PicoCpuMS68k) {
@@ -1783,7 +1788,7 @@ unsigned int  m68k_read_pcrelative_CD16(unsigned int a)
   }
   return 0;
 }
-unsigned int  m68k_read_pcrelative_CD32(unsigned int a)
+static unsigned int  m68k_read_pcrelative_CD32(unsigned int a)
 {
   u16 *pm;
   a&=0xffffff;
@@ -1813,5 +1818,28 @@ unsigned int  m68k_read_pcrelative_CD32(unsigned int a)
   }
   return 0;
 }
+
+extern unsigned int (*pm68k_read_memory_8) (unsigned int address);
+extern unsigned int (*pm68k_read_memory_16)(unsigned int address);
+extern unsigned int (*pm68k_read_memory_32)(unsigned int address);
+extern void (*pm68k_write_memory_8) (unsigned int address, unsigned char  value);
+extern void (*pm68k_write_memory_16)(unsigned int address, unsigned short value);
+extern void (*pm68k_write_memory_32)(unsigned int address, unsigned int   value);
+extern unsigned int (*pm68k_read_memory_pcr_8) (unsigned int address);
+extern unsigned int (*pm68k_read_memory_pcr_16)(unsigned int address);
+extern unsigned int (*pm68k_read_memory_pcr_32)(unsigned int address);
+
+static void m68k_mem_setup_cd(void)
+{
+  pm68k_read_memory_8  = PicoReadCD8w;
+  pm68k_read_memory_16 = PicoReadCD16w;
+  pm68k_read_memory_32 = PicoReadCD32w;
+  pm68k_write_memory_8  = PicoWriteCD8w;
+  pm68k_write_memory_16 = PicoWriteCD16w;
+  pm68k_write_memory_32 = PicoWriteCD32w;
+  pm68k_read_memory_pcr_8  = m68k_read_pcrelative_CD8;
+  pm68k_read_memory_pcr_16 = m68k_read_pcrelative_CD16;
+  pm68k_read_memory_pcr_32 = m68k_read_pcrelative_CD32;
+}
 #endif // EMU_M68K