JohnyTheCarrot/ableos
1
0
Fork 0
forked from AbleOS/ableos
Code Issues Pull requests Packages Projects Releases Wiki Activity

kupdate

Browse source
This commit is contained in:
able 2022-08-06 08:16:08 -05:00
parent 4518e7ef5e
commit e8221f8513
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ableos/src/logger.rs
View file

@ -58,7 +58,7 @@ impl log::Log for SimpleLogger {
record.args(), record.args(),
); );
println!("{msg}"); // println!("{msg}");
if KERNEL_CONF.logging.log_to_serial { if KERNEL_CONF.logging.log_to_serial {
serial_println!( serial_println!(

5
ableos/src/scratchpad.rs
View file

@ -10,6 +10,7 @@ use crate::devices::pci::brute_force_scan;
use crate::image::mono_bitmap::bruh; use crate::image::mono_bitmap::bruh;
use crate::systeminfo::{KERNEL_VERSION, RELEASE_TYPE}; use crate::systeminfo::{KERNEL_VERSION, RELEASE_TYPE};
use crate::time::fetch_time; use crate::time::fetch_time;
use crate::KERNEL_STATE;
use crate::{ use crate::{
arch::shutdown, filesystem::FILE_SYSTEM, rhai_shell::KEYBUFF, vterm::VTerm, arch::shutdown, filesystem::FILE_SYSTEM, rhai_shell::KEYBUFF, vterm::VTerm,
wasm_jumploader::run_program, wasm_jumploader::run_program,
@ -82,6 +83,7 @@ pub fn scratchpad() {
disable(); disable();
let tick_time = fetch_time(); let tick_time = fetch_time();
let hostname = &KERNEL_STATE.lock().hostname;
let allocator = ALLOCATOR.lock(); let allocator = ALLOCATOR.lock();
let size = allocator.size(); let size = allocator.size();
@ -92,7 +94,7 @@ pub fn scratchpad() {
println!( println!(
"{} "{}
,-------. OS: \0BLUE\0AbleOS\0RESET\0 ,-------. OS: \0BLUE\0AbleOS\0RESET\0
,'\\ _ _`. Host: None ,'\\ _ _`. Host: \0PINK\0{}\0RESET\0
/ \\)_)-)_)-\\ Kernel: \0RED\0AKern-{}-v{}\0RESET\0 / \\)_)-)_)-\\ Kernel: \0RED\0AKern-{}-v{}\0RESET\0
: : Uptime: \0GREEN\0{}\0RESET\0 : : Uptime: \0GREEN\0{}\0RESET\0
\\ / Packages: None \\ / Packages: None
@ -106,6 +108,7 @@ pub fn scratchpad() {
// include_str!("../assets/balloon.txt"), // include_str!("../assets/balloon.txt"),
// kstate.hostname, // kstate.hostname,
BANNER_WIDTH, BANNER_WIDTH,
hostname,
RELEASE_TYPE, RELEASE_TYPE,
KERNEL_VERSION, KERNEL_VERSION,
tick_time, tick_time,