examples: shell: get shell working on baremetal

Signed-off-by: Sean Cross <sean@xobs.io>
This commit is contained in:
Sean Cross 2020-08-10 23:04:36 +08:00
parent 4b58e5108e
commit 45bd670138
4 changed files with 36 additions and 31 deletions

View file

@ -37,5 +37,6 @@
"vmim", "vmim",
"vmip", "vmip",
"xous" "xous"
] ],
"git.ignoreLimitWarning": true
} }

View file

@ -36,7 +36,7 @@ pub unsafe extern "C" fn start_rust() -> ! {
xous::MemoryFlags::R | xous::MemoryFlags::W, xous::MemoryFlags::R | xous::MemoryFlags::W,
) )
.expect("couldn't map uart"); .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()); println!("Mapped UART @ {:08x}", uart.addr.get());
xous::syscall::map_memory( xous::syscall::map_memory(
@ -51,11 +51,12 @@ pub unsafe extern "C" fn start_rust() -> ! {
crate::debug::DEFAULT.enable_rx(); crate::debug::DEFAULT.enable_rx();
println!("Allocating IRQ..."); println!("Allocating IRQ...");
xous::rsyscall(xous::SysCall::ClaimInterrupt( xous::claim_interrupt(2, handle_irq, core::ptr::null_mut::<usize>())
2, // xous::rsyscall(xous::SysCall::ClaimInterrupt(
handle_irq as *mut usize, // 2,
core::ptr::null_mut::<usize>(), // handle_irq as *mut usize,
)) // core::ptr::null_mut::<usize>(),
// ))
.expect("couldn't claim interrupt"); .expect("couldn't claim interrupt");
main(); main();

View file

@ -11,9 +11,6 @@ mod baremetal;
mod timer; mod timer;
// mod logstr; // mod logstr;
#[cfg(baremetal)]
use core::fmt::Write;
// fn print_and_yield(index: *mut usize) -> ! { // fn print_and_yield(index: *mut usize) -> ! {
// let num = index as usize; // let num = index as usize;
// loop { // loop {
@ -25,6 +22,7 @@ use core::fmt::Write;
#[cfg_attr(baremetal, no_mangle)] #[cfg_attr(baremetal, no_mangle)]
fn main() { fn main() {
println!("Starting to initialize the timer"); println!("Starting to initialize the timer");
#[cfg(not(baremetal))]
xous::arch::ensure_connection().unwrap(); xous::arch::ensure_connection().unwrap();
timer::init(); timer::init();
@ -62,6 +60,8 @@ fn main() {
println!("Loop {}", counter); println!("Loop {}", counter);
} }
counter += 1; counter += 1;
#[cfg(not(baremetal))]
std::thread::sleep(std::time::Duration::from_millis(500)); std::thread::sleep(std::time::Duration::from_millis(500));
// if counter & 2 == 0 { // if counter & 2 == 0 {
// xous::syscall::yield_slice(); // xous::syscall::yield_slice();

View file

@ -9,7 +9,7 @@ fn timer_tick(_irq_no: usize, _arg: *mut usize) {
println!(">>> Timer tick"); println!(">>> Timer tick");
let ptr = TIMER_BASE as *mut usize; 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 // acknowledge the timer
unsafe { ptr.add(6).write_volatile(1) }; unsafe { ptr.add(6).write_volatile(1) };
@ -49,25 +49,28 @@ pub fn init() {
#[cfg(not(baremetal))] #[cfg(not(baremetal))]
pub fn init() {} pub fn init() {}
// pub fn load(value: u32) { #[cfg(baremetal)]
// let ptr = TIMER_BASE as *mut usize; pub fn load(value: u32) {
// unsafe { let ptr = TIMER_BASE as *mut usize;
// ptr.add(0).write_volatile(value as usize); unsafe {
// } ptr.add(0).write_volatile(value as usize);
// } }
}
// pub fn reload(value: u32) { #[cfg(baremetal)]
// let ptr = TIMER_BASE as *mut usize; pub fn reload(value: u32) {
// unsafe { let ptr = TIMER_BASE as *mut usize;
// ptr.add(1).write_volatile(value as usize); unsafe {
// } ptr.add(1).write_volatile(value as usize);
// } }
}
// pub fn en(en: bool) { #[cfg(baremetal)]
// let ptr = TIMER_BASE as *mut usize; pub fn en(en: bool) {
// if en { let ptr = TIMER_BASE as *mut usize;
// unsafe { ptr.add(2).write_volatile(1) }; if en {
// } else { unsafe { ptr.add(2).write_volatile(1) };
// unsafe { ptr.add(2).write_volatile(0) }; } else {
// } unsafe { ptr.add(2).write_volatile(0) };
// } }
}