Merge pull request #10 from woshiluo/main

fix(prototyper): wrong return value for ConsoleDevice

docs/booting-ubuntu-24.04.1-in-qemu-using-uboot-and-rustsbi.md

@@ -105,7 +105,3 @@ $ qemu-system-riscv64 \
     -netdev user,id=usernet,hostfwd=tcp::12055-:22 \
     -device qemu-xhci -usb -device usb-kbd -device usb-tablet
 ```
-
-进入 GRUB 选择页后，按 e 进入编辑模式。
-
-修改内核参数中的 `earlycon=sbi` 为 `earlycon`。按 C-x 启动即可。

prototyper/src/console.rs

@@ -22,7 +22,6 @@ pub fn init(base: usize) {
     log_init();
 }
 
-
 impl<'a> Console for ConsoleDevice<'a> {
     #[inline]
     fn write(&self, bytes: Physical<&[u8]>) -> SbiRet {
@@ -30,13 +29,11 @@ impl<'a> Console for ConsoleDevice<'a> {
         let start = bytes.phys_addr_lo();
         let buf = unsafe { core::slice::from_raw_parts(start as *const u8, bytes.num_bytes()) };
         let console = self.inner.lock();
-        match *console {
-            MachineConsole::Uart16550(uart16550) => unsafe {
-                (*uart16550).write(buf);
-            },
-        }
+        let bytes_num: usize = match *console {
+            MachineConsole::Uart16550(uart16550) => unsafe { (*uart16550).write(buf) },
+        };
         drop(console);
-        SbiRet::success(0)
+        SbiRet::success(bytes_num)
     }
 
     #[inline]
@@ -46,9 +43,7 @@ impl<'a> Console for ConsoleDevice<'a> {
         let buf = unsafe { core::slice::from_raw_parts_mut(start as *mut u8, bytes.num_bytes()) };
         let console = self.inner.lock();
         let bytes_num: usize = match *console {
-            MachineConsole::Uart16550(uart16550) => unsafe {
-               (*uart16550).read(buf)
-            },
+            MachineConsole::Uart16550(uart16550) => unsafe { (*uart16550).read(buf) },
         };
         drop(console);
         SbiRet::success(bytes_num)
@@ -58,10 +53,8 @@ impl<'a> Console for ConsoleDevice<'a> {
     fn write_byte(&self, byte: u8) -> SbiRet {
         let console = self.inner.lock();
         match *console {
-            MachineConsole::Uart16550(uart16550) => unsafe {
-                (*uart16550).write(&[byte]);
-            },
-        }
+            MachineConsole::Uart16550(uart16550) => unsafe { (*uart16550).write(&[byte]) },
+        };
         drop(console);
         SbiRet::success(0)
     }