AbleOS
/
ableos
2
1
Fork 9
Code Issues 1 Pull Requests Projects Releases Wiki Activity

remove redundant comment bb

pull/11/head
able 2023-10-25 08:36:12 -05:00
parent fb0f7df5db
commit 25fbabf0b9
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
kernel/src/arch/x86_64/graphics.rs
View File

@ -25,7 +25,6 @@ pub static DISPLAY: Lazy<Mutex<Display>> = Lazy::new(|| {
let m = Mutex::new(Display { let m = Mutex::new(Display {
fb: fb1.address.as_ptr().unwrap().cast(), fb: fb1.address.as_ptr().unwrap().cast(),
// bb: fb1.address.as_ptr().unwrap().cast(),
bb: back_buffer.as_slice().as_ptr() as *mut u32, bb: back_buffer.as_slice().as_ptr() as *mut u32,
size: Size::new(fb1.width as u32, fb1.height as u32), size: Size::new(fb1.width as u32, fb1.height as u32),
color: Rgb888::WHITE, color: Rgb888::WHITE,

17
kernel/src/holeybytes/mod.rs
View File

@ -9,7 +9,7 @@ use {
}, },
Vm, VmRunError, VmRunOk, Vm, VmRunError, VmRunOk,
}, },
log::{debug, info, trace, warn}, log::{debug, error, info, trace, warn},
}; };
const TIMER_QUOTIENT: usize = 100; const TIMER_QUOTIENT: usize = 100;
@ -60,8 +60,8 @@ Register dump: {:?}",
let r254 = self.vm.registers[254]; let r254 = self.vm.registers[254];
let r253 = self.vm.registers[253]; let r253 = self.vm.registers[253];
log::debug!("Ecall number {:?}", r255); debug!("Ecall number {:?}", r255);
log::trace!("Register dump: {:?}", self.vm.registers); trace!("Register dump: {:?}", self.vm.registers);
match r255.cast::<u64>() { match r255.cast::<u64>() {
0 => { 0 => {
@ -114,11 +114,16 @@ Register dump: {:?}",
let buffer_id = unsafe { r254.u64 }; let buffer_id = unsafe { r254.u64 };
let mem_addr = unsafe { r253.u64 }; let mem_addr = unsafe { r253.u64 };
let length = unsafe { r252.u64 as usize }; let length = unsafe { r252.u64 as usize };
trace!("{:?}", mem_addr); trace!("IPC address: {:?}", mem_addr);
use alloc::vec::Vec; use alloc::vec::Vec;
if buffer_id == 1 { match buffer_id {
info!("Logging") 1 => {
error!("Logging via IPC isn't quite ready")
}
buffer_id => {
info!("Message has been sent to {}", buffer_id)
}
} }
} }
// 4 // 4