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

stm32/sdmmc: remove unneeded pointer casts.

Browse Source
This commit is contained in:
Dario Nieuwenhuis 2023-04-17 00:13:34 +02:00
parent df7ef1d98f
commit e14fa11fc3
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -793,7 +793,7 @@ impl SdmmcInner {
let on_drop = OnDrop::new(|| unsafe { self.on_drop() }); let on_drop = OnDrop::new(|| unsafe { self.on_drop() });
unsafe { unsafe {
self.prepare_datapath_read(buffer as *mut [u32; 128], 512, 9, data_transfer_timeout, dma); self.prepare_datapath_read(buffer, 512, 9, data_transfer_timeout, dma);
self.data_interrupts(true); self.data_interrupts(true);
} }
self.cmd(Cmd::read_single_block(address), true)?; self.cmd(Cmd::read_single_block(address), true)?;
@ -1121,7 +1121,7 @@ impl SdmmcInner {
let on_drop = OnDrop::new(|| unsafe { self.on_drop() }); let on_drop = OnDrop::new(|| unsafe { self.on_drop() });
unsafe { unsafe {
self.prepare_datapath_read(&mut status as *mut [u32; 16], 64, 6, data_transfer_timeout, dma); self.prepare_datapath_read(&mut status, 64, 6, data_transfer_timeout, dma);
self.data_interrupts(true); self.data_interrupts(true);
} }
self.cmd(Cmd::cmd6(set_function), true)?; // CMD6 self.cmd(Cmd::cmd6(set_function), true)?; // CMD6
@ -1202,7 +1202,7 @@ impl SdmmcInner {
let on_drop = OnDrop::new(|| unsafe { self.on_drop() }); let on_drop = OnDrop::new(|| unsafe { self.on_drop() });
unsafe { unsafe {
self.prepare_datapath_read(&mut status as *mut [u32; 16], 64, 6, data_transfer_timeout, dma); self.prepare_datapath_read(&mut status, 64, 6, data_transfer_timeout, dma);
self.data_interrupts(true); self.data_interrupts(true);
} }
self.cmd(Cmd::card_status(0), true)?; self.cmd(Cmd::card_status(0), true)?;
@ -1320,7 +1320,7 @@ impl SdmmcInner {
let on_drop = OnDrop::new(move || unsafe { self.on_drop() }); let on_drop = OnDrop::new(move || unsafe { self.on_drop() });
unsafe { unsafe {
self.prepare_datapath_read(&mut scr as *mut [u32], 8, 3, data_transfer_timeout, dma); self.prepare_datapath_read(&mut scr[..], 8, 3, data_transfer_timeout, dma);
self.data_interrupts(true); self.data_interrupts(true);
} }
self.cmd(Cmd::cmd51(), true)?; self.cmd(Cmd::cmd51(), true)?;
@ -1560,15 +1560,14 @@ pin_trait!(D5Pin, Instance);
pin_trait!(D6Pin, Instance); pin_trait!(D6Pin, Instance);
pin_trait!(D7Pin, Instance); pin_trait!(D7Pin, Instance);
cfg_if::cfg_if! { #[cfg(sdmmc_v1)]
if #[cfg(sdmmc_v1)] { dma_trait!(SdmmcDma, Instance);
dma_trait!(SdmmcDma, Instance);
} else if #[cfg(sdmmc_v2)] { // SDMMCv2 uses internal DMA
// SDMMCv2 uses internal DMA #[cfg(sdmmc_v2)]
pub trait SdmmcDma<T: Instance> {} pub trait SdmmcDma<T: Instance> {}
impl<T: Instance> SdmmcDma<T> for NoDma {} #[cfg(sdmmc_v2)]
} impl<T: Instance> SdmmcDma<T> for NoDma {}
}
cfg_if::cfg_if! { cfg_if::cfg_if! {
// TODO, these could not be implemented, because required clocks are not exposed in RCC: // TODO, these could not be implemented, because required clocks are not exposed in RCC: