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

stm32/sdmmc: remove cfg_if.

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

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

@ -135,14 +135,13 @@ enum Response {
Long = 3, Long = 3,
} }
cfg_if::cfg_if! { /// Calculate clock divisor. Returns a SDMMC_CK less than or equal to
if #[cfg(sdmmc_v1)] { /// `sdmmc_ck` in Hertz.
/// Calculate clock divisor. Returns a SDMMC_CK less than or equal to ///
/// `sdmmc_ck` in Hertz. /// Returns `(bypass, clk_div, clk_f)`, where `bypass` enables clock divisor bypass (only sdmmc_v1),
/// /// `clk_div` is the divisor register value and `clk_f` is the resulting new clock frequency.
/// Returns `(bypass, clk_div, clk_f)`, where `bypass` enables clock divisor bypass (only sdmmc_v1), #[cfg(sdmmc_v1)]
/// `clk_div` is the divisor register value and `clk_f` is the resulting new clock frequency. fn clk_div(ker_ck: Hertz, sdmmc_ck: u32) -> Result<(bool, u8, Hertz), Error> {
fn clk_div(ker_ck: Hertz, sdmmc_ck: u32) -> Result<(bool, u8, Hertz), Error> {
// sdmmc_v1 maximum clock is 50 MHz // sdmmc_v1 maximum clock is 50 MHz
if sdmmc_ck > 50_000_000 { if sdmmc_ck > 50_000_000 {
return Err(Error::BadClock); return Err(Error::BadClock);
@ -156,23 +155,22 @@ cfg_if::cfg_if! {
// `ker_ck / sdmmc_ck` rounded up // `ker_ck / sdmmc_ck` rounded up
let clk_div = match (ker_ck.0 + sdmmc_ck - 1) / sdmmc_ck { let clk_div = match (ker_ck.0 + sdmmc_ck - 1) / sdmmc_ck {
0 | 1 => Ok(0), 0 | 1 => Ok(0),
x @ 2..=258 => { x @ 2..=258 => Ok((x - 2) as u8),
Ok((x - 2) as u8)
}
_ => Err(Error::BadClock), _ => Err(Error::BadClock),
}?; }?;
// SDIO_CK frequency = SDIOCLK / [CLKDIV + 2] // SDIO_CK frequency = SDIOCLK / [CLKDIV + 2]
let clk_f = Hertz(ker_ck.0 / (clk_div as u32 + 2)); let clk_f = Hertz(ker_ck.0 / (clk_div as u32 + 2));
Ok((false, clk_div, clk_f)) Ok((false, clk_div, clk_f))
} }
} else if #[cfg(sdmmc_v2)] {
/// Calculate clock divisor. Returns a SDMMC_CK less than or equal to /// Calculate clock divisor. Returns a SDMMC_CK less than or equal to
/// `sdmmc_ck` in Hertz. /// `sdmmc_ck` in Hertz.
/// ///
/// Returns `(bypass, clk_div, clk_f)`, where `bypass` enables clock divisor bypass (only sdmmc_v1), /// Returns `(bypass, clk_div, clk_f)`, where `bypass` enables clock divisor bypass (only sdmmc_v1),
/// `clk_div` is the divisor register value and `clk_f` is the resulting new clock frequency. /// `clk_div` is the divisor register value and `clk_f` is the resulting new clock frequency.
fn clk_div(ker_ck: Hertz, sdmmc_ck: u32) -> Result<(bool, u16, Hertz), Error> { #[cfg(sdmmc_v2)]
fn clk_div(ker_ck: Hertz, sdmmc_ck: u32) -> Result<(bool, u16, Hertz), Error> {
// `ker_ck / sdmmc_ck` rounded up // `ker_ck / sdmmc_ck` rounded up
match (ker_ck.0 + sdmmc_ck - 1) / sdmmc_ck { match (ker_ck.0 + sdmmc_ck - 1) / sdmmc_ck {
0 | 1 => Ok((false, 0, ker_ck)), 0 | 1 => Ok((false, 0, ker_ck)),
@ -185,8 +183,6 @@ cfg_if::cfg_if! {
} }
_ => Err(Error::BadClock), _ => Err(Error::BadClock),
} }
}
}
} }
/// SDMMC configuration /// SDMMC configuration
@ -904,13 +900,10 @@ impl SdmmcInner {
// NOTE(unsafe) Atomic read with no side-effects // NOTE(unsafe) Atomic read with no side-effects
unsafe { unsafe {
let status = regs.star().read(); let status = regs.star().read();
cfg_if::cfg_if! { #[cfg(sdmmc_v1)]
if #[cfg(sdmmc_v1)] { return status.rxact() || status.txact();
status.rxact() || status.txact() #[cfg(sdmmc_v2)]
} else if #[cfg(sdmmc_v2)] { return status.dpsmact();
status.dpsmact()
}
}
} }
} }
@ -922,13 +915,10 @@ impl SdmmcInner {
// NOTE(unsafe) Atomic read with no side-effects // NOTE(unsafe) Atomic read with no side-effects
unsafe { unsafe {
let status = regs.star().read(); let status = regs.star().read();
cfg_if::cfg_if! { #[cfg(sdmmc_v1)]
if #[cfg(sdmmc_v1)] { return status.cmdact();
status.cmdact() #[cfg(sdmmc_v2)]
} else if #[cfg(sdmmc_v2)] { return status.cpsmact();
status.cpsmact()
}
}
} }
} }
@ -961,21 +951,27 @@ impl SdmmcInner {
regs.dtimer().write(|w| w.set_datatime(data_transfer_timeout)); regs.dtimer().write(|w| w.set_datatime(data_transfer_timeout));
regs.dlenr().write(|w| w.set_datalength(length_bytes)); regs.dlenr().write(|w| w.set_datalength(length_bytes));
cfg_if::cfg_if! { #[cfg(sdmmc_v1)]
if #[cfg(sdmmc_v1)] { {
let request = dma.request(); let request = dma.request();
dma.start_read(request, regs.fifor().ptr() as *const u32, buffer, crate::dma::TransferOptions { dma.start_read(
request,
regs.fifor().ptr() as *const u32,
buffer,
crate::dma::TransferOptions {
pburst: crate::dma::Burst::Incr4, pburst: crate::dma::Burst::Incr4,
mburst: crate::dma::Burst::Incr4, mburst: crate::dma::Burst::Incr4,
flow_ctrl: crate::dma::FlowControl::Peripheral, flow_ctrl: crate::dma::FlowControl::Peripheral,
fifo_threshold: Some(crate::dma::FifoThreshold::Full), fifo_threshold: Some(crate::dma::FifoThreshold::Full),
..Default::default() ..Default::default()
}); },
} else if #[cfg(sdmmc_v2)] { );
}
#[cfg(sdmmc_v2)]
{
regs.idmabase0r().write(|w| w.set_idmabase0(buffer as *mut u32 as u32)); regs.idmabase0r().write(|w| w.set_idmabase0(buffer as *mut u32 as u32));
regs.idmactrlr().modify(|w| w.set_idmaen(true)); regs.idmactrlr().modify(|w| w.set_idmaen(true));
} }
}
regs.dctrl().modify(|w| { regs.dctrl().modify(|w| {
w.set_dblocksize(block_size); w.set_dblocksize(block_size);
@ -1011,20 +1007,27 @@ impl SdmmcInner {
regs.dtimer().write(|w| w.set_datatime(data_transfer_timeout)); regs.dtimer().write(|w| w.set_datatime(data_transfer_timeout));
regs.dlenr().write(|w| w.set_datalength(length_bytes)); regs.dlenr().write(|w| w.set_datalength(length_bytes));
cfg_if::cfg_if! { #[cfg(sdmmc_v1)]
if #[cfg(sdmmc_v1)] { {
let request = dma.request(); let request = dma.request();
dma.start_write(request, buffer, regs.fifor().ptr() as *mut u32, crate::dma::TransferOptions { dma.start_write(
request,
buffer,
regs.fifor().ptr() as *mut u32,
crate::dma::TransferOptions {
pburst: crate::dma::Burst::Incr4, pburst: crate::dma::Burst::Incr4,
mburst: crate::dma::Burst::Incr4, mburst: crate::dma::Burst::Incr4,
flow_ctrl: crate::dma::FlowControl::Peripheral, flow_ctrl: crate::dma::FlowControl::Peripheral,
fifo_threshold: Some(crate::dma::FifoThreshold::Full), fifo_threshold: Some(crate::dma::FifoThreshold::Full),
..Default::default() ..Default::default()
}); },
} else if #[cfg(sdmmc_v2)] { );
regs.idmabase0r().write(|w| w.set_idmabase0(buffer as *const u32 as u32));
regs.idmactrlr().modify(|w| w.set_idmaen(true));
} }
#[cfg(sdmmc_v2)]
{
regs.idmabase0r()
.write(|w| w.set_idmabase0(buffer as *const u32 as u32));
regs.idmactrlr().modify(|w| w.set_idmaen(true));
} }
regs.dctrl().modify(|w| { regs.dctrl().modify(|w| {
@ -1043,18 +1046,15 @@ impl SdmmcInner {
let regs = self.0; let regs = self.0;
unsafe { unsafe {
cfg_if::cfg_if! { #[cfg(sdmmc_v1)]
if #[cfg(sdmmc_v1)] {
regs.dctrl().modify(|w| { regs.dctrl().modify(|w| {
w.set_dmaen(false); w.set_dmaen(false);
w.set_dten(false); w.set_dten(false);
}); });
} else if #[cfg(sdmmc_v2)] { #[cfg(sdmmc_v2)]
regs.idmactrlr().modify(|w| w.set_idmaen(false)); regs.idmactrlr().modify(|w| w.set_idmaen(false));
} }
} }
}
}
/// Sets the CLKDIV field in CLKCR. Updates clock field in self /// Sets the CLKDIV field in CLKCR. Updates clock field in self
fn clkcr_set_clkdiv(&self, freq: u32, width: BusWidth, ker_ck: Hertz, clock: &mut Hertz) -> Result<(), Error> { fn clkcr_set_clkdiv(&self, freq: u32, width: BusWidth, ker_ck: Hertz, clock: &mut Hertz) -> Result<(), Error> {