3300b12

diff --git a/akiko.cpp b/akiko.cpp
index 0dfc91c661c35d2d0fdf6eec68326684bcc92126..b7563222344c889f66a6c2576bf7dab76258f49f 100644 (file)
--- 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 80b29f84d5ced88fa007333a584818bdae77faa8..901acdd27eec0cac67160438494bee44674ae6d0 100644 (file)
--- 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 73d736acd50bebaf029e586e951f45c5e0fc0b01..bf275bc9eaca0cdfa74d2b111b438ae8fc0a0b97 100644 (file)
--- 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 7d3f4516621e459f12d1ab213974234050312e9c..8fecd686cdee2879b0f5e5f5496fed014a56af3c 100644 (file)
--- 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()