2600b21

diff --git a/filesys.cpp b/filesys.cpp
index 123c5760e79a2e054c436da9f1192c0938172945..fff087718e172ce4a72ceb4614b4e3f3b2ca3f7a 100644 (file)
--- a/filesys.cpp
+++ b/filesys.cpp
@@ -6729,6 +6729,9 @@ static int rdb_mount (UnitInfo *uip, int unit_no, int partnum, uaecptr parmpacke
                err = -1;
                goto error;
        }
+       if (dostype == 0xffffffff) {
+               write_log (_T("RDB: WARNING: dostype = 0xFFFFFFFF. FFS bug can report partition in \"no disk inserted\" state!!\n"));
+       }
 
        err = 2;
 

diff --git a/gayle.cpp b/gayle.cpp
index 70580f30147219e5da27099df6dd3417afa54443..8ca0d2418f88ef7bc241ef5c28d326742a1772fb 100644 (file)
--- a/gayle.cpp
+++ b/gayle.cpp
@@ -953,6 +953,8 @@ static void ide_read_sectors (struct ide_hdf *ide, int flags)
                ide_fail_err (ide, IDE_ERR_IDNF);
                return;
        }
+       if (IDE_LOG > 0)
+               write_log (_T("IDE%d read off=%d, sec=%d (%d) lba%d\n"), ide->num, (uae_u32)lba, nsec, ide->multiple_mode, ide->lba48 ? 48 : 28);
        ide->data_multi = multi ? ide->multiple_mode : 1;
        ide->data_offset = 0;
        ide->data_size = nsec * ide->blocksize;

diff --git a/inputdevice.cpp b/inputdevice.cpp
index b72c4618dd2ababf771606bd1cc82aff0824f701..29e6f37118e8382bcdd5cb07d59b92db3e3edfa5 100644 (file)
--- a/inputdevice.cpp
+++ b/inputdevice.cpp
@@ -2189,7 +2189,7 @@ uae_u8 handle_joystick_buttons (uae_u8 pra, uae_u8 dra)
        if (inputdevice_logging & 4) {
                static uae_u8 old;
                if (but != old)
-                       write_log (_T("BFE001: %02X:%02X %x\n"), dra, but, M68K_GETPC);
+                       write_log (_T("BFE001 R: %02X:%02X %x\n"), dra, but, M68K_GETPC);
                old = but;
        }
        return but;
@@ -2201,6 +2201,9 @@ void handle_cd32_joystick_cia (uae_u8 pra, uae_u8 dra)
        static int oldstate[2];
        int i;
 
+       if (inputdevice_logging & 4) {
+               write_log (_T("BFE001 W: %02X:%02X %x\n"), dra, pra, M68K_GETPC);
+       }
        cap_check ();
        for (i = 0; i < 2; i++) {
                uae_u8 but = 0x40 << i;
@@ -2212,10 +2215,12 @@ void handle_cd32_joystick_cia (uae_u8 pra, uae_u8 dra)
                                        cd32_shifter[i]--;
                                        if (cd32_shifter[i] < 0)
                                                cd32_shifter[i] = 0;
+                                       if (inputdevice_logging & 4)
+                                               write_log (_T("CD32 %d shift: %d %08x\n"), i, cd32_shifter[i], M68K_GETPC);
                                }
                        }
                }
-               oldstate[i] = pra & but;
+               oldstate[i] = dra & pra & but;
        }
 }
 
@@ -2545,7 +2550,7 @@ uae_u16 POTGOR (void)
                write_log (_T("POTGOR %04X %s\n"), v, debuginfo(0));
 #endif
        if (inputdevice_logging & 16)
-               write_log (_T("POTGO_R: %04X %08X %d\n"), v, M68K_GETPC, cd32_shifter[1]);
+               write_log (_T("POTGO_R: %04X %08X %d %d\n"), v, M68K_GETPC, cd32_shifter[0], cd32_shifter[1]);
        return v;
 }
 

diff --git a/od-win32/sounddep/sound.cpp b/od-win32/sounddep/sound.cpp
index 426993aa522510aa7339a880a68f3eea2783d605..c7a23f45bc70d38fb127a7ba738dfc701cf7af66 100644 (file)
--- a/od-win32/sounddep/sound.cpp
+++ b/od-win32/sounddep/sound.cpp
@@ -2055,7 +2055,7 @@ static void finish_sound_buffer_ds (struct sound_data *sd, uae_u16 *sndbuffer)
                        if (counter < 0) {
                                write_log (_T("DS: stuck?!?!\n"));
                                disable_sound ();
-                               break;
+                               return;
                        }
                }
                write_log (_T("DS: %d = (%d - %d)\n"), (s->safedist - playpos) / sd->samplesize, s->safedist / sd->samplesize, playpos / sd->samplesize);

diff --git a/od-win32/win32.h b/od-win32/win32.h
index 2d8893930765caf2950e17ab78c96410d7946e15..5fd94bd98fa6b5e6613563c7326d03c3a5114d7c 100644 (file)
--- a/od-win32/win32.h
+++ b/od-win32/win32.h
@@ -19,11 +19,11 @@
 #define LANG_DLL 1
 
 #if WINUAEPUBLICBETA
-#define WINUAEBETA _T("19")
+#define WINUAEBETA _T("21")
 #else
 #define WINUAEBETA _T("")
 #endif
-#define WINUAEDATE MAKEBD(2013, 5, 2)
+#define WINUAEDATE MAKEBD(2013, 5, 14)
 #define WINUAEEXTRA _T("")
 //#define WINUAEEXTRA _T("AmiKit Preview")
 //#define WINUAEEXTRA _T("Amiga Forever Edition")

diff --git a/od-win32/win32gfx.cpp b/od-win32/win32gfx.cpp
index b7207ef8018f2bca288ff0877016df44aff47831..790127f7284ea7a28dbe156bc544d6f371de0442 100644 (file)
--- a/od-win32/win32gfx.cpp
+++ b/od-win32/win32gfx.cpp
@@ -721,6 +721,7 @@ static void getd3dmonitornames (void)
                                continue;
                        if (SUCCEEDED (d3d->GetAdapterIdentifier (i, 0, &did))) {
                                TCHAR *name = au (did.Description);
+                               my_trim (name);
                                if (_tcsicmp (name, md->adaptername)) {
                                        write_log (_T("%d: '%s' -> '%s'\n"), i, md->adaptername, name);
                                        xfree (md->adaptername);

diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt
index c77ee0385a7aff52a0bb47263bdb8cecddfc91ab..eeb9c1903ed7392f61eed4b734ff22b48577c0e8 100644 (file)
--- a/od-win32/winuaechangelog.txt
+++ b/od-win32/winuaechangelog.txt
@@ -1,6 +1,11 @@
 
 - restore only single input target to default.
 
+Beta 20 (RC1) Final in few days:
+
+- AROS ROM updated.
+- DirectSound mode crashed if DS sound play cursor got stuck (which normally shouldn't happen)
+
 Beta 19:
 
 - Reduced internal display buffer memory usage, use MEM_TOP_DOWN VirtualAlloc() flag, this seems to