//
//  SOS: the Stupid Operating System
//  by Hawk Weisman (hi@hawkweisman.me)
//
//  Copyright (c) 2015 Hawk Weisman
//  Released under the terms of the MIT license. See `LICENSE` in the root
//  directory of this repository for more information.
//
//! Code for interacting with the x86 CPU.
//!
//! Currently this module contains a quick implementation of CPU port
//! input and output, and little else.
//!

#[path = "../x86_all/cpu.rs"] mod cpu_all;
#[path = "../x86_all/pics.rs"] pub mod pics;

pub use self::cpu_all::*;

//
//  SOS: the Stupid Operating System
//  by Hawk Weisman (hi@hawkweisman.me)
//
//  Copyright (c) 2015 Hawk Weisman
//  Released under the terms of the MIT license. See `LICENSE` in the root
//  directory of this repository for more information.
//
//! Code for interacting with the x86 CPU.
//!
//! Currently this module contains a quick implementation of CPU port
//! input and output, and little else.
//!

#[path = "../x86_all/cpu.rs"] mod cpu_all;
#[path = "../x86_all/pic.rs"] mod pic;

pub use self::cpu_all::*;
pub use self::pic::{IRQ, PICS};

--- 
+++ 
@@ -13,7 +13,6 @@
 //!
 
 #[path = "../x86_all/cpu.rs"] mod cpu_all;
-#[path = "../x86_all/pic.rs"] mod pic;
+#[path = "../x86_all/pics.rs"] pub mod pics;
 
 pub use self::cpu_all::*;
-pub use self::pic::{IRQ, PICS};
Fix import of 32-bit PIC module
