From 45bd6701385a2edf86aa04a323f1f1be821ecd0d Mon Sep 17 00:00:00 2001 From: Sean Cross Date: Mon, 10 Aug 2020 23:04:36 +0800 Subject: [PATCH] examples: shell: get shell working on baremetal Signed-off-by: Sean Cross --- examples/shell/.vscode/settings.json | 3 +- examples/shell/src/baremetal.rs | 13 ++++---- examples/shell/src/main.rs | 6 ++-- examples/shell/src/timer.rs | 45 +++++++++++++++------------- 4 files changed, 36 insertions(+), 31 deletions(-) diff --git a/examples/shell/.vscode/settings.json b/examples/shell/.vscode/settings.json index bc21aa68f..9e8b36038 100644 --- a/examples/shell/.vscode/settings.json +++ b/examples/shell/.vscode/settings.json @@ -37,5 +37,6 @@ "vmim", "vmip", "xous" - ] + ], + "git.ignoreLimitWarning": true } \ No newline at end of file diff --git a/examples/shell/src/baremetal.rs b/examples/shell/src/baremetal.rs index 087f1b70f..a0e071fa3 100644 --- a/examples/shell/src/baremetal.rs +++ b/examples/shell/src/baremetal.rs @@ -36,7 +36,7 @@ pub unsafe extern "C" fn start_rust() -> ! { xous::MemoryFlags::R | xous::MemoryFlags::W, ) .expect("couldn't map uart"); - unsafe { crate::debug::DEFAULT_UART_ADDR = uart.as_mut_ptr() }; + crate::debug::DEFAULT_UART_ADDR = uart.as_mut_ptr() as _; println!("Mapped UART @ {:08x}", uart.addr.get()); xous::syscall::map_memory( @@ -51,11 +51,12 @@ pub unsafe extern "C" fn start_rust() -> ! { crate::debug::DEFAULT.enable_rx(); println!("Allocating IRQ..."); - xous::rsyscall(xous::SysCall::ClaimInterrupt( - 2, - handle_irq as *mut usize, - core::ptr::null_mut::(), - )) + xous::claim_interrupt(2, handle_irq, core::ptr::null_mut::()) + // xous::rsyscall(xous::SysCall::ClaimInterrupt( + // 2, + // handle_irq as *mut usize, + // core::ptr::null_mut::(), + // )) .expect("couldn't claim interrupt"); main(); diff --git a/examples/shell/src/main.rs b/examples/shell/src/main.rs index 24058b9b8..239a7ab2a 100644 --- a/examples/shell/src/main.rs +++ b/examples/shell/src/main.rs @@ -11,9 +11,6 @@ mod baremetal; mod timer; // mod logstr; -#[cfg(baremetal)] -use core::fmt::Write; - // fn print_and_yield(index: *mut usize) -> ! { // let num = index as usize; // loop { @@ -25,6 +22,7 @@ use core::fmt::Write; #[cfg_attr(baremetal, no_mangle)] fn main() { println!("Starting to initialize the timer"); + #[cfg(not(baremetal))] xous::arch::ensure_connection().unwrap(); timer::init(); @@ -62,6 +60,8 @@ fn main() { println!("Loop {}", counter); } counter += 1; + + #[cfg(not(baremetal))] std::thread::sleep(std::time::Duration::from_millis(500)); // if counter & 2 == 0 { // xous::syscall::yield_slice(); diff --git a/examples/shell/src/timer.rs b/examples/shell/src/timer.rs index 7403c3172..3e3ec9786 100644 --- a/examples/shell/src/timer.rs +++ b/examples/shell/src/timer.rs @@ -9,7 +9,7 @@ fn timer_tick(_irq_no: usize, _arg: *mut usize) { println!(">>> Timer tick"); let ptr = TIMER_BASE as *mut usize; - xous::rsyscall(xous::SysCall::ReturnToParentI(0, 0)).expect("couldn't return to parent"); + xous::rsyscall(xous::SysCall::ReturnToParentI(xous::PID::new(1).unwrap(), 0)).expect("couldn't return to parent"); // acknowledge the timer unsafe { ptr.add(6).write_volatile(1) }; @@ -49,25 +49,28 @@ pub fn init() { #[cfg(not(baremetal))] pub fn init() {} -// pub fn load(value: u32) { -// let ptr = TIMER_BASE as *mut usize; -// unsafe { -// ptr.add(0).write_volatile(value as usize); -// } -// } +#[cfg(baremetal)] +pub fn load(value: u32) { + let ptr = TIMER_BASE as *mut usize; + unsafe { + ptr.add(0).write_volatile(value as usize); + } +} -// pub fn reload(value: u32) { -// let ptr = TIMER_BASE as *mut usize; -// unsafe { -// ptr.add(1).write_volatile(value as usize); -// } -// } +#[cfg(baremetal)] +pub fn reload(value: u32) { + let ptr = TIMER_BASE as *mut usize; + unsafe { + ptr.add(1).write_volatile(value as usize); + } +} -// pub fn en(en: bool) { -// let ptr = TIMER_BASE as *mut usize; -// if en { -// unsafe { ptr.add(2).write_volatile(1) }; -// } else { -// unsafe { ptr.add(2).write_volatile(0) }; -// } -// } +#[cfg(baremetal)] +pub fn en(en: bool) { + let ptr = TIMER_BASE as *mut usize; + if en { + unsafe { ptr.add(2).write_volatile(1) }; + } else { + unsafe { ptr.add(2).write_volatile(0) }; + } +}