mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-20 09:03:28 +00:00
ticktimer-server: remove debug module
This was leftover from before a time when we had the log server. It no longer serves a need. Signed-off-by: Sean Cross <sean@xobs.io>
This commit is contained in:
parent
fcb64a85d4
commit
513b99f916
2 changed files with 2 additions and 124 deletions
|
|
@ -1,117 +0,0 @@
|
||||||
use core::fmt::{Error, Write};
|
|
||||||
|
|
||||||
use utralib::generated::*;
|
|
||||||
|
|
||||||
#[macro_export]
|
|
||||||
macro_rules! print
|
|
||||||
{
|
|
||||||
($($args:tt)+) => ({
|
|
||||||
use core::fmt::Write;
|
|
||||||
let _ = write!(crate::debug::Uart {}, $($args)+);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
#[macro_export]
|
|
||||||
macro_rules! println
|
|
||||||
{
|
|
||||||
() => ({
|
|
||||||
print!("\r\n")
|
|
||||||
});
|
|
||||||
($fmt:expr) => ({
|
|
||||||
print!(concat!($fmt, "\r\n"))
|
|
||||||
});
|
|
||||||
($fmt:expr, $($args:tt)+) => ({
|
|
||||||
print!(concat!($fmt, "\r\n"), $($args)+)
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
fn handle_irq(irq_no: usize, arg: *mut usize) {
|
|
||||||
print!("Handling IRQ {} (arg: {:08x}): ", irq_no, arg as usize);
|
|
||||||
let u = crate::debug::Uart {};
|
|
||||||
while let Some(c) = u.getc() {
|
|
||||||
print!("{}", c as char);
|
|
||||||
}
|
|
||||||
println!();
|
|
||||||
}
|
|
||||||
|
|
||||||
pub struct Uart {}
|
|
||||||
|
|
||||||
// this is a hack to bypass an explicit initialization/allocation step for the debug structure
|
|
||||||
pub static mut DEFAULT_UART_ADDR: *mut usize = 0x0000_0000 as *mut usize;
|
|
||||||
|
|
||||||
impl Uart {
|
|
||||||
fn map_uart(&self) {
|
|
||||||
/*
|
|
||||||
Note: the memory address and interrupt specified here needs to map to a unique hardware
|
|
||||||
UART resource. Modify in this function as necessary.
|
|
||||||
*/
|
|
||||||
let uart = xous::syscall::map_memory(
|
|
||||||
xous::MemoryAddress::new(utra::server1::HW_SERVER1_BASE),
|
|
||||||
None,
|
|
||||||
4096,
|
|
||||||
xous::MemoryFlags::R | xous::MemoryFlags::W,
|
|
||||||
)
|
|
||||||
.expect("couldn't map debug uart");
|
|
||||||
unsafe {
|
|
||||||
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(
|
|
||||||
utra::server1::SERVER1_IRQ,
|
|
||||||
handle_irq,
|
|
||||||
core::ptr::null_mut::<usize>(),
|
|
||||||
)
|
|
||||||
.expect("unable to allocate IRQ");
|
|
||||||
self.enable_rx();
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn putc(&self, c: u8) {
|
|
||||||
if cfg!(feature = "debugprint") {
|
|
||||||
if unsafe { DEFAULT_UART_ADDR } as usize == 0 {
|
|
||||||
self.map_uart();
|
|
||||||
}
|
|
||||||
let mut uart_csr = CSR::new(unsafe { DEFAULT_UART_ADDR as *mut u32 });
|
|
||||||
|
|
||||||
// Wait until TXFULL is `0`
|
|
||||||
while uart_csr.r(utra::uart::TXFULL) != 0 {}
|
|
||||||
uart_csr.wo(utra::uart::RXTX, c as u32);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn enable_rx(&self) {
|
|
||||||
if cfg!(feature = "debugprint") {
|
|
||||||
let mut uart_csr = CSR::new(unsafe { DEFAULT_UART_ADDR as *mut u32 });
|
|
||||||
uart_csr.rmwf(utra::uart::EV_ENABLE_RX, 1);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn getc(&self) -> Option<u8> {
|
|
||||||
if cfg!(feature = "debugprint") {
|
|
||||||
if unsafe { DEFAULT_UART_ADDR } as usize == 0 {
|
|
||||||
self.map_uart();
|
|
||||||
}
|
|
||||||
let mut uart_csr = CSR::new(unsafe { DEFAULT_UART_ADDR as *mut u32 });
|
|
||||||
match uart_csr.rf(utra::uart::EV_PENDING_RX) {
|
|
||||||
0 => None,
|
|
||||||
ack => {
|
|
||||||
let c = Some(uart_csr.rf(utra::uart::RXTX_RXTX) as u8);
|
|
||||||
uart_csr.wfo(utra::uart::EV_PENDING_RX, ack);
|
|
||||||
c
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
None
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Write for Uart {
|
|
||||||
fn write_str(&mut self, s: &str) -> Result<(), Error> {
|
|
||||||
for c in s.bytes() {
|
|
||||||
self.putc(c);
|
|
||||||
}
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,10 +1,6 @@
|
||||||
#![cfg_attr(target_os = "none", no_std)]
|
#![cfg_attr(target_os = "none", no_std)]
|
||||||
#![cfg_attr(target_os = "none", no_main)]
|
#![cfg_attr(target_os = "none", no_main)]
|
||||||
|
|
||||||
#[cfg(target_os = "none")]
|
|
||||||
#[macro_use]
|
|
||||||
mod debug;
|
|
||||||
|
|
||||||
mod api;
|
mod api;
|
||||||
use api::Opcode;
|
use api::Opcode;
|
||||||
|
|
||||||
|
|
@ -54,7 +50,7 @@ mod implementation {
|
||||||
|
|
||||||
fn handle_irq(_irq_no: usize, arg: *mut usize) {
|
fn handle_irq(_irq_no: usize, arg: *mut usize) {
|
||||||
let xtt = unsafe { &mut *(arg as *mut XousTickTimer) };
|
let xtt = unsafe { &mut *(arg as *mut XousTickTimer) };
|
||||||
println!("In IRQ, connection: {}", xtt.connection);
|
// println!("In IRQ, connection: {}", xtt.connection);
|
||||||
|
|
||||||
// Safe because we're in an interrupt, and this interrupt is only
|
// Safe because we're in an interrupt, and this interrupt is only
|
||||||
// enabled when this value is not None.
|
// enabled when this value is not None.
|
||||||
|
|
@ -71,7 +67,7 @@ mod implementation {
|
||||||
|
|
||||||
impl XousTickTimer {
|
impl XousTickTimer {
|
||||||
pub fn new(connection: xous::CID) -> XousTickTimer {
|
pub fn new(connection: xous::CID) -> XousTickTimer {
|
||||||
println!("Connection: {}", connection);
|
// println!("Connection: {}", connection);
|
||||||
let csr = xous::syscall::map_memory(
|
let csr = xous::syscall::map_memory(
|
||||||
xous::MemoryAddress::new(utra::ticktimer::HW_TICKTIMER_BASE),
|
xous::MemoryAddress::new(utra::ticktimer::HW_TICKTIMER_BASE),
|
||||||
None,
|
None,
|
||||||
|
|
@ -264,7 +260,6 @@ fn recalculate_sleep(
|
||||||
|
|
||||||
#[xous::xous_main]
|
#[xous::xous_main]
|
||||||
fn xmain() -> ! {
|
fn xmain() -> ! {
|
||||||
println!("Timer Init");
|
|
||||||
log_server::init_wait().unwrap();
|
log_server::init_wait().unwrap();
|
||||||
|
|
||||||
// "Sleep" commands get put in here and are ordered as necessary
|
// "Sleep" commands get put in here and are ordered as necessary
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue