opt(console): 优化了console的相关内容

Author: zhangxuan2011

kernel/Cargo.toml

@@ -10,8 +10,8 @@ glob = "0.3.0"
 [dependencies]
 ab_glyph = { version = "0.2.31", default-features = false, features = [
     "libm",
-], optional = true }
-libm = { version = "0.2.15", optional = true }
+] }
+libm = "0.2.15"
 lazy_static = { version = "1.5.0", features = ["spin_no_std"] }
 limine = "0.5.0"
 log = "0.4.27"
@@ -24,6 +24,3 @@ uart_16550 = "0.4.0"
 x86_64 = "0.15.2"
 pc-keyboard = "0.7.0"
 acpi = "6.0.1"
-
-[features]
-ttf = ["dep:ab_glyph", "dep:libm"]

kernel/src/main.rs

@@ -73,6 +73,9 @@ pub extern "C" fn kernel_main() -> ! {
     println!("Time since boot: {time}");
     CONSOLE.lock().cursor_show();
 
+    proka_kernel::output::console::select_console(proka_kernel::output::console::ConsoleType::Ttf);
+    println!("Console after switch to Ttf");
+
     loop {
         let mut buf = [0u8; 1];
         let kbd_device = {

kernel/src/output/Kconfig.toml

@@ -7,23 +7,9 @@ default = 0x3F8
 desc = "Serial Port for Logging"
 help = "The I/O port address for the serial port used for kernel logging (default 0x3F8 is COM1)."
 
-[[config]]
-name = "ENABLE_BITFONT_CONSOLE"
-type = "bool"
-default = true
-desc = "Enable Bitfont Console"
-
-[[config]]
-name = "ENABLE_TTF_CONSOLE"
-type = "bool"
-default = true
-desc = "Enable TTF Console"
-feature = ["ttf"]
-
 [[config]]
 name = "DEFAULT_CONSOLE_TYPE"
 type = "choice"
 default = "bitfont"
 desc = "Default Console Type"
 options = ["bitfont", "ttf"]
-depends_on = "ENABLE_BITFONT_CONSOLE || ENABLE_TTF_CONSOLE"

kernel/src/output/console/mod.rs

@@ -4,14 +4,10 @@ use spin::Mutex;
 
 use crate::graphics::Color;
 
-#[cfg(ENABLE_BITFONT_CONSOLE)]
 pub mod console_bitfont;
-#[cfg(ENABLE_TTF_CONSOLE)]
 pub mod console_ttf;
 
-#[cfg(ENABLE_BITFONT_CONSOLE)]
 pub use console_bitfont::BitfontConsole;
-#[cfg(ENABLE_TTF_CONSOLE)]
 pub use console_ttf::TtfConsole;
 
 /// General [`Console`] trait, which defined generic APIs.
@@ -64,20 +60,13 @@ pub type ConsoleImpl<'a> = alloc::boxed::Box<dyn Console + Send + 'a>;
 lazy_static! {
     pub static ref CONSOLE: Mutex<ConsoleImpl<'static>> = {
         let console_type = crate::config::DEFAULT_CONSOLE_TYPE;
-        #[cfg(ENABLE_TTF_CONSOLE)]
         if console_type == "ttf" {
             return Mutex::new(alloc::boxed::Box::new(TtfConsole::init()));
-        }
-        #[cfg(ENABLE_BITFONT_CONSOLE)]
-        if console_type == "bitfont" {
+        } else if console_type == "bitfont" {
+            return Mutex::new(alloc::boxed::Box::new(BitfontConsole::init()));
+        } else {
             return Mutex::new(alloc::boxed::Box::new(BitfontConsole::init()));
         }
-
-        // Fallback
-        #[cfg(ENABLE_BITFONT_CONSOLE)]
-        return Mutex::new(alloc::boxed::Box::new(BitfontConsole::init()));
-        #[cfg(all(not(ENABLE_BITFONT_CONSOLE), ENABLE_TTF_CONSOLE))]
-        return Mutex::new(alloc::boxed::Box::new(TtfConsole::init()));
     };
 }
 
@@ -90,21 +79,19 @@ pub fn _print(args: fmt::Arguments) {
 }
 
 pub enum ConsoleType {
-    #[cfg(ENABLE_BITFONT_CONSOLE)]
     Bitfont,
-    #[cfg(ENABLE_TTF_CONSOLE)]
     Ttf,
 }
 
+/// Set up the current using console
 pub fn select_console(t: ConsoleType) {
     let mut console = CONSOLE.lock();
+
+    // Must do clear before switching console, in order to 
+    // avoid 2 console displaying problem.
+    console.clear();
     *console = match t {
-        #[cfg(ENABLE_BITFONT_CONSOLE)]
         ConsoleType::Bitfont => alloc::boxed::Box::new(BitfontConsole::init()),
-        #[cfg(ENABLE_TTF_CONSOLE)]
         ConsoleType::Ttf => alloc::boxed::Box::new(TtfConsole::init()),
     };
 }
-
-#[cfg(not(any(ENABLE_BITFONT_CONSOLE, ENABLE_TTF_CONSOLE)))]
-compile_error!("At least one console implementation must be enabled");

kernel/src/output/mod.rs

@@ -1,10 +1,6 @@
-#[cfg(ENABLE_GRAPHICS)]
 pub mod console;
-#[cfg(ENABLE_BITFONT_CONSOLE)]
 pub use console::console_bitfont;
-#[cfg(ENABLE_GRAPHICS)]
 pub mod font8x16;
-#[cfg(ENABLE_TTF_CONSOLE)]
 pub use console::console_ttf;
 
 pub mod dual;