1 files changed, 27 insertions, 8 deletions

diff --git a/rsnix/src/serial.rs b/rsnix/src/serial.rs
index 484a114..2267225 100644
--- a/rsnix/src/serial.rs
+++ b/rsnix/src/serial.rs
@@ -60,8 +60,17 @@ pub fn try_get_byte() -> Option<u8> {
     }
 }
 
-/// Write a string to serial.
+/// Write a string to serial, holding the scheduler lock for the whole
+/// write so a line can't be interleaved with another task's output.
 pub fn write_str(s: &str) {
+    crate::sched::lock();
+    write_raw(s);
+    crate::sched::unlock();
+}
+
+/// Raw serial write — no scheduler lock.  Callers must hold the lock
+/// (klog::emit does) or be in a context where preemption is impossible.
+pub fn write_raw(s: &str) {
     for &b in s.as_bytes() {
         if b == b'\n' {
             put_byte(b'\r');
@@ -70,6 +79,16 @@ pub fn write_str(s: &str) {
     }
 }
 
+/// One scheduler-locked call: the line plus its CRLF, atomic with
+/// respect to context switches (used by the shell's term_println, where
+/// the line and its newline must not be split by a tick).
+pub fn write_line(s: &str) {
+    crate::sched::lock();
+    write_raw(s);
+    write_raw("\r\n");
+    crate::sched::unlock();
+}
+
 // ---------------------------------------------------------------------------
 // fmt::Write implementation
 // ---------------------------------------------------------------------------
@@ -96,17 +115,17 @@ macro_rules! serial_print {
 /// here, so the ring captures the whole boot sequence for free.
 /// User-facing shell output must NOT use this macro (shell output would
 /// pollute the boot log); it writes to the serial port directly.
+///
+/// The whole line is formatted, written, and logged under one scheduler
+/// lock (klog::emit), so lines from different tasks never interleave.
 #[macro_export]
 macro_rules! serial_println {
     () => {
-        $crate::serial::write_str("\r\n");
-        $crate::klog::append_fmt(core::format_args!(""));
+        $crate::klog::emit(core::format_args!(""))
+    };
+    ($($arg:tt)*) => {
+        $crate::klog::emit(core::format_args!($($arg)*))
     };
-    ($($arg:tt)*) => {{
-        $crate::serial_print!($($arg)*);
-        $crate::serial::write_str("\r\n");
-        $crate::klog::append_fmt(core::format_args!($($arg)*));
-    }};
 }
 
 // ---------------------------------------------------------------------------