From 4e392f34711f84d9d98f9140dbaca2e10143db49 Mon Sep 17 00:00:00 2001 From: Toni Wilen Date: Sun, 15 Aug 2021 19:58:57 +0300 Subject: [PATCH] 4900b30 --- custom.cpp | 2 +- expansion.cpp | 2 +- od-win32/win32.h | 4 ++-- od-win32/winuaechangelog.txt | 12 ++++++++++++ 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/custom.cpp b/custom.cpp index bf01216a..50e22445 100644 --- a/custom.cpp +++ b/custom.cpp @@ -1829,7 +1829,7 @@ static bool fetch(int nr, int fm, int hpos, bool addmodulo) { int add = fetchmode_bytes; - if (cycle_line_slot[hpos] == CYCLE_REFRESH) { + if (cycle_line_slot[hpos] == CYCLE_REFRESH || cycle_line_slot[hpos] == CYCLE_STROBE) { // refresh conflict add = fetch_warn(nr, hpos); } else if (cycle_line_slot[hpos] == CYCLE_MISC) { diff --git a/expansion.cpp b/expansion.cpp index 6ca21658..4ebb3a4c 100644 --- a/expansion.cpp +++ b/expansion.cpp @@ -3936,7 +3936,7 @@ uae_u8 *save_expansion_boards(int *len, uae_u8 *dstptr, int cardnum) save_u8(ec->aci.autoconfig_bytes[j]); } struct romconfig *rc = ec->rc; - if (rc) { + if (rc && rc->back) { save_u32(rc->back->device_type); save_u32(rc->back->device_num); save_string(rc->romfile); diff --git a/od-win32/win32.h b/od-win32/win32.h index 50c57b9d..d137cba0 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("Beta 29") +#define WINUAEBETA _T("Beta 30") #else #define WINUAEBETA _T("") #endif -#define WINUAEDATE MAKEBD(2021, 8, 9) +#define WINUAEDATE MAKEBD(2021, 8, 15) //#define WINUAEEXTRA _T("AmiKit Preview") //#define WINUAEEXTRA _T("Amiga Forever Edition") diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt index 2547c57f..d20b9f09 100644 --- a/od-win32/winuaechangelog.txt +++ b/od-win32/winuaechangelog.txt @@ -1,4 +1,16 @@ + +- BEAMCON0 LOLDIS modification was ignored unless display setup needed reinitialization (programmed refresh rate change etc..) +- Programmed VBLANK (BEAMCON0 bit 12) didn't blank lines after VBSTRT in some situations. +- Fixed scanline offset if resolution and BPLCON1 was changed during same scanline. +- Sprite horizontal wrap around support was only partially implemented. +- Horizontal display window (DIWSTRT/DIWSTOP) didn't support some wrap around/start larger than stop conditions correctly. +- Borderblank glitch emulation improved. If HDIW is open before first BPL1DAT access, there is 1.5 lores pixel COLOR00 gap between borderblank and first bitplane pixel. +- Reset didn't clear CIA-A/B B data port/direction. +- Bitplane first refresh slot conflict (strobe signal) was not reported and didn't trigger simulated conflict corrupted graphics. +- Added A590/A2091 v4.4 ROMs to ROM scanner. Probably original release version because ROMs had labels 390388-01 and 390389-01. +- If on the fly (emulation has already been started) Quickstart model or model specific change modifies expansion devices, force internal "Restart"-button press. Without it not all expansion devices initialize correctly. + Beta 29: - b28 copper update was wrong. Second attempt. (Hotbleeps etc. This time without breaking others.) -- 2.47.3