mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-21 09:14:34 +00:00
make it so that double-debug alloc doesn't cause insta-failure
This commit is contained in:
parent
06ad86a0fc
commit
50e3899028
1 changed files with 16 additions and 10 deletions
|
|
@ -19,24 +19,30 @@ impl Uart {
|
||||||
#[cfg(all(feature = "debug-print-usb", target_os = "xous"))]
|
#[cfg(all(feature = "debug-print-usb", target_os = "xous"))]
|
||||||
pub fn putc(&mut self, c: u8) {
|
pub fn putc(&mut self, c: u8) {
|
||||||
if unsafe { SWAP_APP_UART_VADDR } == 0 {
|
if unsafe { SWAP_APP_UART_VADDR } == 0 {
|
||||||
let uart = xous::syscall::map_memory(
|
match xous::syscall::map_memory(
|
||||||
xous::MemoryAddress::new(utralib::utra::udma_uart_0::HW_UDMA_UART_0_BASE),
|
xous::MemoryAddress::new(utralib::utra::udma_uart_0::HW_UDMA_UART_0_BASE),
|
||||||
None,
|
None,
|
||||||
4096,
|
4096,
|
||||||
xous::MemoryFlags::R | xous::MemoryFlags::W,
|
xous::MemoryFlags::R | xous::MemoryFlags::W,
|
||||||
)
|
) {
|
||||||
.expect("couldn't map debug serial port");
|
Ok(uart) => {
|
||||||
unsafe { SWAP_APP_UART_VADDR = uart.as_mut_ptr() as usize };
|
unsafe { SWAP_APP_UART_VADDR = uart.as_mut_ptr() as usize };
|
||||||
|
}
|
||||||
|
_ => return,
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if unsafe { SWAP_APP_UART_IFRAM_VADDR } == 0 {
|
if unsafe { SWAP_APP_UART_IFRAM_VADDR } == 0 {
|
||||||
let mem = xous::syscall::map_memory(
|
match xous::syscall::map_memory(
|
||||||
xous::MemoryAddress::new(crate::board::APP_UART_IFRAM_ADDR),
|
xous::MemoryAddress::new(crate::board::APP_UART_IFRAM_ADDR),
|
||||||
None,
|
None,
|
||||||
4096,
|
4096,
|
||||||
xous::MemoryFlags::R | xous::MemoryFlags::W,
|
xous::MemoryFlags::R | xous::MemoryFlags::W,
|
||||||
)
|
) {
|
||||||
.expect("couldn't map debug serial port dma ram");
|
Ok(mem) => {
|
||||||
unsafe { SWAP_APP_UART_IFRAM_VADDR = mem.as_mut_ptr() as usize };
|
unsafe { SWAP_APP_UART_IFRAM_VADDR = mem.as_mut_ptr() as usize };
|
||||||
|
}
|
||||||
|
_ => return,
|
||||||
|
}
|
||||||
}
|
}
|
||||||
use crate::udma;
|
use crate::udma;
|
||||||
// safety: safe to call as long as the raw parts are initialized and we exclusively
|
// safety: safe to call as long as the raw parts are initialized and we exclusively
|
||||||
|
|
@ -65,8 +71,8 @@ impl Write for Uart {
|
||||||
for c in s.bytes() {
|
for c in s.bytes() {
|
||||||
self.putc(c);
|
self.putc(c);
|
||||||
}
|
}
|
||||||
#[cfg(all(feature = "std", not(feature = "debug-print-usb")))]
|
// #[cfg(all(feature = "std", not(feature = "debug-print-usb")))]
|
||||||
log::info!("{}", s);
|
// log::info!("{}", s);
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue