Skip to content

Commit

Permalink
fix testbuild
Browse files Browse the repository at this point in the history
  • Loading branch information
Murmele committed Jun 5, 2024
1 parent 56a07fe commit ccb1fb2
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 10 deletions.
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ pub mod filesystem;
pub mod sdcard;

use filesystem::SearchId;
use volume_mgr::VolumeOpenMode;
pub use volume_mgr::VolumeOpenMode;

#[doc(inline)]
pub use crate::blockdevice::{Block, BlockCount, BlockDevice, BlockIdx};
Expand Down
3 changes: 3 additions & 0 deletions src/volume_mgr.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,12 @@ use crate::{
};
use heapless::Vec;

/// Opening volume mode
#[derive(Debug, PartialEq, Eq, Clone, Copy)]
pub enum VolumeOpenMode {
/// Opening volume read only. This is faster than ReadWrite if only readings are done
ReadOnly,
/// Opening volume for reading and writing.
ReadWrite,
}

Expand Down
18 changes: 9 additions & 9 deletions tests/directories.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//! Directory related tests
use embedded_sdmmc::{Mode, ShortFileName};
use embedded_sdmmc::{Mode, ShortFileName, VolumeOpenMode};

mod utils;

Expand Down Expand Up @@ -41,7 +41,7 @@ fn fat16_root_directory_listing() {
let mut volume_mgr = embedded_sdmmc::VolumeManager::new(disk, time_source);

let fat16_volume = volume_mgr
.open_raw_volume(embedded_sdmmc::VolumeIdx(0))
.open_raw_volume(embedded_sdmmc::VolumeIdx(0), VolumeOpenMode::ReadWrite)
.expect("open volume 0");
let root_dir = volume_mgr
.open_root_dir(fat16_volume)
Expand Down Expand Up @@ -103,7 +103,7 @@ fn fat16_sub_directory_listing() {
let mut volume_mgr = embedded_sdmmc::VolumeManager::new(disk, time_source);

let fat16_volume = volume_mgr
.open_raw_volume(embedded_sdmmc::VolumeIdx(0))
.open_raw_volume(embedded_sdmmc::VolumeIdx(0), VolumeOpenMode::ReadWrite)
.expect("open volume 0");
let root_dir = volume_mgr
.open_root_dir(fat16_volume)
Expand Down Expand Up @@ -168,7 +168,7 @@ fn fat32_root_directory_listing() {
let mut volume_mgr = embedded_sdmmc::VolumeManager::new(disk, time_source);

let fat32_volume = volume_mgr
.open_raw_volume(embedded_sdmmc::VolumeIdx(1))
.open_raw_volume(embedded_sdmmc::VolumeIdx(1), VolumeOpenMode::ReadWrite)
.expect("open volume 1");
let root_dir = volume_mgr
.open_root_dir(fat32_volume)
Expand Down Expand Up @@ -230,7 +230,7 @@ fn open_dir_twice() {
let mut volume_mgr = embedded_sdmmc::VolumeManager::new(disk, time_source);

let fat32_volume = volume_mgr
.open_raw_volume(embedded_sdmmc::VolumeIdx(1))
.open_raw_volume(embedded_sdmmc::VolumeIdx(1), VolumeOpenMode::ReadWrite)
.expect("open volume 1");

let root_dir = volume_mgr
Expand Down Expand Up @@ -276,7 +276,7 @@ fn open_too_many_dirs() {
> = embedded_sdmmc::VolumeManager::new_with_limits(disk, time_source, 0x1000_0000);

let fat32_volume = volume_mgr
.open_raw_volume(embedded_sdmmc::VolumeIdx(1))
.open_raw_volume(embedded_sdmmc::VolumeIdx(1), VolumeOpenMode::ReadWrite)
.expect("open volume 1");
let root_dir = volume_mgr
.open_root_dir(fat32_volume)
Expand All @@ -295,7 +295,7 @@ fn find_dir_entry() {
let mut volume_mgr = embedded_sdmmc::VolumeManager::new(disk, time_source);

let fat32_volume = volume_mgr
.open_raw_volume(embedded_sdmmc::VolumeIdx(1))
.open_raw_volume(embedded_sdmmc::VolumeIdx(1), VolumeOpenMode::ReadWrite)
.expect("open volume 1");

let root_dir = volume_mgr
Expand Down Expand Up @@ -325,7 +325,7 @@ fn delete_file() {
let mut volume_mgr = embedded_sdmmc::VolumeManager::new(disk, time_source);

let fat32_volume = volume_mgr
.open_raw_volume(embedded_sdmmc::VolumeIdx(1))
.open_raw_volume(embedded_sdmmc::VolumeIdx(1), VolumeOpenMode::ReadWrite)
.expect("open volume 1");

let root_dir = volume_mgr
Expand Down Expand Up @@ -370,7 +370,7 @@ fn make_directory() {
let mut volume_mgr = embedded_sdmmc::VolumeManager::new(disk, time_source);

let fat32_volume = volume_mgr
.open_raw_volume(embedded_sdmmc::VolumeIdx(1))
.open_raw_volume(embedded_sdmmc::VolumeIdx(1), VolumeOpenMode::ReadWrite)
.expect("open volume 1");

let root_dir = volume_mgr
Expand Down

0 comments on commit ccb1fb2

Please sign in to comment.