sdio: use experimental embedded-hal-sdio crate

Uses the experimental `embedded-hal-sdmmc` crate for SD/MMC traits.

See discussion for reasoning:

- <#3503 (comment)>
- <#3503 (comment)>
- <#3503 (comment)>

Author: rmsyn

esp-hal/Cargo.toml

@@ -27,8 +27,8 @@ bitflags                 = "2.9.0"
 bytemuck                 = "1.22.0"
 cfg-if                   = "1.0.0"
 critical-section         = { version = "1.2.0", features = ["restore-state-u32"] }
-embedded-hal             = { version = "1.0.0", git = "https://github.com/rmsyn/embedded-hal", branch = "embedded-hal/mmc" }
-embedded-hal-async       = { version = "1.0.0", git = "https://github.com/rmsyn/embedded-hal", branch = "embedded-hal/mmc" }
+embedded-hal             = "1.0.0"
+embedded-hal-async       = "1.0.0"
 enumset                  = "1.1.6"
 paste                    = "1.0.15"
 portable-atomic          = { version = "1.11.0", default-features = false }
@@ -56,6 +56,7 @@ embassy-usb-synopsys-otg = { version = "0.2.0", optional = true }
 embedded-can             = { version = "0.4.1", optional = true }
 esp-synopsys-usb-otg     = { version = "0.4.2", optional = true }
 nb                       = { version = "1.1.0", optional = true }
+embedded-hal-sdmmc       = { version = "0.1.0-alpha.2", optional = true }
 
 # Logging interfaces, they are mutually exclusive so they need to be behind separate features.
 defmt                    = { version = "1.0.1", optional = true }
@@ -208,6 +209,7 @@ unstable = [
     "dep:rand_core-09",
     "dep:nb",
     "dep:ufmt-write",
+    "dep:embedded-hal-sdmmc",
 ]
 
 [lints.clippy]

esp-hal/src/lib.rs

@@ -226,7 +226,7 @@ pub mod i2c;
 pub mod peripheral;
 #[cfg(all(feature = "unstable", any(hmac, sha)))]
 mod reg_access;
-#[cfg(any(feature = "esp32", feature = "esp32c6"))]
+#[cfg(all(feature = "unstable", any(feature = "esp32", feature = "esp32c6")))]
 pub mod sdio;
 #[cfg(any(spi0, spi1, spi2, spi3))]
 pub mod spi;

esp-hal/src/sdio.rs

@@ -5,15 +5,15 @@
 //! The peripheral can be used to transfer data over the SDIO bus in `Slave`
 //! mode.
 
-use embedded_hal::mmc::{
+use embedded_hal_sdmmc::{
     CardMode,
     CardType,
     FifoStatus,
-    MmcCommon,
-    MmcDevice,
+    Common,
+    Device,
     Reset,
-    command::MmcCommand,
-    response::MmcResponse,
+    command::Command,
+    response::Response,
     tuning::{TuningMode, TuningWidth},
 };
 
@@ -227,7 +227,7 @@ impl core::fmt::Display for Error {
 
 impl core::error::Error for Error {}
 
-impl<'d> MmcCommon for Sdio<'d> {
+impl<'d> Common for Sdio<'d> {
     type Error = Error;
 
     fn card_type(&self) -> CardType {
@@ -292,12 +292,12 @@ impl<'d> MmcCommon for Sdio<'d> {
     fn clear_all_response_interrupt(&mut self) {}
 }
 
-impl<'d> MmcDevice for Sdio<'d> {
-    fn read_command<C: MmcCommand>(&mut self) -> Result<C, Error> {
+impl<'d> Device for Sdio<'d> {
+    fn read_command<C: Command>(&mut self) -> Result<C, Error> {
         Err(Error::unimplemented())
     }
 
-    fn write_response<R: MmcResponse>(&mut self, _response: &R) -> Result<(), Error> {
+    fn write_response<R: Response>(&mut self, _response: &R) -> Result<(), Error> {
         Err(Error::unimplemented())
     }
 }

esp-lp-hal/Cargo.toml

@@ -17,8 +17,8 @@ test  = false
 [dependencies]
 cfg-if            = "1.0.0"
 document-features = "0.2.10"
-embedded-hal      = { version = "1.0.0", git = "https://github.com/rmsyn/embedded-hal", branch = "embedded-hal/mmc", optional = true }
-embedded-hal-nb   = { version = "1.0.0", git = "https://github.com/rmsyn/embedded-hal", branch = "embedded-hal/mmc", optional = true }
+embedded-hal      = { version = "1.0.0", optional = true }
+embedded-hal-nb   = { version = "1.0.0", optional = true }
 embedded-io       = { version = "0.6.1",  optional = true }
 esp32c6-lp        = { version = "0.3.0", features = ["critical-section"], optional = true }
 esp32s2-ulp       = { version = "0.3.0", features = ["critical-section"], optional = true }

examples/Cargo.toml

@@ -17,7 +17,7 @@ embassy-net = { version = "0.6.0", features = [ "tcp", "udp", "dhcpv4", "medium-
 embassy-sync        = "0.6.2"
 embassy-time        = "0.4.0"
 embassy-usb         = { version = "0.4.0", default-features = false }
-embedded-hal-async  = { version = "1.0.0", git = "https://github.com/rmsyn/embedded-hal", branch = "embedded-hal/mmc" }
+embedded-hal-async  = "1.0.0"
 embedded-io         = { version = "0.6.1", default-features = false }
 embedded-io-async   = "0.6.1"
 embedded-storage    = "0.3.1"

hil-test/Cargo.toml

@@ -230,12 +230,12 @@ embassy-futures    = "0.1.1"
 embedded-storage   = "0.3.1"
 embassy-sync       = "0.6.0"
 embassy-time       = "0.4.0"
-embedded-hal       = { version = "1.0.0", git = "https://github.com/rmsyn/embedded-hal", branch = "embedded-hal/mmc" }
+embedded-hal       = "1.0.0"
 embedded-io        = "0.6.1"
 embedded-io-async  = "0.6.1"
 embedded-can       = "0.4.1"
-embedded-hal-async  = { version = "1.0.0", git = "https://github.com/rmsyn/embedded-hal", branch = "embedded-hal/mmc" }
-embedded-hal-nb    = { version = "1.0.0", git = "https://github.com/rmsyn/embedded-hal", branch = "embedded-hal/mmc" }
+embedded-hal-async = "1.0.0"
+embedded-hal-nb    = "1.0.0"
 esp-alloc          = { path = "../esp-alloc", optional = true }
 esp-backtrace      = { path = "../esp-backtrace", default-features = false, features = ["exception-handler", "defmt", "semihosting"] }
 esp-bootloader-esp-idf = { path = "../esp-bootloader-esp-idf" }

qa-test/Cargo.toml

@@ -12,7 +12,7 @@ embassy-time       = "0.4.0"
 embassy-futures    = "0.1.1"
 embassy-sync       = "0.6.1"
 embedded-graphics  = "0.8.1"
-embedded-hal-async = { version = "1.0.0", git = "https://github.com/rmsyn/embedded-hal", branch = "embedded-hal/mmc" }
+embedded-hal-async = "1.0.0"
 esp-alloc          = { path = "../esp-alloc" }
 esp-backtrace      = { path = "../esp-backtrace", features = ["exception-handler", "panic-handler", "println"] }
 esp-bootloader-esp-idf = { path = "../esp-bootloader-esp-idf" }