From: Michael McMaster <michael@codesrc.com>
Date: Thu, 27 May 2021 22:33:34 +0000 (+1000)
Subject: Remove obsolete blind writes option
X-Git-Url: http://git.codesrc.com/gitweb.cgi?a=commitdiff_plain;h=89375821dac08823f49c8fdaba1310ab3149cf05;p=scsi2sd-util.git

Remove obsolete blind writes option
---

diff --git a/scsi2sd.io/scsi2sd.io.iml b/scsi2sd.io/scsi2sd.io.iml
index d415012..71c155d 100644
--- a/scsi2sd.io/scsi2sd.io.iml
+++ b/scsi2sd.io/scsi2sd.io.iml
@@ -14,7 +14,10 @@
     <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.8.0-beta2" level="project" />
     <orderEntry type="library" name="Maven: net.java.dev.jna:jna:5.2.0" level="project" />
     <orderEntry type="library" name="Maven: org.hid4java:hid4java:0.5.0" level="project" />
-    <orderEntry type="module" module-name="scsi2sd.io.usb4java" />
+    <orderEntry type="library" name="Maven: com.codesrc:scsi2sd.io.usb4java:1.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.8.1" level="project" />
+    <orderEntry type="library" name="Maven: javax.usb:usb-api:1.0.2" level="project" />
+    <orderEntry type="library" name="Maven: org.usb4java:usb4java-javax:1.3.0" level="project" />
     <orderEntry type="library" name="Maven: org.usb4java:usb4java:1.3.0" level="project" />
     <orderEntry type="library" name="Maven: org.usb4java:libusb4java:linux-x86:1.3.0" level="project" />
     <orderEntry type="library" name="Maven: org.usb4java:libusb4java:linux-x86-64:1.3.0" level="project" />
@@ -23,9 +26,6 @@
     <orderEntry type="library" name="Maven: org.usb4java:libusb4java:darwin-x86-64:1.3.0" level="project" />
     <orderEntry type="library" name="Maven: org.usb4java:libusb4java:linux-arm:1.3.0" level="project" />
     <orderEntry type="library" name="Maven: org.usb4java:libusb4java:linux-aarch64:1.3.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.8.1" level="project" />
-    <orderEntry type="library" name="Maven: javax.usb:usb-api:1.0.2" level="project" />
-    <orderEntry type="library" name="Maven: org.usb4java:usb4java-javax:1.3.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
   </component>
diff --git a/scsi2sd.ui/src/main/java/com/codesrc/scsi2sd/model/BoardConfig.java b/scsi2sd.ui/src/main/java/com/codesrc/scsi2sd/model/BoardConfig.java
index 1466883..d0a16ef 100644
--- a/scsi2sd.ui/src/main/java/com/codesrc/scsi2sd/model/BoardConfig.java
+++ b/scsi2sd.ui/src/main/java/com/codesrc/scsi2sd/model/BoardConfig.java
@@ -154,14 +154,6 @@ public class BoardConfig {
         this.flags6.add(Flag6.S2S_CFG_ENABLE_TERMINATOR);
     }
 
-    public boolean isEnableBlindWrites() {
-        return flags6.contains(Flag6.S2S_CFG_ENABLE_BLIND_WRITES);
-    }
-
-    public void setEnableBlindWrites(boolean enableBlindWrites) {
-        this.flags6.add(Flag6.S2S_CFG_ENABLE_BLIND_WRITES);
-    }
-
     public BoardConfig(Node node) {
 	    var childNodes = node.getChildNodes();
         var children = IntStream.range(0, childNodes.getLength())
@@ -199,10 +191,6 @@ public class BoardConfig {
             this.flags6.add(Flag6.S2S_CFG_ENABLE_TERMINATOR);
         }
 
-        if (children.getOrDefault("blindWrites", "false").equalsIgnoreCase("true")) {
-            this.flags6.add(Flag6.S2S_CFG_ENABLE_BLIND_WRITES);
-        }
-
         this.selectionDelay = 255;
         var selDelayText = children.getOrDefault("selectionDelay", "255");
         try {
@@ -325,14 +313,6 @@ public class BoardConfig {
             .append("	********************************************************* -->\n")
             .append("	<scsiSpeed>").append(this.scsiSpeed.getValue()).append("</scsiSpeed>\n")
 
-            .append("	<!-- ********************************************************\n")
-            .append("	Enable SD card blind writes, which starts writing to the SD\n")
-            .append("	card before all the SCSI data has been received. Can cause problems\n")
-            .append("	with some SCSI hosts\n")
-            .append("	********************************************************* -->\n")
-            .append("	<blindWrites>")
-            .append(this.flags6.contains(Flag6.S2S_CFG_ENABLE_BLIND_WRITES) ? "true" : "false")
-            .append("   </blindWrites>\n")
             .append("</S2S_BoardCfg>\n");
 
         return out.toString();
diff --git a/scsi2sd.ui/src/main/java/com/codesrc/scsi2sd/model/Flag6.java b/scsi2sd.ui/src/main/java/com/codesrc/scsi2sd/model/Flag6.java
index 582d254..1c6fce4 100644
--- a/scsi2sd.ui/src/main/java/com/codesrc/scsi2sd/model/Flag6.java
+++ b/scsi2sd.ui/src/main/java/com/codesrc/scsi2sd/model/Flag6.java
@@ -22,8 +22,8 @@ import java.util.HashSet;
 import java.util.Set;
 
 public enum Flag6 implements BitEnum {
-    S2S_CFG_ENABLE_TERMINATOR(1),
-    S2S_CFG_ENABLE_BLIND_WRITES(2);
+    S2S_CFG_ENABLE_TERMINATOR(1);
+    // Obsolete S2S_CFG_ENABLE_BLIND_WRITES(2);
 
     static Set<Flag6> fromBitmask(byte bitmask) {
         Set<Flag6> result = new HashSet<>();
diff --git a/scsi2sd.ui/src/main/java/com/codesrc/scsi2sd/presentation/ConfigController.java b/scsi2sd.ui/src/main/java/com/codesrc/scsi2sd/presentation/ConfigController.java
index 053a229..27ccb1a 100644
--- a/scsi2sd.ui/src/main/java/com/codesrc/scsi2sd/presentation/ConfigController.java
+++ b/scsi2sd.ui/src/main/java/com/codesrc/scsi2sd/presentation/ConfigController.java
@@ -50,7 +50,6 @@ public class ConfigController implements Initializable, DocumentObserver {
     @FXML private ToggleSwitch cfgScsi2;
     @FXML private ToggleSwitch cfgSelPulses;
     @FXML private ToggleSwitch cfgMapLuns;
-    @FXML private ToggleSwitch cfgEnableBlindWrites;
 
     @FXML private ChoiceBox speedLimit;
 
@@ -76,7 +75,6 @@ public class ConfigController implements Initializable, DocumentObserver {
         this.cfgScsi2.selectedProperty().addListener(it -> this.setFlag(Flag.S2S_CFG_ENABLE_SCSI2, this.cfgScsi2));
         this.cfgSelPulses.selectedProperty().addListener(it -> this.setFlag(Flag.S2S_CFG_ENABLE_SEL_LATCH, this.cfgSelPulses));
         this.cfgMapLuns.selectedProperty().addListener(it -> this.setFlag(Flag.S2S_CFG_MAP_LUNS_TO_IDS, this.cfgMapLuns));
-        this.cfgEnableBlindWrites.selectedProperty().addListener(it -> this.setBlindWrites());
 
         this.speedLimit.getItems().addAll(Speed.values());
         this.speedLimit.setOnAction(e -> this.setSpeedLimit());
@@ -111,7 +109,6 @@ public class ConfigController implements Initializable, DocumentObserver {
         cfgScsi2.setSelected(this.boardConfig.getFlags().contains(Flag.S2S_CFG_ENABLE_SCSI2));
         cfgSelPulses.setSelected(this.boardConfig.getFlags().contains(Flag.S2S_CFG_ENABLE_SEL_LATCH));
         cfgMapLuns.setSelected(this.boardConfig.getFlags().contains(Flag.S2S_CFG_MAP_LUNS_TO_IDS));
-        cfgEnableBlindWrites.setSelected(this.boardConfig.isEnableBlindWrites());
 
         this.speedLimit.setValue(this.boardConfig.getScsiSpeed());
     }
@@ -143,15 +140,6 @@ public class ConfigController implements Initializable, DocumentObserver {
         }
     }
 
-    private void setBlindWrites()
-    {
-        if (this.boardConfig != null)
-        {
-            this.boardConfig.setFlag6(Flag6.S2S_CFG_ENABLE_BLIND_WRITES, this.cfgEnableBlindWrites.isSelected());
-            this.activeDocument.setModified(this.getClass().getName(), true);
-        }
-    }
-
     private void setStartupDelay()
     {
         if (this.boardConfig != null)
diff --git a/scsi2sd.ui/src/main/resources/fx/configTab.fxml b/scsi2sd.ui/src/main/resources/fx/configTab.fxml
index 63437bc..7473f9e 100644
--- a/scsi2sd.ui/src/main/resources/fx/configTab.fxml
+++ b/scsi2sd.ui/src/main/resources/fx/configTab.fxml
@@ -36,7 +36,6 @@
                         <RowConstraints maxHeight="60.0" minHeight="15.0" prefHeight="30.0" vgrow="SOMETIMES" />
                         <RowConstraints maxHeight="60.0" minHeight="15.0" prefHeight="30.0" vgrow="SOMETIMES" />
                         <RowConstraints maxHeight="60.0" minHeight="15.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                        <RowConstraints maxHeight="60.0" minHeight="15.0" prefHeight="30.0" vgrow="SOMETIMES" />
                     </rowConstraints>
                     <children>
                         <Label text="Enable Active Terminator" GridPane.columnIndex="1" GridPane.rowIndex="1" />
@@ -65,9 +64,6 @@
                         <Label text="Map LUNS to IDs" GridPane.columnIndex="1" GridPane.rowIndex="11" />
                         <ToggleSwitch fx:id="cfgMapLuns" mnemonicParsing="false" GridPane.rowIndex="11" />
 
-                        <Label text="Blind Writes" GridPane.columnIndex="1" GridPane.rowIndex="12" />
-                        <ToggleSwitch fx:id="cfgEnableBlindWrites" mnemonicParsing="false" GridPane.rowIndex="12" />
-
                         <Label text="Default" GridPane.columnIndex="2">
                             <font>
                                 <Font name="System Bold" size="13.0" />
@@ -82,7 +78,6 @@
                         <Label text="Disabled" GridPane.columnIndex="2" GridPane.rowIndex="2" />
                         <Label text="Disabled" GridPane.columnIndex="2" GridPane.rowIndex="10" />
                         <Label text="Disabled" GridPane.columnIndex="2" GridPane.rowIndex="11" />
-                        <Label text="Disabled" GridPane.columnIndex="2" GridPane.rowIndex="12" />
                         <Label text="Advanced" GridPane.columnIndex="1" GridPane.rowIndex="9">
                             <font>
                                 <Font name="System Bold" size="13.0" />