diff --git a/libs/cramium-hal/Cargo.toml b/libs/cramium-hal/Cargo.toml index f96204a72..c0411e1f2 100644 --- a/libs/cramium-hal/Cargo.toml +++ b/libs/cramium-hal/Cargo.toml @@ -10,10 +10,16 @@ utralib = { version = "0.1.24", default-features = false, features = [ "cramium-soc", ] } bitflags = "1.2.1" +rkyv = { version = "0.4.3", default-features = false, features = [ + "const_generics", +], optional = true } +num-derive = { version = "0.3.3", default-features = false } +num-traits = { version = "0.2.14", default-features = false } [target.'cfg(target_os = "xous")'.dependencies] xous = { version = "0.9.57", features = ["v2p"] } [features] baremetal = [] +derive-rkyv = ["rkyv"] default = [] diff --git a/libs/cramium-hal/src/iox.rs b/libs/cramium-hal/src/iox.rs index 7d9f6e4d5..9d29c4bfa 100644 --- a/libs/cramium-hal/src/iox.rs +++ b/libs/cramium-hal/src/iox.rs @@ -8,17 +8,18 @@ macro_rules! set_pin_in_bank { // code below does not add to the raw pointer outside of its approved range, // thanks to the constraints placed by the enum type of IoxPort. unsafe { - let oe_ptr = $self.csr.base(); + let ptr = $self.csr.base(); - oe_ptr.add($register.offset() + $port as usize).write_volatile( - (oe_ptr.add($register.offset() + $port as usize).read_volatile() & !(1u32 << ($pin as u32))) + ptr.add($register.offset() + $port as usize).write_volatile( + (ptr.add($register.offset() + $port as usize).read_volatile() & !(1u32 << ($pin as u32))) | (($val as u32) << ($pin as u32)), ) } }}; } -#[derive(Copy, Clone)] +#[cfg_attr(feature = "derive-rkyv", derive(rkyv::Archive, rkyv::Serialize, rkyv::Deserialize))] +#[derive(Debug, Copy, Clone, num_derive::FromPrimitive, num_derive::ToPrimitive)] #[repr(u32)] pub enum IoxPort { PA = 0, @@ -29,6 +30,8 @@ pub enum IoxPort { PF = 5, } +#[cfg_attr(feature = "derive-rkyv", derive(rkyv::Archive, rkyv::Serialize, rkyv::Deserialize))] +#[derive(Debug)] #[repr(u32)] pub enum IoxFunction { Gpio = 0b00, @@ -37,6 +40,8 @@ pub enum IoxFunction { AF3 = 0b11, } +#[cfg_attr(feature = "derive-rkyv", derive(rkyv::Archive, rkyv::Serialize, rkyv::Deserialize))] +#[derive(Debug)] #[repr(u32)] pub enum IoxDriveStrength { Drive2mA = 0b00, @@ -45,19 +50,24 @@ pub enum IoxDriveStrength { Drive12mA = 0b11, } +#[cfg_attr(feature = "derive-rkyv", derive(rkyv::Archive, rkyv::Serialize, rkyv::Deserialize))] +#[derive(Debug)] #[repr(u32)] pub enum IoxDir { Input = 0, Output = 1, } +#[cfg_attr(feature = "derive-rkyv", derive(rkyv::Archive, rkyv::Serialize, rkyv::Deserialize))] +#[derive(Debug)] #[repr(u32)] pub enum IoxEnable { Disable = 0, Enable = 1, } -#[derive(Copy, Clone)] +#[cfg_attr(feature = "derive-rkyv", derive(rkyv::Archive, rkyv::Serialize, rkyv::Deserialize))] +#[derive(Debug, Copy, Clone)] #[repr(u32)] pub enum IoxValue { Low = 0, @@ -87,6 +97,18 @@ impl Iox { set_pin_in_bank!(self, iox::SFR_GPIOOUT_CRGO0, port, pin, value) } + pub fn set_gpio_bank(&mut self, port: IoxPort, value: u16, mask: u16) { + // safety: it is safe to manipulate a raw pointer because IoxPort constrains + // the offset to be within range. + unsafe { + let ptr = self.csr.base(); + ptr.add(iox::SFR_GPIOOUT_CRGO0.offset() + port as usize).write_volatile( + ptr.add(iox::SFR_GPIOOUT_CRGO0.offset() + port as usize).read_volatile() & !(mask as u32) + | value as u32, + ) + } + } + pub fn set_gpio_schmitt_trigger(&mut self, port: IoxPort, pin: u8, enable: IoxEnable) { set_pin_in_bank!(self, iox::SFR_CFG_SCHM_CR_CFG_SCHMSEL0, port, pin, enable) }