From af675dcf208049dd11692a0f22645342e00dcf08 Mon Sep 17 00:00:00 2001
From: Michael McMaster <michael@codesrc.com>
Date: Wed, 29 Mar 2017 19:51:47 +1000
Subject: [PATCH] Lots of bug fixing, and 4.7 merges

---
 CHANGELOG                                     |   5 +-
 Makefile                                      |   1 +
 include/scsi2sd.h                             |  17 ++-
 rtl/fpga_bitmap.o                             | Bin 32724 -> 32724 bytes
 src/firmware/config.c                         |   6 +-
 src/firmware/disk.c                           |   2 +
 src/firmware/scsi.c                           |  44 +++++-
 src/firmware/scsiPhy.c                        | 143 ++++++++++++------
 src/firmware/scsiPhy.h                        |  11 +-
 src/firmware/time.h                           |   2 +-
 src/scsi2sd-util6/BoardPanel.cc               |  57 +++----
 src/scsi2sd-util6/BoardPanel.hh               |  11 +-
 src/scsi2sd-util6/ConfigUtil.cc               | 117 +++++++-------
 src/scsi2sd-util6/Makefile                    |   8 +-
 src/scsi2sd-util6/TargetPanel.cc              |   4 +-
 src/scsi2sd-util6/scsi2sd-util.cc             |  35 +++--
 .../wxWidgets/src/osx/carbon/dataobj.cpp      |   2 +-
 .../wxWidgets/src/osx/core/bitmap.cpp         |   2 +-
 18 files changed, 275 insertions(+), 192 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index c0579e09..3c17ec20 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,7 +1,8 @@
-2016100X		?
+20170329		6.1.0
 	- Enable synchronous transfers on SCSI1 hosts
 	- Support 4MB/s sync transfers for Amiga A590 (WD33C93)
-	- Faster SD performance, but cannot use USB + SD at the same time.
+	- Merge v4.7 release changes, excluding custom mode/inquiry pages
+	- various bug fixes
 
 20161006		6.0.13
 	- Fixed SCSI timing issue
diff --git a/Makefile b/Makefile
index b90b51a3..b6a296d8 100644
--- a/Makefile
+++ b/Makefile
@@ -148,6 +148,7 @@ SRC = \
 	src/firmware/tape.c \
 	src/firmware/time.c \
 	src/firmware/trace.c \
+	src/firmware/vendor.c \
 	${USBCOMPOSITE_SRC}
 
 build/firmware.elf: $(SRC) rtl/fpga_bitmap.o $(STM32OBJS)
diff --git a/include/scsi2sd.h b/include/scsi2sd.h
index e15d0b09..6048e55f 100755
--- a/include/scsi2sd.h
+++ b/include/scsi2sd.h
@@ -79,9 +79,20 @@ typedef enum
 typedef enum
 {
 	S2S_CFG_QUIRKS_NONE,
-	S2S_CFG_QUIRKS_APPLE
+	S2S_CFG_QUIRKS_APPLE,
+	S2S_CFG_QUIRKS_OMTI
 } S2S_CFG_QUIRKS;
 
+typedef enum
+{
+	S2S_CFG_SPEED_NoLimit,
+	S2S_CFG_SPEED_ASYNC_15,
+	S2S_CFG_SPEED_ASYNC_33,
+	S2S_CFG_SPEED_ASYNC_50,
+	S2S_CFG_SPEED_SYNC_5,
+	S2S_CFG_SPEED_SYNC_10
+} S2S_CFG_SPEED;
+
 typedef struct __attribute__((packed))
 {
 	// bits 7 -> 3 = S2S_CFG_TARGET_FLAGS
@@ -122,7 +133,9 @@ typedef struct __attribute__((packed))
 	uint8_t selectionDelay; // milliseconds. 255 = auto
 	uint8_t flags6; // S2S_CFG_FLAGS6
 
-	uint8_t reserved[120]; // Pad out to 128 bytes
+	uint8_t scsiSpeed;
+
+	uint8_t reserved[119]; // Pad out to 128 bytes
 } S2S_BoardCfg;
 
 typedef enum
diff --git a/rtl/fpga_bitmap.o b/rtl/fpga_bitmap.o
index 6cbce7c58ef6b593e699f40565e37b8c6806855b..c7f26cf18d87115c81f093ca4db32b9547ff81bf 100644
GIT binary patch
literal 32724
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
UA^cJ0(ehfrcM51Z$jSTv0Pyct-T(jq

literal 32724
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

diff --git a/src/firmware/config.c b/src/firmware/config.c
index 9bb8b113..edb4be06 100755
--- a/src/firmware/config.c
+++ b/src/firmware/config.c
@@ -38,7 +38,7 @@
 
 #include <string.h>
 
-static const uint16_t FIRMWARE_VERSION = 0x060E;
+static const uint16_t FIRMWARE_VERSION = 0x0610;
 
 // 1 flash row
 static const uint8_t DEFAULT_CONFIG[128] =
@@ -220,9 +220,9 @@ debugCommand()
 	response[26] = blockDev.state;
 	response[27] = scsiDev.lastSenseASC >> 8;
 	response[28] = scsiDev.lastSenseASC;
-	response[29] = *SCSI_STS_DBX;
+	response[29] = *SCSI_STS_DBX & 0xff; // What we've read
 	response[30] = LastTrace;
-	response[31] = 0; // Unused
+	response[31] = *SCSI_STS_DBX >> 8; // What we're writing
 	hidPacket_send(response, sizeof(response));
 }
 
diff --git a/src/firmware/disk.c b/src/firmware/disk.c
index d234854e..4496c289 100755
--- a/src/firmware/disk.c
+++ b/src/firmware/disk.c
@@ -703,11 +703,13 @@ void scsiDiskPoll()
 			uint32_t sectors =
 				rem < maxSectors ? rem : maxSectors;
 			scsiRead(&scsiDev.data[0], sectors * SD_SECTOR_SIZE, &parityError);
+
 			if (!parityError)
 			{
 				sdTmpWrite(&scsiDev.data[0], i + sdLBA, sectors);
 			}
 			i += sectors;
+
 #if 0
 			// Wait for the next DMA interrupt. It's beneficial to halt the
 			// processor to give the DMA controller more memory bandwidth to
diff --git a/src/firmware/scsi.c b/src/firmware/scsi.c
index 0b9b8078..854707d5 100755
--- a/src/firmware/scsi.c
+++ b/src/firmware/scsi.c
@@ -29,6 +29,7 @@
 //#include "debug.h"
 #include "tape.h"
 #include "mo.h"
+#include "vendor.h"
 
 #include <string.h>
 
@@ -64,6 +65,7 @@ static void enter_BusFree()
 	}
 #endif
 
+
 	scsiEnterBusFree();
 
 	// Wait for the initiator to cease driving signals
@@ -134,6 +136,17 @@ void process_Status()
 	uint8_t message;
 
 	uint8_t control = scsiDev.cdb[scsiDev.cdbLen - 1];
+
+	if (scsiDev.target->cfg->quirks == S2S_CFG_QUIRKS_OMTI)
+	{
+		// OMTI non-standard LINK control
+		if (control & 0x01)
+		{
+			scsiDev.phase = COMMAND;
+			return;
+		}
+	}
+
 	if ((scsiDev.status == GOOD) && (control & 0x01))
 	{
 		// Linked command.
@@ -151,6 +164,12 @@ void process_Status()
 	{
 		message = MSG_COMMAND_COMPLETE;
 	}
+
+	if (scsiDev.target->cfg->quirks == S2S_CFG_QUIRKS_OMTI)
+	{
+		scsiDev.status |= (scsiDev.target->targetId & 0x03) << 5;
+	}
+
 	scsiWriteByte(scsiDev.status);
 
 	scsiDev.lastStatus = scsiDev.status;
@@ -388,7 +407,7 @@ static void process_Command()
 	{
 		scsiReadBuffer();
 	}
-	else if (!scsiModeCommand())
+	else if (!scsiModeCommand() && !scsiVendorCommand())
 	{
 		scsiDev.target->sense.code = ILLEGAL_REQUEST;
 		scsiDev.target->sense.asc = INVALID_COMMAND_OPERATION_CODE;
@@ -765,7 +784,9 @@ static void process_MessageOut()
 			int transferPeriod = extmsg[1];
 			int offset = extmsg[2];
 
-			if ((transferPeriod < scsiDev.minSyncPeriod) ||
+			if ((
+					(transferPeriod > 0) &&
+					(transferPeriod < scsiDev.minSyncPeriod)) ||
 				(scsiDev.minSyncPeriod == 0))
 			{
 				scsiDev.minSyncPeriod = transferPeriod;
@@ -775,7 +796,9 @@ static void process_MessageOut()
 				// Amiga A590 (WD33C93 chip) only does 3.5MB/s sync
 				// After 80 we start to run out of bits in the fpga timing
 				// register.
-				(transferPeriod == 0))
+				(transferPeriod == 0) ||
+				((scsiDev.boardCfg.scsiSpeed != S2S_CFG_SPEED_NoLimit) &&
+					(scsiDev.boardCfg.scsiSpeed <= S2S_CFG_SPEED_ASYNC_50)))
 			{
 				scsiDev.target->syncOffset = 0;
 				scsiDev.target->syncPeriod = 0;
@@ -791,11 +814,22 @@ static void process_MessageOut()
 				{
 					scsiDev.target->syncPeriod = 12; // 50ns, 20MB/s
 				}
-				else */if (transferPeriod <= 25)
+				else */if (transferPeriod <= 25 &&
+					((scsiDev.boardCfg.scsiSpeed == S2S_CFG_SPEED_NoLimit) ||
+						(scsiDev.boardCfg.scsiSpeed >= S2S_CFG_SPEED_SYNC_10)))
 				{
 					scsiDev.target->syncPeriod = 25; // 100ns, 10MB/s
-				} else {
+
+				} else if (transferPeriod < 50 &&
+					((scsiDev.boardCfg.scsiSpeed == S2S_CFG_SPEED_NoLimit) ||
+						(scsiDev.boardCfg.scsiSpeed >= S2S_CFG_SPEED_SYNC_10)))
+				{
+					scsiDev.target->syncPeriod = transferPeriod;
+				} else if (transferPeriod >= 50)
+				{
 					scsiDev.target->syncPeriod = transferPeriod;
+				} else {
+					scsiDev.target->syncPeriod = 50;
 				}
 			}
 
diff --git a/src/firmware/scsiPhy.c b/src/firmware/scsiPhy.c
index fe92d247..c0f8cdb0 100755
--- a/src/firmware/scsiPhy.c
+++ b/src/firmware/scsiPhy.c
@@ -28,45 +28,53 @@
 
 #include <string.h>
 
-// Time until we consider ourselves selected
-// 400ns at 108MHz
-#define SCSI_DEFAULT_SELECTION 43
-#define SCSI_FAST_SELECTION 5
+static uint8_t asyncTimings[][4] =
+{
+/* Speed,    Assert,    Deskew,    Hold,    Glitch */
+{/*1.5MB/s*/ 28,        18,        13,      13},
+{/*3.3MB/s*/ 13,        6,         6,       13},
+{/*5MB/s*/   9,         6,         6,       6} // 80ns
+};
 
-// async.
-// Assumes a 108MHz fpga clock.
-// 2:0 Deskew count, 55ns
-// 6:4 Hold count, 53ns
-// 3:0 Assertion count, 80ns
-#define SCSI_DEFAULT_DESKEW 0x6
-#define SCSI_DEFAULT_TIMING ((0x6 << 4) | 0x9)
+#define SCSI_ASYNC_15 0
+#define SCSI_ASYNC_33 1
+#define SCSI_ASYNC_50 2
 
-// 3.125MB/s (80 period) to < 10MB/s sync
-// Assumes a 108MHz fpga clock. (9 ns)
-// (((period * 4) / 2) * 0.8) / 9
-// Done using 3 fixed point math.
-// 2:0 Deskew count, 55ns normal, or 25ns if faster than 5.5MB/s
-// 6:4 Hold count, 53ns normal, or 33ns if faster than 5.5MB/s
-// 3:0 Assertion count, variable
-#define SCSI_SYNC_DESKEW(period) (period < 45 ? SCSI_FAST10_DESKEW : SCSI_DEFAULT_DESKEW)
-#define SCSI_SYNC_TIMING(period) (((period < 45 ? 0x4 : 0x6) << 4) | ((((((int)period) * 177) + 750)/1000) & 0xF))
+// 5MB/s synchronous timing
+#define SCSI_FAST5_DESKEW 6 // 55ns
+#define SCSI_FAST5_HOLD 6 // 53ns
 
-// 10MB/s
+// 10MB/s synchronous timing
 // 2:0 Deskew count, 25ns
 // 6:4 Hold count, 33ns
 // 3:0 Assertion count, 30ns
 // We want deskew + hold + assert + 3 to add up to 11 clocks
 // the fpga code has 1 clock of overhead when transitioning from deskew to
 // assert to hold
-#define SCSI_FAST10_DESKEW 2
-#define SCSI_FAST10_TIMING ((0x3 << 4) | 0x3)
 
-// 20MB/s
-// 2:0 Deskew count, 12ns
-// 6:4 Hold count, 17ns
-// 3:0 Assertion count, 15ns
-#define SCSI_FAST20_DESKEW 1
-#define SCSI_FAST20_TIMING ((0x2 << 4) | 0x2)
+#define SCSI_FAST10_DESKEW 2 // 25ns
+#define SCSI_FAST10_HOLD 3 // 33ns
+#define SCSI_FAST10_ASSERT 3 // 30ns
+
+#define syncDeskew(period) ((period) < 45 ? \
+	SCSI_FAST10_DESKEW : SCSI_FAST5_DESKEW)
+
+#define syncHold(period) ((period) < 45 ? \
+	((period) == 25 ? SCSI_FAST10_HOLD : 4) /* 25ns/33ns */\
+	: SCSI_FAST5_HOLD)
+
+
+// 3.125MB/s (80 period) to < 10MB/s sync
+// Assumes a 108MHz fpga clock. (9 ns)
+// (((period * 4) / 2) * 0.8) / 9
+// Done using 3 fixed point math.
+// 3:0 Assertion count, variable
+#define syncAssertion(period) ((((((int)period) * 177) + 750)/1000) & 0xF)
+
+// Time until we consider ourselves selected
+// 400ns at 108MHz
+#define SCSI_DEFAULT_SELECTION 43
+#define SCSI_FAST_SELECTION 5
 
 // Private DMA variables.
 static int dmaInProgress = 0;
@@ -440,6 +448,29 @@ void scsiEnterBusFree()
 	*SCSI_CTRL_PHASE = 0;
 }
 
+static void
+scsiSetTiming(
+	uint8_t assertClocks,
+	uint8_t deskew,
+	uint8_t hold,
+	uint8_t glitch)
+{
+	*SCSI_CTRL_DESKEW = ((hold & 7) << 5) | (deskew & 0x1F);
+	*SCSI_CTRL_TIMING = (assertClocks & 0x3F);
+	*SCSI_CTRL_TIMING3 = (glitch & 0xF);
+}
+
+static void
+scsiSetDefaultTiming()
+{
+	const uint8_t* asyncTiming = asyncTimings[3];
+	scsiSetTiming(
+		asyncTiming[0],
+		asyncTiming[1],
+		asyncTiming[2],
+		asyncTiming[3]);
+}
+
 void scsiEnterPhase(int phase)
 {
 	// ANSI INCITS 362-2002 SPI-3 10.7.1:
@@ -458,22 +489,18 @@ void scsiEnterPhase(int phase)
 		if ((newPhase == DATA_IN || newPhase == DATA_OUT) &&
 			scsiDev.target->syncOffset)
 		{
-			if (scsiDev.target->syncPeriod == 12)
+			
+			if (scsiDev.target->syncPeriod <= 25)
 			{
-				// SCSI2 FAST-20 Timing. 20MB/s.
-				*SCSI_CTRL_DESKEW = SCSI_FAST20_DESKEW;
-				*SCSI_CTRL_TIMING = SCSI_FAST20_TIMING;
-			}
-			else if (scsiDev.target->syncPeriod == 25)
-			{
-				// SCSI2 FAST Timing. 10MB/s.
-				*SCSI_CTRL_DESKEW = SCSI_FAST10_DESKEW;
-				*SCSI_CTRL_TIMING = SCSI_FAST10_TIMING;
+				scsiSetTiming(SCSI_FAST10_ASSERT, SCSI_FAST10_DESKEW, SCSI_FAST10_HOLD, 1);
 			}
 			else
 			{
-				*SCSI_CTRL_DESKEW = SCSI_SYNC_DESKEW(scsiDev.target->syncPeriod);
-				*SCSI_CTRL_TIMING = SCSI_SYNC_TIMING(scsiDev.target->syncPeriod);
+				scsiSetTiming(
+					syncAssertion(scsiDev.target->syncPeriod),
+					syncDeskew(scsiDev.target->syncPeriod),
+					syncHold(scsiDev.target->syncPeriod),
+					scsiDev.target->syncPeriod < 45 ? 1 : 5);
 			}
 
 			// See note 26 in SCSI 2 standard: SCSI 1 implementations may assume
@@ -487,12 +514,29 @@ void scsiEnterPhase(int phase)
 			} else {
 				*SCSI_CTRL_SYNC_OFFSET = scsiDev.target->syncOffset;
 			}
-		} else {
+		}
+		else
+		{
+
 			*SCSI_CTRL_SYNC_OFFSET = 0;
+			const uint8_t* asyncTiming;
+
+			if (scsiDev.boardCfg.scsiSpeed == S2S_CFG_SPEED_NoLimit ||
+				scsiDev.boardCfg.scsiSpeed >= S2S_CFG_SPEED_ASYNC_50) {
+
+				asyncTiming = asyncTimings[SCSI_ASYNC_50];
+			} else if (scsiDev.boardCfg.scsiSpeed >= S2S_CFG_SPEED_ASYNC_33) {
 
-			// 5MB/s Timing
-			*SCSI_CTRL_DESKEW = SCSI_DEFAULT_DESKEW;
-			*SCSI_CTRL_TIMING = SCSI_DEFAULT_TIMING;
+				asyncTiming = asyncTimings[SCSI_ASYNC_33];
+	
+			} else {
+				asyncTiming = asyncTimings[SCSI_ASYNC_15];
+			}
+			scsiSetTiming(
+				asyncTiming[0],
+				asyncTiming[1],
+				asyncTiming[2],
+				asyncTiming[3]);
 		}
 
 		*SCSI_CTRL_PHASE = newPhase;
@@ -527,8 +571,7 @@ void scsiPhyReset()
 	*SCSI_CTRL_DBX = 0;
 
 	*SCSI_CTRL_SYNC_OFFSET = 0;
-	*SCSI_CTRL_DESKEW = SCSI_DEFAULT_DESKEW;
-	*SCSI_CTRL_TIMING = SCSI_DEFAULT_TIMING;
+	scsiSetDefaultTiming();
 
 	// DMA Benchmark code
 	// Currently 11MB/s.
@@ -638,8 +681,7 @@ void scsiPhyInit()
 	*SCSI_CTRL_DBX = 0;
 
 	*SCSI_CTRL_SYNC_OFFSET = 0;
-	*SCSI_CTRL_DESKEW = SCSI_DEFAULT_DESKEW;
-	*SCSI_CTRL_TIMING = SCSI_DEFAULT_TIMING;
+	scsiSetDefaultTiming();
 
 	*SCSI_CTRL_SEL_TIMING = SCSI_DEFAULT_SELECTION;
 
@@ -725,7 +767,8 @@ int scsiSelfTest()
 	{
 		*SCSI_CTRL_DBX = i;
 		busSettleDelay();
-		if (*SCSI_STS_DBX != (i & 0xff))
+		// STS_DBX is 16 bit!
+		if ((*SCSI_STS_DBX & 0xff) != (i & 0xff))
 		{
 			result |= 1;
 		}
diff --git a/src/firmware/scsiPhy.h b/src/firmware/scsiPhy.h
index c16d9314..f8f5bdda 100755
--- a/src/firmware/scsiPhy.h
+++ b/src/firmware/scsiPhy.h
@@ -26,8 +26,9 @@
 #define SCSI_DATA_CNT_SET ((volatile uint8_t*)0x6000000C)
 #define SCSI_CTRL_DBX ((volatile uint8_t*)0x6000000E)
 #define SCSI_CTRL_SYNC_OFFSET ((volatile uint8_t*)0x60000010)
-#define SCSI_CTRL_DESKEW ((volatile uint8_t*)0x60000012)
-#define SCSI_CTRL_TIMING ((volatile uint8_t*)0x60000014)
+#define SCSI_CTRL_DESKEW ((volatile uint8_t*)0x60000012)// Timing
+#define SCSI_CTRL_TIMING ((volatile uint8_t*)0x60000014)//Timing2
+#define SCSI_CTRL_TIMING3 ((volatile uint8_t*)0x6000001A)//Timing3
 #define SCSI_CTRL_FLAGS ((volatile uint8_t*)0x60000016)
 #define SCSI_CTRL_FLAGS_DISABLE_GLITCH 0x1
 #define SCSI_CTRL_FLAGS_ENABLE_PARITY 0x2
@@ -38,7 +39,11 @@
 #define SCSI_STS_FIFO_COMPLETE ((volatile uint8_t*)0x60000024)
 #define SCSI_STS_SELECTED ((volatile uint8_t*)0x60000026)
 #define SCSI_STS_SCSI ((volatile uint8_t*)0x60000028)
-#define SCSI_STS_DBX ((volatile uint8_t*)0x6000002A)
+
+// top 8 bits = data we're writing.
+// bottom 8 bits = data we're reading
+#define SCSI_STS_DBX ((volatile uint16_t*)0x6000002A)
+
 #define SCSI_STS_PARITY_ERR ((volatile uint8_t*)0x6000002C)
 
 #define SCSI_FIFO_DATA ((volatile uint16_t*)0x60000040)
diff --git a/src/firmware/time.h b/src/firmware/time.h
index 4970f589..1926b2ee 100755
--- a/src/firmware/time.h
+++ b/src/firmware/time.h
@@ -24,7 +24,7 @@ uint32_t s2s_getTime_ms(void); // Returns milliseconds since init
 uint32_t s2s_diffTime_ms(uint32_t start, uint32_t end);
 uint32_t s2s_elapsedTime_ms(uint32_t since);
 
-#define s2s_cpu_freq 120000000LL
+#define s2s_cpu_freq 108000000LL
 #define s2s_delay_ms(delay) s2s_delay_clocks((delay) * (s2s_cpu_freq / 1000))
 #define s2s_delay_us(delay) s2s_delay_clocks((delay) * (s2s_cpu_freq / 1000000))
 void s2s_delay_clocks(uint32_t delay);
diff --git a/src/scsi2sd-util6/BoardPanel.cc b/src/scsi2sd-util6/BoardPanel.cc
index 54ea2352..157435b1 100644
--- a/src/scsi2sd-util6/BoardPanel.cc
+++ b/src/scsi2sd-util6/BoardPanel.cc
@@ -53,7 +53,7 @@ BoardPanel::BoardPanel(wxWindow* parent, const S2S_BoardCfg& initialConfig) :
 	myParent(parent),
 	myDelayValidator(new wxIntegerValidator<uint8_t>)
 {
-	wxFlexGridSizer *fgs = new wxFlexGridSizer(11, 2, 9, 25);
+	wxFlexGridSizer *fgs = new wxFlexGridSizer(13, 2, 9, 25);
 
 	fgs->Add(new wxStaticText(this, wxID_ANY, wxT("")));
 	myTermCtrl =
@@ -64,6 +64,26 @@ BoardPanel::BoardPanel(wxWindow* parent, const S2S_BoardCfg& initialConfig) :
 	myTermCtrl->SetToolTip(_("Enable active terminator. Both ends of the SCSI chain must be terminated."));
 	fgs->Add(myTermCtrl);
 
+	fgs->Add(new wxStaticText(this, wxID_ANY, _("SCSI Speed Limit")));
+	wxString speeds[] = {
+		wxT("No limit"),
+		wxT("Async, 1.5MB/s"),
+		wxT("Async, 3.3MB/s"),
+		wxT("Async, 5 MB/s"),
+		wxT("Sync, 5 MB/s")};
+
+	myScsiSpeedCtrl =
+		new wxChoice(
+			this,
+			ID_scsiSpeedCtrl,
+			wxDefaultPosition,
+			wxDefaultSize,
+			sizeof(speeds) / sizeof(wxString),
+			speeds
+			);
+	myScsiSpeedCtrl->SetToolTip(_("Limit SCSI interface speed"));
+	fgs->Add(myScsiSpeedCtrl);
+
 	fgs->Add(new wxStaticText(this, wxID_ANY, _("Startup Delay (seconds)")));
 	myStartDelayCtrl =
 		new wxTextCtrl(
@@ -118,33 +138,6 @@ BoardPanel::BoardPanel(wxWindow* parent, const S2S_BoardCfg& initialConfig) :
 	myScsi2Ctrl->SetToolTip(_("Enable high-performance mode. May cause problems with SASI/SCSI1 hosts."));
 	fgs->Add(myScsi2Ctrl);
 
-	fgs->Add(new wxStaticText(this, wxID_ANY, wxT("")));
-	myGlitchCtrl =
-		new wxCheckBox(
-			this,
-			ID_glitchCtrl,
-			_("Disable glitch filter"));
-	myGlitchCtrl->SetToolTip(_("Improve performance at the cost of noise immunity. Only use with short cables."));
-	fgs->Add(myGlitchCtrl);
-
-	fgs->Add(new wxStaticText(this, wxID_ANY, wxT("")));
-	myCacheCtrl =
-		new wxCheckBox(
-			this,
-			ID_cacheCtrl,
-			_("Enable disk cache (experimental)"));
-	myCacheCtrl->SetToolTip(_("SD IO commands aren't completed when SCSI commands complete"));
-	fgs->Add(myCacheCtrl);
-
-	fgs->Add(new wxStaticText(this, wxID_ANY, wxT("")));
-	myDisconnectCtrl =
-		new wxCheckBox(
-			this,
-			ID_disconnectCtrl,
-			_("Enable SCSI Disconnect"));
-	myDisconnectCtrl->SetToolTip(_("Release the SCSI bus while waiting for SD card writes to complete. Must also be enabled in host OS."));
-	fgs->Add(myDisconnectCtrl);
-
 	fgs->Add(new wxStaticText(this, wxID_ANY, wxT("")));
 	mySelLatchCtrl =
 		new wxCheckBox(
@@ -185,9 +178,6 @@ BoardPanel::getConfig() const
 		(myParityCtrl->IsChecked() ? S2S_CFG_ENABLE_PARITY : 0) |
 		(myUnitAttCtrl->IsChecked() ? S2S_CFG_ENABLE_UNIT_ATTENTION : 0) |
 		(myScsi2Ctrl->IsChecked() ? S2S_CFG_ENABLE_SCSI2 : 0) |
-		(myGlitchCtrl->IsChecked() ? S2S_CFG_DISABLE_GLITCH : 0) |
-		(myCacheCtrl->IsChecked() ? S2S_CFG_ENABLE_CACHE: 0) |
-		(myDisconnectCtrl->IsChecked() ? S2S_CFG_ENABLE_DISCONNECT: 0) |
 		(mySelLatchCtrl->IsChecked() ? S2S_CFG_ENABLE_SEL_LATCH : 0) |
 		(myMapLunsCtrl->IsChecked() ? S2S_CFG_MAP_LUNS_TO_IDS : 0);
 
@@ -195,6 +185,7 @@ BoardPanel::getConfig() const
 
 	config.startupDelay = CtrlGetValue<unsigned int>(myStartDelayCtrl).first;
 	config.selectionDelay = CtrlGetValue<unsigned int>(mySelDelayCtrl).first;
+	config.scsiSpeed = myScsiSpeedCtrl->GetSelection();
 	return config;
 }
 
@@ -206,10 +197,7 @@ BoardPanel::setConfig(const S2S_BoardCfg& config)
 	myParityCtrl->SetValue(config.flags & S2S_CFG_ENABLE_PARITY);
 	myUnitAttCtrl->SetValue(config.flags & S2S_CFG_ENABLE_UNIT_ATTENTION);
 	myScsi2Ctrl->SetValue(config.flags & S2S_CFG_ENABLE_SCSI2);
-	myGlitchCtrl->SetValue(config.flags & S2S_CFG_DISABLE_GLITCH);
 	myTermCtrl->SetValue(config.flags6 & S2S_CFG_ENABLE_TERMINATOR);
-	myCacheCtrl->SetValue(config.flags & S2S_CFG_ENABLE_CACHE);
-	myDisconnectCtrl->SetValue(config.flags & S2S_CFG_ENABLE_DISCONNECT);
 	mySelLatchCtrl->SetValue(config.flags & S2S_CFG_ENABLE_SEL_LATCH);
 	myMapLunsCtrl->SetValue(config.flags & S2S_CFG_MAP_LUNS_TO_IDS);
 
@@ -223,6 +211,7 @@ BoardPanel::setConfig(const S2S_BoardCfg& config)
 		conv << static_cast<unsigned int>(config.selectionDelay);
 		mySelDelayCtrl->ChangeValue(conv.str());
 	}
+	myScsiSpeedCtrl->SetSelection(config.scsiSpeed);
 }
 
 
diff --git a/src/scsi2sd-util6/BoardPanel.hh b/src/scsi2sd-util6/BoardPanel.hh
index 8a8bc04f..9d419b77 100644
--- a/src/scsi2sd-util6/BoardPanel.hh
+++ b/src/scsi2sd-util6/BoardPanel.hh
@@ -55,14 +55,12 @@ private:
 		ID_parityCtrl = wxID_HIGHEST + 1,
 		ID_unitAttCtrl,
 		ID_scsi2Ctrl,
-		ID_glitchCtrl,
 		ID_termCtrl,
-		ID_cacheCtrl,
-		ID_disconnectCtrl,
 		ID_selLatchCtrl,
 		ID_mapLunsCtrl,
 		ID_startDelayCtrl,
-		ID_selDelayCtrl
+		ID_selDelayCtrl,
+		ID_scsiSpeedCtrl
 	};
 
 	wxWindow* myParent;
@@ -72,16 +70,15 @@ private:
 	wxCheckBox* myParityCtrl;
 	wxCheckBox* myUnitAttCtrl;
 	wxCheckBox* myScsi2Ctrl;
-	wxCheckBox* myGlitchCtrl;
 	wxCheckBox* myTermCtrl;
-	wxCheckBox* myCacheCtrl;
-	wxCheckBox* myDisconnectCtrl;
 	wxCheckBox* mySelLatchCtrl;
 	wxCheckBox* myMapLunsCtrl;
 
 	wxIntegerValidator<uint8_t>* myDelayValidator;
 	wxTextCtrl* myStartDelayCtrl;
 	wxTextCtrl* mySelDelayCtrl;
+
+	wxChoice* myScsiSpeedCtrl;
 };
 
 } // namespace SCSI2SD
diff --git a/src/scsi2sd-util6/ConfigUtil.cc b/src/scsi2sd-util6/ConfigUtil.cc
index 9db2ded6..42362290 100755
--- a/src/scsi2sd-util6/ConfigUtil.cc
+++ b/src/scsi2sd-util6/ConfigUtil.cc
@@ -213,9 +213,19 @@ ConfigUtil::toXML(const S2S_TargetCfg& config)
 		"	<!-- ********************************************************\n" <<
 		"	Space separated list. Available options:\n" <<
 		"	apple\t\tReturns Apple-specific mode pages\n" <<
+		"	omti\t\tOMTI host non-standard link control\n" <<
 		"	********************************************************* -->\n" <<
-		"	<quirks>" <<
-			(config.quirks & S2S_CFG_QUIRKS_APPLE ? "apple" : "") <<
+		"	<quirks>";
+	if (config.quirks == S2S_CFG_QUIRKS_APPLE)
+	{
+		s << "apple";
+	}
+	else if (config.quirks == S2S_CFG_QUIRKS_OMTI)
+	{
+		s << "omti";
+	}
+
+	s <<
 			"</quirks>\n" <<
 
 		"\n\n" <<
@@ -315,26 +325,6 @@ ConfigUtil::toXML(const S2S_BoardCfg& config)
 			(config.flags & S2S_CFG_ENABLE_SCSI2 ? "true" : "false") <<
 			"</enableScsi2>\n" <<
 
-		"	<enableCache>" <<
-			(config.flags & S2S_CFG_ENABLE_CACHE ? "true" : "false") <<
-			"</enableCache>\n" <<
-
-		"	<!-- ********************************************************\n" <<
-		"	Setting to 'true' will result in increased performance at the\n" <<
-		"	cost of lower noise immunity.\n" <<
-		"	Only set to true when using short cables with only 1 or two\n" <<
-		"	devices. This should remain off when using external SCSI1 DB25\n" <<
-		"	cables.\n" <<
-		"	********************************************************* -->\n" <<
-		"	<disableGlitchFilter>" <<
-			(config.flags & S2S_CFG_DISABLE_GLITCH ? "true" : "false") <<
-			"</disableGlitchFilter>\n" <<
-
-
-		"	<enableDisconnect>" <<
-			(config.flags & S2S_CFG_ENABLE_DISCONNECT ? "true" : "false") <<
-			"</enableDisconnect>\n" <<
-
 		"	<!-- ********************************************************\n" <<
 		"	Respond to very short duration selection attempts. This supports\n" <<
 		"	non-standard hardware, but is generally safe to enable.\n" <<
@@ -356,6 +346,34 @@ ConfigUtil::toXML(const S2S_BoardCfg& config)
 		"	<mapLunsToIds>" <<
 			(config.flags & S2S_CFG_MAP_LUNS_TO_IDS ? "true" : "false") <<
 			"</mapLunsToIds>\n" <<
+
+
+		"	<!-- ********************************************************\n" <<
+		"	Delay (in milliseconds) before responding to a SCSI selection.\n" <<
+		"	255 (auto) sets it to 0 for SCSI2 hosts and 1ms otherwise.\n" <<
+		"	Some samplers need this set to 1 manually.\n" <<
+		"	********************************************************* -->\n" <<
+		"	<selectionDelay>" << static_cast<int>(config.selectionDelay) << "</selectionDelay>\n" <<
+
+		"	<!-- ********************************************************\n" <<
+		"	Startup delay (in seconds) before responding to the SCSI bus \n" <<
+		"	after power on. Default = 0.\n" <<
+		"	********************************************************* -->\n" <<
+		"	<startupDelay>" << static_cast<int>(config.startupDelay) << "</startupDelay>\n" <<
+
+		"	<!-- ********************************************************\n" <<
+		"	Speed limit the SCSI interface. This is the -max- speed the \n" <<
+		"	device will run at. The actual spee depends on the capability\n" <<
+		"	of the host controller.\n" <<
+		"	0	No limit\n" <<
+		"	1	Async 1.5MB/s\n" <<
+		"	2	Async 3.3MB/s\n" <<
+		"	3	Async 5MB/s\n" <<
+		"	4	Sync 5MB/s\n" <<
+		"	5	Sync 10MB/s\n" <<
+		"	********************************************************* -->\n" <<
+		"	<scsiSpeed>" << static_cast<int>(config.scsiSpeed) << "</scsiSpeed>\n" <<
+
 		"</S2S_BoardCfg>\n";
 
 	return s.str();
@@ -434,6 +452,10 @@ parseTarget(wxXmlNode* node)
 				{
 					result.quirks |= S2S_CFG_QUIRKS_APPLE;
 				}
+				else if (quirk == "omti")
+				{
+					result.quirks |= S2S_CFG_QUIRKS_OMTI;
+				}
 			}
 		}
 		else if (child->GetName() == "deviceType")
@@ -507,8 +529,15 @@ parseBoardConfig(wxXmlNode* node)
 	wxXmlNode *child = node->GetChildren();
 	while (child)
 	{
-// FIXME WHERE IS SELECTION DELAY ? STARTUP DELAY ? FFS.
-		if (child->GetName() == "unitAttention")
+		if (child->GetName() == "selectionDelay")
+		{
+			result.selectionDelay = parseInt(child, 255);
+		}
+		else if (child->GetName() == "startupDelay")
+		{
+			result.startupDelay = parseInt(child, 255);
+		}
+		else if (child->GetName() == "unitAttention")
 		{
 			std::string s(child->GetNodeContent().mb_str());
 			if (s == "true")
@@ -544,18 +573,6 @@ parseBoardConfig(wxXmlNode* node)
 				result.flags = result.flags & ~S2S_CFG_ENABLE_SCSI2;
 			}
 		}
-		else if (child->GetName() == "disableGlitchFilter")
-		{
-			std::string s(child->GetNodeContent().mb_str());
-			if (s == "true")
-			{
-				result.flags |= S2S_CFG_DISABLE_GLITCH;
-			}
-			else
-			{
-				result.flags = result.flags & ~S2S_CFG_DISABLE_GLITCH;
-			}
-		}
 		else if (child->GetName() == "enableTerminator")
 		{
 			std::string s(child->GetNodeContent().mb_str());
@@ -568,30 +585,6 @@ parseBoardConfig(wxXmlNode* node)
 				result.flags6 = result.flags & ~S2S_CFG_ENABLE_TERMINATOR;
 			}
 		}
-		else if (child->GetName() == "enableCache")
-		{
-			std::string s(child->GetNodeContent().mb_str());
-			if (s == "true")
-			{
-				result.flags |= S2S_CFG_ENABLE_CACHE;
-			}
-			else
-			{
-				result.flags = result.flags & ~S2S_CFG_ENABLE_CACHE;
-			}
-		}
-		else if (child->GetName() == "enableDisconnect")
-		{
-			std::string s(child->GetNodeContent().mb_str());
-			if (s == "true")
-			{
-				result.flags |= S2S_CFG_ENABLE_DISCONNECT;
-			}
-			else
-			{
-				result.flags = result.flags & ~S2S_CFG_ENABLE_DISCONNECT;
-			}
-		}
 		else if (child->GetName() == "selLatch")
 		{
 			std::string s(child->GetNodeContent().mb_str());
@@ -616,6 +609,10 @@ parseBoardConfig(wxXmlNode* node)
 				result.flags = result.flags & ~S2S_CFG_MAP_LUNS_TO_IDS;
 			}
 		}
+		else if (child->GetName() == "scsiSpeed")
+		{
+			result.scsiSpeed = parseInt(child, S2S_CFG_SPEED_SYNC_10);
+		}
 		child = child->GetNext();
 	}
 	return result;
diff --git a/src/scsi2sd-util6/Makefile b/src/scsi2sd-util6/Makefile
index 28a10367..42e1d9b6 100755
--- a/src/scsi2sd-util6/Makefile
+++ b/src/scsi2sd-util6/Makefile
@@ -49,8 +49,8 @@ CPPFLAGS = $(CPPFLAGS_HIDAPI) -I. -I ../../include -ITerminalWx/src \
 	-DHAVE_LIBUSB_1_0 \
 
 
-CFLAGS += -Wall -Wno-pointer-sign -O2 -g
-CXXFLAGS += -Wall -O2 -g -std=c++0x
+CFLAGS += -Wall -Wno-pointer-sign -O2 -g -fPIC
+CXXFLAGS += -Wall -O2 -g -std=c++0x -fPIC
 
 LDFLAGS += -L$(BUILD)/libzipper/.libs -lzipper \
 	$(LDFLAGS_ZLIB) \
@@ -60,7 +60,8 @@ LDFLAGS += -L$(BUILD)/libzipper/.libs -lzipper \
 
 # wxWidgets 3.0.2 uses broken Webkit headers under OSX Yosemeti
 # liblzma not available on OSX 10.7
-WX_CONFIG=--disable-webkit --disable-webviewwebkit  \
+# --disable-mediactrl for missing Quicktime.h on Mac OSX Sierra
+WX_CONFIG=--disable-webkit --disable-webviewwebkit  --disable-mediactrl \
 	--without-libtiff --without-libjbig --without-liblzma --without-opengl \
 	--enable-monolithic --enable-stl --disable-shared
 
@@ -110,6 +111,7 @@ ifeq ($(TARGET),Darwin)
 all: $(BUILD)/scsi2sd-util6.dmg
 
 $(BUILD)/scsi2sd-util6.dmg: $(BUILD)/scsi2sd-util6 $(BUILD)/dfu-util/buildstamp
+	rm -rf $(dir $@)/dmg $@
 	mkdir -p $(dir $@)/dmg
 	cp $(BUILD)/scsi2sd-util6 $(BUILD)/dfu-util/src/dfu-util $(dir $@)/dmg
 	chmod a+rx $(dir $@)/dmg/*
diff --git a/src/scsi2sd-util6/TargetPanel.cc b/src/scsi2sd-util6/TargetPanel.cc
index 94c822bd..fb8b07d2 100755
--- a/src/scsi2sd-util6/TargetPanel.cc
+++ b/src/scsi2sd-util6/TargetPanel.cc
@@ -311,8 +311,8 @@ TargetPanel::evaluate()
 	switch (myDeviceTypeCtrl->GetSelection())
 	{
 	case S2S_CFG_OPTICAL:
-		// TODO mySectorSizeCtrl->ChangeValue("2048");
-		// TODO mySectorSizeCtrl->Enable(false);
+		mySectorSizeCtrl->ChangeValue("2048");
+		mySectorSizeCtrl->Enable(true); // Enable override
 		break;
 	case S2S_CFG_FLOPPY_14MB:
 		mySectorSizeCtrl->ChangeValue("512");
diff --git a/src/scsi2sd-util6/scsi2sd-util.cc b/src/scsi2sd-util6/scsi2sd-util.cc
index 988f9c7b..ebdc8f74 100644
--- a/src/scsi2sd-util6/scsi2sd-util.cc
+++ b/src/scsi2sd-util6/scsi2sd-util.cc
@@ -160,6 +160,18 @@ public:
 			ID_ConfigDefaults,
 			_("Load &Defaults"),
 			_("Load default configuration options."));
+
+		menuFile->AppendSeparator();
+		myLoadButton = menuFile->Append(
+			ID_BtnLoad,
+			_("Load from device"),
+			_("Load configuration from hardware device"));
+		mySaveButton = menuFile->Append(
+			ID_BtnSave,
+			_("Save to device"),
+			_("Save configuration to hardware device"));
+
+		menuFile->AppendSeparator();
 		menuFile->Append(
 			ID_Firmware,
 			_("&Upgrade Firmware..."),
@@ -219,19 +231,6 @@ public:
 			tabs->Fit();
 			fgs->Add(tabs);
 
-
-			wxPanel* btnPanel = new wxPanel(cfgPanel);
-			wxFlexGridSizer *btnFgs = new wxFlexGridSizer(1, 2, 5, 5);
-			btnPanel->SetSizer(btnFgs);
-			myLoadButton =
-				new wxButton(btnPanel, ID_BtnLoad, _("Load from device"));
-			btnFgs->Add(myLoadButton);
-			mySaveButton =
-				new wxButton(btnPanel, ID_BtnSave, _("Save to device"));
-			btnFgs->Add(mySaveButton);
-			fgs->Add(btnPanel);
-
-			btnPanel->Fit();
 			cfgPanel->Fit();
 		}
 
@@ -253,10 +252,10 @@ private:
 	wxLogWindow* myLogWindow;
 	BoardPanel* myBoardPanel;
 	std::vector<TargetPanel*> myTargets;
-	wxButton* myLoadButton;
-	wxButton* mySaveButton;
 	wxMenuItem* mySCSILogChk;
 	wxMenuItem* mySelfTestChk;
+	wxMenuItem* myLoadButton;
+	wxMenuItem* mySaveButton;
 	wxTimer* myTimer;
 	shared_ptr<HID> myHID;
 	bool myInitialConfig;
@@ -945,7 +944,7 @@ private:
 	{
 		wxMessageBox(
 			"SCSI2SD (scsi2sd-util6)\n"
-			"Copyright (C) 2014-2016 Michael McMaster <michael@codesrc.com>\n"
+			"Copyright (C) 2014-2017 Michael McMaster <michael@codesrc.com>\n"
 			"\n"
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -979,8 +978,8 @@ wxBEGIN_EVENT_TABLE(AppFrame, wxFrame)
 
 	EVT_COMMAND(wxID_ANY, ConfigChangedEvent, AppFrame::onConfigChanged)
 
-	EVT_BUTTON(ID_BtnSave, AppFrame::doSave)
-	EVT_BUTTON(ID_BtnLoad, AppFrame::doLoad)
+	EVT_MENU(ID_BtnSave, AppFrame::doSave)
+	EVT_MENU(ID_BtnLoad, AppFrame::doLoad)
 
 	EVT_CLOSE(AppFrame::OnCloseEvt)
 
diff --git a/src/scsi2sd-util6/wxWidgets/src/osx/carbon/dataobj.cpp b/src/scsi2sd-util6/wxWidgets/src/osx/carbon/dataobj.cpp
index 758e3a79..6757e5e9 100644
--- a/src/scsi2sd-util6/wxWidgets/src/osx/carbon/dataobj.cpp
+++ b/src/scsi2sd-util6/wxWidgets/src/osx/carbon/dataobj.cpp
@@ -30,7 +30,7 @@
 #include "wx/osx/private.h"
 
 #if wxOSX_USE_COCOA_OR_CARBON
-    #include <QuickTime/QuickTime.h>
+//    #include <QuickTime/QuickTime.h>
 #endif
 
 // ----------------------------------------------------------------------------
diff --git a/src/scsi2sd-util6/wxWidgets/src/osx/core/bitmap.cpp b/src/scsi2sd-util6/wxWidgets/src/osx/core/bitmap.cpp
index 3c61c173..4dd8e8e3 100644
--- a/src/scsi2sd-util6/wxWidgets/src/osx/core/bitmap.cpp
+++ b/src/scsi2sd-util6/wxWidgets/src/osx/core/bitmap.cpp
@@ -36,7 +36,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxMask, wxObject)
 #endif
 
 #ifndef __WXOSX_IPHONE__
-#include <QuickTime/QuickTime.h>
+//#include <QuickTime/QuickTime.h>
 #endif
 
 CGColorSpaceRef wxMacGetGenericRGBColorSpace();
-- 
2.38.5