nvme: mi: Convert NvmSubsystemHealthDataStructureResponse to FlagSet

Signed-off-by: Andrew Jeffery <andrew@codeconstruct.com.au>

Author: amboar

src/nvme/mi.rs

@@ -507,12 +507,32 @@ flags! {
     }
 }
 
+// MI v2.0, 5.6, Figure 108, SW
+flags! {
+    pub enum SmartWarningFlags: u8 {
+        Ascbt,
+        Ttc,
+        Ndr,
+        Amro,
+        Vmbf,
+        Pmrro,
+    }
+}
+
+impl From<FlagSet<super::CriticalWarningFlags>> for WireFlagSet<SmartWarningFlags> {
+    fn from(value: FlagSet<super::CriticalWarningFlags>) -> Self {
+        FlagSet::<SmartWarningFlags>::new((!value.bits()) & 0x3f)
+            .expect("Undefined bits set")
+            .into()
+    }
+}
+
 // MI v2.0, 5.6, Figure 108
 #[derive(Debug, DekuRead, DekuWrite)]
 #[deku(endian = "little")]
 struct NvmSubsystemHealthDataStructureResponse {
     nss: WireFlagSet<NvmSubsystemStatusFlags>,
-    sw: u8,
+    sw: WireFlagSet<SmartWarningFlags>,
     ctemp: u8,
     pldu: u8,
 }

src/nvme/mi/dev.rs

@@ -234,13 +234,26 @@ impl RequestHandler for NvmeMiCommandRequestHeader {
                         flags
                     }
                     .into(),
-                    #[allow(clippy::nonminimal_bool)]
-                    sw: (!false as u8) << 5 // PMRRO
-                        | (!false as u8) << 4 // VMBF
-                        | (!ctlr.ro as u8) << 3 // AMRO
-                        | (!ctlr.ro as u8) << 2 // NDR
-                        | (!(ctlr.temp_range.lower <= ctlr.temp && ctlr.temp <= ctlr.temp_range.upper) as u8) << 1 // TTC
-                        | (!((100 * ctlr.spare / ctlr.capacity) < ctlr.spare_range.lower) as u8),
+                    sw: {
+                        let mut flags = FlagSet::full();
+
+                        if ctlr.ro {
+                            flags -= super::SmartWarningFlags::Amro;
+                            flags -= super::SmartWarningFlags::Ndr;
+                        }
+
+                        if ctlr.temp_range.lower <= ctlr.temp && ctlr.temp <= ctlr.temp_range.upper
+                        {
+                            flags -= super::SmartWarningFlags::Ttc;
+                        }
+
+                        if (100 * ctlr.spare / ctlr.capacity) < ctlr.spare_range.lower {
+                            flags -= super::SmartWarningFlags::Ascbt;
+                        }
+
+                        flags
+                    }
+                    .into(),
                     ctemp: ctemp as u8,
                     pldu: pdlu as u8,
                 }