@@ -149,7 +149,7 @@ pub enum ClockFreq {
149
149
}
150
150
151
151
/// Error during SDMMC operations.
152
- #[ derive( Debug ) ]
152
+ #[ derive( Debug , Clone , Copy ) ]
153
153
pub enum Error {
154
154
/// No card detected.
155
155
NoCard ,
@@ -344,7 +344,7 @@ impl Sdmmc {
344
344
345
345
let check_pattern = 0xaa ;
346
346
self . cmd ( sd_cmd:: send_if_cond ( 1 , check_pattern) ) ?;
347
- let cic = CIC :: from ( self . sdmmc . resp1 . read ( ) . bits ( ) ) ;
347
+ let cic = CIC :: from ( self . sdmmc . resp1 . read ( ) . bits ( ) . to_le ( ) ) ;
348
348
349
349
let card_version = if cic. pattern ( ) == 0xAA {
350
350
SdCardVersion :: V2
@@ -376,7 +376,7 @@ impl Sdmmc {
376
376
Err ( err) => return Err ( err) ,
377
377
}
378
378
379
- let ocr = OCR :: from ( self . sdmmc . resp1 . read ( ) . bits ( ) ) ;
379
+ let ocr = OCR :: from ( self . sdmmc . resp1 . read ( ) . bits ( ) . to_le ( ) ) ;
380
380
if !ocr. is_busy ( ) {
381
381
// Power up done
382
382
break ocr;
@@ -385,21 +385,21 @@ impl Sdmmc {
385
385
386
386
self . cmd ( common_cmd:: all_send_cid ( ) ) ?;
387
387
card. cid = CID :: from ( [
388
- self . sdmmc . resp1 . read ( ) . bits ( ) ,
389
- self . sdmmc . resp2 . read ( ) . bits ( ) ,
390
- self . sdmmc . resp3 . read ( ) . bits ( ) ,
391
- self . sdmmc . resp4 . read ( ) . bits ( ) ,
388
+ self . sdmmc . resp4 . read ( ) . bits ( ) . to_le ( ) ,
389
+ self . sdmmc . resp3 . read ( ) . bits ( ) . to_le ( ) ,
390
+ self . sdmmc . resp2 . read ( ) . bits ( ) . to_le ( ) ,
391
+ self . sdmmc . resp1 . read ( ) . bits ( ) . to_le ( ) ,
392
392
] ) ;
393
393
394
394
self . cmd ( sd_cmd:: send_relative_address ( ) ) ?;
395
- card. rca = RCA :: from ( self . sdmmc . resp1 . read ( ) . bits ( ) ) ;
395
+ card. rca = RCA :: from ( self . sdmmc . resp1 . read ( ) . bits ( ) . to_le ( ) ) ;
396
396
397
397
self . cmd ( common_cmd:: send_csd ( card. rca . address ( ) ) ) ?;
398
398
card. csd = CSD :: from ( [
399
- self . sdmmc . resp1 . read ( ) . bits ( ) ,
400
- self . sdmmc . resp2 . read ( ) . bits ( ) ,
401
- self . sdmmc . resp3 . read ( ) . bits ( ) ,
402
- self . sdmmc . resp4 . read ( ) . bits ( ) ,
399
+ self . sdmmc . resp4 . read ( ) . bits ( ) . to_le ( ) ,
400
+ self . sdmmc . resp3 . read ( ) . bits ( ) . to_le ( ) ,
401
+ self . sdmmc . resp2 . read ( ) . bits ( ) . to_le ( ) ,
402
+ self . sdmmc . resp1 . read ( ) . bits ( ) . to_le ( ) ,
403
403
] ) ;
404
404
405
405
self . select_card ( card. rca . address ( ) ) ?;
@@ -668,8 +668,7 @@ impl Sdmmc {
668
668
669
669
self . cmd ( common_cmd:: card_status ( card. address ( ) , false ) ) ?;
670
670
671
- let r1 = self . sdmmc . resp1 . read ( ) . bits ( ) ;
672
- Ok ( CardStatus :: from ( r1) )
671
+ Ok ( CardStatus :: from ( self . sdmmc . resp1 . read ( ) . bits ( ) . to_le ( ) ) )
673
672
}
674
673
675
674
/// Check if card is done writing/reading and back in transfer state.
0 commit comments