M-Labs/ionpak-thermostat
7
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

gpio: fix masked_data

Browse Source
This commit is contained in:
Astro 2019-09-01 22:05:26 +02:00
parent f94173788e
commit bf8c7fda88
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
firmware/src/board/gpio.rs
View File

@ -43,13 +43,13 @@ macro_rules! def_gpio {
type Error = (); type Error = ();
fn set_low(&mut self) -> Result<(), Self::Error> { fn set_low(&mut self) -> Result<(), Self::Error> {
let gpio = unsafe { &*tm4c129x::$PORT::ptr() }; let gpio = unsafe { &*tm4c129x::$PORT::ptr() };
let data = masked_data(unsafe { transmute(&gpio.data) }, $idx); let data = masked_data(unsafe { transmute(&gpio.data) }, (1 << $idx));
*data = 0; *data = 0;
Ok(()) Ok(())
} }
fn set_high(&mut self) -> Result<(), Self::Error> { fn set_high(&mut self) -> Result<(), Self::Error> {
let gpio = unsafe { &*tm4c129x::$PORT::ptr() }; let gpio = unsafe { &*tm4c129x::$PORT::ptr() };
let data = masked_data(unsafe { transmute(&gpio.data) }, $idx); let data = masked_data(unsafe { transmute(&gpio.data) }, (1 << $idx));
*data = 1 << $idx; *data = 1 << $idx;
Ok(()) Ok(())
} }
@ -68,6 +68,6 @@ def_gpio!(GPIO_PORTE_AHB, PE5, 5);
/// Setting of GPIO pins is optimized by address masking /// Setting of GPIO pins is optimized by address masking
fn masked_data<'a>(data: *mut u32, bits: u8) -> &'a mut u32 { fn masked_data<'a>(data: *mut u32, bits: u8) -> &'a mut u32 {
let data = unsafe { from_raw_parts_mut(data, 0x100) }; let data = unsafe { from_raw_parts_mut(data, 0x400) };
&mut data[usize::from(bits)] &mut data[usize::from(bits)]
} }