Skip to content

Commit 44f2f01

Browse files
bors[bot]jkristell
andauthored
Merge #179
179: Move sdio response parsing to library r=therealprof a=jkristell Clean up the sdio driver by moving the parsing of the various sd response to a separate library https://crates.io/crates/sdio-host. Some other cleanups related to this change was made as well. Co-authored-by: Johan Kristell <[email protected]>
2 parents 2b1be69 + 59391e0 commit 44f2f01

File tree

4 files changed

+85
-170
lines changed

4 files changed

+85
-170
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
1010
### Changed
1111

1212
- [breaking-change] Updated synopsys-usb-otg dependency to v0.2.0.
13+
- Cleanups to the Sdio driver, some hw independent functionality moved to the new sdio-host library.
14+
- [breaking-change] Sdio is disabled by default, enable with the `sdio` feature flag.
1315

1416
### Added
1517

Cargo.toml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ nb = "0.1.2"
3232
rand_core = "0.5.1"
3333
stm32f4 = "0.11"
3434
synopsys-usb-otg = { version = "0.2.0", features = ["cortex-m"], optional = true }
35+
sdio-host = { version = "0.2.0", optional = true }
3536

3637
[dependencies.bare-metal]
3738
version = "0.2.5"
@@ -84,6 +85,8 @@ stm32f479 = ["stm32f4/stm32f469", "device-selected"]
8485
usb_fs = ["synopsys-usb-otg", "synopsys-usb-otg/fs"]
8586
usb_hs = ["synopsys-usb-otg", "synopsys-usb-otg/hs"]
8687

88+
sdio = ["sdio-host"]
89+
8790
[profile.dev]
8891
debug = true
8992
lto = true
@@ -99,7 +102,7 @@ required-features = ["rt", "stm32f401", "usb_fs"]
99102

100103
[[example]]
101104
name = "sd"
102-
required-features = ["rt", "stm32f405"]
105+
required-features = ["rt", "stm32f405", "sdio"]
103106

104107
[[example]]
105108
name = "delay-blinky"

src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ pub mod qei;
158158
#[cfg(feature = "device-selected")]
159159
pub mod rcc;
160160
#[cfg(all(
161-
feature = "device-selected",
161+
feature = "sdio",
162162
not(any(feature = "stm32f410", feature = "stm32f446",))
163163
))]
164164
pub mod sdio;

0 commit comments

Comments
 (0)