From fa328add4265d8eeaf72369a0e9913cc4cabb25d Mon Sep 17 00:00:00 2001
From: able <abl3theabove@gmail.com>
Date: Wed, 25 Oct 2023 08:36:12 -0500
Subject: [PATCH] remove redundant comment bb
---
kernel/src/arch/x86_64/graphics.rs | 1 -
kernel/src/holeybytes/mod.rs | 17 +++++++++++------
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/kernel/src/arch/x86_64/graphics.rs b/kernel/src/arch/x86_64/graphics.rs
index 18476ed..2b8ca57 100644
--- a/kernel/src/arch/x86_64/graphics.rs
+++ b/kernel/src/arch/x86_64/graphics.rs
@@ -25,7 +25,6 @@ pub static DISPLAY: Lazy<Mutex<Display>> = Lazy::new(|| {
let m = Mutex::new(Display {
fb: fb1.address.as_ptr().unwrap().cast(),
- // bb: fb1.address.as_ptr().unwrap().cast(),
bb: back_buffer.as_slice().as_ptr() as *mut u32,
size: Size::new(fb1.width as u32, fb1.height as u32),
color: Rgb888::WHITE,
diff --git a/kernel/src/holeybytes/mod.rs b/kernel/src/holeybytes/mod.rs
index fc8e2e8..4e2b69c 100644
--- a/kernel/src/holeybytes/mod.rs
+++ b/kernel/src/holeybytes/mod.rs
@@ -9,7 +9,7 @@ use {
},
Vm, VmRunError, VmRunOk,
},
- log::{debug, info, trace, warn},
+ log::{debug, error, info, trace, warn},
};
const TIMER_QUOTIENT: usize = 100;
@@ -60,8 +60,8 @@ Register dump: {:?}",
let r254 = self.vm.registers[254];
let r253 = self.vm.registers[253];
- log::debug!("Ecall number {:?}", r255);
- log::trace!("Register dump: {:?}", self.vm.registers);
+ debug!("Ecall number {:?}", r255);
+ trace!("Register dump: {:?}", self.vm.registers);
match r255.cast::<u64>() {
0 => {
@@ -114,11 +114,16 @@ Register dump: {:?}",
let buffer_id = unsafe { r254.u64 };
let mem_addr = unsafe { r253.u64 };
let length = unsafe { r252.u64 as usize };
- trace!("{:?}", mem_addr);
+ trace!("IPC address: {:?}", mem_addr);
use alloc::vec::Vec;
- if buffer_id == 1 {
- info!("Logging")
+ match buffer_id {
+ 1 => {
+ error!("Logging via IPC isn't quite ready")
+ }
+ buffer_id => {
+ info!("Message has been sent to {}", buffer_id)
+ }
}
}
// 4