openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

merge from open-source master

This commit is contained in:
Jean-Baptiste Queru 2009-08-21 10:19:14 -07:00
parent 444acdd436 e36c153e25
commit 50717d3ca8
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vold/blkdev.c
View File

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

3
vold/mmc.c
View File

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