From c58b89299d6a6895ac04fe5e1b6b8c9c11a612ed Mon Sep 17 00:00:00 2001 From: juls0730 <62722391+juls0730@users.noreply.github.com> Date: Sat, 25 Nov 2023 23:11:03 -0600 Subject: [PATCH] small fixes --- src/arch/x86_64/interrupts/mod.rs | 2 +- src/main.rs | 5 ----- src/usr/tty.rs | 18 +++++++++--------- 3 files changed, 10 insertions(+), 15 deletions(-) diff --git a/src/arch/x86_64/interrupts/mod.rs b/src/arch/x86_64/interrupts/mod.rs index 1d1e0df..10c0dbe 100755 --- a/src/arch/x86_64/interrupts/mod.rs +++ b/src/arch/x86_64/interrupts/mod.rs @@ -114,7 +114,7 @@ fn idt_init() { } #[naked] -pub extern "C" fn syscall(func: extern "C" fn()) { +pub extern "C" fn syscall() { unsafe { core::arch::asm!( "push rdi", diff --git a/src/main.rs b/src/main.rs index f478ccc..8ad2fac 100755 --- a/src/main.rs +++ b/src/main.rs @@ -46,11 +46,6 @@ pub extern "C" fn _start() -> ! { .label_bytes() ); - let asd: u32 = 0xdeadbeef; - unsafe { - *(asd as *mut u64) = 12; - }; - usr::shell::init_shell(); hcf(); diff --git a/src/usr/tty.rs b/src/usr/tty.rs index 1e86d01..5d7b792 100755 --- a/src/usr/tty.rs +++ b/src/usr/tty.rs @@ -77,17 +77,17 @@ impl Console { back_buffer.pointer = back_buffer_region.unwrap(); - let row_size = back_buffer.pitch / (back_buffer.bpp / 8); + // let row_size = back_buffer.pitch / (back_buffer.bpp / 8); - let screen_size = row_size * back_buffer.height; + // let screen_size = row_size * back_buffer.height; - unsafe { - core::ptr::write_bytes::( - back_buffer.pointer as *mut u32, - 0x000000, - screen_size, - ); - } + // unsafe { + // core::ptr::write_bytes::( + // back_buffer.pointer as *mut u32, + // 0x000000, + // screen_size, + // ); + // } (*self.second_buffer.lock().write()) = Some(back_buffer); }