NaxdyOrg/embassy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #34 from mattiasgronlund/wlan_read_fix

Browse source 
Fixed length for wlan_read.
This commit is contained in:
Dario Nieuwenhuis 2023-01-02 00:26:37 +01:00 committed by GitHub
commit 072b8ce035
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/bus.rs
View file

@ -48,11 +48,12 @@ where
assert_eq!(val, TEST_PATTERN); assert_eq!(val, TEST_PATTERN);
} }
pub async fn wlan_read(&mut self, buf: &mut [u32]) { pub async fn wlan_read(&mut self, buf: &mut [u32], len_in_u8: u32) {
let cmd = cmd_word(READ, INC_ADDR, FUNC_WLAN, 0, buf.len() as u32 * 4); let cmd = cmd_word(READ, INC_ADDR, FUNC_WLAN, 0, len_in_u8);
let len_in_u32 = (len_in_u8 as usize + 3) / 4;
transaction!(&mut self.spi, |bus| async { transaction!(&mut self.spi, |bus| async {
bus.write(&[cmd]).await?; bus.write(&[cmd]).await?;
bus.read(buf).await?; bus.read(&mut buf[..len_in_u32]).await?;
Ok(()) Ok(())
}) })
.await .await

2
src/lib.rs
View file

@ -685,7 +685,7 @@ where
if status & STATUS_F2_PKT_AVAILABLE != 0 { if status & STATUS_F2_PKT_AVAILABLE != 0 {
let len = (status & STATUS_F2_PKT_LEN_MASK) >> STATUS_F2_PKT_LEN_SHIFT; let len = (status & STATUS_F2_PKT_LEN_MASK) >> STATUS_F2_PKT_LEN_SHIFT;
self.bus.wlan_read(&mut buf[..(len as usize + 3) / 4]).await; self.bus.wlan_read(&mut buf, len).await;
trace!("rx {:02x}", &slice8_mut(&mut buf)[..(len as usize).min(48)]); trace!("rx {:02x}", &slice8_mut(&mut buf)[..(len as usize).min(48)]);
self.rx(&slice8_mut(&mut buf)[..len as usize]); self.rx(&slice8_mut(&mut buf)[..len as usize]);
} }