Move PciHeader out of the pcid_interface crate

pcid/src/main.rs

@@ -11,14 +11,16 @@ use redox_log::{OutputBuilder, RedoxLogger};
 
 use crate::cfg_access::Pcie;
 use crate::config::Config;
-use crate::pci::{CfgAccess, PciAddress, PciBar, PciClass, PciFunc, PciHeader, PciHeaderError, PciHeaderType};
+use crate::pci::{CfgAccess, PciAddress, PciBar, PciClass, PciFunc};
 use crate::pci::cap::Capability as PciCapability;
 use crate::pci::func::{ConfigReader, ConfigWriter};
+use crate::pci_header::{PciHeader, PciHeaderError, PciHeaderType};
 
 mod cfg_access;
 mod config;
 mod driver_interface;
 mod pci;
+mod pci_header;
 
 #[derive(StructOpt)]
 #[structopt(about)]

pcid/src/pci/mod.rs

@@ -6,14 +6,12 @@ use serde::{Deserialize, Serialize};
 pub use self::bar::PciBar;
 pub use self::class::PciClass;
 pub use self::func::PciFunc;
-pub use self::header::{PciHeader, PciHeaderError, PciHeaderType};
 pub use self::id::FullDeviceId;
 
 mod bar;
 pub mod cap;
 mod class;
 pub mod func;
-pub mod header;
 mod id;
 pub mod msi;
 

pcid/src/pci_header.rs

@@ -2,10 +2,8 @@ use bitflags::bitflags;
 use byteorder::{ByteOrder, LittleEndian};
 use serde::{Deserialize, Serialize};
 
-use super::bar::PciBar;
-use super::class::PciClass;
-use super::func::ConfigReader;
-use super::id::FullDeviceId;
+use crate::pci::{FullDeviceId, PciBar, PciClass};
+use crate::pci::func::ConfigReader;
 
 #[derive(Debug, PartialEq)]
 pub enum PciHeaderError {
@@ -38,6 +36,7 @@ pub struct SharedPciHeader {
     header_type: PciHeaderType,
 }
 
+// FIXME move out of pcid_interface
 #[derive(Clone, Copy, Debug, PartialEq, Serialize, Deserialize)]
 pub enum PciHeader {
     General {
@@ -297,9 +296,8 @@ impl<'a> ConfigReader for &'a [u8] {
 #[cfg(test)]
 mod test {
     use super::{PciHeaderError, PciHeader, PciHeaderType};
-    use super::super::func::ConfigReader;
-    use super::super::class::PciClass;
-    use super::super::bar::PciBar;
+    use crate::pci::func::ConfigReader;
+    use crate::pci::{PciBar, PciClass};
 
     const IGB_DEV_BYTES: [u8; 256] = [
         0x86, 0x80, 0x33, 0x15, 0x07, 0x04, 0x10, 0x00, 0x03, 0x00, 0x00, 0x02, 0x10, 0x00, 0x00, 0x00,