--- previous/src/cpu/memory.c	2018/04/24 19:30:17	1.1.1.4
+++ previous/src/cpu/memory.c	2018/04/24 19:33:43	1.1.1.6
@@ -28,6 +28,7 @@ const char Memory_fileid[] = "Previous m
 #include "nextMemory.h"
 #include "m68000.h"
 #include "configuration.h"
+#include "NextBus.hpp"
 
 #include "newcpu.h"
 
@@ -206,9 +207,8 @@ __inline__ void byteput (uaecptr addr, u
 
 
 /* Some prototypes: */
-extern void SDL_Quit(void);
+void SDL_Quit(void);
 
-uae_u8 ce_banktype[65536];
 uae_u8 ce_cachable[65536];
 
 
@@ -825,7 +825,7 @@ static uae_u32 mem_bmap_lget(uaecptr add
 		M68000_BusError(addr, 0);
 		return 0;
 	}
-	write_log ("bmap lget at %08lx PC=%08x\n", (long)addr,m68k_getpc());
+	//write_log ("bmap lget at %08lx PC=%08x\n", (long)addr,m68k_getpc());
 	addr &= NEXT_BMAP_MASK;
 	return bmap_lget(addr);
 }
@@ -837,7 +837,7 @@ static uae_u32 mem_bmap_wget(uaecptr add
 		M68000_BusError(addr, 0);
 		return 0;
 	}
-	write_log ("bmap wget at %08lx PC=%08x\n", (long)addr,m68k_getpc());
+	//write_log ("bmap wget at %08lx PC=%08x\n", (long)addr,m68k_getpc());
 	addr &= NEXT_BMAP_MASK;
 	return bmap_wget(addr);
 }
@@ -849,7 +849,7 @@ static uae_u32 mem_bmap_bget(uaecptr add
 		M68000_BusError(addr, 0);
 		return 0;
 	}
-	write_log ("bmap bget at %08lx PC=%08x\n", (long)addr,m68k_getpc());
+	//write_log ("bmap bget at %08lx PC=%08x\n", (long)addr,m68k_getpc());
 	addr &= NEXT_BMAP_MASK;
 	return bmap_bget(addr);
 }
@@ -860,7 +860,7 @@ static void mem_bmap_lput(uaecptr addr,
 		write_log ("bmap bus error at %08lx PC=%08x\n", (long)addr,m68k_getpc());
 		M68000_BusError(addr, 0);
 	}
-	write_log ("bmap lput at %08lx val=%x PC=%08x\n", (long)addr,l,m68k_getpc());
+	//write_log ("bmap lput at %08lx val=%x PC=%08x\n", (long)addr,l,m68k_getpc());
 	addr &= NEXT_BMAP_MASK;
 	bmap_lput(addr, l);
 }
@@ -871,7 +871,7 @@ static void mem_bmap_wput(uaecptr addr,
 		write_log ("bmap bus error at %08lx PC=%08x\n", (long)addr,m68k_getpc());
 		M68000_BusError(addr, 0);
 	}
-	write_log ("bmap wput at %08lx val=%x PC=%08x\n", (long)addr,w,m68k_getpc());
+	//write_log ("bmap wput at %08lx val=%x PC=%08x\n", (long)addr,w,m68k_getpc());
 	addr &= NEXT_BMAP_MASK;
 	bmap_wput(addr, w);
 }
@@ -882,7 +882,7 @@ static void mem_bmap_bput(uaecptr addr,
 		write_log ("bmap bus error at %08lx PC=%08x\n", (long)addr,m68k_getpc());
 		M68000_BusError(addr, 0);
 	}
-	write_log ("bmap bput at %08lx val=%x PC=%08x\n", (long)addr,b,m68k_getpc());
+	//write_log ("bmap bput at %08lx val=%x PC=%08x\n", (long)addr,b,m68k_getpc());
 	addr &= NEXT_BMAP_MASK;
 	bmap_bput(addr, b);
 }
@@ -1158,6 +1158,7 @@ const char* memory_init(int *nNewNEXTMem
 			write_log("Mapping device space at $%08X\n", NEXT_IO_BMAP_START);
 		}
 	}
+	bmap_init();
 	
 	if (ConfigureParams.System.bTurbo) {
 		map_banks(&TMC_bank, NEXT_IO_TMC_START >> 16, NEXT_IO_SIZE>>16);
@@ -1189,10 +1190,8 @@ const char* memory_init(int *nNewNEXTMem
 			map_banks(&NEXTBUS_slot_bank, NEXTBUS_SLOT_START(i)>>16, NEXTBUS_SLOT_SIZE>>16);
 		}
 		write_log("Mapping NextBus slot memory at $%08x\n", NEXTBUS_SLOT_START(i));
-        
-        nextbus_init();
 	}
-
+    nextbus_init();
     
 	ROMmemory=NEXTRom;
 	IOmemory=NEXTIo;