diff --git a/services/cram-hal-service/src/iox_lib.rs b/services/cram-hal-service/src/iox_lib.rs index 5602dfdea..50e955a87 100644 --- a/services/cram-hal-service/src/iox_lib.rs +++ b/services/cram-hal-service/src/iox_lib.rs @@ -1,6 +1,6 @@ use core::sync::atomic::Ordering; -use cramium_hal::iox::{IoxDir, IoxDriveStrength, IoxEnable, IoxFunction, IoxPort, IoxValue}; +use cramium_hal::iox::{IoSetup, IoxDir, IoxDriveStrength, IoxEnable, IoxFunction, IoxPort, IoxValue}; use num_traits::*; use crate::{Opcode, SERVER_NAME_CRAM_HAL, api::IoxConfigMessage}; @@ -18,23 +18,6 @@ impl IoxHal { IoxHal { conn } } - pub fn setup_io_pin( - &self, - port: IoxPort, - pin: u8, - direction: Option, - function: Option, - schmitt_trigger: Option, - pullup: Option, - slow_slew: Option, - strength: Option, - ) { - let msg = - IoxConfigMessage { port, pin, direction, function, schmitt_trigger, pullup, slow_slew, strength }; - let buf = xous_ipc::Buffer::into_buf(msg).unwrap(); - buf.lend(self.conn, Opcode::ConfigureIox.to_u32().unwrap()).expect("Couldn't set up IO"); - } - pub fn set_gpio_pin_value(&self, port: IoxPort, pin: u8, value: IoxValue) { xous::send_message( self.conn, @@ -138,6 +121,25 @@ impl IoxHal { } } +impl IoSetup for IoxHal { + fn setup_pin( + &self, + port: IoxPort, + pin: u8, + direction: Option, + function: Option, + schmitt_trigger: Option, + pullup: Option, + slow_slew: Option, + strength: Option, + ) { + let msg = + IoxConfigMessage { port, pin, direction, function, schmitt_trigger, pullup, slow_slew, strength }; + let buf = xous_ipc::Buffer::into_buf(msg).unwrap(); + buf.lend(self.conn, Opcode::ConfigureIox.to_u32().unwrap()).expect("Couldn't set up IO"); + } +} + impl Drop for IoxHal { fn drop(&mut self) { // de-allocate myself. It's unsafe because we are responsible to make sure nobody else is using the diff --git a/services/cram-hal-service/src/main.rs b/services/cram-hal-service/src/main.rs index d6066c4d4..471af57cc 100644 --- a/services/cram-hal-service/src/main.rs +++ b/services/cram-hal-service/src/main.rs @@ -123,7 +123,7 @@ fn main() { xous::MemoryFlags::R | xous::MemoryFlags::W, ) .expect("couldn't claim the IOX hardware page"); - let mut iox = iox::Iox::new(iox_page.as_mut_ptr() as *mut u32); + let iox = iox::Iox::new(iox_page.as_ptr() as *mut u32); let udma_global_csr = xous::syscall::map_memory( xous::MemoryAddress::new(utralib::generated::HW_UDMA_CTRL_BASE),