From 6dbf4cf8277beb91c64ff92dfe8fd93284b3b13b Mon Sep 17 00:00:00 2001 From: Maurus Cuelenaere Date: Fri, 3 Jul 2009 11:40:50 +0000 Subject: Ingenic Jz4740: remove some unneeded stuff and simplify SD driver (also thanks to Rafaël Carré) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21621 a1c6a512-1295-4272-9138-f99709370657 --- firmware/drivers/sd.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'firmware/drivers') 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 @@ ****************************************************************************/ #include "config.h" +#include "logf.h" #include "hotswap.h" #include "storage.h" @@ -42,14 +43,12 @@ void sd_parse_csd(tCardInfo *card) max_read_bl_len = 1 << card_extract_bits(card->csd, 83, 4); card->numblocks = c_size * c_mult * (max_read_bl_len/512); } -#ifdef HAVE_MULTIVOLUME else if(csd_version == 1) { /* CSD version 2.0 */ c_size = card_extract_bits(card->csd, 69, 22) + 1; card->numblocks = c_size << 10; } -#endif card->blocksize = 512; /* Always use 512 byte blocks */ @@ -62,6 +61,9 @@ void sd_parse_csd(tCardInfo *card) sd_exponent[card_extract_bits(card->csd, 114, 3)]; card->r2w_factor = card_extract_bits(card->csd, 28, 3); + + logf("CSD%d.0 numblocks:%d speed:%d", csd_version+1, card->numblocks, card->speed); + logf("nsac: %d taac: %d r2w: %d", card->nsac, card->taac, card->r2w_factor); } void sd_sleep(void) -- cgit v1.2.3