nvme: mi: Convert ControllerInformationResponse to deku bits

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

Author: amboar

src/nvme/mi.rs

@@ -815,8 +815,14 @@ impl Encode<24> for TwoWirePortDataResponse {}
 struct ControllerInformationResponse {
     #[deku(pad_bytes_after = "4")]
     portid: u8,
-    prii: u8,
-    pri: u16,
+    #[deku(bits = "1", pad_bits_before = "7")]
+    prii_pcieriv: bool,
+    #[deku(bits = "8")]
+    pri_pcibn: u16,
+    #[deku(bits = "5")]
+    pri_pcidn: u16,
+    #[deku(bits = "3")]
+    pri_pcifn: u16,
     pcivid: u16,
     pcidid: u16,
     pcisvid: u16,

src/nvme/mi/dev.rs

@@ -797,8 +797,10 @@ impl RequestHandler for NvmeMiDataStructureRequest {
 
                 let ci = ControllerInformationResponse {
                     portid: ctlr.port.0,
-                    prii: 1,
-                    pri: pprt.b << 8 | pprt.d << 4 | pprt.f,
+                    prii_pcieriv: true,
+                    pri_pcibn: pprt.b,
+                    pri_pcidn: pprt.d,
+                    pri_pcifn: pprt.f,
                     pcivid: subsys.info.pci_vid,
                     pcidid: subsys.info.pci_did,
                     pcisvid: subsys.info.pci_svid,