@@ -439,21 +439,21 @@ macro_rules! littlefs2_filesystem {
439
439
type LOOKAHEAD_SIZE = $crate:: drivers:: flash:: littlefs_params:: LOOKAHEAD_SIZE ;
440
440
441
441
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 > {
443
443
<$crate:: drivers:: flash:: FlashGordon as $crate:: traits:: flash:: Read <$crate:: drivers:: flash:: U16 >>
444
444
:: read( & self . flash_gordon, Self :: BASE_OFFSET + off, buf) ;
445
445
Ok ( buf. len( ) )
446
446
}
447
447
448
- fn write( & mut self , off: usize , data: & [ u8 ] ) -> LfsResult <usize > {
448
+ fn write( & mut self , off: usize , data: & [ u8 ] ) -> littlefs2 :: io :: Result <usize > {
449
449
let ret = <$crate:: drivers:: flash:: FlashGordon as $crate:: traits:: flash:: WriteErase <$crate:: drivers:: flash:: U512 , $crate:: drivers:: flash:: U512 >>
450
450
:: write( & mut self . flash_gordon, Self :: BASE_OFFSET + off, data) ;
451
451
ret
452
452
. map( |_| data. len( ) )
453
453
. map_err( |_| littlefs2:: io:: Error :: IO )
454
454
}
455
455
456
- fn erase( & mut self , off: usize , len: usize ) -> LfsResult <usize > {
456
+ fn erase( & mut self , off: usize , len: usize ) -> littlefs2 :: io :: Result <usize > {
457
457
let first_page = ( Self :: BASE_OFFSET + off) / 512 ;
458
458
let pages = len / 512 ;
459
459
for i in 0 ..pages {
@@ -523,7 +523,7 @@ macro_rules! littlefs2_prince_filesystem {
523
523
type LOOKAHEAD_SIZE = $crate:: drivers:: flash:: littlefs_params:: LOOKAHEAD_SIZE ;
524
524
525
525
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 > {
527
527
self . prince. enable_region_2_for( ||{
528
528
let flash: * const u8 = ( Self :: BASE_OFFSET + off) as * const u8 ;
529
529
for i in 0 .. buf. len( ) {
@@ -533,7 +533,7 @@ macro_rules! littlefs2_prince_filesystem {
533
533
Ok ( buf. len( ) )
534
534
}
535
535
536
- fn write( & mut self , off: usize , data: & [ u8 ] ) -> LfsResult <usize > {
536
+ fn write( & mut self , off: usize , data: & [ u8 ] ) -> littlefs2 :: io :: Result <usize > {
537
537
let prince = & mut self . prince;
538
538
let flash_gordon = & mut self . flash_gordon;
539
539
let ret = prince. write_encrypted( |prince| {
@@ -548,7 +548,7 @@ macro_rules! littlefs2_prince_filesystem {
548
548
. map_err( |_| littlefs2:: io:: Error :: IO )
549
549
}
550
550
551
- fn erase( & mut self , off: usize , len: usize ) -> LfsResult <usize > {
551
+ fn erase( & mut self , off: usize , len: usize ) -> littlefs2 :: io :: Result <usize > {
552
552
let first_page = ( Self :: BASE_OFFSET + off) / 512 ;
553
553
let pages = len / 512 ;
554
554
for i in 0 ..pages {
0 commit comments