From 52d1c0fb4fee59da2978d4d06a56d553ac84eb32 Mon Sep 17 00:00:00 2001
From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Date: Sun, 16 Jun 2024 15:19:14 +0200
Subject: [PATCH] pcid: Move FullDeviceId from pci to driver_interface

---
 pcid/src/config.rs                       | 2 +-
 pcid/src/{pci => driver_interface}/id.rs | 0
 pcid/src/driver_interface/mod.rs         | 4 +++-
 pcid/src/main.rs                         | 4 ++--
 pcid/src/pci/mod.rs                      | 2 --
 5 files changed, 6 insertions(+), 6 deletions(-)
 rename pcid/src/{pci => driver_interface}/id.rs (100%)

diff --git a/pcid/src/config.rs b/pcid/src/config.rs
index df82e437d4..8278f33c3c 100644
--- a/pcid/src/config.rs
+++ b/pcid/src/config.rs
@@ -3,7 +3,7 @@ use std::ops::Range;
 
 use serde::Deserialize;
 
-use crate::pci::FullDeviceId;
+use crate::driver_interface::FullDeviceId;
 
 #[derive(Clone, Debug, Default, Deserialize)]
 pub struct Config {
diff --git a/pcid/src/pci/id.rs b/pcid/src/driver_interface/id.rs
similarity index 100%
rename from pcid/src/pci/id.rs
rename to pcid/src/driver_interface/id.rs
diff --git a/pcid/src/driver_interface/mod.rs b/pcid/src/driver_interface/mod.rs
index b0e33cee4d..815af7bc84 100644
--- a/pcid/src/driver_interface/mod.rs
+++ b/pcid/src/driver_interface/mod.rs
@@ -11,8 +11,10 @@ use thiserror::Error;
 
 pub use crate::pci::cap::VendorSpecificCapability;
 pub use crate::pci::msi;
-pub use crate::pci::{FullDeviceId, PciAddress, PciBar};
+pub use crate::pci::{PciAddress, PciBar};
+pub use id::FullDeviceId;
 
+mod id;
 pub mod irq_helpers;
 
 #[derive(Clone, Copy, Debug, Serialize, Deserialize)]
diff --git a/pcid/src/main.rs b/pcid/src/main.rs
index 87280eda73..d54089a243 100644
--- a/pcid/src/main.rs
+++ b/pcid/src/main.rs
@@ -13,8 +13,8 @@ use structopt::StructOpt;
 
 use crate::cfg_access::Pcie;
 use crate::config::Config;
-use crate::driver_interface::LegacyInterruptLine;
-use crate::pci::{FullDeviceId, PciBar};
+use crate::driver_interface::{FullDeviceId, LegacyInterruptLine};
+use crate::pci::PciBar;
 
 mod cfg_access;
 mod config;
diff --git a/pcid/src/pci/mod.rs b/pcid/src/pci/mod.rs
index 2db9368d9b..5507cea877 100644
--- a/pcid/src/pci/mod.rs
+++ b/pcid/src/pci/mod.rs
@@ -1,8 +1,6 @@
 pub use self::bar::PciBar;
-pub use self::id::FullDeviceId;
 pub use pci_types::PciAddress;
 
 mod bar;
 pub mod cap;
-mod id;
 pub mod msi;