From e94fe1564eb0149c64a7b235e2763915abb91445 Mon Sep 17 00:00:00 2001 From: Harry Chen Date: Mon, 6 May 2019 10:48:27 +0800 Subject: [PATCH] Init console on ThinPad, seems not wworking properly Signed-off-by: Harry Chen --- kernel/src/arch/mipsel/board/thinpad/consts.rs | 2 +- kernel/src/arch/mipsel/board/thinpad/mod.rs | 3 --- kernel/src/arch/mipsel/driver/mod.rs | 3 +++ 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/kernel/src/arch/mipsel/board/thinpad/consts.rs b/kernel/src/arch/mipsel/board/thinpad/consts.rs index db1971f..98f0a5e 100644 --- a/kernel/src/arch/mipsel/board/thinpad/consts.rs +++ b/kernel/src/arch/mipsel/board/thinpad/consts.rs @@ -1,3 +1,3 @@ /// board specific constants pub const MEMORY_END: usize = 0x8080_0000; -pub const KERNEL_HEAP_SIZE: usize = 0x0038_0000; +pub const KERNEL_HEAP_SIZE: usize = 0x0044_0000; diff --git a/kernel/src/arch/mipsel/board/thinpad/mod.rs b/kernel/src/arch/mipsel/board/thinpad/mod.rs index fcb7117..836d300 100644 --- a/kernel/src/arch/mipsel/board/thinpad/mod.rs +++ b/kernel/src/arch/mipsel/board/thinpad/mod.rs @@ -24,9 +24,6 @@ pub fn init_driver() { // TODO: add possibly more drivers // timer::init(); fb::init(); - if let Some(fb) = fb::FRAME_BUFFER.lock().as_mut() { - fb.clear(); - } } pub fn probe_fb_info(width: u32, height: u32, depth: u32) -> FramebufferResult { diff --git a/kernel/src/arch/mipsel/driver/mod.rs b/kernel/src/arch/mipsel/driver/mod.rs index 0cf6ad0..4c1645b 100644 --- a/kernel/src/arch/mipsel/driver/mod.rs +++ b/kernel/src/arch/mipsel/driver/mod.rs @@ -13,4 +13,7 @@ pub fn init() { assert_has_not_been_called!("driver::init must be called only once"); board::init_driver(); console::init(); + if let Some(con) = console::CONSOLE.lock().as_mut() { + con.clear(); + } }