From c832c9fdeaffa299d05db4d0c6fb77aee17ca443 Mon Sep 17 00:00:00 2001
From: Toni Wilen <twilen@winuae.net>
Date: Tue, 14 May 2013 19:12:29 +0300
Subject: [PATCH] 2600b21

---
 filesys.cpp                  |  3 +++
 gayle.cpp                    |  2 ++
 inputdevice.cpp              | 11 ++++++++---
 od-win32/sounddep/sound.cpp  |  2 +-
 od-win32/win32.h             |  4 ++--
 od-win32/win32gfx.cpp        |  1 +
 od-win32/winuaechangelog.txt |  5 +++++
 7 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/filesys.cpp b/filesys.cpp
index 123c5760..fff08771 100644
--- 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 70580f30..8ca0d241 100644
--- 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 b72c4618..29e6f371 100644
--- 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 426993aa..c7a23f45 100644
--- 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 2d889393..5fd94bd9 100644
--- 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 b7207ef8..790127f7 100644
--- 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 c77ee038..eeb9c190 100644
--- 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
-- 
2.47.3