use type InterruptLine to specify the interrupt number

hermit-os · May 14, 2023 · 9d8f8e8 · 9d8f8e8
1 parent 968752e
commit 9d8f8e8
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 7 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/drivers/fs/virtio_fs.rs b/src/drivers/fs/virtio_fs.rs
@@ -2,6 +2,8 @@ use alloc::rc::Rc;
 use alloc::string::{String, ToString};
 use alloc::vec::Vec;
 
+use pci_types::InterruptLine;
+
 use self::constants::{FeatureSet, Features};
 use crate::config::VIRTIO_MAX_QUEUE_SIZE;
 #[cfg(feature = "pci")]
@@ -37,7 +39,7 @@ pub(crate) struct VirtioFsDriver {
 	pub(super) notif_cfg: NotifCfg,
 	pub(super) vqueues: Vec<Rc<Virtq>>,
 	pub(super) ready_queue: Vec<BufferToken>,
-	pub(super) irq: u8,
+	pub(super) irq: InterruptLine,
 }
 
 // Backend-independent interface for Virtio network driver

diff --git a/src/drivers/net/rtl8139.rs b/src/drivers/net/rtl8139.rs
@@ -6,7 +6,7 @@ use alloc::boxed::Box;
 use alloc::vec::Vec;
 use core::mem;
 
-use pci_types::{Bar, MAX_BARS};
+use pci_types::{Bar, InterruptLine, MAX_BARS};
 use x86::io::*;
 
 use crate::arch::kernel::core_local::increment_irq_counter;
@@ -204,7 +204,7 @@ pub enum RTL8139Error {
 pub(crate) struct RTL8139Driver {
 	iobase: u16,
 	mtu: u16,
-	irq: u8,
+	irq: InterruptLine,
 	mac: [u8; 6],
 	tx_in_use: [bool; NO_TX_BUFFERS],
 	tx_counter: usize,

diff --git a/src/drivers/net/virtio_net.rs b/src/drivers/net/virtio_net.rs
@@ -11,6 +11,7 @@ use core::cmp::Ordering;
 use core::mem;
 use core::result::Result;
 
+use pci_types::InterruptLine;
 use zerocopy::AsBytes;
 
 use self::constants::{FeatureSet, Features, NetHdrGSO, Status, MAX_NUM_VQ};
@@ -497,7 +498,7 @@ pub(crate) struct VirtioNetDriver {
 	pub(super) send_vqs: TxQueues,
 
 	pub(super) num_vqs: u16,
-	pub(super) irq: u8,
+	pub(super) irq: InterruptLine,
 	pub(super) polling_mode_counter: u32,
 }
 

diff --git a/src/drivers/pci.rs b/src/drivers/pci.rs
@@ -5,7 +5,8 @@ use core::fmt;
 
 use hermit_sync::{without_interrupts, InterruptTicketMutex};
 use pci_types::{
-	Bar, ConfigRegionAccess, DeviceId, EndpointHeader, PciAddress, PciHeader, VendorId, MAX_BARS,
+	Bar, ConfigRegionAccess, DeviceId, EndpointHeader, InterruptLine, PciAddress, PciHeader,
+	VendorId, MAX_BARS,
 };
 
 use crate::arch::mm::{PhysAddr, VirtAddr};
@@ -212,7 +213,7 @@ impl<T: ConfigRegionAccess> PciDevice<T> {
 		Some((virtual_address, size))
 	}
 
-	pub fn irq(&self) -> Option<u8> {
+	pub fn irq(&self) -> Option<InterruptLine> {
 		let header = PciHeader::new(self.address);
 		if let Some(endpoint) = EndpointHeader::from_header(header, &self.access) {
 			let (_pin, line) = endpoint.interrupt(&self.access);