Use released embedded-sdmmc 0.5

Author: thejpster

Cargo.lock

@@ -51,8 +51,7 @@ shared-bus = "0.2"
 # Gets us compare-swap atomic operations
 atomic-polyfill = "1.0.2"
 # SD Card driver
-embedded-sdmmc = { git = "https://github.com/rust-embedded-community/embedded-sdmmc-rs.git", branch="more-api-cleanups", default-features = false, features = ["defmt-log"] }
-# embedded-sdmmc = { version = "0.4", default-features = false, features = ["defmt-log"] }
+embedded-sdmmc = { version = "0.5", default-features = false, features = ["defmt-log"] }
 
 [[bin]]
 name = "neotron-pico-bios"

Cargo.toml

@@ -1221,7 +1221,8 @@ impl Hardware {
 				let spi = sdcard::FakeSpi(self, true);
 				let cs = sdcard::FakeCs();
 				let delayer = sdcard::FakeDelayer();
-				let sdcard = embedded_sdmmc::SdCard::new(spi, cs, delayer);
+				let options = embedded_sdmmc::sdcard::AcquireOpts { use_crc: true };
+				let sdcard = embedded_sdmmc::SdCard::new_with_options(spi, cs, delayer, options);
 				// Talk to the card to trigger a scan if its type
 				let num_blocks = sdcard.num_blocks();
 				let card_type = sdcard.get_card_type();
@@ -1987,7 +1988,8 @@ pub extern "C" fn block_read(
 				let spi = sdcard::FakeSpi(hw, false);
 				let cs = sdcard::FakeCs();
 				let delayer = sdcard::FakeDelayer();
-				let sdcard = embedded_sdmmc::SdCard::new(spi, cs, delayer);
+				let options = embedded_sdmmc::sdcard::AcquireOpts { use_crc: true };
+				let sdcard = embedded_sdmmc::SdCard::new_with_options(spi, cs, delayer, options);
 				unsafe {
 					sdcard.mark_card_as_init(info.card_type);
 				}

src/main.rs

@@ -22,7 +22,7 @@ impl<'a> embedded_hal::blocking::spi::Transfer<u8> for FakeSpi<'a> {
 	type Error = core::convert::Infallible;
 	fn transfer<'w>(&mut self, words: &'w mut [u8]) -> Result<&'w [u8], Self::Error> {
 		let result = if IS_CS_LOW.load(Ordering::SeqCst) {
-			defmt::debug!("SD out: {:02x}", words);
+			defmt::debug!("SD > {:02x}", words);
 			self.0.with_bus_cs(
 				1,
 				if self.1 {
@@ -34,7 +34,7 @@ impl<'a> embedded_hal::blocking::spi::Transfer<u8> for FakeSpi<'a> {
 					spi.transfer(words).unwrap();
 				},
 			);
-			defmt::debug!("SD: {:02x}", words);
+			defmt::debug!("SD < {:02x}", words);
 			words
 		} else {
 			// Select a slot we don't use so the SD card won't be activated
@@ -47,6 +47,32 @@ impl<'a> embedded_hal::blocking::spi::Transfer<u8> for FakeSpi<'a> {
 	}
 }
 
+impl<'a> embedded_hal::blocking::spi::Write<u8> for FakeSpi<'a> {
+	type Error = core::convert::Infallible;
+	fn write(&mut self, words: &[u8]) -> Result<(), Self::Error> {
+		if IS_CS_LOW.load(Ordering::SeqCst) {
+			defmt::debug!("SD > {:02x}", words);
+			self.0.with_bus_cs(
+				1,
+				if self.1 {
+					CLOCK_SD_CARD_INIT
+				} else {
+					CLOCK_SD_CARD
+				},
+				|spi, _buffer| {
+					spi.write(words).unwrap();
+				},
+			);
+		} else {
+			// Select a slot we don't use so the SD card won't be activated
+			self.0.with_bus_cs(7, CLOCK_SD_CARD_INIT, |spi, _buffer| {
+				spi.write(words).unwrap();
+			});
+		}
+		Ok(())
+	}
+}
+
 impl embedded_hal::digital::v2::OutputPin for FakeCs {
 	type Error = core::convert::Infallible;
 	fn set_low(&mut self) -> Result<(), Self::Error> {