summaryrefslogtreecommitdiff
path: root/firmware/drivers/sd.c
diff options
context:
space:
mode:
Diffstat (limited to 'firmware/drivers/sd.c')
-rw-r--r--firmware/drivers/sd.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/firmware/drivers/sd.c b/firmware/drivers/sd.c
index d566e614d2..4034b9453d 100644
--- a/firmware/drivers/sd.c
+++ b/firmware/drivers/sd.c
@@ -20,6 +20,7 @@
20 ****************************************************************************/ 20 ****************************************************************************/
21 21
22#include "config.h" 22#include "config.h"
23#include "logf.h"
23#include "hotswap.h" 24#include "hotswap.h"
24#include "storage.h" 25#include "storage.h"
25 26
@@ -42,14 +43,12 @@ void sd_parse_csd(tCardInfo *card)
42 max_read_bl_len = 1 << card_extract_bits(card->csd, 83, 4); 43 max_read_bl_len = 1 << card_extract_bits(card->csd, 83, 4);
43 card->numblocks = c_size * c_mult * (max_read_bl_len/512); 44 card->numblocks = c_size * c_mult * (max_read_bl_len/512);
44 } 45 }
45#ifdef HAVE_MULTIVOLUME
46 else if(csd_version == 1) 46 else if(csd_version == 1)
47 { 47 {
48 /* CSD version 2.0 */ 48 /* CSD version 2.0 */
49 c_size = card_extract_bits(card->csd, 69, 22) + 1; 49 c_size = card_extract_bits(card->csd, 69, 22) + 1;
50 card->numblocks = c_size << 10; 50 card->numblocks = c_size << 10;
51 } 51 }
52#endif
53 52
54 card->blocksize = 512; /* Always use 512 byte blocks */ 53 card->blocksize = 512; /* Always use 512 byte blocks */
55 54
@@ -62,6 +61,9 @@ void sd_parse_csd(tCardInfo *card)
62 sd_exponent[card_extract_bits(card->csd, 114, 3)]; 61 sd_exponent[card_extract_bits(card->csd, 114, 3)];
63 62
64 card->r2w_factor = card_extract_bits(card->csd, 28, 3); 63 card->r2w_factor = card_extract_bits(card->csd, 28, 3);
64
65 logf("CSD%d.0 numblocks:%d speed:%d", csd_version+1, card->numblocks, card->speed);
66 logf("nsac: %d taac: %d r2w: %d", card->nsac, card->taac, card->r2w_factor);
65} 67}
66 68
67void sd_sleep(void) 69void sd_sleep(void)