diff options
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/src/init.rs | 6 | ||||
| -rw-r--r-- | kernel/src/init/acpi.rs | 1 | ||||
| -rw-r--r-- | kernel/src/io/input.rs | 1 | ||||
| -rw-r--r-- | kernel/src/io/output/render.rs | 1 | ||||
| -rw-r--r-- | kernel/src/io/output/serial/uart_16550.rs | 27 | ||||
| -rw-r--r-- | kernel/src/mm/addr.rs | 5 |
6 files changed, 28 insertions, 13 deletions
diff --git a/kernel/src/init.rs b/kernel/src/init.rs index cb125ba..18a6634 100644 --- a/kernel/src/init.rs +++ b/kernel/src/init.rs @@ -1,9 +1,7 @@ -use crate::init::cpu::int; - pub mod acpi; -pub mod earlyprintk; pub mod cpu; +pub mod earlyprintk; pub fn init() { - int::init(); + cpu::int::init(); } diff --git a/kernel/src/init/acpi.rs b/kernel/src/init/acpi.rs index e69de29..8b13789 100644 --- a/kernel/src/init/acpi.rs +++ b/kernel/src/init/acpi.rs @@ -0,0 +1 @@ + diff --git a/kernel/src/io/input.rs b/kernel/src/io/input.rs index e69de29..8b13789 100644 --- a/kernel/src/io/input.rs +++ b/kernel/src/io/input.rs @@ -0,0 +1 @@ + diff --git a/kernel/src/io/output/render.rs b/kernel/src/io/output/render.rs index e69de29..8b13789 100644 --- a/kernel/src/io/output/render.rs +++ b/kernel/src/io/output/render.rs @@ -0,0 +1 @@ + diff --git a/kernel/src/io/output/serial/uart_16550.rs b/kernel/src/io/output/serial/uart_16550.rs index 2df3668..d94398a 100644 --- a/kernel/src/io/output/serial/uart_16550.rs +++ b/kernel/src/io/output/serial/uart_16550.rs @@ -41,13 +41,24 @@ impl Uart16550 { ) -> Result<Self, Uart16550TtyError<PortIoAddress>> { let mut addrs = SerialPortAddress::iter(); - Ok(Self { - coms: array::try_from_fn(|i| { - config[i] - .take() - .map(|c| unsafe { Uart16550Tty::new_port(addrs.next().unwrap().into(), c) }) - .transpose() - })?, - }) + Ok( + Self { + coms: array::try_from_fn( + |i| { + config[i] + .take() + .map( + |c| unsafe { + Uart16550Tty::new_port( + addrs.next().unwrap().into(), + c, + ) + }, + ) + .transpose() + }, + )?, + }, + ) } } diff --git a/kernel/src/mm/addr.rs b/kernel/src/mm/addr.rs index 0e848a6..a56fb39 100644 --- a/kernel/src/mm/addr.rs +++ b/kernel/src/mm/addr.rs @@ -6,7 +6,10 @@ use bytemuck::{Pod, Zeroable}; static KERNEL_VIRTUAL_BASE: Atomic<PhysicalMemoryAddress> = Atomic::new(PhysicalMemoryAddress(0)); pub fn init(kernel_virtual_base: PhysicalMemoryAddress) { - KERNEL_VIRTUAL_BASE.store(kernel_virtual_base, Ordering::Relaxed); + KERNEL_VIRTUAL_BASE.store( + kernel_virtual_base, + Ordering::Relaxed, + ); } #[derive(Clone, Copy, Pod, Zeroable)] |