d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

When reporting the user readable size, round up. Several SD cards not

Browse Source 
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.
This commit is contained in:
Warner Losh 2013-05-16 19:44:51 +00:00
parent 3e8b845956
commit c96e8c3222
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=250709
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/dev/mmc/mmcsd.c
View File

@ -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