From eb89a797870a4a0d871c025f0ee9d9a3835cf0c5 Mon Sep 17 00:00:00 2001 From: Toni Wilen Date: Sun, 4 Dec 2016 14:10:57 +0200 Subject: [PATCH] 3400b18 --- gayle.cpp | 5 ++++ memory.cpp | 32 +++++++++++++++++----- od-win32/win32.h | 4 +-- od-win32/winuae_msvc15/winuae_msvc.vcxproj | 2 +- od-win32/winuaechangelog.txt | 6 ++++ rommgr.cpp | 2 +- 6 files changed, 40 insertions(+), 11 deletions(-) diff --git a/gayle.cpp b/gayle.cpp index 293c10f2..9ec4f290 100644 --- a/gayle.cpp +++ b/gayle.cpp @@ -214,6 +214,11 @@ static uae_u8 checkgayleideirq (void) return irq ? GAYLE_IRQ_IDE : 0; } +bool isideint(void) +{ + return checkgayleideirq() != 0; +} + void rethink_gayle (void) { int lev2 = 0; diff --git a/memory.cpp b/memory.cpp index d3cbbbab..c024d4a9 100644 --- a/memory.cpp +++ b/memory.cpp @@ -8,6 +8,9 @@ #define DEBUG_STUPID 0 +// don't touch +#define ACA500x_DEVELOPMENT 0 + #include "sysconfig.h" #include "sysdeps.h" @@ -226,6 +229,7 @@ void dummy_put (uaecptr addr, int size, uae_u32 val) if (addr >= 0xf00000 && addr < 0xf80000 && size < 2) flash_write(addr, val); #endif + if (gary_nonrange(addr) || (size > 1 && gary_nonrange(addr + size - 1))) { if (gary_timeout) gary_wait (addr, size, true); @@ -278,7 +282,27 @@ uae_u32 dummy_get (uaecptr addr, int size, bool inst, uae_u32 defvalue) return 8; } #endif - +#if ACA500x_DEVELOPMENT + if (addr == 0xb03000) { + return 0xffff; + } + if (addr == 0xb07000) { + return 0x0000; + } + if (addr == 0xb2f800) { + return 0xffff; + } + if (addr == 0xb3b800) { + return 0x0000; + } + if (addr == 0xb3f800) { + return currprefs.cpu_model > 68000 ? 0x0000 : 0xffff; + } + if (addr == 0xb0b000) { + extern bool isideint(void); + return isideint() ? 0xffff : 0x0000; + } +#endif if (gary_nonrange(addr) || (size > 1 && gary_nonrange(addr + size - 1))) { if (gary_timeout) gary_wait (addr, size, false); @@ -305,12 +329,6 @@ uae_u32 REGPARAM2 dummy_lgeti (uaecptr addr) static uae_u32 REGPARAM2 dummy_wget (uaecptr addr) { -#if 0 - if (addr == 0xb0b000) { - extern uae_u16 isideint(void); - return isideint(); - } -#endif if (currprefs.illegal_mem) dummylog (0, addr, 2, 0, 0); return dummy_get (addr, 2, false, NONEXISTINGDATA); diff --git a/od-win32/win32.h b/od-win32/win32.h index 197e8dba..b0d2ec21 100644 --- a/od-win32/win32.h +++ b/od-win32/win32.h @@ -20,12 +20,12 @@ #define LANG_DLL_FULL_VERSION_MATCH 1 #if WINUAEPUBLICBETA -#define WINUAEBETA _T("17") +#define WINUAEBETA _T("18") #else #define WINUAEBETA _T("") #endif -#define WINUAEDATE MAKEBD(2016, 11, 27) +#define WINUAEDATE MAKEBD(2016, 12, 4) //#define WINUAEEXTRA _T("AmiKit Preview") //#define WINUAEEXTRA _T("Amiga Forever Edition") diff --git a/od-win32/winuae_msvc15/winuae_msvc.vcxproj b/od-win32/winuae_msvc15/winuae_msvc.vcxproj index 1bcd885c..080fb8f3 100644 --- a/od-win32/winuae_msvc15/winuae_msvc.vcxproj +++ b/od-win32/winuae_msvc15/winuae_msvc.vcxproj @@ -72,7 +72,7 @@ false Unicode true - v140 + v141 Application diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt index 92d8c4d7..13b7cdca 100644 --- a/od-win32/winuaechangelog.txt +++ b/od-win32/winuaechangelog.txt @@ -4,6 +4,12 @@ JIT Direct current rules are less complex now. It automatically switches off onl - RTG VRAM is outside of reserved natmem space. Workaround: Move RTG in earlier position using Hardware info GUI panel. Note that in 64-bit version RTG VRAM must be inside of reserved natmem space. (Outside = error message and return back to GUI) +Beta 18: + +- Input device on the fly change support now ignores all non-input device change events. +- On the fly switching from keyboard connected to disconnected did nothing. +- Added MIDI out and Genlock video volume setting to Sound panel volume drop down menu. + Beta 17: - Allow non-power of 2 manually configurable memory size, in 64k blocks. (Unsupported with JIT) diff --git a/rommgr.cpp b/rommgr.cpp index e93a4178..bf96957e 100644 --- a/rommgr.cpp +++ b/rommgr.cpp @@ -608,7 +608,7 @@ static struct romdata roms[] = { ALTROMPN(184, 1, 2, 65536, ROMTYPE_ODD | ROMTYPE_8BIT, NULL, 0xedde1745, 0x573b79f8,0x808fedaa,0xbf3b7623,0x50a91579,0x2d26c1bc) // wsjr151.bin,wsjr152.bin { _T("American Laser Games Who Shot Johnny Rock? v1.5"), 0, 0, 0, 0, _T("ALG\0"), 131072, 185, 0, 0, ROMTYPE_ALG, 0, 0, NULL, - 0x50eb4827, 0x72568673,0x4163aa16,0xdad3177,0xbd720187,0x125a63ec }, + 0x50eb4827, 0x72568673,0x4163aa16,0xd0ad3177,0xbd720187,0x125a63ec }, ALTROMPN(185, 1, 1, 65536, ROMTYPE_EVEN | ROMTYPE_8BIT, NULL, 0x8ab626dd, 0xe45561f7,0x7fc279b7,0x1dc1dd2e,0x15a0870c,0xb5c1cd89) ALTROMPN(185, 1, 2, 65536, ROMTYPE_ODD | ROMTYPE_8BIT, NULL, 0x9beeb1d7, 0x3fe0265e,0x5d36103d,0x3d9557d7,0x5e5e3728,0xe0b30da7) // gg_1.dat,gg_2.dat -- 2.47.3