bug: Changing how new capacity is displayed after changing maxLBA

Changing how the new capacity is displayed after changing the maxLBA since it can differ for USB devices. Signed-off-by: Tyler Erickson <[email protected]>
Seagate · Aug 2, 2023 · a61f1c1 · a61f1c1
1 parent 8926425
commit a61f1c1
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 5 deletions.
diff --git a/utils/C/openSeaChest/openSeaChest_Configure.c b/utils/C/openSeaChest/openSeaChest_Configure.c
@@ -33,7 +33,7 @@
 // Global Variables //
 ////////////////////////
 const char *util_name = "openSeaChest_Configure";
-const char *buildVersion = "2.4.1";
+const char *buildVersion = "2.4.2";
 
 ////////////////////////////
 // functions to declare //
@@ -2992,7 +2992,14 @@ int32_t main(int argc, char *argv[])
  double mCapacity = 0, capacity = 0;
  char mCapUnits[UNIT_STRING_LENGTH] = { 0 }, capUnits[UNIT_STRING_LENGTH] = { 0 };
  char* mCapUnit = &mCapUnits[0], * capUnit = &capUnits[0];
- mCapacity = C_CAST(double, deviceList[deviceIter].drive_info.deviceMaxLba * deviceList[deviceIter].drive_info.deviceBlockSize);
+ if (deviceList[deviceIter].drive_info.interface_type == USB_INTERFACE && deviceList[deviceIter].drive_info.bridge_info.isValid)
+ {
+ mCapacity = C_CAST(double, deviceList[deviceIter].drive_info.bridge_info.childDeviceMaxLba * deviceList[deviceIter].drive_info.bridge_info.childDeviceBlockSize);
+ }
+ else
+ {
+ mCapacity = C_CAST(double, deviceList[deviceIter].drive_info.deviceMaxLba * deviceList[deviceIter].drive_info.deviceBlockSize);
+ }
  capacity = mCapacity;
  metric_Unit_Convert(&mCapacity, &mCapUnit);
  capacity_Unit_Convert(&capacity, &capUnit);
@@ -3025,12 +3032,20 @@ int32_t main(int argc, char *argv[])
  switch (set_Max_LBA(&deviceList[deviceIter], 0, true))
  {
  case SUCCESS:
+ fill_Drive_Info_Data(&deviceList[deviceIter]);
  if (VERBOSITY_QUIET < toolVerbosity)
  {
  double mCapacity = 0, capacity = 0;
  char mCapUnits[UNIT_STRING_LENGTH] = { 0 }, capUnits[UNIT_STRING_LENGTH] = { 0 };
  char* mCapUnit = &mCapUnits[0], * capUnit = &capUnits[0];
- mCapacity = C_CAST(double, deviceList[deviceIter].drive_info.deviceMaxLba * deviceList[deviceIter].drive_info.deviceBlockSize);
+ if (deviceList[deviceIter].drive_info.interface_type == USB_INTERFACE && deviceList[deviceIter].drive_info.bridge_info.isValid)
+ {
+ mCapacity = C_CAST(double, deviceList[deviceIter].drive_info.bridge_info.childDeviceMaxLba * deviceList[deviceIter].drive_info.bridge_info.childDeviceBlockSize);
+ }
+ else
+ {
+ mCapacity = C_CAST(double, deviceList[deviceIter].drive_info.deviceMaxLba * deviceList[deviceIter].drive_info.deviceBlockSize);
+ }
  capacity = mCapacity;
  metric_Unit_Convert(&mCapacity, &mCapUnit);
  capacity_Unit_Convert(&capacity, &capUnit);

diff --git a/utils/C/openSeaChest/openSeaChest_Erase.c b/utils/C/openSeaChest/openSeaChest_Erase.c
@@ -47,7 +47,7 @@
 // Global Variables //
 ////////////////////////
 const char *util_name = "openSeaChest_Erase";
-const char *buildVersion = "4.3.1";
+const char *buildVersion = "4.3.2";
 
 typedef enum _eSeaChestEraseExitCodes
 {
@@ -1664,7 +1664,14 @@ int32_t main(int argc, char *argv[])
  double mCapacity = 0, capacity = 0;
  char mCapUnits[UNIT_STRING_LENGTH] = { 0 }, capUnits[UNIT_STRING_LENGTH] = { 0 };
  char* mCapUnit = &mCapUnits[0], * capUnit = &capUnits[0];
- mCapacity = C_CAST(double, deviceList[deviceIter].drive_info.deviceMaxLba * deviceList[deviceIter].drive_info.deviceBlockSize);
+ if (deviceList[deviceIter].drive_info.interface_type == USB_INTERFACE && deviceList[deviceIter].drive_info.bridge_info.isValid)
+ {
+ mCapacity = C_CAST(double, deviceList[deviceIter].drive_info.bridge_info.childDeviceMaxLba * deviceList[deviceIter].drive_info.bridge_info.childDeviceBlockSize);
+ }
+ else
+ {
+ mCapacity = C_CAST(double, deviceList[deviceIter].drive_info.deviceMaxLba * deviceList[deviceIter].drive_info.deviceBlockSize);
+ }
  capacity = mCapacity;
  metric_Unit_Convert(&mCapacity, &mCapUnit);
  capacity_Unit_Convert(&capacity, &capUnit);