From ab940e18dba28bdb5e36b009b635ac4de056061d Mon Sep 17 00:00:00 2001
From: bunnie <bunnie@kosagi.com>
Date: Tue, 27 Sep 2022 17:27:21 +0800
Subject: [PATCH] fixup warnings

---
 kernel/Cargo.toml       |  3 ++-
 kernel/src/debug/mod.rs | 37 -------------------------------------
 2 files changed, 2 insertions(+), 38 deletions(-)

diff --git a/kernel/Cargo.toml b/kernel/Cargo.toml
index e5ed56511..87bdaa1a2 100644
--- a/kernel/Cargo.toml
+++ b/kernel/Cargo.toml
@@ -24,10 +24,11 @@ xous-kernel = { package = "xous", version = "0.9.9", features = [
 utralib = { version = "0.1.1", default_features = false }
 
 [target.'cfg(target_arch = "riscv32")'.dependencies]
-riscv = { version = "0.5.6", path = "../imports/riscv-0.5.6" }
+riscv = { version = "0.5.6", package = "xous-riscv" } # source is in "../imports/riscv-0.5.6"
 
 [features]
 debug-print = []
+gdb-stub = []
 print-panics = []
 report-memory = ["stats_alloc"]
 wrap-print = []
diff --git a/kernel/src/debug/mod.rs b/kernel/src/debug/mod.rs
index dc9919e4a..5204d6fef 100644
--- a/kernel/src/debug/mod.rs
+++ b/kernel/src/debug/mod.rs
@@ -119,31 +119,6 @@ impl Uart {
     }
 }
 
-#[cfg(all(feature = "gdbserver", baremetal))]
-mod gdb_server;
-
-#[cfg(all(feature = "gdbserver", baremetal))]
-impl gdbstub::Connection for Uart {
-    type Error = ();
-
-    fn write(&mut self, byte: u8) -> Result<(), Self::Error> {
-        if unsafe { DEBUG_OUTPUT.is_none() } {
-            return Err(());
-        }
-        let mut uart_csr = CSR::new(crate::debug::SUPERVISOR_UART_ADDR as *mut u32);
-        // Wait until TXFULL is not `0`
-        while uart_csr.r(utra::uart::TXFULL) != 0 {}
-        uart_csr.wo(utra::uart::RXTX, byte as u32);
-        Ok(())
-    }
-    fn peek(&mut self) -> Result<Option<u8>, Self::Error> {
-        Ok(None)
-    }
-    fn flush(&mut self) -> Result<(), Self::Error> {
-        Ok(())
-    }
-}
-
 #[cfg(all(
     baremetal,
     not(test),
@@ -163,11 +138,6 @@ pub fn irq(_irq_number: usize, _arg: *mut usize) {
     any(feature = "debug-print", feature = "print-panics")
 ))]
 fn process_irq_character(b: u8) {
-    #[cfg(all(feature = "gdbserver", baremetal))]
-    if gdb_server::handle(b) {
-        return;
-    }
-
     match b {
         b'i' => {
             println!("Interrupt handlers:");
@@ -301,17 +271,10 @@ fn process_irq_character(b: u8) {
                 }
             });
         }
-        #[cfg(all(feature = "gdbserver", baremetal))]
-        b'g' => {
-            println!("Starting GDB server -- attach your debugger now");
-            gdb_server::setup();
-        }
         b'h' => {
             println!("Xous Kernel Debug");
             println!("key | command");
             println!("--- + -----------------------");
-            #[cfg(all(feature = "gdbserver", baremetal))]
-            println!(" g  | enter the gdb server");
             println!(" i  | print irq handlers");
             println!(" m  | print MMU page tables of all processes");
             println!(" p  | print all processes");