From d5b15826e2d38d6b825cdbee461c44a2180f1d45 Mon Sep 17 00:00:00 2001 From: zxq5 Date: Mon, 24 Feb 2025 15:33:42 +0000 Subject: [PATCH] adding std io idk --- libk/src/drivers/io/ascii/mod.rs | 4 ++-- libk/src/lib.rs | 3 +-- libk/src/std/io/io.rs | 6 ++++++ libk/src/std/io/mod.rs | 2 ++ libk/src/std/mod.rs | 1 + libk/src/util/shell.rs | 0 6 files changed, 12 insertions(+), 4 deletions(-) create mode 100644 libk/src/std/io/io.rs create mode 100644 libk/src/std/io/mod.rs create mode 100644 libk/src/util/shell.rs diff --git a/libk/src/drivers/io/ascii/mod.rs b/libk/src/drivers/io/ascii/mod.rs index 1b41b7b..56e5199 100644 --- a/libk/src/drivers/io/ascii/mod.rs +++ b/libk/src/drivers/io/ascii/mod.rs @@ -4,7 +4,7 @@ use x86_64::instructions::interrupts; use super::framebuffer::{colour::Colour, display::FRAMEBUFFER_WRITER}; -use crate::resources::font::{FONT_CP850_8X16, Font}; +use crate::resources::font::{FONT_SPLEEN_8X16, Font}; static FONT_WIDTH: u32 = 8; static FONT_HEIGHT: u32 = 16; @@ -47,7 +47,7 @@ impl Writer { panic!("Framebuffer writer not initialized."); }, |writer| Self { - font: &FONT_CP850_8X16, + font: &FONT_SPLEEN_8X16, screen_width: writer.width() / 8, screen_height: writer.height() / 16, text_line: 0, diff --git a/libk/src/lib.rs b/libk/src/lib.rs index 84b7e3d..e528ca6 100644 --- a/libk/src/lib.rs +++ b/libk/src/lib.rs @@ -26,8 +26,7 @@ pub mod std; /// Re-exports most of the IO macros as well as standard allocation stuff pub mod prelude { - pub use crate::drivers::io::ascii::{_print, _print_log}; - pub use crate::{print, print_log, println, println_log, serial_print, serial_println}; + pub use crate::std::io::*; pub use alloc::{ boxed::Box, string::{String, ToString}, diff --git a/libk/src/std/io/io.rs b/libk/src/std/io/io.rs new file mode 100644 index 0000000..dfb3dc0 --- /dev/null +++ b/libk/src/std/io/io.rs @@ -0,0 +1,6 @@ +pub use crate::drivers::io::{ + ascii::{_print, _print_err, _print_log}, + print, print_log, printerr, println, println_log, printlnerr, + serial::_serial_write, + serial_print, serial_println, +}; diff --git a/libk/src/std/io/mod.rs b/libk/src/std/io/mod.rs new file mode 100644 index 0000000..608d4e1 --- /dev/null +++ b/libk/src/std/io/mod.rs @@ -0,0 +1,2 @@ +mod io; +pub use io::*; diff --git a/libk/src/std/mod.rs b/libk/src/std/mod.rs index aeba020..43b22c1 100644 --- a/libk/src/std/mod.rs +++ b/libk/src/std/mod.rs @@ -1,2 +1,3 @@ pub mod application; +pub mod io; pub mod maths; diff --git a/libk/src/util/shell.rs b/libk/src/util/shell.rs new file mode 100644 index 0000000..e69de29