diff options
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/src/arch/mod.rs | 1 | ||||
| -rw-r--r-- | kernel/src/arch/x86/io.rs (renamed from kernel/src/io.rs) | 0 | ||||
| -rw-r--r-- | kernel/src/arch/x86/mod.rs | 1 | ||||
| -rw-r--r-- | kernel/src/lib.rs | 5 | ||||
| -rw-r--r-- | kernel/src/serial.rs | 2 | ||||
| -rw-r--r-- | kernel/src/terminal.rs | 2 |
6 files changed, 7 insertions, 4 deletions
diff --git a/kernel/src/arch/mod.rs b/kernel/src/arch/mod.rs new file mode 100644 index 0000000..8581bb3 --- /dev/null +++ b/kernel/src/arch/mod.rs @@ -0,0 +1 @@ +pub(crate) mod x86; diff --git a/kernel/src/io.rs b/kernel/src/arch/x86/io.rs index a647408..a647408 100644 --- a/kernel/src/io.rs +++ b/kernel/src/arch/x86/io.rs diff --git a/kernel/src/arch/x86/mod.rs b/kernel/src/arch/x86/mod.rs new file mode 100644 index 0000000..af514a1 --- /dev/null +++ b/kernel/src/arch/x86/mod.rs @@ -0,0 +1 @@ +pub mod io; diff --git a/kernel/src/lib.rs b/kernel/src/lib.rs index b1c8cf2..c5e05a4 100644 --- a/kernel/src/lib.rs +++ b/kernel/src/lib.rs @@ -2,10 +2,11 @@ #![no_std] #![no_main] -use crate::terminal::Terminal; use core::panic::PanicInfo; -mod io; +use crate::terminal::Terminal; + +mod arch; mod serial; mod terminal; diff --git a/kernel/src/serial.rs b/kernel/src/serial.rs index 77c15cb..73cb247 100644 --- a/kernel/src/serial.rs +++ b/kernel/src/serial.rs @@ -1,4 +1,4 @@ -use crate::io::{in8, out8}; +use crate::arch::x86::io::{in8, out8}; use crate::serial::SerialError::SerialPortInitializationFailed; const COM1_PORT: u16 = 0x3F8; diff --git a/kernel/src/terminal.rs b/kernel/src/terminal.rs index 63c7d95..1045b09 100644 --- a/kernel/src/terminal.rs +++ b/kernel/src/terminal.rs @@ -1,4 +1,4 @@ -use crate::io; +use crate::arch::x86::io; use compiler_builtins::mem::memcpy; const VGA_BUFFER_POINTER: *mut u8 = 0xB8000 as *mut u8; |