Support Serial Being logger

Author: asensio-project

Cargo.lock

@@ -19,6 +19,7 @@ xmas-elf = "0.8.0"
 raw-cpuid = "10.2.0"
 rand = { version = "0.8.4", default-features = false }
 rand_hc = "0.3.1"
+uart_16550 = "0.2.18"
 
 [dependencies.noto-sans-mono-bitmap]
 version = "0.2.0"

common/Cargo.toml

@@ -33,6 +33,7 @@ pub mod level_4_entries;
 pub mod load_kernel;
 /// Provides a logger that logs output as text in various formats.
 pub mod logger;
+pub mod serial;
 
 const PAGE_SIZE: u64 = 4096;
 

common/src/lib.rs

@@ -1,4 +1,4 @@
-use crate::framebuffer::FrameBufferWriter;
+use crate::{framebuffer::FrameBufferWriter, serial::SerialPort};
 use bootloader_api::info::FrameBufferInfo;
 use conquer_once::spin::OnceCell;
 use core::fmt::Write;
@@ -8,20 +8,26 @@ use spinning_top::Spinlock;
 pub static LOGGER: OnceCell<LockedLogger> = OnceCell::uninit();
 
 /// A [`FrameBufferWriter`] instance protected by a spinlock.
-pub struct LockedLogger(Spinlock<FrameBufferWriter>);
+pub struct LockedLogger(Spinlock<FrameBufferWriter>, Spinlock<SerialPort>);
 
 impl LockedLogger {
     /// Create a new instance that logs to the given framebuffer.
     pub fn new(framebuffer: &'static mut [u8], info: FrameBufferInfo) -> Self {
-        LockedLogger(Spinlock::new(FrameBufferWriter::new(framebuffer, info)))
+        LockedLogger(
+            Spinlock::new(FrameBufferWriter::new(framebuffer, info)),
+            Spinlock::new(SerialPort::new()),
+        )
     }
 
     /// Force-unlocks the logger to prevent a deadlock.
     ///
     /// ## Safety
     /// This method is not memory safe and should be only used when absolutely necessary.
     pub unsafe fn force_unlock(&self) {
-        unsafe { self.0.force_unlock() };
+        unsafe {
+            self.0.force_unlock();
+            self.1.force_unlock();
+        };
     }
 }
 
@@ -32,7 +38,9 @@ impl log::Log for LockedLogger {
 
     fn log(&self, record: &log::Record) {
         let mut logger = self.0.lock();
+        let mut serial = self.1.lock();
         writeln!(logger, "{:5}: {}", record.level(), record.args()).unwrap();
+        writeln!(serial, "{:5}: {}", record.level(), record.args()).unwrap();
     }
 
     fn flush(&self) {}

common/src/logger.rs

@@ -0,0 +1,20 @@
+use core::fmt;
+
+pub struct SerialPort {
+    port: uart_16550::SerialPort,
+}
+
+impl SerialPort {
+    pub fn new() -> Self {
+        let mut port = unsafe { uart_16550::SerialPort::new(0x3F8) };
+        port.init();
+        Self { port }
+    }
+}
+
+impl fmt::Write for SerialPort {
+    fn write_str(&mut self, s: &str) -> fmt::Result {
+        self.port.write_str(s).unwrap();
+        Ok(())
+    }
+}