3410b7

diff --git a/arcadia.cpp b/arcadia.cpp
index 9fca583a8f07ed1c3445a184865d17da127293b9..cb2bbe9855beebd783a1c79253c7fa7417a2a616 100644 (file)
--- a/arcadia.cpp
+++ b/arcadia.cpp
@@ -959,7 +959,7 @@ uae_u16 alg_joydat(int joy, uae_u16 v)
 {
        if (!alg_flag)
                return v;
-       int ply = (alg_potgo & 0x4000) && (alg_potgo & 0x8000) ? 1 : 0;
+       int ply = alg_get_player(alg_potgo);
        v = 0;
        if (joy == 0) {
 

diff --git a/expansion.cpp b/expansion.cpp
index 7a17c31d01e4157b918a23f819078e3440de7d35..2d7c96c06efbfc678a0df4e4d0b7209c01e65ba5 100644 (file)
--- a/expansion.cpp
+++ b/expansion.cpp
@@ -4489,7 +4489,7 @@ const struct expansionromtype expansionroms[] = {
        },
        {
                _T("comspec1000"), _T("SA-1000"), _T("Comspec"),
-               comspec_init, NULL, comspec_add_scsi_unit, ROMTYPE_COMSPEC, 0, 0, BOARD_NONAUTOCONFIG_BEFORE, true,
+               comspec_init, NULL, comspec_add_scsi_unit, ROMTYPE_COMSPEC, 0, 0, BOARD_AUTOCONFIG_Z2, true,
                NULL, 0,
                true, EXPANSIONTYPE_SCSI
        },

diff --git a/od-win32/win32.h b/od-win32/win32.h
index cae655d91217cd9ef4e519fe2bc4dfc43bf60f8d..a451e52ca869e9a206a1b9b51c6a04ee655e32a0 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("6")
+#define WINUAEBETA _T("7")
 #else
 #define WINUAEBETA _T("")
 #endif
 
-#define WINUAEDATE MAKEBD(2017, 4, 17)
+#define WINUAEDATE MAKEBD(2017, 4, 22)
 
 //#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 5bcd59ecf79ea579a9dbb49fa7279d0767363baa..0a8091e1cf1605ab6834141f3e4ed3919cb45b3d 100644 (file)
--- a/od-win32/winuae_msvc15/winuae_msvc.vcxproj
+++ b/od-win32/winuae_msvc15/winuae_msvc.vcxproj
@@ -896,7 +896,6 @@
     <ClCompile Include="..\..\sndboard.cpp" />
     <ClCompile Include="..\..\softfloat\softfloat.cpp" />
     <ClCompile Include="..\..\softfloat\softfloat_decimal.cpp" />
-    <ClCompile Include="..\..\softfloat\softfloat_extension.cpp" />
     <ClCompile Include="..\..\softfloat\softfloat_fpsp.cpp" />
     <ClCompile Include="..\..\specialmonitors.cpp" />
     <ClCompile Include="..\..\statusline.cpp" />

diff --git a/od-win32/winuae_msvc15/winuae_msvc.vcxproj.filters b/od-win32/winuae_msvc15/winuae_msvc.vcxproj.filters
index abe3d6f6bb51f3b93ea62b9be3228ed7fe007d60..25cd6c812c63ebe83d44cc6c91a878ae3de3be07 100644 (file)
--- a/od-win32/winuae_msvc15/winuae_msvc.vcxproj.filters
+++ b/od-win32/winuae_msvc15/winuae_msvc.vcxproj.filters
@@ -841,9 +841,6 @@
     <ClCompile Include="..\..\softfloat\softfloat_decimal.cpp">
       <Filter>softfloat</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\softfloat\softfloat_extension.cpp">
-      <Filter>softfloat</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\softfloat\softfloat_fpsp.cpp">
       <Filter>softfloat</Filter>
     </ClCompile>

diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt
index 250ad7b706da3b749c8ec0723dedf7c63d64a234..c5b83569570cad74448a4059fe4d1bc25c7a17c6 100644 (file)
--- a/od-win32/winuaechangelog.txt
+++ b/od-win32/winuaechangelog.txt
@@ -4,6 +4,18 @@ 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 7:\r
+\r
+- Accessing accelerator board SCSI IO region without any added SCSI device caused crash.\r
+- winlaunch.lib native code use attempts are now internally "emulated". Library is not used or needed anymore.\r
+- Old style 0xf00000 boot rom is automatically mapped (if memory is not already in use and "new" rom mode) if it looks like\r
+  program is directly jumping to boot rom trap space instead of using uae.resource.\r
+- AGA FMODE>0 unaligned bitplane and sprite pointer behavior should be now accurately emulated. (It is not simple masking)\r
+  Sprites not tested (too boring) but both should use same DMA hardware.\r
+- Added A590 v4.6 boot ROM to ROM scanner.\r
+- Fixed A590 XT mode request sense handling (for example if out of bounds read).\r
+- 68040/060 without FPU or 68060 with FPU disabled exception had wrong PC OF FAULTED INSTRUCTION field in exception stack frame.\r
+- Comspec SA-1000 controller emulation remaining features implemented.\r
 \r
 Beta 6:\r
 \r