3400b18

diff --git a/gayle.cpp b/gayle.cpp
index 293c10f2b85afd7b99c4c36d1d75c269ee519dd1..9ec4f290a79270a882165fed92fbde44e2aa0dba 100644 (file)
--- 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 d3cbbbaba2c935f4166aaa9eb906b509193db85c..c024d4a9aa19579569e015a357f52f71cf425a3e 100644 (file)
--- 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 197e8dbabe3c30efebcc8f52cd0b4a9030447b0c..b0d2ec2100b330ca4f7203b7e7348b18976eb2c6 100644 (file)
--- 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 1bcd885c15008ae06975bf46bbdc6f7b4bbaf918..080fb8f394718a581197035faf8a2c2dbcb94681 100644 (file)
--- a/od-win32/winuae_msvc15/winuae_msvc.vcxproj
+++ b/od-win32/winuae_msvc15/winuae_msvc.vcxproj
@@ -72,7 +72,7 @@
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>

diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt
index 92d8c4d773e1ff7df43bc32bb09f046429cc748c..13b7cdca3bdaf161a8ea6b2d74b5694cb269bf2f 100644 (file)
--- 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.\r
   Note that in 64-bit version RTG VRAM must be inside of reserved natmem space. (Outside = error message and return back to GUI)\r
 \r
+Beta 18:\r
+\r
+- Input device on the fly change support now ignores all non-input device change events.\r
+- On the fly switching from keyboard connected to disconnected did nothing.\r
+- Added MIDI out and Genlock video volume setting to Sound panel volume drop down menu.\r
+\r
 Beta 17:\r
 \r
 - Allow non-power of 2 manually configurable memory size, in 64k blocks. (Unsupported with JIT)\r

diff --git a/rommgr.cpp b/rommgr.cpp
index e93a41782947545e8ce2829e47c65543d8cea4af..bf96957e49cba27b676e15c84e86b966ed4055b3 100644 (file)
--- 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