From 4009d994ca75b80baec0eff703e9396b54926dd1 Mon Sep 17 00:00:00 2001 From: Toni Wilen Date: Sat, 22 Apr 2017 20:51:05 +0300 Subject: [PATCH] 3410b7 --- arcadia.cpp | 2 +- expansion.cpp | 2 +- od-win32/win32.h | 4 ++-- od-win32/winuae_msvc15/winuae_msvc.vcxproj | 1 - od-win32/winuae_msvc15/winuae_msvc.vcxproj.filters | 3 --- od-win32/winuaechangelog.txt | 12 ++++++++++++ 6 files changed, 16 insertions(+), 8 deletions(-) diff --git a/arcadia.cpp b/arcadia.cpp index 9fca583a..cb2bbe98 100644 --- 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 7a17c31d..2d7c96c0 100644 --- 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 cae655d9..a451e52c 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("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 5bcd59ec..0a8091e1 100644 --- a/od-win32/winuae_msvc15/winuae_msvc.vcxproj +++ b/od-win32/winuae_msvc15/winuae_msvc.vcxproj @@ -896,7 +896,6 @@ - diff --git a/od-win32/winuae_msvc15/winuae_msvc.vcxproj.filters b/od-win32/winuae_msvc15/winuae_msvc.vcxproj.filters index abe3d6f6..25cd6c81 100644 --- a/od-win32/winuae_msvc15/winuae_msvc.vcxproj.filters +++ b/od-win32/winuae_msvc15/winuae_msvc.vcxproj.filters @@ -841,9 +841,6 @@ softfloat - - softfloat - softfloat diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt index 250ad7b7..c5b83569 100644 --- 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. Note that in 64-bit version RTG VRAM must be inside of reserved natmem space. (Outside = error message and return back to GUI) +Beta 7: + +- Accessing accelerator board SCSI IO region without any added SCSI device caused crash. +- winlaunch.lib native code use attempts are now internally "emulated". Library is not used or needed anymore. +- Old style 0xf00000 boot rom is automatically mapped (if memory is not already in use and "new" rom mode) if it looks like + program is directly jumping to boot rom trap space instead of using uae.resource. +- AGA FMODE>0 unaligned bitplane and sprite pointer behavior should be now accurately emulated. (It is not simple masking) + Sprites not tested (too boring) but both should use same DMA hardware. +- Added A590 v4.6 boot ROM to ROM scanner. +- Fixed A590 XT mode request sense handling (for example if out of bounds read). +- 68040/060 without FPU or 68060 with FPU disabled exception had wrong PC OF FAULTED INSTRUCTION field in exception stack frame. +- Comspec SA-1000 controller emulation remaining features implemented. Beta 6: -- 2.47.3