From 33418e79ab6f18f313da9d79b3a4cded1ec2f4e2 Mon Sep 17 00:00:00 2001
From: Berkus Decker <berkus+github@metta.systems>
Date: Sat, 29 Jul 2023 21:36:01 +0300
Subject: [PATCH] =?UTF-8?q?refactor:=20=F0=9F=93=A6=20Refactor=20command?=
 =?UTF-8?q?=5Fprompt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 machine/src/console.rs                        | 33 ++++++++++++++++---
 machine/src/console/null_console.rs           |  6 ----
 machine/src/devices/console.rs                | 29 ----------------
 .../platform/rpi3/device_driver/mini_uart.rs  |  6 ----
 4 files changed, 28 insertions(+), 46 deletions(-)

diff --git a/machine/src/console.rs b/machine/src/console.rs
index b4f21e5..59d9263 100644
--- a/machine/src/console.rs
+++ b/machine/src/console.rs
@@ -34,12 +34,8 @@ pub mod interface {
         fn read_char(&self) -> char;
     }
 
-    pub trait ConsoleTools {
-        fn command_prompt<'a>(&self, buf: &'a mut [u8]) -> &'a [u8];
-    }
-
     /// Trait alias for a full-fledged console.
-    pub trait All: Write + ConsoleOps + ConsoleTools {}
+    pub trait All: Write + ConsoleOps {}
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -66,3 +62,30 @@ pub fn register_console(new_console: &'static (dyn interface::All + Sync)) {
 pub fn console() -> &'static dyn interface::All {
     CONSOLE.lock(|con| *con)
 }
+
+/// A command prompt.
+pub fn command_prompt(buf: &mut [u8]) -> &[u8] {
+    use interface::ConsoleOps;
+
+    console().write_string("\n$> ");
+
+    let mut i = 0;
+    let mut input;
+    loop {
+        input = console().read_char();
+
+        if input == '\n' {
+            console().write_char('\n'); // do \r\n output
+            return &buf[..i];
+        } else {
+            if i < buf.len() {
+                buf[i] = input as u8;
+                i += 1;
+            } else {
+                return &buf[..i];
+            }
+
+            console().write_char(input);
+        }
+    }
+}
diff --git a/machine/src/console/null_console.rs b/machine/src/console/null_console.rs
index 290f801..33b6ecb 100644
--- a/machine/src/console/null_console.rs
+++ b/machine/src/console/null_console.rs
@@ -45,10 +45,4 @@ impl SerialOps for NullConsole {
     fn clear_rx(&self) {}
 }
 
-impl interface::ConsoleTools for NullConsole {
-    fn command_prompt<'a>(&self, buf: &'a mut [u8]) -> &'a [u8] {
-        buf
-    }
-}
-
 impl interface::All for NullConsole {}
diff --git a/machine/src/devices/console.rs b/machine/src/devices/console.rs
index edcfaa7..ea47824 100644
--- a/machine/src/devices/console.rs
+++ b/machine/src/devices/console.rs
@@ -102,35 +102,6 @@ impl Console {
     }
 }
 
-impl interface::ConsoleTools for Console {
-    /// A command prompt.
-    fn command_prompt<'a>(&self, buf: &'a mut [u8]) -> &'a [u8] {
-        use interface::ConsoleOps;
-
-        self.write_string("\n$> ");
-
-        let mut i = 0;
-        let mut input;
-        loop {
-            input = self.read_char();
-
-            if input == '\n' {
-                self.write_char('\n'); // do \r\n output
-                return &buf[..i];
-            } else {
-                if i < buf.len() {
-                    buf[i] = input as u8;
-                    i += 1;
-                } else {
-                    return &buf[..i];
-                }
-
-                self.write_char(input);
-            }
-        }
-    }
-}
-
 /// The global console. Output of the kernel print! and println! macros goes here.
 pub fn console() -> &'static dyn crate::console::interface::All {
     &CONSOLE
diff --git a/machine/src/platform/rpi3/device_driver/mini_uart.rs b/machine/src/platform/rpi3/device_driver/mini_uart.rs
index 9d8e61b..a4ea5e2 100644
--- a/machine/src/platform/rpi3/device_driver/mini_uart.rs
+++ b/machine/src/platform/rpi3/device_driver/mini_uart.rs
@@ -401,10 +401,4 @@ impl interface::ConsoleOps for MiniUart {
     }
 }
 
-impl interface::ConsoleTools for MiniUart {
-    fn command_prompt<'a>(&self, buf: &'a mut [u8]) -> &'a [u8] {
-        todo!()
-    }
-}
-
 impl interface::All for MiniUart {}