diff options
| author | Jens Arnold <amiconn@rockbox.org> | 2005-02-12 23:09:00 +0000 |
|---|---|---|
| committer | Jens Arnold <amiconn@rockbox.org> | 2005-02-12 23:09:00 +0000 |
| commit | b3017c8701b9b4e4ed041e224d163e82f198c10c (patch) | |
| tree | ec0f4302e728d8fe6de3d726b8df2c50aa8bd1a8 | |
| parent | c5d00d82b0905edb13310d9713919674c2172e6a (diff) | |
| download | rockbox-b3017c8701b9b4e4ed041e224d163e82f198c10c.zip rockbox-b3017c8701b9b4e4ed041e224d163e82f198c10c.tar.gz rockbox-b3017c8701b9b4e4ed041e224d163e82f198c10c.tar.bz2 rockbox-b3017c8701b9b4e4ed041e224d163e82f198c10c.tar.xz | |
Fixed calculation of MMC sector count. Display sector count instead of (rough) size info for debugging.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5937 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | apps/debug_menu.c | 3 | ||||
| -rw-r--r-- | firmware/drivers/ata_mmc.c | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/apps/debug_menu.c b/apps/debug_menu.c index ab1b60a..63630b2 100644 --- a/apps/debug_menu.c +++ b/apps/debug_menu.c @@ -1421,8 +1421,7 @@ bool dbg_mmc_info(void) (int) mmc_extract_bits(card->cid, 0, 8), (int) mmc_extract_bits(card->cid, 8, 16)); lcd_puts(0, 4, pbuf); - snprintf(pbuf, sizeof(pbuf), "Size: %d MB", - card->numsectors * SECTOR_SIZE / (1024*1024)); + snprintf(pbuf, sizeof(pbuf), "Sectors: %08x", card->numsectors); lcd_puts(0, 5, pbuf); } else /* Technical details */ diff --git a/firmware/drivers/ata_mmc.c b/firmware/drivers/ata_mmc.c index b528bdb..7149e11 100644 --- a/firmware/drivers/ata_mmc.c +++ b/firmware/drivers/ata_mmc.c @@ -477,8 +477,8 @@ static int initialize_card(int card_no) card->write_timeout = card->read_timeout * card->r2w_factor; /* card size */ - card->numsectors = mmc_extract_bits(card->csd, 54, 12) - * (1 << (mmc_extract_bits(card->csd, 78, 3)+2)); + card->numsectors = (mmc_extract_bits(card->csd, 54, 12) + 1) + * (1 << (mmc_extract_bits(card->csd, 78, 3)+2)); /* switch to full speed */ setup_sci1(card->bitrate_register); |