diff --git a/subprojects/opensea-transport b/subprojects/opensea-transport index 8528ed33..859e4dec 160000 --- a/subprojects/opensea-transport +++ b/subprojects/opensea-transport @@ -1 +1 @@ -Subproject commit 8528ed3319ded9c64f70cc7d8f704f6ee2d28095 +Subproject commit 859e4dec4feac18d55aefe5ac6109141d5126692 diff --git a/utils/C/openSeaChest/openSeaChest_Basics.c b/utils/C/openSeaChest/openSeaChest_Basics.c index a4eb6d90..b3d1bf0e 100644 --- a/utils/C/openSeaChest/openSeaChest_Basics.c +++ b/utils/C/openSeaChest/openSeaChest_Basics.c @@ -1282,10 +1282,12 @@ int main(int argc, char* argv[]) if (VERBOSITY_QUIET < toolVerbosity) { - printf("\n%s - %s - %s - %s - %s\n", deviceList[deviceIter].os_info.name, - deviceList[deviceIter].drive_info.product_identification, - deviceList[deviceIter].drive_info.serialNumber, deviceList[deviceIter].drive_info.product_revision, - print_drive_type(&deviceList[deviceIter])); + const char* modelString = M_NULLPTR; + const char* serialString = M_NULLPTR; + const char* fwString = M_NULLPTR; + get_Device_Strings_For_Display(&deviceList[deviceIter], &modelString, &serialString, &fwString); + printf("\n%s - %s - %s - %s - %s\n", deviceList[deviceIter].os_info.name, modelString, serialString, + fwString, print_drive_type(&deviceList[deviceIter])); } #if defined(FEATURE_JSONOUTPUT_SUPPORT) diff --git a/utils/C/openSeaChest/openSeaChest_Configure.c b/utils/C/openSeaChest/openSeaChest_Configure.c index 1c2adbdb..6dd1c2ce 100644 --- a/utils/C/openSeaChest/openSeaChest_Configure.c +++ b/utils/C/openSeaChest/openSeaChest_Configure.c @@ -2176,10 +2176,12 @@ int main(int argc, char* argv[]) if (VERBOSITY_QUIET < toolVerbosity) { - printf("\n%s - %s - %s - %s - %s\n", deviceList[deviceIter].os_info.name, - deviceList[deviceIter].drive_info.product_identification, - deviceList[deviceIter].drive_info.serialNumber, deviceList[deviceIter].drive_info.product_revision, - print_drive_type(&deviceList[deviceIter])); + const char* modelString = M_NULLPTR; + const char* serialString = M_NULLPTR; + const char* fwString = M_NULLPTR; + get_Device_Strings_For_Display(&deviceList[deviceIter], &modelString, &serialString, &fwString); + printf("\n%s - %s - %s - %s - %s\n", deviceList[deviceIter].os_info.name, modelString, serialString, + fwString, print_drive_type(&deviceList[deviceIter])); } #if defined(FEATURE_JSONOUTPUT_SUPPORT) diff --git a/utils/C/openSeaChest/openSeaChest_Defect.c b/utils/C/openSeaChest/openSeaChest_Defect.c index c386a597..e8fc5142 100644 --- a/utils/C/openSeaChest/openSeaChest_Defect.c +++ b/utils/C/openSeaChest/openSeaChest_Defect.c @@ -1202,10 +1202,12 @@ int main(int argc, char* argv[]) if (VERBOSITY_QUIET < toolVerbosity) { - printf("\n%s - %s - %s - %s - %s\n", deviceList[deviceIter].os_info.name, - deviceList[deviceIter].drive_info.product_identification, - deviceList[deviceIter].drive_info.serialNumber, deviceList[deviceIter].drive_info.product_revision, - print_drive_type(&deviceList[deviceIter])); + const char* modelString = M_NULLPTR; + const char* serialString = M_NULLPTR; + const char* fwString = M_NULLPTR; + get_Device_Strings_For_Display(&deviceList[deviceIter], &modelString, &serialString, &fwString); + printf("\n%s - %s - %s - %s - %s\n", deviceList[deviceIter].os_info.name, modelString, serialString, + fwString, print_drive_type(&deviceList[deviceIter])); } #if defined(FEATURE_JSONOUTPUT_SUPPORT) diff --git a/utils/C/openSeaChest/openSeaChest_Erase.c b/utils/C/openSeaChest/openSeaChest_Erase.c index f743b302..09d0e832 100644 --- a/utils/C/openSeaChest/openSeaChest_Erase.c +++ b/utils/C/openSeaChest/openSeaChest_Erase.c @@ -1864,10 +1864,12 @@ int main(int argc, char* argv[]) if (VERBOSITY_QUIET < toolVerbosity) { - printf("\n%s - %s - %s - %s - %s\n", deviceList[deviceIter].os_info.name, - deviceList[deviceIter].drive_info.product_identification, - deviceList[deviceIter].drive_info.serialNumber, deviceList[deviceIter].drive_info.product_revision, - print_drive_type(&deviceList[deviceIter])); + const char* modelString = M_NULLPTR; + const char* serialString = M_NULLPTR; + const char* fwString = M_NULLPTR; + get_Device_Strings_For_Display(&deviceList[deviceIter], &modelString, &serialString, &fwString); + printf("\n%s - %s - %s - %s - %s\n", deviceList[deviceIter].os_info.name, modelString, serialString, + fwString, print_drive_type(&deviceList[deviceIter])); } #if defined(FEATURE_JSONOUTPUT_SUPPORT) diff --git a/utils/C/openSeaChest/openSeaChest_Firmware.c b/utils/C/openSeaChest/openSeaChest_Firmware.c index c2c7a452..2d9081b1 100644 --- a/utils/C/openSeaChest/openSeaChest_Firmware.c +++ b/utils/C/openSeaChest/openSeaChest_Firmware.c @@ -1038,10 +1038,12 @@ int main(int argc, char* argv[]) if (VERBOSITY_QUIET < toolVerbosity) { - printf("\n%s - %s - %s - %s - %s\n", deviceList[deviceIter].os_info.name, - deviceList[deviceIter].drive_info.product_identification, - deviceList[deviceIter].drive_info.serialNumber, deviceList[deviceIter].drive_info.product_revision, - print_drive_type(&deviceList[deviceIter])); + const char* modelString = M_NULLPTR; + const char* serialString = M_NULLPTR; + const char* fwString = M_NULLPTR; + get_Device_Strings_For_Display(&deviceList[deviceIter], &modelString, &serialString, &fwString); + printf("\n%s - %s - %s - %s - %s\n", deviceList[deviceIter].os_info.name, modelString, serialString, + fwString, print_drive_type(&deviceList[deviceIter])); } #if defined(FEATURE_JSONOUTPUT_SUPPORT) diff --git a/utils/C/openSeaChest/openSeaChest_Format.c b/utils/C/openSeaChest/openSeaChest_Format.c index 42c1be0a..5eab464f 100644 --- a/utils/C/openSeaChest/openSeaChest_Format.c +++ b/utils/C/openSeaChest/openSeaChest_Format.c @@ -1338,10 +1338,12 @@ int main(int argc, char* argv[]) if (VERBOSITY_QUIET < toolVerbosity) { - printf("\n%s - %s - %s - %s - %s\n", deviceList[deviceIter].os_info.name, - deviceList[deviceIter].drive_info.product_identification, - deviceList[deviceIter].drive_info.serialNumber, deviceList[deviceIter].drive_info.product_revision, - print_drive_type(&deviceList[deviceIter])); + const char* modelString = M_NULLPTR; + const char* serialString = M_NULLPTR; + const char* fwString = M_NULLPTR; + get_Device_Strings_For_Display(&deviceList[deviceIter], &modelString, &serialString, &fwString); + printf("\n%s - %s - %s - %s - %s\n", deviceList[deviceIter].os_info.name, modelString, serialString, + fwString, print_drive_type(&deviceList[deviceIter])); } #if defined(FEATURE_JSONOUTPUT_SUPPORT) diff --git a/utils/C/openSeaChest/openSeaChest_GenericTests.c b/utils/C/openSeaChest/openSeaChest_GenericTests.c index 9b4bcacc..51c90eca 100644 --- a/utils/C/openSeaChest/openSeaChest_GenericTests.c +++ b/utils/C/openSeaChest/openSeaChest_GenericTests.c @@ -1178,10 +1178,12 @@ int main(int argc, char* argv[]) if (VERBOSITY_QUIET < toolVerbosity) { - printf("\n%s - %s - %s - %s - %s\n", deviceList[deviceIter].os_info.name, - deviceList[deviceIter].drive_info.product_identification, - deviceList[deviceIter].drive_info.serialNumber, deviceList[deviceIter].drive_info.product_revision, - print_drive_type(&deviceList[deviceIter])); + const char* modelString = M_NULLPTR; + const char* serialString = M_NULLPTR; + const char* fwString = M_NULLPTR; + get_Device_Strings_For_Display(&deviceList[deviceIter], &modelString, &serialString, &fwString); + printf("\n%s - %s - %s - %s - %s\n", deviceList[deviceIter].os_info.name, modelString, serialString, + fwString, print_drive_type(&deviceList[deviceIter])); } #if defined(FEATURE_JSONOUTPUT_SUPPORT) diff --git a/utils/C/openSeaChest/openSeaChest_Info.c b/utils/C/openSeaChest/openSeaChest_Info.c index 8aaaef5d..264123fb 100644 --- a/utils/C/openSeaChest/openSeaChest_Info.c +++ b/utils/C/openSeaChest/openSeaChest_Info.c @@ -1024,10 +1024,15 @@ int main(int argc, char* argv[]) if (VERBOSITY_QUIET < toolVerbosity) { - printf("\n%s - %s - %s - %s - %s\n", deviceList[deviceIter].os_info.name, - deviceList[deviceIter].drive_info.product_identification, - deviceList[deviceIter].drive_info.serialNumber, deviceList[deviceIter].drive_info.product_revision, - print_drive_type(&deviceList[deviceIter])); + // When a drive is behind a USB/SAT bridge, the standard drive info fields hold the bridge's SCSI identity + // while the actual drive's identity is stored in the bridge info (child MN/SN/FW). Prefer the child drive + // identity when it is available so the header shows the real drive. + const char* modelString = M_NULLPTR; + const char* serialString = M_NULLPTR; + const char* fwString = M_NULLPTR; + get_Device_Strings_For_Display(&deviceList[deviceIter], &modelString, &serialString, &fwString); + printf("\n%s - %s - %s - %s - %s\n", deviceList[deviceIter].os_info.name, modelString, serialString, + fwString, print_drive_type(&deviceList[deviceIter])); } #if defined(FEATURE_JSONOUTPUT_SUPPORT) diff --git a/utils/C/openSeaChest/openSeaChest_Logs.c b/utils/C/openSeaChest/openSeaChest_Logs.c index ae3bc4c8..a355846b 100644 --- a/utils/C/openSeaChest/openSeaChest_Logs.c +++ b/utils/C/openSeaChest/openSeaChest_Logs.c @@ -1067,10 +1067,12 @@ int main(int argc, char* argv[]) if (VERBOSITY_QUIET < toolVerbosity) { - printf("\n%s - %s - %s - %s - %s\n", deviceList[deviceIter].os_info.name, - deviceList[deviceIter].drive_info.product_identification, - deviceList[deviceIter].drive_info.serialNumber, deviceList[deviceIter].drive_info.product_revision, - print_drive_type(&deviceList[deviceIter])); + const char* modelString = M_NULLPTR; + const char* serialString = M_NULLPTR; + const char* fwString = M_NULLPTR; + get_Device_Strings_For_Display(&deviceList[deviceIter], &modelString, &serialString, &fwString); + printf("\n%s - %s - %s - %s - %s\n", deviceList[deviceIter].os_info.name, modelString, serialString, + fwString, print_drive_type(&deviceList[deviceIter])); } #if defined(FEATURE_JSONOUTPUT_SUPPORT) diff --git a/utils/C/openSeaChest/openSeaChest_NVMe.c b/utils/C/openSeaChest/openSeaChest_NVMe.c index a3a16159..013e5f03 100644 --- a/utils/C/openSeaChest/openSeaChest_NVMe.c +++ b/utils/C/openSeaChest/openSeaChest_NVMe.c @@ -1126,10 +1126,12 @@ int main(int argc, char* argv[]) if (VERBOSITY_QUIET < toolVerbosity) { - printf("\n%s - %s - %s - %s - %s\n", deviceList[deviceIter].os_info.name, - deviceList[deviceIter].drive_info.product_identification, - deviceList[deviceIter].drive_info.serialNumber, deviceList[deviceIter].drive_info.product_revision, - print_drive_type(&deviceList[deviceIter])); + const char* modelString = M_NULLPTR; + const char* serialString = M_NULLPTR; + const char* fwString = M_NULLPTR; + get_Device_Strings_For_Display(&deviceList[deviceIter], &modelString, &serialString, &fwString); + printf("\n%s - %s - %s - %s - %s\n", deviceList[deviceIter].os_info.name, modelString, serialString, + fwString, print_drive_type(&deviceList[deviceIter])); } #if defined(FEATURE_JSONOUTPUT_SUPPORT) diff --git a/utils/C/openSeaChest/openSeaChest_PassthroughTest.c b/utils/C/openSeaChest/openSeaChest_PassthroughTest.c index ab8143dd..01292806 100644 --- a/utils/C/openSeaChest/openSeaChest_PassthroughTest.c +++ b/utils/C/openSeaChest/openSeaChest_PassthroughTest.c @@ -1140,10 +1140,12 @@ int main(int argc, char* argv[]) if (VERBOSITY_QUIET < toolVerbosity) { - printf("\n%s - %s - %s - %s - %s\n", deviceList[deviceIter].os_info.name, - deviceList[deviceIter].drive_info.product_identification, - deviceList[deviceIter].drive_info.serialNumber, deviceList[deviceIter].drive_info.product_revision, - print_drive_type(&deviceList[deviceIter])); + const char* modelString = M_NULLPTR; + const char* serialString = M_NULLPTR; + const char* fwString = M_NULLPTR; + get_Device_Strings_For_Display(&deviceList[deviceIter], &modelString, &serialString, &fwString); + printf("\n%s - %s - %s - %s - %s\n", deviceList[deviceIter].os_info.name, modelString, serialString, + fwString, print_drive_type(&deviceList[deviceIter])); } #if defined(FEATURE_JSONOUTPUT_SUPPORT) diff --git a/utils/C/openSeaChest/openSeaChest_PowerControl.c b/utils/C/openSeaChest/openSeaChest_PowerControl.c index f49d6dc5..1308400a 100644 --- a/utils/C/openSeaChest/openSeaChest_PowerControl.c +++ b/utils/C/openSeaChest/openSeaChest_PowerControl.c @@ -1637,10 +1637,12 @@ int main(int argc, char* argv[]) if (VERBOSITY_QUIET < toolVerbosity) { - printf("\n%s - %s - %s - %s - %s\n", deviceList[deviceIter].os_info.name, - deviceList[deviceIter].drive_info.product_identification, - deviceList[deviceIter].drive_info.serialNumber, deviceList[deviceIter].drive_info.product_revision, - print_drive_type(&deviceList[deviceIter])); + const char* modelString = M_NULLPTR; + const char* serialString = M_NULLPTR; + const char* fwString = M_NULLPTR; + get_Device_Strings_For_Display(&deviceList[deviceIter], &modelString, &serialString, &fwString); + printf("\n%s - %s - %s - %s - %s\n", deviceList[deviceIter].os_info.name, modelString, serialString, + fwString, print_drive_type(&deviceList[deviceIter])); } #if defined(FEATURE_JSONOUTPUT_SUPPORT) diff --git a/utils/C/openSeaChest/openSeaChest_Raw.c b/utils/C/openSeaChest/openSeaChest_Raw.c index 4b99c3ce..492796f8 100644 --- a/utils/C/openSeaChest/openSeaChest_Raw.c +++ b/utils/C/openSeaChest/openSeaChest_Raw.c @@ -1374,10 +1374,12 @@ int main(int argc, char* argv[]) if (VERBOSITY_QUIET < toolVerbosity) { - printf("\n%s - %s - %s - %s - %s\n", deviceList[deviceIter].os_info.name, - deviceList[deviceIter].drive_info.product_identification, - deviceList[deviceIter].drive_info.serialNumber, deviceList[deviceIter].drive_info.product_revision, - print_drive_type(&deviceList[deviceIter])); + const char* modelString = M_NULLPTR; + const char* serialString = M_NULLPTR; + const char* fwString = M_NULLPTR; + get_Device_Strings_For_Display(&deviceList[deviceIter], &modelString, &serialString, &fwString); + printf("\n%s - %s - %s - %s - %s\n", deviceList[deviceIter].os_info.name, modelString, serialString, + fwString, print_drive_type(&deviceList[deviceIter])); } #if defined(FEATURE_JSONOUTPUT_SUPPORT) diff --git a/utils/C/openSeaChest/openSeaChest_Reservations.c b/utils/C/openSeaChest/openSeaChest_Reservations.c index 9ffd855a..2c69c9d9 100644 --- a/utils/C/openSeaChest/openSeaChest_Reservations.c +++ b/utils/C/openSeaChest/openSeaChest_Reservations.c @@ -947,10 +947,12 @@ int main(int argc, char* argv[]) if (VERBOSITY_QUIET < toolVerbosity) { - printf("\n%s - %s - %s - %s - %s\n", deviceList[deviceIter].os_info.name, - deviceList[deviceIter].drive_info.product_identification, - deviceList[deviceIter].drive_info.serialNumber, deviceList[deviceIter].drive_info.product_revision, - print_drive_type(&deviceList[deviceIter])); + const char* modelString = M_NULLPTR; + const char* serialString = M_NULLPTR; + const char* fwString = M_NULLPTR; + get_Device_Strings_For_Display(&deviceList[deviceIter], &modelString, &serialString, &fwString); + printf("\n%s - %s - %s - %s - %s\n", deviceList[deviceIter].os_info.name, modelString, serialString, + fwString, print_drive_type(&deviceList[deviceIter])); } #if defined(FEATURE_JSONOUTPUT_SUPPORT) diff --git a/utils/C/openSeaChest/openSeaChest_SMART.c b/utils/C/openSeaChest/openSeaChest_SMART.c index 347c60bb..c2d7ed84 100644 --- a/utils/C/openSeaChest/openSeaChest_SMART.c +++ b/utils/C/openSeaChest/openSeaChest_SMART.c @@ -1216,10 +1216,12 @@ int main(int argc, char* argv[]) if (VERBOSITY_QUIET < toolVerbosity) { - printf("\n%s - %s - %s - %s - %s\n", deviceList[deviceIter].os_info.name, - deviceList[deviceIter].drive_info.product_identification, - deviceList[deviceIter].drive_info.serialNumber, deviceList[deviceIter].drive_info.product_revision, - print_drive_type(&deviceList[deviceIter])); + const char* modelString = M_NULLPTR; + const char* serialString = M_NULLPTR; + const char* fwString = M_NULLPTR; + get_Device_Strings_For_Display(&deviceList[deviceIter], &modelString, &serialString, &fwString); + printf("\n%s - %s - %s - %s - %s\n", deviceList[deviceIter].os_info.name, modelString, serialString, + fwString, print_drive_type(&deviceList[deviceIter])); } #if defined(FEATURE_JSONOUTPUT_SUPPORT) diff --git a/utils/C/openSeaChest/openSeaChest_Sample.c b/utils/C/openSeaChest/openSeaChest_Sample.c index 53f0336a..05f09cbc 100644 --- a/utils/C/openSeaChest/openSeaChest_Sample.c +++ b/utils/C/openSeaChest/openSeaChest_Sample.c @@ -849,10 +849,12 @@ int main(int argc, char* argv[]) if (VERBOSITY_QUIET < toolVerbosity) { - printf("\n%s - %s - %s - %s - %s\n", deviceList[deviceIter].os_info.name, - deviceList[deviceIter].drive_info.product_identification, - deviceList[deviceIter].drive_info.serialNumber, deviceList[deviceIter].drive_info.product_revision, - print_drive_type(&deviceList[deviceIter])); + const char* modelString = M_NULLPTR; + const char* serialString = M_NULLPTR; + const char* fwString = M_NULLPTR; + get_Device_Strings_For_Display(&deviceList[deviceIter], &modelString, &serialString, &fwString); + printf("\n%s - %s - %s - %s - %s\n", deviceList[deviceIter].os_info.name, modelString, serialString, + fwString, print_drive_type(&deviceList[deviceIter])); } #if defined(FEATURE_JSONOUTPUT_SUPPORT) diff --git a/utils/C/openSeaChest/openSeaChest_Security.c b/utils/C/openSeaChest/openSeaChest_Security.c index 60741830..df1bdcd7 100644 --- a/utils/C/openSeaChest/openSeaChest_Security.c +++ b/utils/C/openSeaChest/openSeaChest_Security.c @@ -1435,10 +1435,12 @@ int main(int argc, char* argv[]) if (VERBOSITY_QUIET < toolVerbosity) { - printf("\n%s - %s - %s - %s - %s\n", deviceList[deviceIter].os_info.name, - deviceList[deviceIter].drive_info.product_identification, - deviceList[deviceIter].drive_info.serialNumber, deviceList[deviceIter].drive_info.product_revision, - print_drive_type(&deviceList[deviceIter])); + const char* modelString = M_NULLPTR; + const char* serialString = M_NULLPTR; + const char* fwString = M_NULLPTR; + get_Device_Strings_For_Display(&deviceList[deviceIter], &modelString, &serialString, &fwString); + printf("\n%s - %s - %s - %s - %s\n", deviceList[deviceIter].os_info.name, modelString, serialString, + fwString, print_drive_type(&deviceList[deviceIter])); } #if defined(FEATURE_JSONOUTPUT_SUPPORT) diff --git a/utils/C/openSeaChest/openSeaChest_ZBD.c b/utils/C/openSeaChest/openSeaChest_ZBD.c index 8ec5685f..1bef0f4e 100644 --- a/utils/C/openSeaChest/openSeaChest_ZBD.c +++ b/utils/C/openSeaChest/openSeaChest_ZBD.c @@ -937,10 +937,12 @@ int main(int argc, char* argv[]) if (VERBOSITY_QUIET < toolVerbosity) { - printf("\n%s - %s - %s - %s - %s\n", deviceList[deviceIter].os_info.name, - deviceList[deviceIter].drive_info.product_identification, - deviceList[deviceIter].drive_info.serialNumber, deviceList[deviceIter].drive_info.product_revision, - print_drive_type(&deviceList[deviceIter])); + const char* modelString = M_NULLPTR; + const char* serialString = M_NULLPTR; + const char* fwString = M_NULLPTR; + get_Device_Strings_For_Display(&deviceList[deviceIter], &modelString, &serialString, &fwString); + printf("\n%s - %s - %s - %s - %s\n", deviceList[deviceIter].os_info.name, modelString, serialString, + fwString, print_drive_type(&deviceList[deviceIter])); } #if defined(FEATURE_JSONOUTPUT_SUPPORT)