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

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

diff --git a/pcid/src/pci/bar.rs b/pcid/src/driver_interface/bar.rs
similarity index 100%
rename from pcid/src/pci/bar.rs
rename to pcid/src/driver_interface/bar.rs
diff --git a/pcid/src/driver_interface/mod.rs b/pcid/src/driver_interface/mod.rs
index 815af7bc84..25f97fe738 100644
--- a/pcid/src/driver_interface/mod.rs
+++ b/pcid/src/driver_interface/mod.rs
@@ -11,9 +11,11 @@ use thiserror::Error;
 
 pub use crate::pci::cap::VendorSpecificCapability;
 pub use crate::pci::msi;
-pub use crate::pci::{PciAddress, PciBar};
+pub use crate::pci::PciAddress;
+pub use bar::PciBar;
 pub use id::FullDeviceId;
 
+mod bar;
 mod id;
 pub mod irq_helpers;
 
diff --git a/pcid/src/main.rs b/pcid/src/main.rs
index d54089a243..c7e0e644e1 100644
--- a/pcid/src/main.rs
+++ b/pcid/src/main.rs
@@ -13,8 +13,7 @@ use structopt::StructOpt;
 
 use crate::cfg_access::Pcie;
 use crate::config::Config;
-use crate::driver_interface::{FullDeviceId, LegacyInterruptLine};
-use crate::pci::PciBar;
+use crate::driver_interface::{FullDeviceId, LegacyInterruptLine, PciBar};
 
 mod cfg_access;
 mod config;
diff --git a/pcid/src/pci/mod.rs b/pcid/src/pci/mod.rs
index 5507cea877..f8b0ef4997 100644
--- a/pcid/src/pci/mod.rs
+++ b/pcid/src/pci/mod.rs
@@ -1,6 +1,4 @@
-pub use self::bar::PciBar;
 pub use pci_types::PciAddress;
 
-mod bar;
 pub mod cap;
 pub mod msi;
diff --git a/pcid/src/pci/msi.rs b/pcid/src/pci/msi.rs
index f477737c3c..0a625d53e0 100644
--- a/pcid/src/pci/msi.rs
+++ b/pcid/src/pci/msi.rs
@@ -1,6 +1,6 @@
 use std::fmt;
 
-use super::bar::PciBar;
+use crate::driver_interface::PciBar;
 
 use serde::{Deserialize, Serialize};
 use syscall::{Io, Mmio};