mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-18 08:52:45 +00:00
fixup warnings
This commit is contained in:
parent
320a8e2b32
commit
ab940e18db
2 changed files with 2 additions and 38 deletions
|
|
@ -24,10 +24,11 @@ xous-kernel = { package = "xous", version = "0.9.9", features = [
|
||||||
utralib = { version = "0.1.1", default_features = false }
|
utralib = { version = "0.1.1", default_features = false }
|
||||||
|
|
||||||
[target.'cfg(target_arch = "riscv32")'.dependencies]
|
[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]
|
[features]
|
||||||
debug-print = []
|
debug-print = []
|
||||||
|
gdb-stub = []
|
||||||
print-panics = []
|
print-panics = []
|
||||||
report-memory = ["stats_alloc"]
|
report-memory = ["stats_alloc"]
|
||||||
wrap-print = []
|
wrap-print = []
|
||||||
|
|
|
||||||
|
|
@ -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(
|
#[cfg(all(
|
||||||
baremetal,
|
baremetal,
|
||||||
not(test),
|
not(test),
|
||||||
|
|
@ -163,11 +138,6 @@ pub fn irq(_irq_number: usize, _arg: *mut usize) {
|
||||||
any(feature = "debug-print", feature = "print-panics")
|
any(feature = "debug-print", feature = "print-panics")
|
||||||
))]
|
))]
|
||||||
fn process_irq_character(b: u8) {
|
fn process_irq_character(b: u8) {
|
||||||
#[cfg(all(feature = "gdbserver", baremetal))]
|
|
||||||
if gdb_server::handle(b) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
match b {
|
match b {
|
||||||
b'i' => {
|
b'i' => {
|
||||||
println!("Interrupt handlers:");
|
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' => {
|
b'h' => {
|
||||||
println!("Xous Kernel Debug");
|
println!("Xous Kernel Debug");
|
||||||
println!("key | command");
|
println!("key | command");
|
||||||
println!("--- + -----------------------");
|
println!("--- + -----------------------");
|
||||||
#[cfg(all(feature = "gdbserver", baremetal))]
|
|
||||||
println!(" g | enter the gdb server");
|
|
||||||
println!(" i | print irq handlers");
|
println!(" i | print irq handlers");
|
||||||
println!(" m | print MMU page tables of all processes");
|
println!(" m | print MMU page tables of all processes");
|
||||||
println!(" p | print all processes");
|
println!(" p | print all processes");
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue