diff options
author | imp <imp@FreeBSD.org> | 2013-05-16 19:44:51 +0000 |
---|---|---|
committer | imp <imp@FreeBSD.org> | 2013-05-16 19:44:51 +0000 |
commit | 5410e1edbe758d678b2fced1fbed9d6b7793be50 (patch) | |
tree | a25eee76e504d4e29d8ef18bd172067283d3ed71 /sys | |
parent | 0750e3e86451d76b599bad457e005e92b1dd9c60 (diff) | |
download | FreeBSD-src-5410e1edbe758d678b2fced1fbed9d6b7793be50.zip FreeBSD-src-5410e1edbe758d678b2fced1fbed9d6b7793be50.tar.gz |
When reporting the user readable size, round up. Several SD cards not
only use SI units, but also are a couple of percent short. If you need
to know the exact size, diskinfo will return exact results.
Diffstat (limited to 'sys')
-rw-r--r-- | sys/dev/mmc/mmcsd.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sys/dev/mmc/mmcsd.c b/sys/dev/mmc/mmcsd.c index 63e0b54..8c936ce 100644 --- a/sys/dev/mmc/mmcsd.c +++ b/sys/dev/mmc/mmcsd.c @@ -162,6 +162,7 @@ mmcsd_attach(device_t dev) d->d_stripesize = mmc_get_erase_sector(dev) * d->d_sectorsize; d->d_unit = device_get_unit(dev); d->d_flags = DISKFLAG_CANDELETE; + d->d_delmaxsize = mmc_get_erase_sector(dev) * d->d_sectorsize * 1; /* conservative */ /* * Display in most natural units. There's no cards < 1MB. The SD * standard goes to 2GiB due to its reliance on FAT, but the data @@ -170,13 +171,14 @@ mmcsd_attach(device_t dev) * data format supports up to 2TiB however. 2048GB isn't too ugly, so * we note it in passing here and don't add the code to print * TB). Since these cards are sold in terms of MB and GB not MiB and - * GiB, report them like that. + * GiB, report them like that. We also round to the nearest unit, since + * many cards are a few percent short, even of the power of 10 size. */ - mb = d->d_mediasize / 1000000; + mb = (d->d_mediasize + 1000000 / 2 - 1) / 1000000; unit = 'M'; if (mb >= 1000) { unit = 'G'; - mb /= 1000; + mb = (mb + 1000 / 2 - 1) / 1000; } /* * Report the clock speed of the underlying hardware, which might be |