Various fixes

lib/SCSI2SD/src/firmware/inquiry.c

@@ -274,10 +274,11 @@ uint32_t s2s_getStandardInquiry(
 	}
 	// Iomega already has a vendor inquiry
 	if(cfg->deviceType != S2S_CFG_NETWORK && cfg->deviceType != S2S_CFG_ZIP100) {
-		memcpy(&out[size], INQUIRY_NAME, sizeof(INQUIRY_NAME));
-		size += sizeof(INQUIRY_NAME);
-		out[size] = TOOLBOX_API;
-		size += 1;
+		memcpy(&out[size], INQUIRY_NAME, sizeof(INQUIRY_NAME) - 1);
+		size += sizeof(INQUIRY_NAME) - 1;
+		out[size++] = TOOLBOX_API;
+		out[4] = 0x1f + (sizeof(INQUIRY_NAME) - 1)
+		              + 1; // PLATFORM_TOOLBOX_API
 	}
 	return size;
 }

src/BlueSCSI_Toolbox.cpp

@@ -1,6 +1,5 @@
 /**
- * Copyright (C) 2023-2025 Eric Helgeson
- * Copyright (c) 2024-2025 Rabbit Hole Computing
+ * Copyright (C) 2023 Eric Helgeson
  *
  * This file is part of BlueSCSI
  *
@@ -42,7 +41,7 @@ extern "C" int8_t scsiToolboxEnabled()
 }
 
 
-static bool toolboxFilenameValid(const char* name, bool isCD = false)
+static bool toolboxFilenameValid(const char* name, const bool isCD = false)
 {
     if(strlen(name) == 0)
     {
@@ -213,7 +212,7 @@ static void onListDevices()
         const S2S_TargetCfg* cfg = s2s_getConfigById(i);
         if (cfg && (cfg->scsiId & S2S_CFG_TARGET_ENABLED))
         {
-            scsiDev.data[i] = (int)cfg->deviceType; // 2 == cd
+            scsiDev.data[i] = static_cast<int>(cfg->deviceType); // 2 == cd
         }
         else
         {
@@ -237,7 +236,7 @@ static void onSetNextCD(const char * img_dir)
     switchNextImage(img, full_path);
 }
 
-FsFile gFile; // global so we can keep it open while transfering.
+FsFile gFile; // global so we can keep it open while transferring.
 void onGetFile10(char * dir_name) {
     uint8_t index = scsiDev.cdb[1];
 

src/BlueSCSI_config.h

@@ -29,7 +29,7 @@
 #include <BlueSCSI_platform_config.h>
 
 // Use variables for version number
-#define FW_VER_NUM      "25.06.17"
+#define FW_VER_NUM      "2025.06.00"
 // rel or dev only.
 #define FW_VER_SUFFIX   "dev"
 
@@ -37,7 +37,7 @@
 #define STRINGFY(STR) #STR
 #define FIRMWARE_NAME_PREFIX DEF_STRINGFY(BUILD_ENV)
 #define BLUE_FW_VERSION FW_VER_NUM "-" FW_VER_SUFFIX
-#define INQUIRY_NAME  PLATFORM_NAME " v" BLUE_FW_VERSION
+#define INQUIRY_NAME  PLATFORM_NAME "v" FW_VER_NUM
 #define TOOLBOX_API 0
 
 // Configuration and log file paths

src/BlueSCSI_disk.cpp

@@ -665,6 +665,7 @@ bool scsiDiskFilenameValid(const char* name)
             ".tar", ".tgz", ".gz", ".bz2", ".tbz2", ".xz", ".zst", ".z",
             ".zip", ".zipx", ".rar", ".lzh", ".lha", ".lzo", ".lz4", ".arj",
             ".dmg", ".hqx", ".cpt", ".7z", ".s7z", ".mid", ".wav", ".aiff",
+            ".mar",
             NULL
         };
 
@@ -2221,7 +2222,7 @@ int scsiDiskCommand()
         // Enable or disable media access operations.
         //int immed = scsiDev.cdb[1] & 1;
         int start = scsiDev.cdb[4] & 1;
-        if ((scsiDev.cdb[4] & 2) || img.deviceType == S2S_CFG_ZIP100)
+        if ((scsiDev.cdb[4] & 2) || img.deviceType != S2S_CFG_FIXED)
         {
             // Device load & eject
             if (start)