max/embassy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use async spi transaction helper macro.

Browse Source
This commit is contained in:
Dario Nieuwenhuis 2022-09-20 22:01:24 +02:00
parent c385bbf07d
commit 0d84533bcb
1 changed files with 70 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/lib.rs
View File

@ -23,7 +23,7 @@ use embassy_sync::blocking_mutex::raw::NoopRawMutex;
use embassy_sync::channel::Channel; use embassy_sync::channel::Channel;
use embassy_time::{block_for, Duration, Timer}; use embassy_time::{block_for, Duration, Timer};
use embedded_hal_1::digital::OutputPin; use embedded_hal_1::digital::OutputPin;
use embedded_hal_async::spi::{SpiBusRead, SpiBusWrite, SpiDevice}; use embedded_hal_async::spi::{transaction, SpiBusRead, SpiBusWrite, SpiDevice};
use self::structs::*; use self::structs::*;
use crate::events::Event; use crate::events::Event;
@ -753,14 +753,10 @@ where
let cmd = cmd_word(READ, INC_ADDR, FUNC_WLAN, 0, len); let cmd = cmd_word(READ, INC_ADDR, FUNC_WLAN, 0, len);
self.spi transaction!(&mut self.spi, |bus| async {
.transaction(|bus| {
let bus = unsafe { &mut *bus };
async {
bus.write(&[cmd]).await?; bus.write(&[cmd]).await?;
bus.read(&mut buf[..(len as usize + 3) / 4]).await?; bus.read(&mut buf[..(len as usize + 3) / 4]).await?;
Ok(()) Ok(())
}
}) })
.await .await
.unwrap(); .unwrap();
@ -817,14 +813,10 @@ where
trace!(" {:02x}", &buf8[..total_len.min(48)]); trace!(" {:02x}", &buf8[..total_len.min(48)]);
let cmd = cmd_word(WRITE, INC_ADDR, FUNC_WLAN, 0, total_len as _); let cmd = cmd_word(WRITE, INC_ADDR, FUNC_WLAN, 0, total_len as _);
self.spi transaction!(&mut self.spi, |bus| async {
.transaction(|bus| {
let bus = unsafe { &mut *bus };
async {
bus.write(&[cmd]).await?; bus.write(&[cmd]).await?;
bus.write(&buf[..(total_len / 4)]).await?; bus.write(&buf[..(total_len / 4)]).await?;
Ok(()) Ok(())
}
}) })
.await .await
.unwrap(); .unwrap();
@ -1012,14 +1004,10 @@ where
let cmd = cmd_word(WRITE, INC_ADDR, FUNC_WLAN, 0, total_len as _); let cmd = cmd_word(WRITE, INC_ADDR, FUNC_WLAN, 0, total_len as _);
self.spi transaction!(&mut self.spi, |bus| async {
.transaction(|bus| {
let bus = unsafe { &mut *bus };
async {
bus.write(&[cmd]).await?; bus.write(&[cmd]).await?;
bus.write(&buf[..total_len / 4]).await?; bus.write(&buf[..total_len / 4]).await?;
Ok(()) Ok(())
}
}) })
.await .await
.unwrap(); .unwrap();
@ -1101,10 +1089,7 @@ where
let cmd = cmd_word(READ, INC_ADDR, FUNC_BACKPLANE, window_offs, len as u32); let cmd = cmd_word(READ, INC_ADDR, FUNC_BACKPLANE, window_offs, len as u32);
self.spi transaction!(&mut self.spi, |bus| async {
.transaction(|bus| {
let bus = unsafe { &mut *bus };
async {
bus.write(&[cmd]).await?; bus.write(&[cmd]).await?;
// 4-byte response delay. // 4-byte response delay.
@ -1114,7 +1099,6 @@ where
// Read data // Read data
bus.read(&mut data[..len / 4]).await?; bus.read(&mut data[..len / 4]).await?;
Ok(()) Ok(())
}
}) })
.await .await
.unwrap(); .unwrap();
@ -1146,14 +1130,10 @@ where
let cmd = cmd_word(WRITE, INC_ADDR, FUNC_BACKPLANE, window_offs, len as u32); let cmd = cmd_word(WRITE, INC_ADDR, FUNC_BACKPLANE, window_offs, len as u32);
self.spi transaction!(&mut self.spi, |bus| async {
.transaction(|bus| {
let bus = unsafe { &mut *bus };
async {
bus.write(&[cmd]).await?; bus.write(&[cmd]).await?;
bus.write(&buf[..(len + 3) / 4]).await?; bus.write(&buf[..(len + 3) / 4]).await?;
Ok(()) Ok(())
}
}) })
.await .await
.unwrap(); .unwrap();
@ -1270,10 +1250,7 @@ where
let cmd = cmd_word(READ, INC_ADDR, func, addr, len); let cmd = cmd_word(READ, INC_ADDR, func, addr, len);
let mut buf = [0; 1]; let mut buf = [0; 1];
self.spi transaction!(&mut self.spi, |bus| async {
.transaction(|bus| {
let bus = unsafe { &mut *bus };
async {
bus.write(&[cmd]).await?; bus.write(&[cmd]).await?;
if func == FUNC_BACKPLANE { if func == FUNC_BACKPLANE {
// 4-byte response delay. // 4-byte response delay.
@ -1281,7 +1258,6 @@ where
} }
bus.read(&mut buf).await?; bus.read(&mut buf).await?;
Ok(()) Ok(())
}
}) })
.await .await
.unwrap(); .unwrap();
@ -1292,13 +1268,9 @@ where
async fn writen(&mut self, func: u32, addr: u32, val: u32, len: u32) { async fn writen(&mut self, func: u32, addr: u32, val: u32, len: u32) {
let cmd = cmd_word(WRITE, INC_ADDR, func, addr, len); let cmd = cmd_word(WRITE, INC_ADDR, func, addr, len);
self.spi transaction!(&mut self.spi, |bus| async {
.transaction(|bus| {
let bus = unsafe { &mut *bus };
async {
bus.write(&[cmd, val]).await?; bus.write(&[cmd, val]).await?;
Ok(()) Ok(())
}
}) })
.await .await
.unwrap(); .unwrap();
@ -1308,14 +1280,10 @@ where
let cmd = cmd_word(READ, INC_ADDR, FUNC_BUS, addr, 4); let cmd = cmd_word(READ, INC_ADDR, FUNC_BUS, addr, 4);
let mut buf = [0; 1]; let mut buf = [0; 1];
self.spi transaction!(&mut self.spi, |bus| async {
.transaction(|bus| {
let bus = unsafe { &mut *bus };
async {
bus.write(&[swap16(cmd)]).await?; bus.write(&[swap16(cmd)]).await?;
bus.read(&mut buf).await?; bus.read(&mut buf).await?;
Ok(()) Ok(())
}
}) })
.await .await
.unwrap(); .unwrap();
@ -1326,13 +1294,9 @@ where
async fn write32_swapped(&mut self, addr: u32, val: u32) { async fn write32_swapped(&mut self, addr: u32, val: u32) {
let cmd = cmd_word(WRITE, INC_ADDR, FUNC_BUS, addr, 4); let cmd = cmd_word(WRITE, INC_ADDR, FUNC_BUS, addr, 4);
self.spi transaction!(&mut self.spi, |bus| async {
.transaction(|bus| {
let bus = unsafe { &mut *bus };
async {
bus.write(&[swap16(cmd), swap16(val)]).await?; bus.write(&[swap16(cmd), swap16(val)]).await?;
Ok(()) Ok(())
}
}) })
.await .await
.unwrap(); .unwrap();