Merge pull request erichelgeson#194 from mynameistroy/troy/cdb_length…

…_fix added a full lookup table for cdb length
androda · Dec 20, 2022 · 1336343 · 1336343
1 parent ff20a1c
commit 1336343
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/F4_BlueSCSI/BlueSCSI.h b/F4_BlueSCSI/BlueSCSI.h
@@ -347,5 +347,19 @@ typedef __attribute__((aligned(4))) struct _SCSI_DEVICE
   uint8_t       m_sector_offset;          // optical sector offset for missing sync header
 } SCSI_DEVICE;
 
+static byte cdb_len_lookup[] = {
+  6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,
+  10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+  10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+  10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+  10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+  10,10,10,10,10,10,10,10,10,10,10,10,10,16,16,16,16,16,16,16,16,
+  16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
+  16,16,16,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
+  12,12,12,12,12,12,12,12,12,12,12,12,12,12,10,10,10,10,10,10,10,
+  10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+  10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+  10,10,10,10,10,10,10,10,10,10,10,10,10,10
+};
 
 #endif
diff --git a/F4_BlueSCSI/F4_BlueSCSI.ino b/F4_BlueSCSI/F4_BlueSCSI.ino
@@ -1229,8 +1229,7 @@ void loop()
 
   LOGHEX(cmd[0]);
   // Command length selection, reception
-  static const int cmd_class_len[8]={6,10,10,6,6,12,6,6};
-  len = cmd_class_len[cmd[0] >> 5];
+  len = cdb_len_lookup[cmd[0]];
   cmd[1] = readHandshake(); LOG(":");LOGHEX(cmd[1]);
   cmd[2] = readHandshake(); LOG(":");LOGHEX(cmd[2]);
   cmd[3] = readHandshake(); LOG(":");LOGHEX(cmd[3]);