From 6ad48ab0621ea7811cef667f0ee988b758d8023a Mon Sep 17 00:00:00 2001 From: Sean Cross Date: Wed, 3 Jun 2020 15:39:48 +0800 Subject: [PATCH] examples: shell: adapt to new form of syscalls We're not slinging raw pointers around anymore. Signed-off-by: Sean Cross --- examples/shell/src/timer.rs | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/examples/shell/src/timer.rs b/examples/shell/src/timer.rs index fa58414d4..bee80a1ce 100644 --- a/examples/shell/src/timer.rs +++ b/examples/shell/src/timer.rs @@ -1,3 +1,5 @@ +use xous::{MemorySize, MemoryAddress}; + const SYSTEM_CLOCK_FREQUENCY: u32 = 12_000_000; const TIMER_BASE: usize = 0xF000_3000; @@ -15,17 +17,17 @@ fn timer_tick(_irq_no: usize, _arg: *mut usize) { pub fn init() { println!("Allocating timer..."); xous::rsyscall(xous::SysCall::MapMemory( - TIMER_BASE as *mut usize, - TIMER_BASE as *mut usize, - 4096, + MemoryAddress::new(TIMER_BASE), + MemoryAddress::new(TIMER_BASE), + MemorySize::new(4096).unwrap(), xous::MemoryFlags::R | xous::MemoryFlags::W, )) .expect("timer: couldn't map timer"); xous::rsyscall(xous::SysCall::ClaimInterrupt( 1, - timer_tick as *mut usize, - core::ptr::null_mut::(), + MemoryAddress::new(timer_tick as *mut usize as usize).unwrap(), + None, )) .expect("timer: couldn't claim interrupt");