diff options
| author | Ben Winslow <rain@bluecherry.net> | 2009-08-15 09:52:10 -0400 |
|---|---|---|
| committer | Ben Winslow <rain@bluecherry.net> | 2009-08-15 10:09:34 -0400 |
| commit | 227c74af84f6612559bfb3dceeac324c8ef30870 (patch) | |
| tree | 4e05408fb737d376ba432399673e5a576820a81d /vold | |
| parent | 1f7aceb2229e76678f9878d4682f2a7c7048ea6f (diff) | |
| download | core-227c74af84f6612559bfb3dceeac324c8ef30870.tar.gz core-227c74af84f6612559bfb3dceeac324c8ef30870.tar.bz2 core-227c74af84f6612559bfb3dceeac324c8ef30870.zip | |
vold: Check partitions 1-4 instead of 0-3
In mmc_bootstrap_mmcblk, bootstrap partitions 1-4 instead of 0-3, since
that's how the kernel labels them. Additionally, use the NDOSPART constant
from diskmbr.h instead of hardcoding 4 when scanning partitions.
Diffstat (limited to 'vold')
| -rw-r--r-- | vold/blkdev.c | 4 | ||||
| -rw-r--r-- | vold/mmc.c | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/vold/blkdev.c b/vold/blkdev.c index 1482a1ac0..0a15a7326 100644 --- a/vold/blkdev.c +++ b/vold/blkdev.c @@ -112,7 +112,7 @@ int blkdev_refresh(blkdev_t *blk) goto out; } - for (i = 0; i < 4; i++) { + for (i = 0; i < NDOSPART; i++) { struct dos_partition part; dos_partition_dec(block + DOSPARTOFF + i * sizeof(struct dos_partition), &part); @@ -134,7 +134,7 @@ int blkdev_refresh(blkdev_t *blk) struct dos_partition part; int part_no = blk->minor -1; - if (part_no < 4) { + if (part_no < NDOSPART) { dos_partition_dec(block + DOSPARTOFF + part_no * sizeof(struct dos_partition), &part); blk->part_type = part.dp_typ; } else { diff --git a/vold/mmc.c b/vold/mmc.c index cbddb9223..fcf7c2f9e 100644 --- a/vold/mmc.c +++ b/vold/mmc.c @@ -25,6 +25,7 @@ #include "vold.h" #include "mmc.h" #include "media.h" +#include "diskmbr.h" /* for NDOSPART */ #define DEBUG_BOOTSTRAP 0 @@ -233,7 +234,7 @@ static int mmc_bootstrap_mmcblk(char *devpath) *mmcblk_devname != '/'; mmcblk_devname--); mmcblk_devname++; - for (part_no = 0; part_no < 4; part_no++) { + for (part_no = 1; part_no <= NDOSPART; part_no++) { char part_file[255]; sprintf(part_file, "/sys%s/%sp%d", devpath, mmcblk_devname, part_no); if (!access(part_file, F_OK)) { |