pcid: Move PciBar from pci to driver_interface

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;
 

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;

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;

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};