X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2Fz80if.c;h=f48da99a63ead801cdc16a70a15c9f2d11fc78e7;hb=679af8a3f466a2a4a20f58e4181a231fb73e9836;hp=815e0030eaff7fdee9261b99d90351d5dc7da748;hpb=d8f51995c466282c7c93f3666b1bc54b827ec19e;p=picodrive.git

diff --git a/pico/z80if.c b/pico/z80if.c
index 815e003..f48da99 100644
--- a/pico/z80if.c
+++ b/pico/z80if.c
@@ -6,29 +6,6 @@
 unsigned long z80_read_map [0x10000 >> Z80_MEM_SHIFT];
 unsigned long z80_write_map[0x10000 >> Z80_MEM_SHIFT];
 
-void MEMH_FUNC z80_map_set(unsigned long *map, int start_addr, int end_addr,
-    void *func_or_mh, int is_func)
-{
-  unsigned long addr = (unsigned long)func_or_mh;
-  int mask = (1 << Z80_MEM_SHIFT) - 1;
-  int i;
-
-  if ((start_addr & mask) != 0 || (end_addr & mask) != mask)
-    elprintf(EL_STATUS|EL_ANOMALY, "z80_map_set: tried to map bad range: %04x-%04x",
-      start_addr, end_addr);
-
-  if (addr & 1) {
-    elprintf(EL_STATUS|EL_ANOMALY, "z80_map_set: ptr is not aligned: %08lx", addr);
-    return;
-  }
-
-  for (i = start_addr >> Z80_MEM_SHIFT; i <= end_addr >> Z80_MEM_SHIFT; i++)
-    if (is_func)
-      map[i] = (addr >> 1) | (1 << (sizeof(addr) * 8 - 1));
-    else
-      map[i] = (addr - (i << Z80_MEM_SHIFT)) >> 1;
-}
-
 #ifdef _USE_MZ80
 
 // memhandlers for mz80 core
@@ -119,7 +96,8 @@ PICO_INTERNAL void z80_reset(void)
   drZ80.z80irqvector = 0xff0000; // RST 38h
   drZ80.Z80PC_BASE = drZ80.Z80PC = z80_read_map[0] << 1;
   // drZ80 is locked in single bank
-  drZ80.Z80SP_BASE = z80_read_map[0] << 1;
+  drZ80.Z80SP_BASE = ((PicoAHW & PAHW_SMS) ?
+    z80_read_map[0xc000 >> Z80_MEM_SHIFT] : z80_read_map[0]) << 1;
 //  drZ80.Z80SP = drZ80.z80_rebaseSP(0x2000); // 0xf000 ?
 #endif
 #ifdef _USE_CZ80
@@ -128,7 +106,6 @@ PICO_INTERNAL void z80_reset(void)
   Cz80_Set_Reg(&CZ80, CZ80_IY, 0xffff);
   Cz80_Set_Reg(&CZ80, CZ80_SP, 0x2000);
 #endif
-  Pico.m.z80_fakeval = 0; // for faking when Z80 is disabled
 }
 
 // XXX TODO: should better use universal z80 save format