diff --git a/kernel/src/main.rs b/kernel/src/main.rs index cf9c80c..8351f18 100644 --- a/kernel/src/main.rs +++ b/kernel/src/main.rs @@ -48,7 +48,7 @@ pub extern "C" fn _start() -> ! { } //setup paging - /*unsafe { + unsafe { let table0 = PageTable::new(0x0); let table1 = PageTable::new(0x0040_0000); let table2 = PageTable::new(0x0080_0000); @@ -63,7 +63,7 @@ pub extern "C" fn _start() -> ! { PAGING.set_table(4, &table); PAGING.enable(); - }*/ + } unsafe { asm!("xchg bx, bx"); diff --git a/kernel/src/memory/paging.rs b/kernel/src/memory/paging.rs index 30e8789..bb6cda1 100644 --- a/kernel/src/memory/paging.rs +++ b/kernel/src/memory/paging.rs @@ -44,14 +44,4 @@ impl PageTable { table } - - pub fn test() -> Self { - let mut table = Self { entries: [0; 1024] }; - for i in 0..4 { - //0b011 (supervisor, write, present) - table.entries[i] = (((i * 0x1000) + 0x0050_0000) | 0b011) as u32; - } - - table - } } diff --git a/kernel/src/shell/shell.rs b/kernel/src/shell/shell.rs index 380d4fc..bc8513a 100644 --- a/kernel/src/shell/shell.rs +++ b/kernel/src/shell/shell.rs @@ -2,8 +2,6 @@ use crate::filesystem::fat::FAT; use crate::syscalls::print::PRINTER; -use crate::multitasking::task::Task; -use crate::multitasking::task::CPUState; use crate::multitasking::task::TASK_MANAGER; const APP_TARGET: u32 = 0x0050_0000;