Skip to content

Commit 9b53329

Browse files
committed
Refactor MsiCapability
1 parent 8f8138f commit 9b53329

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

src/capability/msi.rs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -84,34 +84,34 @@ impl MsiCapability {
8484
}
8585

8686
/// Is MSI capability enabled?
87-
pub fn is_enabled<T: ConfigRegionAccess>(&self, access: &T) -> bool {
87+
pub fn is_enabled(&self, access: &impl ConfigRegionAccess) -> bool {
8888
let reg = unsafe { access.read(self.address.address, self.address.offset) };
8989
reg.get_bit(0)
9090
}
9191

9292
/// Enable or disable MSI capability
93-
pub fn set_enabled<T: ConfigRegionAccess>(&self, enabled: bool, access: &T) {
93+
pub fn set_enabled(&self, enabled: bool, access: &impl ConfigRegionAccess) {
9494
let mut reg = unsafe { access.read(self.address.address, self.address.offset) };
9595
reg.set_bit(0, enabled);
9696
unsafe { access.write(self.address.address, self.address.offset, reg) };
9797
}
9898

9999
/// Set how much interrupts the device will use. If requested count is bigger than supported count,
100100
/// the second will be used.
101-
pub fn set_multiple_message_enable<T: ConfigRegionAccess>(
101+
pub fn set_multiple_message_enable(
102102
&self,
103103
data: MultipleMessageSupport,
104-
access: &T,
104+
access: &impl ConfigRegionAccess,
105105
) {
106106
let mut reg = unsafe { access.read(self.address.address, self.address.offset) };
107107
reg.set_bits(4..7, (data.min(self.multiple_message_capable)) as u32);
108108
unsafe { access.write(self.address.address, self.address.offset, reg) };
109109
}
110110

111111
/// Return how much interrupts the device is using
112-
pub fn get_multiple_message_enable<T: ConfigRegionAccess>(
112+
pub fn get_multiple_message_enable(
113113
&self,
114-
access: &T,
114+
access: &impl ConfigRegionAccess,
115115
) -> MultipleMessageSupport {
116116
let reg = unsafe { access.read(self.address.address, self.address.offset) };
117117
MultipleMessageSupport::try_from(reg.get_bits(4..7) as u8)
@@ -125,12 +125,12 @@ impl MsiCapability {
125125
/// * `vector` - Which interrupt vector should be triggered on LAPIC
126126
/// * `trigger_mode` - When interrupt should be triggered
127127
/// * `access` - PCI Configuration Space accessor
128-
pub fn set_message_info<T: ConfigRegionAccess>(
128+
pub fn set_message_info(
129129
&self,
130130
address: u32,
131131
vector: u8,
132132
trigger_mode: TriggerMode,
133-
access: &T,
133+
access: &impl ConfigRegionAccess,
134134
) {
135135
unsafe { access.write(self.address.address, self.address.offset + 0x4, address) }
136136
let data_offset = if self.is_64bit { 0xC } else { 0x8 };
@@ -152,7 +152,7 @@ impl MsiCapability {
152152
/// # Note
153153
/// Only supported on when device supports 64-bit addressing and per-vector masking. Otherwise
154154
/// returns `0`
155-
pub fn get_message_mask<T: ConfigRegionAccess>(&self, access: &T) -> u32 {
155+
pub fn get_message_mask(&self, access: &impl ConfigRegionAccess) -> u32 {
156156
if self.is_64bit && self.per_vector_masking {
157157
unsafe { access.read(self.address.address, self.address.offset + 0x10) }
158158
} else {
@@ -165,7 +165,7 @@ impl MsiCapability {
165165
/// # Note
166166
/// Only supported on when device supports 64-bit addressing and per-vector masking. Otherwise
167167
/// will do nothing
168-
pub fn set_message_mask<T: ConfigRegionAccess>(&self, access: &T, mask: u32) {
168+
pub fn set_message_mask(&self, access: &impl ConfigRegionAccess, mask: u32) {
169169
if self.is_64bit && self.per_vector_masking {
170170
unsafe { access.write(self.address.address, self.address.offset + 0x10, mask) }
171171
}
@@ -175,7 +175,7 @@ impl MsiCapability {
175175
///
176176
/// # Note
177177
/// Only supported on when device supports 64-bit addressing. Otherwise will return `0`
178-
pub fn get_pending<T: ConfigRegionAccess>(&self, access: &T) -> u32 {
178+
pub fn get_pending(&self, access: &impl ConfigRegionAccess) -> u32 {
179179
if self.is_64bit {
180180
unsafe { access.read(self.address.address, self.address.offset + 0x14) }
181181
} else {

0 commit comments

Comments
 (0)