metta-systems
/
vesper
1
1
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

[VC WIP] fiddling with uart again

This commit is contained in:
Berkus Decker 2019-01-15 01:57:24 +02:00
parent f079b380ee
commit dc3369a8c2
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main.rs
View File

@ -50,11 +50,11 @@ fn panic(_info: &PanicInfo) -> ! {
// Kernel entry point // Kernel entry point
// arch crate is responsible for calling this // arch crate is responsible for calling this
pub fn kmain() -> ! { pub fn kmain() -> ! {
// let mut uart = MiniUart::new(); let mut uart = MiniUart::new();
// uart.init(); uart.init();
// write!(uart, "Hey there, mini uart talking!\n"); writeln!(uart, "Hey there, mini uart talking!");
if let Some(mut display) = VC::init_fb(Size2d { x: 800, y: 600 } /*, &mut uart*/) { if let Some(mut display) = VC::init_fb(Size2d { x: 800, y: 600 }, &mut uart) {
display.rect(10, 10, 250, 250, Color::rgb(32, 96, 64).0); display.rect(10, 10, 250, 250, Color::rgb(32, 96, 64).0);
display.draw_text(50, 50, "Hello there!", Color::rgb(128, 192, 255).0); display.draw_text(50, 50, "Hello there!", Color::rgb(128, 192, 255).0);
// display.draw_text(50, 150, core::fmt("Display width {}", display.width), Color::rgb(255,0,0).0); // display.draw_text(50, 150, core::fmt("Display width {}", display.width), Color::rgb(255,0,0).0);
@ -64,6 +64,6 @@ pub fn kmain() -> ! {
display.draw_text(170, 70, "BLUE", Color::rgb(0, 0, 255).0); display.draw_text(170, 70, "BLUE", Color::rgb(0, 0, 255).0);
} }
// write!(uart, "Bye, going to sleep now\n"); writeln!(uart, "Bye, going to sleep now");
endless_sleep() endless_sleep()
} }

10
src/platform/vc.rs
View File

@ -8,16 +8,16 @@ pub struct VC;
impl VC { impl VC {
// Use mailbox framebuffer interface to initialize // Use mailbox framebuffer interface to initialize
pub fn init_fb(size: Size2d /*, uart: &mut MiniUart*/) -> Option<Display> { pub fn init_fb(size: Size2d, uart: &mut MiniUart) -> Option<Display> {
let mut fb_info = GpuFb::new(size, 32); let mut fb_info = GpuFb::new(size, 32);
// uart.puts("initing fb_info\n"); uart.puts("initing fb_info\n");
fb_info.call().map_err(|_| { fb_info.call().map_err(|_| {
/*uart.puts("fb_info error\n");*/ uart.puts("fb_info error\n");
() ()
}); });
// write!(uart, "inited fb_info: {}\n", fb_info); // write!(uart, "inited fb_info: {}\n", fb_info);
let mut mbox = Mailbox::new(); let mut mbox = Mailbox::new();
@ -62,7 +62,7 @@ impl VC {
/* Need to set up max_x/max_y before using Display::write */ /* Need to set up max_x/max_y before using Display::write */
let max_x = fb_info.vwidth / CHARSIZE_X; let max_x = fb_info.vwidth / CHARSIZE_X;
let max_y = fb_info.vheight / CHARSIZE_Y; let max_y = fb_info.vheight / CHARSIZE_Y;
// uart.puts("inited fb_info #2\n"); uart.puts("inited fb_info #2\n");
Some(Display::new( Some(Display::new(
bus2phys(fb_info.pointer), bus2phys(fb_info.pointer),