alex/rp-hal-boards
1
0
Fork 0
mirror of https://github.com/italicsjenga/rp-hal-boards.git synced 2025-01-11 04:51:31 +11:00
Code Issues Packages Projects Releases Wiki Activity

Update SPI implementation of embedded-hal 1.x to 1.0.0-alpha.6

Browse source
This commit is contained in:
Jan Niehusmann 2021-11-19 22:18:46 +00:00
parent 0f3bb8e88c
commit 1294f556e9
1 changed files with 24 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
rp2040-hal/src/spi.rs
View file

@ -186,6 +186,27 @@ impl<D: SpiDevice, const DS: u8> Spi<Enabled, D, DS> {
}
}
/// Same as core::convert::Infallible, but implementing spi::Error
///
/// For eh 1.0.0-alpha.6, Infallible doesn't implement spi::Error,
/// so use a locally defined type instead.
#[cfg(feature = "eh1_0_alpha")]
pub enum SpiInfallible {}
#[cfg(feature = "eh1_0_alpha")]
impl core::fmt::Debug for SpiInfallible {
fn fmt(&self, _f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
match *self {}
}
}
#[cfg(feature = "eh1_0_alpha")]
impl eh1::Error for SpiInfallible {
fn kind(&self) -> eh1::ErrorKind {
match *self {}
}
}
macro_rules! impl_write {
($type:ident, [$($nr:expr),+]) => {
@ -221,16 +242,16 @@ macro_rules! impl_write {
#[cfg(feature = "eh1_0_alpha")]
impl<D: SpiDevice> eh1::nb::FullDuplex<$type> for Spi<Enabled, D, $nr> {
type Error = Infallible;
type Error = SpiInfallible;
fn read(&mut self) -> Result<$type, nb::Error<Infallible>> {
fn read(&mut self) -> Result<$type, nb::Error<SpiInfallible>> {
if !self.is_readable() {
return Err(nb::Error::WouldBlock);
}
Ok(self.device.sspdr.read().data().bits() as $type)
}
fn write(&mut self, word: $type) -> Result<(), nb::Error<Infallible>> {
fn write(&mut self, word: $type) -> Result<(), nb::Error<SpiInfallible>> {
// Write to TX FIFO whilst ignoring RX, then clean up afterward. When RX
// is full, PL022 inhibits RX pushes, and sets a sticky flag on
// push-on-full, but continues shifting. Safe if SSPIMSC_RORIM is not set.