From: Toni Wilen <twilen@winuae.net>
Date: Sat, 9 Nov 2019 17:39:57 +0000 (+0200)
Subject: 4300b4
X-Git-Tag: 4300~46
X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=bb05e3ca6c5fe1eec8c5f68d6b4e9fe66c870739;p=francis%2Fwinuae.git

4300b4
---

diff --git a/cdtv.cpp b/cdtv.cpp
index ea2ecaf4..8aa0e35a 100644
--- a/cdtv.cpp
+++ b/cdtv.cpp
@@ -1480,6 +1480,27 @@ static void REGPARAM2 dmac_wput (uaecptr addr, uae_u32 w)
 	dmac_bput2 (addr + 1, w);
 }
 
+static void REGPARAM2 dmac_bput(uaecptr addr, uae_u32 b);
+
+static uae_u32 REGPARAM2 dmac_wgeti(uaecptr addr)
+{
+	uae_u32 v = 0xffff;
+	return v;
+}
+static uae_u32 REGPARAM2 dmac_lgeti(uaecptr addr)
+{
+	uae_u32 v = 0xffff;
+	return v;
+}
+
+static addrbank dmac_bank = {
+	dmac_lget, dmac_wget, dmac_bget,
+	dmac_lput, dmac_wput, dmac_bput,
+	default_xlate, default_check, NULL, NULL, _T("CDTV DMAC/CD Controller"),
+	dmac_lgeti, dmac_wgeti,
+	ABFLAG_IO, S_READ, S_WRITE
+};
+
 static void REGPARAM2 dmac_bput (uaecptr addr, uae_u32 b)
 {
 	addr &= 65535;
@@ -1526,25 +1547,6 @@ static void ew (int addr, uae_u32 value)
 	}
 }
 
-static uae_u32 REGPARAM2 dmac_wgeti (uaecptr addr)
-{
-	uae_u32 v = 0xffff;
-	return v;
-}
-static uae_u32 REGPARAM2 dmac_lgeti (uaecptr addr)
-{
-	uae_u32 v = 0xffff;
-	return v;
-}
-
-addrbank dmac_bank = {
-	dmac_lget, dmac_wget, dmac_bget,
-	dmac_lput, dmac_wput, dmac_bput,
-	default_xlate, default_check, NULL, NULL, _T("CDTV DMAC/CD Controller"),
-	dmac_lgeti, dmac_wgeti,
-	ABFLAG_IO, S_READ, S_WRITE
-};
-
 /* CDTV batterybacked RAM emulation */
 #define CDTV_NVRAM_MASK 16383
 #define CDTV_NVRAM_SIZE 32768
diff --git a/expansion.cpp b/expansion.cpp
index 390b8cef..cec19ee1 100644
--- a/expansion.cpp
+++ b/expansion.cpp
@@ -4104,6 +4104,7 @@ void restore_expansion_finish(void)
 			ec->aci.doinit = false;
 			ec->aci.start = ec->base;
 			ec->aci.size = ec->size;
+			ec->aci.prefs = &currprefs;
 			_tcscpy(ec->aci.name, ec->ert->friendlyname);
 			if (ec->ert->init) {
 				if (ec->ert->init(&ec->aci)) {
diff --git a/include/cdtv.h b/include/cdtv.h
index 67ddd0fd..a9212c5f 100644
--- a/include/cdtv.h
+++ b/include/cdtv.h
@@ -5,8 +5,6 @@
 
 #ifdef CDTV
 
-extern addrbank dmac_bank;
-
 extern bool cdtv_init (struct autoconfig_info *aci);
 
 void cdtv_battram_write (int addr, int v);
diff --git a/od-win32/win32.h b/od-win32/win32.h
index 6b5f69b8..044a6c68 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("3")
+#define WINUAEBETA _T("4")
 #else
 #define WINUAEBETA _T("")
 #endif
 
-#define WINUAEDATE MAKEBD(2019, 10, 30)
+#define WINUAEDATE MAKEBD(2019, 11, 9)
 
 //#define WINUAEEXTRA _T("AmiKit Preview")
 //#define WINUAEEXTRA _T("Amiga Forever Edition")
diff --git a/od-win32/win32gui.cpp b/od-win32/win32gui.cpp
index 6dc60048..af5237f9 100644
--- a/od-win32/win32gui.cpp
+++ b/od-win32/win32gui.cpp
@@ -20638,11 +20638,9 @@ static HWND updatePanel (int id, UINT action)
 	ew (guiDlg, IDC_RESETAMIGA, full_property_sheet ? FALSE : TRUE);
 	ew (guiDlg, IDOK, TRUE);
 	if (panelDlg != NULL) {
-		SetWindowRedraw(hDlg, FALSE);
 		ShowWindow (panelDlg, FALSE);
 		DestroyWindow (panelDlg);
 		panelDlg = NULL;
-		SetWindowRedraw(hDlg, TRUE);
 	}
 	if (ToolTipHWND != NULL) {
 		DestroyWindow (ToolTipHWND);
diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt
index d61400ee..22e36d69 100644
--- a/od-win32/winuaechangelog.txt
+++ b/od-win32/winuaechangelog.txt
@@ -1,5 +1,14 @@
 
 
+Beta 4:
+
+- AGA border sprites enabled: sprite was still clipped to horizontal display window end. (b3)
+- Fastlane SCSI DMA controller address configuration emulation was incomplete. (Address bus is used for bits 0 to 23, upper 8 data bits for 24 to 31)
+- A2024 monitor didn't show full viewable area. (4.0) It still won't work correctly if multimonitor mode is enabled. A2024 is a special case, it is basically display port adapter but it is not hardwired to chipset timing/display size/position like all other display port adapters.
+- Remaining (?) GUI update glitch fixed. (b2)
+- Added Trojan light gun preset to Game ports panel. Trojan fire button is joystick left. Standard light pen/gun fire button is 3rd mouse/joystick button.
+- PPC board without ROM or zero size ROM and 68060 CPU with FPU: Generated fake boot ROM didn't include FPU disable boot code. Since 4.1.0 68060 FPU is not disabled when emulated accelerator board is configured.
+
 Beta 3:
 
 - Subpixel emulation + borderblank: sprite end was 1 hires pixel before bitplane end, leaving 1 hires pixel gap in right border.
@@ -21,7 +30,6 @@ Beta 2:
 - Copper COPJMP cycle sequence order was wrong, first cycle does not need free cycle, second cycle requires free cycle, logic analyzer rechecked. (vAmiga test case)
 - Using SPRxPOs to move DMA mode sprite horizontally towards right very little so that "both" sprites still have overlapping pixels: old sprite was still drawn fully. (vAmiga test case)
 
-
 Beta 1:
 
 - Trumpcard A500AT v1.2 ROM dump found, compared to v1.1 (extracted from driver disk .driver file), main difference seems to be use of interrupts. Emulation updated. Both ROM versions have same version/date string "AT 1.1 (06 NOV 1991)", I guess they forgot to update it..