Fix bit offsets in MSI capability

Author: IsaacWoods

src/capability/msi.rs

@@ -59,9 +59,8 @@ impl MsiCapability {
             address,
             per_vector_masking: control.get_bit(8),
             is_64bit: control.get_bit(7),
-            multiple_message_capable:
-                MultipleMessageSupport::try_from(control.get_bits(1..4) as u8)
-                    .unwrap_or(MultipleMessageSupport::Int1),
+            multiple_message_capable: MultipleMessageSupport::try_from(control.get_bits(1..4) as u8)
+                .unwrap_or(MultipleMessageSupport::Int1),
         }
     }
 
@@ -83,39 +82,36 @@ impl MsiCapability {
         self.multiple_message_capable
     }
 
+    pub fn ctrl(&self, access: &impl ConfigRegionAccess) -> u32 {
+        let reg = unsafe { access.read(self.address.address, self.address.offset) };
+        reg
+    }
+
     /// Is MSI capability enabled?
     pub fn is_enabled(&self, access: &impl ConfigRegionAccess) -> bool {
         let reg = unsafe { access.read(self.address.address, self.address.offset) };
-        reg.get_bit(0)
+        reg.get_bit(16)
     }
 
     /// Enable or disable MSI capability
     pub fn set_enabled(&self, enabled: bool, access: &impl ConfigRegionAccess) {
         let mut reg = unsafe { access.read(self.address.address, self.address.offset) };
-        reg.set_bit(0, enabled);
+        reg.set_bit(16, enabled);
         unsafe { access.write(self.address.address, self.address.offset, reg) };
     }
 
     /// Set how many interrupts the device will use. If requested count is bigger than supported count,
     /// the second will be used.
-    pub fn set_multiple_message_enable(
-        &self,
-        data: MultipleMessageSupport,
-        access: &impl ConfigRegionAccess,
-    ) {
+    pub fn set_multiple_message_enable(&self, data: MultipleMessageSupport, access: &impl ConfigRegionAccess) {
         let mut reg = unsafe { access.read(self.address.address, self.address.offset) };
         reg.set_bits(4..7, (data.min(self.multiple_message_capable)) as u32);
         unsafe { access.write(self.address.address, self.address.offset, reg) };
     }
 
     /// Return how many interrupts the device is using
-    pub fn get_multiple_message_enable(
-        &self,
-        access: &impl ConfigRegionAccess,
-    ) -> MultipleMessageSupport {
+    pub fn get_multiple_message_enable(&self, access: &impl ConfigRegionAccess) -> MultipleMessageSupport {
         let reg = unsafe { access.read(self.address.address, self.address.offset) };
-        MultipleMessageSupport::try_from(reg.get_bits(4..7) as u8)
-            .unwrap_or(MultipleMessageSupport::Int1)
+        MultipleMessageSupport::try_from(reg.get_bits(4..7) as u8).unwrap_or(MultipleMessageSupport::Int1)
     }
 
     /// Set where the interrupts will be sent to
@@ -134,17 +130,10 @@ impl MsiCapability {
     ) {
         unsafe { access.write(self.address.address, self.address.offset + 0x4, address) }
         let data_offset = if self.is_64bit { 0xC } else { 0x8 };
-        let mut data =
-            unsafe { access.read(self.address.address, self.address.offset + data_offset) };
+        let mut data = unsafe { access.read(self.address.address, self.address.offset + data_offset) };
         data.set_bits(0..8, vector as u32);
         data.set_bits(14..16, trigger_mode as u32);
-        unsafe {
-            access.write(
-                self.address.address,
-                self.address.offset + data_offset,
-                data,
-            )
-        }
+        unsafe { access.write(self.address.address, self.address.offset + data_offset, data) }
     }
 
     /// Get interrupt mask