From 9816788bce878873ca4d708dd3e2e4a12c2992e3 Mon Sep 17 00:00:00 2001 From: Toni Wilen Date: Thu, 14 Oct 2021 19:03:01 +0300 Subject: [PATCH] 4900b37 --- custom.cpp | 12 +++++++----- gfxboard.cpp | 3 ++- od-win32/resources/winuae.rc | 4 ++-- od-win32/win32.h | 4 ++-- od-win32/winuaechangelog.txt | 16 +++++++++++++++- 5 files changed, 28 insertions(+), 11 deletions(-) diff --git a/custom.cpp b/custom.cpp index 166c66a6..be71a949 100644 --- a/custom.cpp +++ b/custom.cpp @@ -3447,12 +3447,14 @@ static void scandoubler_bpl_dma_start(void) { if (!scandoubled_line && doflickerfix() && interlace_seen > 0) { int lof = 1 - lof_current; - for (int i = 0; i < 8; i++) { + for (int i = 0; i < MAX_PLANES; i++) { prevbpl[lof][vpos][i] = bplptx[i]; - if (!lof && (bplcon0 & 4)) + if (!lof && (bplcon0 & 4)) { bplpt[i] = prevbpl[1 - lof][vpos][i]; - if (!(bplcon0 & 4) || interlace_seen < 0) + } + if (!(bplcon0 & 4) || interlace_seen < 0) { prevbpl[1 - lof][vpos][i] = prevbpl[lof][vpos][i] = 0; + } } } } @@ -13214,8 +13216,8 @@ static int dma_cycle(uaecptr addr, uae_u32 value, int *mode) static void sync_cycles(void) { - unsigned long c; - int extra; + uae_u32 c; + uae_u32 extra; c = get_cycles(); extra = c & (CYCLE_UNIT - 1); diff --git a/gfxboard.cpp b/gfxboard.cpp index ad1babc7..65ee5caa 100644 --- a/gfxboard.cpp +++ b/gfxboard.cpp @@ -1498,7 +1498,8 @@ void gfxboard_vsync_handler(bool full_redraw_required, bool redraw_required) } if (gb->board->pci && gb->vram) { bool svga_on(void *p); - set_monswitch(gb, svga_on(gb->pcemobject2)); + bool on = svga_on(gb->pcemobject2); + set_monswitch(gb, on); } } diff --git a/od-win32/resources/winuae.rc b/od-win32/resources/winuae.rc index 6d83f47f..d78c60f1 100644 --- a/od-win32/resources/winuae.rc +++ b/od-win32/resources/winuae.rc @@ -1121,14 +1121,14 @@ BEGIN RTEXT "Configuration:",IDC_STATIC,5,136,68,10,SS_CENTERIMAGE COMBOBOX IDC_QUICKSTART_HOSTCONFIG,77,134,310,50,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Emulated Drives",IDC_QUICKSTART_DF,1,163,393,93 - CONTROL "Floppy drive DF0:",IDC_DF0QENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,176,77,15 + CONTROL "Floppy drive DF0:",IDC_DF0QENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,176,71,15 PUSHBUTTON "Select image file",IDC_DF0QQ,85,176,88,15 RTEXT "Write-protected",IDC_DF0WPTEXTQ,244,179,69,10,SS_CENTERIMAGE CONTROL "",IDC_DF0WPQ,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,318,177,10,15 PUSHBUTTON "?",IDC_INFO0Q,334,176,19,15 PUSHBUTTON "Eject",IDC_EJECT0Q,358,176,30,15 COMBOBOX IDC_DF0TEXTQ,9,195,379,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - CONTROL "Floppy drive DF1:",IDC_DF1QENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,214,77,15 + CONTROL "Floppy drive DF1:",IDC_DF1QENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,214,71,15 PUSHBUTTON "Select image file",IDC_DF1QQ,85,214,88,15 RTEXT "Write-protected",IDC_DF1WPTEXTQ,243,217,69,10,SS_CENTERIMAGE COMBOBOX IDC_CD0Q_TYPE,253,215,74,50,CBS_DROPDOWNLIST | NOT WS_VISIBLE | WS_VSCROLL | WS_TABSTOP diff --git a/od-win32/win32.h b/od-win32/win32.h index 9be49a85..e3f46ef5 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 36") +#define WINUAEBETA _T("Beta 37") #else #define WINUAEBETA _T("") #endif -#define WINUAEDATE MAKEBD(2021, 10, 3) +#define WINUAEDATE MAKEBD(2021, 10, 14) //#define WINUAEEXTRA _T("AmiKit Preview") //#define WINUAEEXTRA _T("Amiga Forever Edition") diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt index 66adb70e..791701f1 100644 --- a/od-win32/winuaechangelog.txt +++ b/od-win32/winuaechangelog.txt @@ -1,4 +1,19 @@ +Beta 37: + +- "Copper wake up" (W) and "Copper wanted this cycle but couldn't get it" (c) markers in DMA debugger had disappeared. Skip also shows 'W' if SKIP skipped. +- Do not allow cycle-exact blitter without at least memory cycle-exact CPU. It is not anymore compatible with faster modes. +- Fixed random corruption when cycle-exact blitter was enabled and CPU was (memory) cycle-exact and CPU config was fast. +- Do not allow opposite joystick directions at the same time (some games crash..) if mapped using Game Ports panel. It is still allowed if configured using Input panel and it was mapped to left/right/up/down events (not horiz/vert). +- Added official WinUAE FloppyBridge support. +- Added basic floppy type selection to Quickstart panel (3.5" DD, 3.5" HD and FloppyBridge). Selection is not remembered yet. + +FloppyBridge details: +- https://amiga.robsmithdev.co.uk/winuae +- DLLs go to /plugins +- Simple and flexible UI implementation. Different than in unofficial WinUAE floppybridge versions. +- Drive type select menus have "Configure Floppybridge" option if floppybridge DLL is detected. Selecting the option opens floppybridge configuration UI (which is located in floppybridge DLL, it is not part of WinUAE UI), use it configure one or more drive profiles. Select profile to enable floppybridge mode for selected emulated drive. + Beta 36: - Lores Display panel resolution mode: horizontal DIW values had wrong masking, bitplane left/right edge missed 1 pixel row or had 1 pixel row too much. (b29) @@ -29,7 +44,6 @@ Beta 34: - Ateo Pixel 64 RTG board emulation. Another Cirrus Logic based RTG board. Very quickly done, only works with recent Picasso96 versions, does not work with drivers that need ateobus.library (will be done if someone disassembles it, I am too lazy, as usual). 256 color mode has wrong colors and right edge wraps around. Does not autoswitch. - "Smooth Copper" works correctly again. - Beta 33: - DMACONR blitter busy bit state is 1 cycle later than copper waking up from blitter finished. (Circle Scroller / United Force) -- 2.47.3