From 77b5b32b356c7a7a06f7e5227fd568d6a2083685 Mon Sep 17 00:00:00 2001 From: Michael McMaster Date: Fri, 9 Apr 2021 21:06:30 +1000 Subject: [PATCH] Update scsi2sd-util6 to identify the 2021 board --- src/scsi2sd-util6/SCSI2SD_HID.cc | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/scsi2sd-util6/SCSI2SD_HID.cc b/src/scsi2sd-util6/SCSI2SD_HID.cc index 7560c90e..e5b8ca34 100644 --- a/src/scsi2sd-util6/SCSI2SD_HID.cc +++ b/src/scsi2sd-util6/SCSI2SD_HID.cc @@ -359,6 +359,11 @@ HID::getHardwareVersion() // Definitely the 2020c or newer hardware. return "V6, 2020c or newer"; } + else if (prodStr.find(L"2021") != std::string::npos) + { + // Definitely the 2020c or newer hardware. + return "V6, 2021 or newer"; + } else { return "V6, Rev F or older"; @@ -390,7 +395,7 @@ HID::isCorrectFirmware(const std::string& path) { if (myFirmwareVersion < 0x0630) { - // Definitely the 2020c or newer hardware. + // Definitely the older hardware. return path.rfind("firmware.V6.revF.dfu") != std::string::npos || path.rfind("firmware.dfu") != std::string::npos; } @@ -415,6 +420,11 @@ HID::isCorrectFirmware(const std::string& path) // Definitely the 2020c or newer hardware. return path.rfind("firmware.V6.2020.dfu") != std::string::npos; } + else if (prodStr.find(L"2021") != std::string::npos) + { + // Definitely the 2020c or newer hardware. + return path.rfind("firmware.V6.2021.dfu") != std::string::npos; + } else { return path.rfind("firmware.V6.revF.dfu") != std::string::npos || -- 2.38.5