juju/JuliOS
1
0
Fork 0
Code Issues 12 Pull Requests Projects Releases Wiki Activity

feat(vga): add vga change color interface
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source 
Signed-off-by: Julien CLEMENT <julien.clement@epita.fr>
This commit is contained in:
Julien CLEMENT 2021-12-02 20:28:15 +01:00
parent 70e7b48bfe
commit be8f3f2a0f
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lib.rs
View File

@ -1,20 +1,22 @@
#![no_std] #![no_std]
#![no_main] #![no_main]
mod vga;
use core::panic::PanicInfo; use core::panic::PanicInfo;
use vga::Color;
#[panic_handler] #[panic_handler]
fn panic_handler(info: &PanicInfo) -> ! { fn panic_handler(info: &PanicInfo) -> ! {
vga::change_color(Color::LightRed, Color::Black);
println!("{}", info); println!("{}", info);
loop {} loop {}
} }
mod vga;
#[no_mangle] #[no_mangle]
pub extern "C" fn julios_main() -> ! { pub extern "C" fn julios_main() -> ! {
println!("Hello World!"); println!("Hello World!");
println!("{}", "***JuliOS***"); println!("{}", "***JuliOS***");
panic!("Test panick"); panic!("Test panic");
loop {} loop {}
} }

9
src/vga.rs
View File

@ -9,7 +9,7 @@ const BUFFER_WIDTH: usize = 80;
lazy_static! { lazy_static! {
pub static ref WRITER: Mutex<Writer> = Mutex::new(Writer { pub static ref WRITER: Mutex<Writer> = Mutex::new(Writer {
column: 0, column: 0,
color_code: ColorCode::new(Color::Green, Color::Black), color_code: ColorCode::new(Color::LightBlue, Color::Black),
buffer: unsafe { &mut *(0xb8000 as *mut VgaBuffer) } buffer: unsafe { &mut *(0xb8000 as *mut VgaBuffer) }
}); });
} }
@ -30,6 +30,9 @@ pub fn _print(args: fmt::Arguments) {
use core::fmt::Write; use core::fmt::Write;
WRITER.lock().write_fmt(args).unwrap(); WRITER.lock().write_fmt(args).unwrap();
} }
pub fn change_color(fg: Color, bg: Color) {
WRITER.lock().change_color(ColorCode::new(fg, bg))
}
#[allow(dead_code)] #[allow(dead_code)]
@ -133,6 +136,10 @@ impl Writer {
self.buffer.chars[row][col].write(blank); self.buffer.chars[row][col].write(blank);
} }
} }
fn change_color(&mut self, color: ColorCode) {
self.color_code = color;
}
} }
impl fmt::Write for Writer { impl fmt::Write for Writer {