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

Formatting.

Browse Source
This commit is contained in:
Bob McWhirter
2021-05-20 14:19:43 -04:00
parent 8b36269d65
commit 222faccbab
3 changed files with 31 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
embassy-stm32/src/spi/v2.rs
View File

@ -7,10 +7,10 @@ use crate::pac::spi;
use crate::spi::{ByteOrder, Config, Error, Instance, MisoPin, MosiPin, SckPin, WordSize};
use crate::time::Hertz;
use core::marker::PhantomData;
use core::ptr;
use embassy::util::Unborrow;
use embassy_extras::unborrow;
pub use embedded_hal::spi::{Mode, Phase, Polarity, MODE_0, MODE_1, MODE_2, MODE_3};
use core::ptr;
impl WordSize {
fn ds(&self) -> spi::vals::Ds {
@ -166,10 +166,7 @@ impl<'d, T: Instance> embedded_hal::blocking::spi::Write<u8> for Spi<'d, T> {
}
unsafe {
let dr = regs.dr().ptr() as *mut u8;
ptr::write_volatile(
dr,
*word,
);
ptr::write_volatile(dr, *word);
}
loop {
let sr = unsafe { regs.sr().read() };
@ -205,10 +202,7 @@ impl<'d, T: Instance> embedded_hal::blocking::spi::Transfer<u8> for Spi<'d, T> {
}
unsafe {
let dr = regs.dr().ptr() as *mut u8;
ptr::write_volatile(
dr,
*word,
);
ptr::write_volatile(dr, *word);
}
loop {
let sr = unsafe { regs.sr().read() };
@ -227,9 +221,7 @@ impl<'d, T: Instance> embedded_hal::blocking::spi::Transfer<u8> for Spi<'d, T> {
}
unsafe {
let dr = regs.rxdr().ptr() as *const u8;
*word = ptr::read_volatile(
dr
);
*word = ptr::read_volatile(dr);
}
let sr = unsafe { regs.sr().read() };
if sr.fre() {
@ -260,10 +252,7 @@ impl<'d, T: Instance> embedded_hal::blocking::spi::Write<u16> for Spi<'d, T> {
}
unsafe {
let dr = regs.dr().ptr() as *mut u16;
ptr::write_volatile(
dr,
*word,
);
ptr::write_volatile(dr, *word);
}
loop {
let sr = unsafe { regs.sr().read() };
@ -299,19 +288,14 @@ impl<'d, T: Instance> embedded_hal::blocking::spi::Transfer<u16> for Spi<'d, T>
}
unsafe {
let dr = regs.dr().ptr() as *mut u16;
ptr::write_volatile(
dr,
*word,
);
ptr::write_volatile(dr, *word);
}
while unsafe { !regs.sr().read().rxne() } {
// spin waiting for inbound to shift in.
}
unsafe {
let dr = regs.rxdr().ptr() as *const u16;
*word = ptr::read_volatile(
dr
);
*word = ptr::read_volatile(dr);
}
let sr = unsafe { regs.sr().read() };
if sr.fre() {