aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDario Nieuwenhuis <[email protected]>2023-01-02 00:26:37 +0100
committerGitHub <[email protected]>2023-01-02 00:26:37 +0100
commit072b8ce0352f4a000db4d525683d170799b83b1a (patch)
treec68a0799b3e77e5d53f6c40d024b07112f9c8617
parent2548bbdd65fc3094f624bd043a1a9a296f9184b5 (diff)
parentc1fa46bd36986943616bd453c6dfa1c5c7dc63d8 (diff)
Merge pull request #34 from mattiasgronlund/wlan_read_fix
Fixed length for wlan_read.
-rw-r--r--src/bus.rs7
-rw-r--r--src/lib.rs2
2 files changed, 5 insertions, 4 deletions
diff --git a/src/bus.rs b/src/bus.rs
index f220cffcd..f64c0abba 100644
--- a/src/bus.rs
+++ b/src/bus.rs
@@ -48,11 +48,12 @@ where
48 assert_eq!(val, TEST_PATTERN); 48 assert_eq!(val, TEST_PATTERN);
49 } 49 }
50 50
51 pub async fn wlan_read(&mut self, buf: &mut [u32]) { 51 pub async fn wlan_read(&mut self, buf: &mut [u32], len_in_u8: u32) {
52 let cmd = cmd_word(READ, INC_ADDR, FUNC_WLAN, 0, buf.len() as u32 * 4); 52 let cmd = cmd_word(READ, INC_ADDR, FUNC_WLAN, 0, len_in_u8);
53 let len_in_u32 = (len_in_u8 as usize + 3) / 4;
53 transaction!(&mut self.spi, |bus| async { 54 transaction!(&mut self.spi, |bus| async {
54 bus.write(&[cmd]).await?; 55 bus.write(&[cmd]).await?;
55 bus.read(buf).await?; 56 bus.read(&mut buf[..len_in_u32]).await?;
56 Ok(()) 57 Ok(())
57 }) 58 })
58 .await 59 .await
diff --git a/src/lib.rs b/src/lib.rs
index 25e6f8f16..940322715 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -685,7 +685,7 @@ where
685 685
686 if status & STATUS_F2_PKT_AVAILABLE != 0 { 686 if status & STATUS_F2_PKT_AVAILABLE != 0 {
687 let len = (status & STATUS_F2_PKT_LEN_MASK) >> STATUS_F2_PKT_LEN_SHIFT; 687 let len = (status & STATUS_F2_PKT_LEN_MASK) >> STATUS_F2_PKT_LEN_SHIFT;
688 self.bus.wlan_read(&mut buf[..(len as usize + 3) / 4]).await; 688 self.bus.wlan_read(&mut buf, len).await;
689 trace!("rx {:02x}", &slice8_mut(&mut buf)[..(len as usize).min(48)]); 689 trace!("rx {:02x}", &slice8_mut(&mut buf)[..(len as usize).min(48)]);
690 self.rx(&slice8_mut(&mut buf)[..len as usize]); 690 self.rx(&slice8_mut(&mut buf)[..len as usize]);
691 } 691 }