From 6d15fbba75b6f1422fbfe42cbbd2cda474f1fbb4 Mon Sep 17 00:00:00 2001
From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Date: Sun, 16 Jun 2024 15:23:32 +0200
Subject: [PATCH] pcid: Move msi from pci to driver_interface

---
 pcid/src/driver_interface/irq_helpers.rs  | 4 ++--
 pcid/src/driver_interface/mod.rs          | 4 ++--
 pcid/src/{pci => driver_interface}/msi.rs | 0
 pcid/src/lib.rs                           | 1 -
 pcid/src/main.rs                          | 1 -
 pcid/src/pci/mod.rs                       | 3 ---
 6 files changed, 4 insertions(+), 9 deletions(-)
 rename pcid/src/{pci => driver_interface}/msi.rs (100%)
 delete mode 100644 pcid/src/pci/mod.rs

diff --git a/pcid/src/driver_interface/irq_helpers.rs b/pcid/src/driver_interface/irq_helpers.rs
index 9d7615a285..2624be2951 100644
--- a/pcid/src/driver_interface/irq_helpers.rs
+++ b/pcid/src/driver_interface/irq_helpers.rs
@@ -8,7 +8,7 @@ use std::fs::{self, File};
 use std::io::{self, prelude::*};
 use std::num::NonZeroU8;
 
-use crate::pci::msi::MsiAddrAndData;
+use crate::driver_interface::msi::MsiAddrAndData;
 
 /// Read the local APIC ID of the bootstrap processor.
 pub fn read_bsp_apic_id() -> io::Result<usize> {
@@ -180,7 +180,7 @@ pub fn allocate_single_interrupt_vector(cpu_id: usize) -> io::Result<Option<(u8,
 
 #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
 pub fn allocate_single_interrupt_vector_for_msi(cpu_id: usize) -> (MsiAddrAndData, File) {
-    use crate::pci::msi::x86 as x86_msix;
+    use crate::driver_interface::msi::x86 as x86_msix;
 
     // FIXME for cpu_id >255 we need to use the IOMMU to use IRQ remapping
     let lapic_id = u8::try_from(cpu_id).expect("CPU id couldn't fit inside u8");
diff --git a/pcid/src/driver_interface/mod.rs b/pcid/src/driver_interface/mod.rs
index 58bdcdd054..fd9792a270 100644
--- a/pcid/src/driver_interface/mod.rs
+++ b/pcid/src/driver_interface/mod.rs
@@ -9,16 +9,16 @@ use std::os::unix::io::{FromRawFd, RawFd};
 use serde::{de::DeserializeOwned, Deserialize, Serialize};
 use thiserror::Error;
 
-pub use crate::pci::msi;
-pub use crate::pci::PciAddress;
 pub use bar::PciBar;
 pub use cap::VendorSpecificCapability;
 pub use id::FullDeviceId;
+pub use pci_types::PciAddress;
 
 mod bar;
 pub mod cap;
 mod id;
 pub mod irq_helpers;
+pub mod msi;
 
 #[derive(Clone, Copy, Debug, Serialize, Deserialize)]
 pub struct LegacyInterruptLine(pub(crate) u8);
diff --git a/pcid/src/pci/msi.rs b/pcid/src/driver_interface/msi.rs
similarity index 100%
rename from pcid/src/pci/msi.rs
rename to pcid/src/driver_interface/msi.rs
diff --git a/pcid/src/lib.rs b/pcid/src/lib.rs
index bf750605da..312a886cf5 100644
--- a/pcid/src/lib.rs
+++ b/pcid/src/lib.rs
@@ -1,5 +1,4 @@
 //! Interface to `pcid`.
 
 mod driver_interface;
-mod pci;
 pub use driver_interface::*;
diff --git a/pcid/src/main.rs b/pcid/src/main.rs
index c7e0e644e1..7a6df7d091 100644
--- a/pcid/src/main.rs
+++ b/pcid/src/main.rs
@@ -19,7 +19,6 @@ mod cfg_access;
 mod config;
 mod driver_handler;
 mod driver_interface;
-mod pci;
 
 #[derive(StructOpt)]
 #[structopt(about)]
diff --git a/pcid/src/pci/mod.rs b/pcid/src/pci/mod.rs
deleted file mode 100644
index 6b6b3739f9..0000000000
--- a/pcid/src/pci/mod.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-pub use pci_types::PciAddress;
-
-pub mod msi;