diff --git a/examples/shell/src/debug.rs b/examples/shell/src/debug.rs index fbe10eed0..c997ec7df 100644 --- a/examples/shell/src/debug.rs +++ b/examples/shell/src/debug.rs @@ -39,53 +39,54 @@ pub static mut DEFAULT_UART_ADDR: *mut usize = 0x0000_0000 as *mut usize; pub const DEFAULT: Uart = Uart {}; impl Uart { - pub fn putc(&self, c: u8) { - unsafe { - if DEFAULT_UART_ADDR as usize == 0 { - let uart = xous::syscall::map_memory( - xous::MemoryAddress::new(0xf000_1000), - None, - 4096, - xous::MemoryFlags::R | xous::MemoryFlags::W, - ) - .expect("couldn't map uart"); - DEFAULT_UART_ADDR = uart.as_mut_ptr() as _; - println!("Mapped UART @ {:08x}", uart.addr.get()); - // core::mem::forget(uart); + pub fn putc(&self, _c: u8) { + // unsafe { + // if DEFAULT_UART_ADDR as usize == 0 { + // let uart = xous::syscall::map_memory( + // xous::MemoryAddress::new(0xf000_1000), + // None, + // 4096, + // xous::MemoryFlags::R | xous::MemoryFlags::W, + // ) + // .expect("couldn't map uart"); + // DEFAULT_UART_ADDR = uart.as_mut_ptr() as _; + // println!("Mapped UART @ {:08x}", uart.addr.get()); + // // core::mem::forget(uart); - println!("Allocating IRQ..."); - xous::claim_interrupt(2, handle_irq, core::ptr::null_mut::()).expect("unable to allocate IRQ"); - self.enable_rx(); - } - let base = DEFAULT_UART_ADDR; + // println!("Allocating IRQ..."); + // xous::claim_interrupt(2, handle_irq, core::ptr::null_mut::()).expect("unable to allocate IRQ"); + // self.enable_rx(); + // } + // let base = DEFAULT_UART_ADDR; - // Wait until TXFULL is `0` - while base.add(1).read_volatile() != 0 {} - base.add(0).write_volatile(c as usize) - }; + // // Wait until TXFULL is `0` + // while base.add(1).read_volatile() != 0 {} + // base.add(0).write_volatile(c as usize) + // }; } pub fn enable_rx(&self) { unsafe { - let base = DEFAULT_UART_ADDR; - base.add(5).write_volatile(base.add(5).read_volatile() | 2) + // let base = DEFAULT_UART_ADDR; + // base.add(5).write_volatile(base.add(5).read_volatile() | 2) }; } pub fn getc(&self) -> Option { - unsafe { - let base = DEFAULT_UART_ADDR; - // If EV_PENDING_RX is 1, return the pending character. - // Otherwise, return None. - match base.add(4).read_volatile() & 2 { - 0 => None, - ack => { - let c = Some(base.add(0).read_volatile() as u8); - base.add(4).write_volatile(ack); - c - } - } - } + // unsafe { + // let base = DEFAULT_UART_ADDR; + // // If EV_PENDING_RX is 1, return the pending character. + // // Otherwise, return None. + // match base.add(4).read_volatile() & 2 { + // 0 => None, + // ack => { + // let c = Some(base.add(0).read_volatile() as u8); + // base.add(4).write_volatile(ack); + // c + // } + // } + // } + None } }