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

Refactor V1 SPI

Browse Source
This commit is contained in:
Ulf Lilleengen 2021-09-21 14:50:05 +02:00
parent c79485c286
commit 9d45018077
1 changed files with 55 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

151
embassy-stm32/src/spi/v1.rs
View File

@ -303,28 +303,8 @@ impl<'d, T: Instance> embedded_hal::blocking::spi::Write<u8> for Spi<'d, T, NoDm
let regs = T::regs(); let regs = T::regs();
for word in words.iter() { for word in words.iter() {
while unsafe { !regs.sr().read().txe() } { write_word(regs, *word)?;
// spin let _: u8 = read_word(regs)?;
}
unsafe {
let dr = regs.dr().ptr() as *mut u8;
ptr::write_volatile(dr, *word);
}
loop {
let sr = unsafe { regs.sr().read() };
if sr.fre() {
return Err(Error::Framing);
}
if sr.ovr() {
return Err(Error::Overrun);
}
if sr.crcerr() {
return Err(Error::Crc);
}
if !sr.txe() {
// loop waiting for TXE
}
}
} }
Ok(()) Ok(())
@ -339,33 +319,8 @@ impl<'d, T: Instance> embedded_hal::blocking::spi::Transfer<u8> for Spi<'d, T, N
let regs = T::regs(); let regs = T::regs();
for word in words.iter_mut() { for word in words.iter_mut() {
while unsafe { !regs.sr().read().txe() } { write_word(regs, *word)?;
// spin *word = read_word(regs)?;
}
unsafe {
let dr = regs.dr().ptr() as *mut u8;
ptr::write_volatile(dr, *word);
}
while unsafe { !regs.sr().read().rxne() } {
// spin waiting for inbound to shift in.
}
unsafe {
let dr = regs.dr().ptr() as *const u8;
*word = ptr::read_volatile(dr);
}
let sr = unsafe { regs.sr().read() };
if sr.fre() {
return Err(Error::Framing);
}
if sr.ovr() {
return Err(Error::Overrun);
}
if sr.crcerr() {
return Err(Error::Crc);
}
} }
Ok(words) Ok(words)
@ -380,28 +335,8 @@ impl<'d, T: Instance> embedded_hal::blocking::spi::Write<u16> for Spi<'d, T, NoD
let regs = T::regs(); let regs = T::regs();
for word in words.iter() { for word in words.iter() {
while unsafe { !regs.sr().read().txe() } { write_word(regs, *word)?;
// spin let _: u8 = read_word(regs)?;
}
unsafe {
let dr = regs.dr().ptr() as *mut u16;
ptr::write_volatile(dr, *word);
}
loop {
let sr = unsafe { regs.sr().read() };
if sr.fre() {
return Err(Error::Framing);
}
if sr.ovr() {
return Err(Error::Overrun);
}
if sr.crcerr() {
return Err(Error::Crc);
}
if !sr.txe() {
// loop waiting for TXE
}
}
} }
Ok(()) Ok(())
@ -416,31 +351,8 @@ impl<'d, T: Instance> embedded_hal::blocking::spi::Transfer<u16> for Spi<'d, T,
let regs = T::regs(); let regs = T::regs();
for word in words.iter_mut() { for word in words.iter_mut() {
while unsafe { !regs.sr().read().txe() } { write_word(regs, *word)?;
// spin *word = read_word(regs)?;
}
unsafe {
let dr = regs.dr().ptr() as *mut u16;
ptr::write_volatile(dr, *word);
}
while unsafe { !regs.sr().read().rxne() } {
// spin waiting for inbound to shift in.
}
unsafe {
let dr = regs.dr().ptr() as *const u16;
*word = ptr::read_volatile(dr);
}
let sr = unsafe { regs.sr().read() };
if sr.fre() {
return Err(Error::Framing);
}
if sr.ovr() {
return Err(Error::Overrun);
}
if sr.crcerr() {
return Err(Error::Crc);
}
} }
Ok(words) Ok(words)
@ -485,3 +397,50 @@ impl<'d, T: Instance, Tx: TxDmaChannel<T>, Rx: RxDmaChannel<T>> traits::FullDupl
self.read_write_dma_u8(read, write) self.read_write_dma_u8(read, write)
} }
} }
trait Word {}
impl Word for u8 {}
impl Word for u16 {}
fn write_word<W: Word>(regs: &'static crate::pac::spi::Spi, word: W) -> Result<(), Error> {
loop {
let sr = unsafe { regs.sr().read() };
if sr.ovr() {
return Err(Error::Overrun);
} else if sr.fre() {
return Err(Error::Framing);
} else if sr.modf() {
return Err(Error::ModeFault);
} else if sr.crcerr() {
return Err(Error::Crc);
} else if sr.txe() {
unsafe {
let dr = regs.dr().ptr() as *mut W;
ptr::write_volatile(dr, word);
}
return Ok(());
}
}
}
/// Read a single word blocking. Assumes word size have already been set.
fn read_word<W: Word>(regs: &'static crate::pac::spi::Spi) -> Result<W, Error> {
loop {
let sr = unsafe { regs.sr().read() };
if sr.ovr() {
return Err(Error::Overrun);
} else if sr.modf() {
return Err(Error::ModeFault);
} else if sr.fre() {
return Err(Error::Framing);
} else if sr.crcerr() {
return Err(Error::Crc);
} else if sr.rxne() {
unsafe {
let dr = regs.dr().ptr() as *const W;
return Ok(ptr::read_volatile(dr));
}
}
}
}