diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2009-08-21 10:19:14 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2009-08-21 10:19:14 -0700 |
| commit | 50717d3ca874d13f802e402e43dd9cbd5b19539a (patch) | |
| tree | d5a946d3a70ec7b92f0ae2ea29c09e570036fed0 /vold | |
| parent | 444acdd4366dbe7ca4b277a6e5532ea02cc1fbbb (diff) | |
| parent | e36c153e25ceb2640967b8fc2ad9864b2b430b48 (diff) | |
| download | system_core-50717d3ca874d13f802e402e43dd9cbd5b19539a.zip system_core-50717d3ca874d13f802e402e43dd9cbd5b19539a.tar.gz system_core-50717d3ca874d13f802e402e43dd9cbd5b19539a.tar.bz2 | |
merge from open-source master
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 e10eafc..2c5681a 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 { @@ -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)) { |