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

Rename DMA trait

Browse Source
This commit is contained in:
chemicstry 2022-03-16 20:30:57 +02:00
parent 8a8e5c4b73
commit ea467e0acb
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
embassy-stm32/build.rs
View File

@ -483,7 +483,7 @@ fn main() {
(("i2c", "TX"), quote!(crate::i2c::TxDma)), (("i2c", "TX"), quote!(crate::i2c::TxDma)),
(("dcmi", "DCMI"), quote!(crate::dcmi::FrameDma)), (("dcmi", "DCMI"), quote!(crate::dcmi::FrameDma)),
(("dcmi", "PSSI"), quote!(crate::dcmi::FrameDma)), (("dcmi", "PSSI"), quote!(crate::dcmi::FrameDma)),
(("sdmmc", "SDIO"), quote!(crate::sdmmc::SdioDma)), (("sdmmc", "SDIO"), quote!(crate::sdmmc::SdmmcDma)),
] ]
.into(); .into();

26
embassy-stm32/src/sdmmc/mod.rs
View File

@ -192,7 +192,7 @@ pub struct Sdmmc<'d, T: Instance, P: Pins<T>, Dma = NoDma> {
} }
#[cfg(sdmmc_v1)] #[cfg(sdmmc_v1)]
impl<'d, T: Instance, P: Pins<T>, Dma: SdioDma<T>> Sdmmc<'d, T, P, Dma> { impl<'d, T: Instance, P: Pins<T>, Dma: SdmmcDma<T>> Sdmmc<'d, T, P, Dma> {
pub fn new( pub fn new(
_peripheral: impl Unborrow<Target = T> + 'd, _peripheral: impl Unborrow<Target = T> + 'd,
pins: impl Unborrow<Target = P> + 'd, pins: impl Unborrow<Target = P> + 'd,
@ -262,7 +262,7 @@ impl<'d, T: Instance, P: Pins<T>> Sdmmc<'d, T, P, NoDma> {
} }
} }
impl<'d, T: Instance, P: Pins<T>, Dma: SdioDma<T>> Sdmmc<'d, T, P, Dma> { impl<'d, T: Instance, P: Pins<T>, Dma: SdmmcDma<T>> Sdmmc<'d, T, P, Dma> {
#[inline(always)] #[inline(always)]
pub async fn init_card(&mut self, freq: impl Into<Hertz>) -> Result<(), Error> { pub async fn init_card(&mut self, freq: impl Into<Hertz>) -> Result<(), Error> {
let inner = T::inner(); let inner = T::inner();
@ -390,7 +390,7 @@ impl SdmmcInner {
/// Initializes card (if present) and sets the bus at the /// Initializes card (if present) and sets the bus at the
/// specified frequency. /// specified frequency.
#[allow(clippy::too_many_arguments)] #[allow(clippy::too_many_arguments)]
async fn init_card<T: Instance, Dma: SdioDma<T>>( async fn init_card<T: Instance, Dma: SdmmcDma<T>>(
&self, &self,
freq: Hertz, freq: Hertz,
bus_width: BusWidth, bus_width: BusWidth,
@ -537,7 +537,7 @@ impl SdmmcInner {
Ok(()) Ok(())
} }
async fn read_block<T: Instance, Dma: SdioDma<T>>( async fn read_block<T: Instance, Dma: SdmmcDma<T>>(
&self, &self,
block_idx: u32, block_idx: u32,
buffer: &mut [u32; 128], buffer: &mut [u32; 128],
@ -592,7 +592,7 @@ impl SdmmcInner {
res res
} }
async fn write_block<T: Instance, Dma: SdioDma<T>>( async fn write_block<T: Instance, Dma: SdmmcDma<T>>(
&self, &self,
block_idx: u32, block_idx: u32,
buffer: &[u32; 128], buffer: &[u32; 128],
@ -716,7 +716,7 @@ impl SdmmcInner {
/// # Safety /// # Safety
/// ///
/// `buffer` must be valid for the whole transfer and word aligned /// `buffer` must be valid for the whole transfer and word aligned
unsafe fn prepare_datapath_read<T: Instance, Dma: SdioDma<T>>( unsafe fn prepare_datapath_read<T: Instance, Dma: SdmmcDma<T>>(
&self, &self,
buffer: *mut [u32], buffer: *mut [u32],
length_bytes: u32, length_bytes: u32,
@ -765,7 +765,7 @@ impl SdmmcInner {
/// # Safety /// # Safety
/// ///
/// `buffer` must be valid for the whole transfer and word aligned /// `buffer` must be valid for the whole transfer and word aligned
unsafe fn prepare_datapath_write<T: Instance, Dma: SdioDma<T>>( unsafe fn prepare_datapath_write<T: Instance, Dma: SdmmcDma<T>>(
&self, &self,
buffer: *const [u32], buffer: *const [u32],
length_bytes: u32, length_bytes: u32,
@ -855,7 +855,7 @@ impl SdmmcInner {
/// Attempt to set a new signalling mode. The selected /// Attempt to set a new signalling mode. The selected
/// signalling mode is returned. Expects the current clock /// signalling mode is returned. Expects the current clock
/// frequency to be > 12.5MHz. /// frequency to be > 12.5MHz.
async fn switch_signalling_mode<T: Instance, Dma: SdioDma<T>>( async fn switch_signalling_mode<T: Instance, Dma: SdmmcDma<T>>(
&self, &self,
signalling: Signalling, signalling: Signalling,
waker_reg: &AtomicWaker, waker_reg: &AtomicWaker,
@ -952,7 +952,7 @@ impl SdmmcInner {
} }
/// Reads the SD Status (ACMD13) /// Reads the SD Status (ACMD13)
async fn read_sd_status<T: Instance, Dma: SdioDma<T>>( async fn read_sd_status<T: Instance, Dma: SdmmcDma<T>>(
&self, &self,
card: &mut Card, card: &mut Card,
waker_reg: &AtomicWaker, waker_reg: &AtomicWaker,
@ -1076,7 +1076,7 @@ impl SdmmcInner {
} }
} }
async fn get_scr<T: Instance, Dma: SdioDma<T>>( async fn get_scr<T: Instance, Dma: SdmmcDma<T>>(
&self, &self,
card: &mut Card, card: &mut Card,
waker_reg: &AtomicWaker, waker_reg: &AtomicWaker,
@ -1336,11 +1336,11 @@ pin_trait!(D7Pin, Instance);
cfg_if::cfg_if! { cfg_if::cfg_if! {
if #[cfg(sdmmc_v1)] { if #[cfg(sdmmc_v1)] {
dma_trait!(SdioDma, Instance); dma_trait!(SdmmcDma, Instance);
} else if #[cfg(sdmmc_v2)] { } else if #[cfg(sdmmc_v2)] {
// SDMMCv2 uses internal DMA // SDMMCv2 uses internal DMA
pub trait SdioDma<T: Instance> {} pub trait SdmmcDma<T: Instance> {}
impl<T: Instance> SdioDma<T> for NoDma {} impl<T: Instance> SdmmcDma<T> for NoDma {}
} }
} }