alex/rp-hal-boards
1
0
Fork 0
mirror of https://github.com/italicsjenga/rp-hal-boards.git synced 2024-10-17 06:21:30 +11:00
Code Issues Packages Projects Releases Wiki Activity

sdmmc: rename Controller -> VolumeManager

Browse source
This commit is contained in:
Jan Niehusmann 2023-05-22 19:59:30 +00:00
parent c452b530c9
commit 9d07b91b5c
1 changed files with 26 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
boards/rp-pico/examples/pico_spi_sd_card.rs
View file

@ -125,8 +125,8 @@ use rp_pico::hal;
// Link in the embedded_sdmmc crate. // Link in the embedded_sdmmc crate.
// The `SdMmcSpi` is used for block level access to the card. // The `SdMmcSpi` is used for block level access to the card.
// And the `Controller` gives access to the FAT filesystem functions. // And the `VolumeManager` gives access to the FAT filesystem functions.
use embedded_sdmmc::{Controller, SdCard, TimeSource, Timestamp, VolumeIdx}; use embedded_sdmmc::{SdCard, TimeSource, Timestamp, VolumeIdx, VolumeManager};
// Get the file open mode enum: // Get the file open mode enum:
use embedded_sdmmc::filesystem::Mode; use embedded_sdmmc::filesystem::Mode;
@ -263,12 +263,12 @@ fn main() -> ! {
info!("Initialize SPI SD/MMC data structures..."); info!("Initialize SPI SD/MMC data structures...");
let sdcard = SdCard::new(spi, spi_cs, delay); let sdcard = SdCard::new(spi, spi_cs, delay);
let mut cont = Controller::new(sdcard, DummyTimesource::default()); let mut volume_mgr = VolumeManager::new(sdcard, DummyTimesource::default());
blink_signals(&mut led_pin, &mut delay, &BLINK_OK_LONG); blink_signals(&mut led_pin, &mut delay, &BLINK_OK_LONG);
info!("Init SD card controller and retrieve card size..."); info!("Init SD card controller and retrieve card size...");
match cont.device().num_bytes() { match volume_mgr.device().num_bytes() {
Ok(size) => info!("card size is {} bytes", size), Ok(size) => info!("card size is {} bytes", size),
Err(e) => { Err(e) => {
error!("Error retrieving card size: {}", defmt::Debug2Format(&e)); error!("Error retrieving card size: {}", defmt::Debug2Format(&e));
@ -279,11 +279,12 @@ fn main() -> ! {
blink_signals(&mut led_pin, &mut delay, &BLINK_OK_LONG); blink_signals(&mut led_pin, &mut delay, &BLINK_OK_LONG);
// Now that the card is initialized, clock can go faster // Now that the card is initialized, clock can go faster
cont.device() volume_mgr
.device()
.spi(|spi| spi.set_baudrate(clocks.peripheral_clock.freq(), 16.MHz())); .spi(|spi| spi.set_baudrate(clocks.peripheral_clock.freq(), 16.MHz()));
info!("Getting Volume 0..."); info!("Getting Volume 0...");
let mut volume = match cont.get_volume(VolumeIdx(0)) { let mut volume = match volume_mgr.get_volume(VolumeIdx(0)) {
Ok(v) => v, Ok(v) => v,
Err(e) => { Err(e) => {
error!("Error getting volume 0: {}", defmt::Debug2Format(&e)); error!("Error getting volume 0: {}", defmt::Debug2Format(&e));
@ -295,7 +296,7 @@ fn main() -> ! {
// After we have the volume (partition) of the drive we got to open the // After we have the volume (partition) of the drive we got to open the
// root directory: // root directory:
let dir = match cont.open_root_dir(&volume) { let dir = match volume_mgr.open_root_dir(&volume) {
Ok(dir) => dir, Ok(dir) => dir,
Err(e) => { Err(e) => {
error!("Error opening root dir: {}", defmt::Debug2Format(&e)); error!("Error opening root dir: {}", defmt::Debug2Format(&e));
@ -308,7 +309,8 @@ fn main() -> ! {
// This shows how to iterate through the directory and how // This shows how to iterate through the directory and how
// to get the file names (and print them in hope they are UTF-8 compatible): // to get the file names (and print them in hope they are UTF-8 compatible):
cont.iterate_dir(&volume, &dir, |ent| { volume_mgr
.iterate_dir(&volume, &dir, |ent| {
info!( info!(
"/{}.{}", "/{}.{}",
core::str::from_utf8(ent.name.base_name()).unwrap(), core::str::from_utf8(ent.name.base_name()).unwrap(),
@ -322,10 +324,10 @@ fn main() -> ! {
let mut successful_read = false; let mut successful_read = false;
// Next we going to read a file from the SD card: // Next we going to read a file from the SD card:
if let Ok(mut file) = cont.open_file_in_dir(&mut volume, &dir, "O.TST", Mode::ReadOnly) { if let Ok(mut file) = volume_mgr.open_file_in_dir(&mut volume, &dir, "O.TST", Mode::ReadOnly) {
let mut buf = [0u8; 32]; let mut buf = [0u8; 32];
let read_count = cont.read(&volume, &mut file, &mut buf).unwrap(); let read_count = volume_mgr.read(&volume, &mut file, &mut buf).unwrap();
cont.close_file(&volume, file).unwrap(); volume_mgr.close_file(&volume, file).unwrap();
if read_count >= 2 { if read_count >= 2 {
info!("READ {} bytes: {}", read_count, buf); info!("READ {} bytes: {}", read_count, buf);
@ -341,10 +343,12 @@ fn main() -> ! {
blink_signals(&mut led_pin, &mut delay, &BLINK_OK_LONG); blink_signals(&mut led_pin, &mut delay, &BLINK_OK_LONG);
match cont.open_file_in_dir(&mut volume, &dir, "O.TST", Mode::ReadWriteCreateOrTruncate) { match volume_mgr.open_file_in_dir(&mut volume, &dir, "O.TST", Mode::ReadWriteCreateOrTruncate) {
Ok(mut file) => { Ok(mut file) => {
cont.write(&mut volume, &mut file, b"\x42\x1E").unwrap(); volume_mgr
cont.close_file(&volume, file).unwrap(); .write(&mut volume, &mut file, b"\x42\x1E")
.unwrap();
volume_mgr.close_file(&volume, file).unwrap();
} }
Err(e) => { Err(e) => {
error!("Error opening file 'O.TST': {}", defmt::Debug2Format(&e)); error!("Error opening file 'O.TST': {}", defmt::Debug2Format(&e));
@ -352,7 +356,7 @@ fn main() -> ! {
} }
} }
cont.free(); volume_mgr.free();
blink_signals(&mut led_pin, &mut delay, &BLINK_OK_LONG); blink_signals(&mut led_pin, &mut delay, &BLINK_OK_LONG);