--- previous/src/uae-cpu/memory.c 2018/04/24 19:25:10 1.1 +++ previous/src/uae-cpu/memory.c 2018/04/24 19:26:11 1.1.1.2 @@ -24,6 +24,7 @@ const char Memory_fileid[] = "Previous m #include "reset.h" #include "nextMemory.h" #include "m68000.h" +#include "configuration.h" #include "newcpu.h" @@ -209,7 +210,7 @@ static uae_u32 BusErrMem_lget(uaecptr ad if (illegal_mem) write_log ("Bus error lget at %08lx pc=%08x\n", (long)addr,m68k_getpc()); - M68000_BusError(addr, 1); + M68000_BusError(addr, BUS_ERROR_READ); return 0; } @@ -218,7 +219,7 @@ static uae_u32 BusErrMem_wget(uaecptr ad if (illegal_mem) write_log ("Bus error wget at %08lx pc=%08x\n", (long)addr,m68k_getpc()); - M68000_BusError(addr, 1); + M68000_BusError(addr, BUS_ERROR_READ); return 0; } @@ -227,7 +228,7 @@ static uae_u32 BusErrMem_bget(uaecptr ad if (illegal_mem) write_log ("Bus error bget at %08lx pc=%08x\n", (long)addr,m68k_getpc()); - M68000_BusError(addr, 1); + M68000_BusError(addr, BUS_ERROR_READ); return 0; } @@ -236,7 +237,7 @@ static void BusErrMem_lput(uaecptr addr, if (illegal_mem) write_log ("Bus error lput at %08lx pc=%08x\n", (long)addr,m68k_getpc()); - M68000_BusError(addr, 0); + M68000_BusError(addr, BUS_ERROR_WRITE); } static void BusErrMem_wput(uaecptr addr, uae_u32 w) @@ -244,7 +245,7 @@ static void BusErrMem_wput(uaecptr addr, if (illegal_mem) write_log ("Bus error wput at %08lx pc=%08x\n", (long)addr,m68k_getpc()); - M68000_BusError(addr, 0); + M68000_BusError(addr, BUS_ERROR_WRITE); } static void BusErrMem_bput(uaecptr addr, uae_u32 b) @@ -252,7 +253,7 @@ static void BusErrMem_bput(uaecptr addr, if (illegal_mem) write_log ("Bus error bput at %08lx pc=%08x\n", (long)addr,m68k_getpc()); - M68000_BusError(addr, 0); + M68000_BusError(addr, BUS_ERROR_WRITE); } static int BusErrMem_check(uaecptr addr, uae_u32 size) @@ -618,7 +619,7 @@ static void ROMmem_lput(uaecptr addr, ua if (illegal_mem) write_log ("Illegal ROMmem lput at %08lx\n", (long)addr); - M68000_BusError(addr, 0); + M68000_BusError(addr, BUS_ERROR_WRITE); } static void ROMmem_wput(uaecptr addr, uae_u32 b) @@ -626,7 +627,7 @@ static void ROMmem_wput(uaecptr addr, ua if (illegal_mem) write_log ("Illegal ROMmem wput at %08lx\n", (long)addr); - M68000_BusError(addr, 0); + M68000_BusError(addr, BUS_ERROR_WRITE); } static void ROMmem_bput(uaecptr addr, uae_u32 b) @@ -634,7 +635,7 @@ static void ROMmem_bput(uaecptr addr, ua if (illegal_mem) write_log ("Illegal ROMmem bput at %08lx\n", (long)addr); - M68000_BusError(addr, 0); + M68000_BusError(addr, BUS_ERROR_WRITE); } static int ROMmem_check(uaecptr addr, uae_u32 size) @@ -793,7 +794,10 @@ void memory_init(uae_u32 nNewNEXTMemSize { FILE* fin; int ret; - fin=fopen("./Rev_2.5_v66.BIN","rb"); + if(ConfigureParams.System.nCpuLevel == 3) + fin=fopen("./Rev_1.0_v41.BIN","rb"); + else + fin=fopen("./Rev_2.5_v66.BIN","rb"); // fin=fopen("./Rev_3.3_v74.BIN","rb"); // fin=fopen("./Rev_1.2.BIN","rb"); // fin=fopen("./Rev_1.0_v41.BIN","rb");