feat: 重构串口驱动接口，整合 Sender 和 Reciever 特性，优化数据传输逻辑

Author: ZR233

.cargo/config.toml

@@ -1,5 +1,6 @@
 [target.'cfg(all(target_os = "none"))']
-runner = "ostool cargo-test"
+# runner = "ostool cargo-test"
+runner = "cargo osrun"
 
 [build]
 target = "aarch64-unknown-none-softfloat"

.gitignore

@@ -2,4 +2,6 @@
 /.bare-test.toml
 /.spec-workflow
 /CLAUDE.md
-/.claude
+/.claude
+.serena
+.qemu*

Cargo.lock

@@ -18,8 +18,8 @@ heapless = "0.9"
 log = "0.4"
 mbarrier = "0.1"
 # rdif-base = {version = "0.7"}
-# rdif-serial = {version = "0.6.0"}
-rdif-serial = {path = "C:\\Users\\zhoudongsheng\\Documents\\opensource\\rdrive\\interface\\rdif-serial"}
+rdif-serial = {version = "0.6"}
+# rdif-serial = {path = "C:\\Users\\zhoudongsheng\\Documents\\opensource\\rdrive\\interface\\rdif-serial"}
 
 thiserror = {version = "2.0", default-features = false}
 tock-registers = "0.10"

Cargo.toml

@@ -60,42 +60,83 @@
 pub mod ns16550;
 pub mod pl011;
 
+use enum_dispatch::enum_dispatch;
 // 重新导出 rdif-serial 的所有类型
 pub use rdif_serial::*;
 
+#[enum_dispatch]
 pub enum Sender {
     #[cfg(target_arch = "x86_64")]
     Ns16550Sender(ns16550::Ns16550Sender<ns16550::Port>),
     Ns16550MmioSender(ns16550::Ns16550Sender<ns16550::Mmio>),
     Pl011Sender(pl011::Pl011Sender),
 }
 
-impl Sender {
-    pub fn write_byte(&mut self, byte: u8) -> bool {
-        match self {
-            #[cfg(target_arch = "x86_64")]
-            Sender::Ns16550Sender(s) => s.write_byte(byte),
-            Sender::Ns16550MmioSender(s) => s.write_byte(byte),
-            Sender::Pl011Sender(s) => s.write_byte(byte),
-        }
-    }
-
-    pub fn write_bytes(&mut self, buffer: &[u8]) -> usize {
-        match self {
-            #[cfg(target_arch = "x86_64")]
-            Sender::Ns16550Sender(s) => s.write_bytes(buffer),
-            Sender::Ns16550MmioSender(s) => s.write_bytes(buffer),
-            Sender::Pl011Sender(s) => s.write_bytes(buffer),
+#[enum_dispatch(Sender)]
+trait RawSender {
+    fn write_byte(&mut self, byte: u8) -> bool;
+    fn write_bytes(&mut self, buffer: &[u8]) -> usize {
+        let mut written = 0;
+        for &byte in buffer.iter() {
+            if !self.write_byte(byte) {
+                break;
+            }
+            written += 1;
         }
+        written
     }
 }
 
 impl TSender for Sender {
     fn write_byte(&mut self, byte: u8) -> bool {
-        self.write_byte(byte)
+        RawSender::write_byte(self, byte)
     }
 
     fn write_bytes(&mut self, buffer: &[u8]) -> usize {
-        self.write_bytes(buffer)
+        RawSender::write_bytes(self, buffer)
+    }
+}
+
+#[enum_dispatch]
+pub enum Reciever {
+    #[cfg(target_arch = "x86_64")]
+    Ns16550Reciever(ns16550::Ns16550Reciever<ns16550::Port>),
+    Ns16550MmioReciever(ns16550::Ns16550Reciever<ns16550::Mmio>),
+    Pl011Reciever(pl011::Pl011Reciever),
+}
+
+impl TReciever for Reciever {
+    fn read_byte(&mut self) -> Option<Result<u8, TransferError>> {
+        RawReciever::read_byte(self)
+    }
+
+    fn read_bytes(&mut self, bytes: &mut [u8]) -> Result<usize, TransBytesError> {
+        RawReciever::read_bytes(self, bytes)
+    }
+}
+
+#[enum_dispatch(Reciever)]
+trait RawReciever {
+    fn read_byte(&mut self) -> Option<Result<u8, TransferError>>;
+
+    fn read_bytes(&mut self, bytes: &mut [u8]) -> Result<usize, TransBytesError> {
+        let mut read_count = 0;
+        for byte in bytes.iter_mut() {
+            match self.read_byte() {
+                Some(Ok(b)) => {
+                    *byte = b;
+                }
+                Some(Err(e)) => {
+                    return Err(TransBytesError {
+                        bytes_transferred: read_count,
+                        kind: e,
+                    });
+                }
+                None => break,
+            }
+
+            read_count += 1;
+        }
+        Ok(read_count)
     }
 }

src/lib.rs

@@ -2,7 +2,9 @@
 //!
 //! 适用于嵌入式平台的内存映射 IO 版本
 
-use rdif_serial::{BSerial, InterfaceRaw, SerialDyn};
+use rdif_serial::{BSerial, SerialDyn};
+
+use crate::ns16550::{Ns16550IrqHandler, Ns16550Reciever, Ns16550Sender};
 
 use super::{Kind, Ns16550};
 use core::ptr::NonNull;
@@ -35,20 +37,25 @@ impl Kind for Mmio {
 
 impl Ns16550<Mmio> {
     pub fn new_mmio(base: NonNull<u8>, clock_freq: u32, reg_width: usize) -> Ns16550<Mmio> {
-        Ns16550::new(
-            Mmio {
-                base: base.as_ptr() as usize,
-                width: reg_width,
-            },
+        let base = Mmio {
+            base: base.as_ptr() as usize,
+            width: reg_width,
+        };
+
+        Ns16550 {
+            base: base.clone(),
             clock_freq,
-        )
+            irq: Some(Ns16550IrqHandler { base: base.clone() }),
+            tx: Some(crate::Sender::Ns16550MmioSender(Ns16550Sender {
+                base: base.clone(),
+            })),
+            rx: Some(crate::Reciever::Ns16550MmioReciever(Ns16550Reciever {
+                base,
+            })),
+        }
     }
 
     pub fn new_mmio_boxed(base: NonNull<u8>, clock_freq: u32, reg_width: usize) -> BSerial {
         SerialDyn::new_boxed(Ns16550::new_mmio(base, clock_freq, reg_width))
     }
-
-    pub fn take_tx(&mut self) -> Option<crate::Sender> {
-        self.tx.take().map(crate::Sender::Ns16550MmioSender)
-    }
 }