Skip to content

Commit 4f1c820

Browse files
Add test for littlefs macros
1 parent 4c28752 commit 4f1c820

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

examples/flash.rs

+3
Original file line numberDiff line numberDiff line change
@@ -222,3 +222,6 @@ fn main() -> ! {
222222
continue;
223223
}
224224
}
225+
226+
#[cfg(feature = "littlefs")]
227+
lpc55_hal::littlefs2_filesystem!(InternalFilesystem: (0, 10));

src/drivers/flash.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -439,21 +439,21 @@ macro_rules! littlefs2_filesystem {
439439
type LOOKAHEAD_SIZE = $crate::drivers::flash::littlefs_params::LOOKAHEAD_SIZE;
440440

441441

442-
fn read(&mut self, off: usize, buf: &mut [u8]) -> LfsResult<usize> {
442+
fn read(&mut self, off: usize, buf: &mut [u8]) -> littlefs2::io::Result<usize> {
443443
<$crate::drivers::flash::FlashGordon as $crate::traits::flash::Read<$crate::drivers::flash::U16>>
444444
::read(&self.flash_gordon, Self::BASE_OFFSET + off, buf);
445445
Ok(buf.len())
446446
}
447447

448-
fn write(&mut self, off: usize, data: &[u8]) -> LfsResult<usize> {
448+
fn write(&mut self, off: usize, data: &[u8]) -> littlefs2::io::Result<usize> {
449449
let ret = <$crate::drivers::flash::FlashGordon as $crate::traits::flash::WriteErase<$crate::drivers::flash::U512, $crate::drivers::flash::U512>>
450450
::write(&mut self.flash_gordon, Self::BASE_OFFSET + off, data);
451451
ret
452452
.map(|_| data.len())
453453
.map_err(|_| littlefs2::io::Error::IO)
454454
}
455455

456-
fn erase(&mut self, off: usize, len: usize) -> LfsResult<usize> {
456+
fn erase(&mut self, off: usize, len: usize) -> littlefs2::io::Result<usize> {
457457
let first_page = (Self::BASE_OFFSET + off) / 512;
458458
let pages = len / 512;
459459
for i in 0..pages {
@@ -523,7 +523,7 @@ macro_rules! littlefs2_prince_filesystem {
523523
type LOOKAHEAD_SIZE = $crate::drivers::flash::littlefs_params::LOOKAHEAD_SIZE;
524524

525525

526-
fn read(&mut self, off: usize, buf: &mut [u8]) -> LfsResult<usize> {
526+
fn read(&mut self, off: usize, buf: &mut [u8]) -> littlefs2::io::Result<usize> {
527527
self.prince.enable_region_2_for(||{
528528
let flash: *const u8 = (Self::BASE_OFFSET + off) as *const u8;
529529
for i in 0 .. buf.len() {
@@ -533,7 +533,7 @@ macro_rules! littlefs2_prince_filesystem {
533533
Ok(buf.len())
534534
}
535535

536-
fn write(&mut self, off: usize, data: &[u8]) -> LfsResult<usize> {
536+
fn write(&mut self, off: usize, data: &[u8]) -> littlefs2::io::Result<usize> {
537537
let prince = &mut self.prince;
538538
let flash_gordon = &mut self.flash_gordon;
539539
let ret = prince.write_encrypted(|prince| {
@@ -548,7 +548,7 @@ macro_rules! littlefs2_prince_filesystem {
548548
.map_err(|_| littlefs2::io::Error::IO)
549549
}
550550

551-
fn erase(&mut self, off: usize, len: usize) -> LfsResult<usize> {
551+
fn erase(&mut self, off: usize, len: usize) -> littlefs2::io::Result<usize> {
552552
let first_page = (Self::BASE_OFFSET + off) / 512;
553553
let pages = len / 512;
554554
for i in 0..pages {

0 commit comments

Comments
 (0)