feat(vga): add vga change color interface
All checks were successful
continuous-integration/drone/push Build is passing
All checks were successful
continuous-integration/drone/push Build is passing
Signed-off-by: Julien CLEMENT <julien.clement@epita.fr>
This commit is contained in:
parent
70e7b48bfe
commit
be8f3f2a0f
@ -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,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 {
|
||||||
|
Loading…
Reference in New Issue
Block a user