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

Remove AF_NUM const from pin traits, only use af_num fn

Browse Source
This commit is contained in:
Dario Nieuwenhuis
2021-05-15 03:07:37 +02:00
parent e63c4bde0b
commit 180ca48d34
3 changed files with 25 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
embassy-stm32/src/spi/mod.rs
View File

@ -6,6 +6,8 @@ mod spi;
pub use spi::*;
use crate::gpio::Pin;
pub enum Error {
Framing,
Crc,
@ -41,32 +43,21 @@ impl Default for Config {
pub(crate) mod sealed {
use super::*;
use crate::gpio::Pin;
use embassy::util::AtomicWaker;
pub trait Instance {
fn regs() -> &'static crate::pac::spi::Spi;
}
pub trait SckPin<T: Instance>: Pin {
const AF: u8;
fn af(&self) -> u8 {
Self::AF
}
fn af_num(&self) -> u8;
}
pub trait MosiPin<T: Instance>: Pin {
const AF: u8;
fn af(&self) -> u8 {
Self::AF
}
fn af_num(&self) -> u8;
}
pub trait MisoPin<T: Instance>: Pin {
const AF: u8;
fn af(&self) -> u8 {
Self::AF
}
fn af_num(&self) -> u8;
}
}
@ -95,7 +86,9 @@ macro_rules! impl_spi_pin {
impl crate::spi::$pin_func<peripherals::$inst> for peripherals::$pin {}
impl crate::spi::sealed::$pin_func<peripherals::$inst> for peripherals::$pin {
const AF: u8 = $af;
fn af_num(&self) -> u8 {
$af
}
}
};
}

6
embassy-stm32/src/spi/spi_v1.rs
View File

@ -43,9 +43,9 @@ impl<'d, T: Instance> Spi<'d, T> {
unborrow!(peri, sck, mosi, miso);
unsafe {
sck.set_as_af(sck.af());
mosi.set_as_af(mosi.af());
miso.set_as_af(miso.af());
sck.set_as_af(sck.af_num());
mosi.set_as_af(mosi.af_num());
miso.set_as_af(miso.af_num());
}
let sck = sck.degrade();