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

2 files changed, 3 insertions, 4 deletions

diff --git a/apps/debug_menu.c b/apps/debug_menu.c
index ab1b60aaac..63630b2ba9 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 b528bdb1e3..7149e111cd 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);