Merge #458

458: Support eMMC in SDIO module r=burrbull a=antonok-edm

Followup to jkristell/sdio-host#10, which will also be required before this PR can be merged (cc `@jkristell)`

This PR adds support for eMMC peripherals using the SDIO module. `Sdio` is now generic over an `SdioPeripheral`, which can either be a `SdCard` or `Emmc`. Many of the methods are generic enough to be shared between both, although some (like initialization) need to be specialized for each.

Co-authored-by: Anton Lazarev <[email protected]>

Author: bors[bot]

CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+### Added
+
+- Support eMMC peripherals using SDIO module [#458]
+
 ## [v0.12.0] - 2022-02-23
 
 ### Changed

Cargo.toml

@@ -34,7 +34,7 @@ nb = "1"
 rand_core = "0.6"
 stm32f4 = "0.14.0"
 synopsys-usb-otg = { version = "0.2.0", features = ["cortex-m"], optional = true }
-sdio-host = { version = "0.5.0", optional = true }
+sdio-host = { version = "0.6.0", optional = true }
 embedded-dma = "0.2.0"
 bare-metal = { version = "1" }
 void = { default-features = false, version = "1.0.2" }

examples/sd.rs

@@ -8,7 +8,7 @@ use panic_semihosting as _;
 use stm32f4xx_hal::{
     pac,
     prelude::*,
-    sdio::{ClockFreq, Sdio},
+    sdio::{ClockFreq, SdCard, Sdio},
 };
 
 #[entry]
@@ -40,13 +40,13 @@ fn main() -> ! {
     let d3 = gpioc.pc11.into_alternate().internal_pull_up(true);
     let clk = gpioc.pc12.into_alternate().internal_pull_up(false);
     let cmd = gpiod.pd2.into_alternate().internal_pull_up(true);
-    let mut sdio = Sdio::new(device.SDIO, (clk, cmd, d0, d1, d2, d3), &clocks);
+    let mut sdio: Sdio<SdCard> = Sdio::new(device.SDIO, (clk, cmd, d0, d1, d2, d3), &clocks);
 
     hprintln!("Waiting for card...").ok();
 
     // Wait for card to be ready
     loop {
-        match sdio.init_card(ClockFreq::F24Mhz) {
+        match sdio.init(ClockFreq::F24Mhz) {
             Ok(_) => break,
             Err(_err) => (),
         }