From 2fc8e38c90bca8347af92af7d3a7444d29c0aa8b Mon Sep 17 00:00:00 2001
From: Toni Wilen <twilen@winuae.net>
Date: Sat, 14 Jul 2018 21:52:19 +0300
Subject: [PATCH] 4010b6

---
 a2065.cpp                    |  3 +++
 od-win32/hardfile_win32.cpp  | 15 ++++++++++++---
 od-win32/win32.h             |  6 +++---
 od-win32/winuaechangelog.txt |  6 ++++++
 qemuvga/ne2000.cpp           |  2 +-
 5 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/a2065.cpp b/a2065.cpp
index 66128ed5..468ffefa 100644
--- a/a2065.cpp
+++ b/a2065.cpp
@@ -1020,6 +1020,9 @@ static bool a2065_config (struct autoconfig_info *aci)
 {
 	uae_u8 maco[3];
 
+	if (!aci)
+		return false;
+
 	if (aci->postinit) {
 		configured = expamem_board_pointer >> 16;
 		return true;
diff --git a/od-win32/hardfile_win32.cpp b/od-win32/hardfile_win32.cpp
index 3ab2f991..563914fe 100644
--- a/od-win32/hardfile_win32.cpp
+++ b/od-win32/hardfile_win32.cpp
@@ -3681,9 +3681,18 @@ int harddrive_to_hdf (HWND hDlg, struct uae_prefs *p, int idx)
 			}
 		}
 		if (chsmode) {
-			do_scsi_read10_chs(h, -1, cyl, head, 1, (uae_u8*)cache, secs, &specialaccessmode, false);
-			get = 512 * secs;
-			got = 512 * secs;
+			int readsize = secs;
+			int seccnt = 0;
+			uae_u8 *p = (uae_u8*)cache;
+			while (seccnt < secs) {
+				if (seccnt + readsize > secs)
+					readsize = secs - seccnt;
+				do_scsi_read10_chs(h, -1, cyl, head, seccnt + 1, p, readsize, &specialaccessmode, false);
+				get = 512 * readsize;
+				got = 512 * readsize;
+				p += 512 * readsize;
+				seccnt += readsize;
+			}
 			head++;
 			if (head >= heads) {
 				head = 0;
diff --git a/od-win32/win32.h b/od-win32/win32.h
index 251b9497..88e87df2 100644
--- a/od-win32/win32.h
+++ b/od-win32/win32.h
@@ -17,15 +17,15 @@
 
 #define WINUAEPUBLICBETA 1
 #define LANG_DLL 1
-#define LANG_DLL_FULL_VERSION_MATCH 1
+#define LANG_DLL_FULL_VERSION_MATCH 0
 
 #if WINUAEPUBLICBETA
-#define WINUAEBETA _T("5")
+#define WINUAEBETA _T("6")
 #else
 #define WINUAEBETA _T("")
 #endif
 
-#define WINUAEDATE MAKEBD(2018, 7, 12)
+#define WINUAEDATE MAKEBD(2018, 7, 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 6d8f037a..93868e98 100644
--- a/od-win32/winuaechangelog.txt
+++ b/od-win32/winuaechangelog.txt
@@ -1,4 +1,10 @@
 
+Beta 6:
+
+- Statefiles now include full relative and absolute path (disks, harddrives etc), now supports restoring statefile paths correctly even if relative path mode changed between save and restore. Old versions ignore new fields, old statefiles work like previously.
+- When tracing ('t' debugger command) STOP instruction in debugger, break first when STOP is executed (like previously), next trace waits until STOP instruction exits. Previously STOP activated debugger immediately again.
+- Picasso96 statefile restore didn't restore screen state fully. (4.x bug)
+
 Beta 5:
 
 - input.keyboard_type was always read as Amiga keyboard. If PC layout was set as default, keyboard layout was read incorrectly from config file.
diff --git a/qemuvga/ne2000.cpp b/qemuvga/ne2000.cpp
index 094a2010..23525a7a 100644
--- a/qemuvga/ne2000.cpp
+++ b/qemuvga/ne2000.cpp
@@ -1884,7 +1884,7 @@ static addrbank ariadne2_bank = {
 	ariadne2_lget, ariadne2_wget, ariadne2_bget,
 	ariadne2_lput, ariadne2_wput, ariadne2_bput,
 	default_xlate, default_check, NULL, _T("*"), _T("NE2000"),
-	ariadne2_wget, ariadne2_lget,
+	ariadne2_lget, ariadne2_wget,
 	ABFLAG_IO | ABFLAG_PPCIOSPACE, S_READ, S_WRITE
 };
 
-- 
2.47.3