4 files changed, 6 insertions, 4 deletions
diff --git a/src/machine/cgascr.rs b/src/machine/cgascr.rs
index 0983b66..634373c 100644
--- a/src/machine/cgascr.rs
+++ b/src/machine/cgascr.rs
@@ -1,4 +1,4 @@
-use crate::arch::x86_64::io_port::*;
+use crate::machine::device_io::*;
 use crate::arch::x86_64::misc::*;
 use core::{fmt, ptr, slice, str};
 
diff --git a/src/machine/device_io.rs b/src/machine/device_io.rs
new file mode 100644
index 0000000..4573653
--- /dev/null
+++ b/src/machine/device_io.rs
@@ -0,0 +1,2 @@
+#[cfg(target_arch = "x86_64")]
+pub use crate::arch::x86_64::io_port::*;
diff --git a/src/machine/keyctrl.rs b/src/machine/keyctrl.rs
index 14e7aa4..93bd419 100644
--- a/src/machine/keyctrl.rs
+++ b/src/machine/keyctrl.rs
@@ -1,9 +1,8 @@
 use self::super::kbd_defs::*;
 use self::super::key::*;
-use crate::arch::x86_64::io_port::*;
+use crate::machine::device_io::*;
 
-// this is the driver for keyboard controller
-// not to confuse with the keyboard module.
+// this is the driver for keyboard controller not to confuse with the keyboard module.
 // The later is an abstraction
 // This one serves a the HW driver
 
diff --git a/src/machine/mod.rs b/src/machine/mod.rs
index c6f6fec..a9cf4cb 100644
--- a/src/machine/mod.rs
+++ b/src/machine/mod.rs
@@ -5,5 +5,6 @@ pub mod key;
 pub mod keyctrl;
 pub mod mem;
 pub mod plugbox;
+pub mod device_io;
 
 // TODO: this module *should* be arch independent.