From 2eac3ff995a1f4689312d1c9f76e43d79704cbe7 Mon Sep 17 00:00:00 2001 From: Toni Wilen Date: Sat, 30 Apr 2016 17:27:06 +0300 Subject: [PATCH] 3300b12 --- akiko.cpp | 2 +- filesys.cpp | 2 ++ od-win32/win32.h | 4 ++-- od-win32/winuaechangelog.txt | 18 ++++++++++++++++++ 4 files changed, 23 insertions(+), 3 deletions(-) diff --git a/akiko.cpp b/akiko.cpp index 0dfc91c6..b7563222 100644 --- a/akiko.cpp +++ b/akiko.cpp @@ -1487,7 +1487,7 @@ static uae_u32 akiko_bget2 (uaecptr addr, int msg) case 0x28: write_log(_T("Unimplemented Akiko PIO read: %02x PC=%08X\n"), v, M68K_GETPC); - v = cdrom_last_rx; + v = cdrom_last_rx; break; default: diff --git a/filesys.cpp b/filesys.cpp index 80b29f84..901acdd2 100644 --- a/filesys.cpp +++ b/filesys.cpp @@ -3235,6 +3235,8 @@ static uae_u32 REGPARAM2 startup_handler(TrapContext *ctx) put_long(unit->volume + 24, 0); put_long(unit->volume + 28, 0); /* lock list */ put_long(unit->volume + 40, (unit->volume + 64) >> 2); /* Name */ + //put_long(unit->volume + 44, 68); + //put_long(unit->volume + 48, 68); put_byte(unit->volume + 64, 0); if (!uinfo->wasisempty && !uinfo->unknown_media) { diff --git a/od-win32/win32.h b/od-win32/win32.h index 73d736ac..bf275bc9 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("11") +#define WINUAEBETA _T("12") #else #define WINUAEBETA _T("") #endif -#define WINUAEDATE MAKEBD(2016, 4, 24) +#define WINUAEDATE MAKEBD(2016, 4, 30) //#define WINUAEEXTRA _T("AmiKit Preview") //#define WINUAEEXTRA _T("Amiga Forever Edition") diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt index 7d3f4516..8fecd686 100644 --- a/od-win32/winuaechangelog.txt +++ b/od-win32/winuaechangelog.txt @@ -1,4 +1,22 @@ +Beta 12: + +- Dummy 68030 MMU instructions were also accidentally disabled in "generic" 680x0 core. (b11) +- AGA mode HAM6 colors were not 100% accurate. (Was fixed in b11) +- Stop with HALT10 if compatible CPU is not ticked and exception begins with SSP pointing to non-existing + address space. +- Prevent programmed mode display width and height to become too small. Program doing something very stupid + or crashing program can write very random values to programmable refresh rate custom registers. +- Switching Advanced chipset compatible option off and then back on does not anymore reset chipset extra + back to Generic in non-quickstart mode. +- 1M/512k+512k Advanced chipset option was not reset when Advanced chipset was in compatibility mode. +- A3000 SCSI + any WD based Z2 SCSI controller: autoconfig didn't work. + +Offtopic PC story: yesterday one of my GTX980 (Gigabyte Gaming G1) decided to release some magic smoke mid game, +I guess something shorted and power supply shut the system down instantly. Today I tested both (SLI setup, +I wasn't sure which one died, backplate hides most of the PCB), one works, another shows fire +and smoke signals.. Fortunately everything else appears to be fine. + Beta 11: - Screenshot/capture without "before filtering" ticked now uses much faster GetRenderTargetData() -- 2.47.3