Merge #139

139: Add support for the sdio peripheral r=therealprof a=jkristell

Left to do
- [x] Add it to all supported devices
- [x] Pinmap variants
- [x] Add an example
- [x] Document limitation (only SDHC cards)
- [x] Verify power configuration


Co-authored-by: Johan Kristell <[email protected]>

Author: bors[bot]

CHANGELOG.md

@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 - Implement `timer::Cancel` trait for `Timer<TIM>`.
 - Added DWT cycle counter based delay and stopwatch, including an example.
+- Added sdio driver
 
 ## [v0.8.0] - 2020-04-30
 

Cargo.toml

@@ -96,6 +96,10 @@ opt-level = "s"
 name = "usb_serial"
 required-features = ["rt", "stm32f401", "usb_fs"]
 
+[[example]]
+name = "sd"
+required-features = ["rt", "stm32f405"]
+
 [[example]]
 name = "delay-blinky"
 required-features = ["rt", "stm32f411"]

examples/sd.rs

@@ -0,0 +1,73 @@
+#![no_std]
+#![no_main]
+
+use cortex_m_rt::entry;
+use cortex_m_semihosting::{hprint, hprintln};
+use panic_semihosting as _;
+
+use stm32f4xx_hal::{delay, prelude::*, sdio::Sdio, stm32};
+
+#[entry]
+fn main() -> ! {
+    let device = stm32::Peripherals::take().unwrap();
+    let core = cortex_m::Peripherals::take().unwrap();
+
+    let rcc = device.RCC.constrain();
+    let clocks = rcc
+        .cfgr
+        .use_hse(12.mhz())
+        .require_pll48clk()
+        .sysclk(168.mhz())
+        .hclk(168.mhz())
+        .pclk1(42.mhz())
+        .pclk2(84.mhz())
+        .freeze();
+
+    assert!(clocks.is_pll48clk_valid());
+
+    let mut delay = delay::Delay::new(core.SYST, clocks);
+
+    let gpioc = device.GPIOC.split();
+    let gpiod = device.GPIOD.split();
+
+    let d0 = gpioc.pc8.into_alternate_af12().internal_pull_up(true);
+    let d1 = gpioc.pc9.into_alternate_af12().internal_pull_up(true);
+    let d2 = gpioc.pc10.into_alternate_af12().internal_pull_up(true);
+    let d3 = gpioc.pc11.into_alternate_af12().internal_pull_up(true);
+    let clk = gpioc.pc12.into_alternate_af12().internal_pull_up(false);
+    let cmd = gpiod.pd2.into_alternate_af12().internal_pull_up(true);
+    let mut sdio = Sdio::new(device.SDIO, (clk, cmd, d0, d1, d2, d3));
+
+    hprintln!("Waiting for card...").ok();
+
+    // Wait for card to be ready
+    loop {
+        match sdio.init_card() {
+            Ok(_) => break,
+            Err(_err) => (),
+        }
+
+        delay.delay_ms(1000u32);
+    }
+
+    let nblocks = sdio.card().map(|c| c.block_count()).unwrap_or(0);
+    hprintln!("Card detected: nbr of blocks: {:?}", nblocks).ok();
+
+    // Read a block from the card and print the data
+    let mut block = [0u8; 512];
+
+    match sdio.read_block(0, &mut block) {
+        Ok(()) => (),
+        Err(err) => {
+            hprintln!("Failed to read block: {:?}", err).ok();
+        }
+    }
+
+    for b in block.iter() {
+        hprint!("{:X} ", b).ok();
+    }
+
+    loop {
+        continue;
+    }
+}

src/lib.rs

@@ -145,6 +145,11 @@ pub mod pwm;
 pub mod qei;
 #[cfg(feature = "device-selected")]
 pub mod rcc;
+#[cfg(all(
+    feature = "device-selected",
+    not(any(feature = "stm32f410", feature = "stm32f446",))
+))]
+pub mod sdio;
 #[cfg(feature = "device-selected")]
 pub mod serial;
 #[cfg(feature = "device-selected")]