Forráskód Böngészése

toolbox: add api version, fix lun issue.

Eric Helgeson 1 éve
szülő
commit
91c72f9e59

+ 1 - 1
lib/BlueSCSI_platform_RP2040/BlueSCSI_platform.h

@@ -16,7 +16,7 @@ extern const char *g_platform_name;
 #define PLATFORM_NAME "BlueSCSI"
 #define PLATFORM_REVISION "2.0"
 #define PLATFORM_TOOLBOX_API 0
-#define PLATFORM_INQUIRY PLATFORM_NAME " v" BLUESCSI_FW_VERSION PLATFORM_TOOLBOX_API
+#define PLATFORM_INQUIRY PLATFORM_NAME " v" BLUESCSI_FW_VERSION
 #define PLATFORM_MAX_SCSI_SPEED S2S_CFG_SPEED_SYNC_10
 #define PLATFORM_OPTIMAL_MIN_SD_WRITE_SIZE 32768
 #define PLATFORM_OPTIMAL_MAX_SD_WRITE_SIZE 65536

+ 3 - 1
lib/SCSI2SD/src/firmware/inquiry.c

@@ -250,8 +250,10 @@ uint32_t s2s_getStandardInquiry(
 
 	// Mac Daynaport Driver does not like this added.
 	if(cfg->deviceType != S2S_CFG_NETWORK) {
-		memcpy(&out[36], PLATFORM_INQUIRY, sizeof(PLATFORM_INQUIRY));
+		memcpy(&out[size], PLATFORM_INQUIRY, sizeof(PLATFORM_INQUIRY));
 		size += sizeof(PLATFORM_INQUIRY);
+		out[size] = PLATFORM_TOOLBOX_API;
+		size += 1;
 	}
 	return size;
 }

+ 1 - 1
lib/SCSI2SD/src/firmware/scsi.c

@@ -604,7 +604,7 @@ static void process_Command()
 
 		enter_Status(CHECK_CONDITION);
 	}
-	else if (scsiDev.lun && (command < 0xD0)) // Temp workaround for Toolbox API v0
+	else if (scsiDev.lun && (command < 0xD0))
 	{
 		scsiDev.target->sense.code = ILLEGAL_REQUEST;
 		scsiDev.target->sense.asc = LOGICAL_UNIT_NOT_SUPPORTED;