diff --git a/bootloader/bios/stage2.asm b/bootloader/bios/stage2.asm index df09d5c..d069312 100644 --- a/bootloader/bios/stage2.asm +++ b/bootloader/bios/stage2.asm @@ -43,8 +43,6 @@ stage3.entry: xor eax, eax mov al, [disk] push eax - mov eax, 0x00 - push eax mov eax, [stage3 + 0x18] call eax diff --git a/bootloader/bootloader/src/os/bios/mod.rs b/bootloader/bootloader/src/os/bios/mod.rs index 97ffcee..61c6284 100644 --- a/bootloader/bootloader/src/os/bios/mod.rs +++ b/bootloader/bootloader/src/os/bios/mod.rs @@ -29,13 +29,6 @@ pub(crate) static VGA: Mutex = Mutex::new(unsafe { Vga::new(VGA_ADDR, 80, 2 #[no_mangle] pub unsafe extern "C" fn start( - _kernel_entry: extern "C" fn( - page_table: usize, - stack: u64, - func: u64, - args: *const KernelArgs, - long_mode: usize, - ) -> !, _boot_disk: usize, thunk10: extern "C" fn(), _thunk13: extern "C" fn(), @@ -69,14 +62,4 @@ pub unsafe extern "C" fn start( // let (page_phys, func, args) = crate::run_main(&mut os); panic!("kernel"); - - /* - kernel_entry( - page_phys, - args.stack_base + args.stack_size + crate::arch::x32::PHYS_OFFSET as u64, - func, - &args, - 0, - ); - */ }