commit 3afe20b0beb7e274eee195de436211a3e8d1b0ce
author Ethan.Du <a7233c@motorola.com> Wed Sep 02 14:04:26 2009 +0800
committer San Mehat <san@google.com> Thu Sep 24 10:16:15 2009 -0700
tree f37ea0a33afdec107d458acd7997117b317742c2
parent ff7d5835d91b979836b66dc42fac69adf2c6c3a3

vold: Add support for /dev/block/mmcblk1

Signed-off-by: Ethan.Du <a7233c@motorola.com>
Signed-off-by: San Mehat <san@google.com>

vold/blkdev.c

diff --git a/vold/blkdev.c b/vold/blkdev.c
index e10eafc..22d000e 100644
--- a/vold/blkdev.c
+++ b/vold/blkdev.c
@@ -32,6 +32,7 @@
 #include "vold.h"
 #include "blkdev.h"
 #include "diskmbr.h"
+#include "media.h"
 
 #define DEBUG_BLKDEV 0
 
@@ -132,7 +133,12 @@
         }
     } else if (blk->type == blkdev_partition) {
         struct dos_partition part;
-        int part_no = blk->minor -1;
+	int part_no;
+
+        if (blk->media->media_type == media_mmc)
+            part_no = blk->minor % MMC_PARTS_PER_CARD -1;
+        else
+            part_no = blk->minor -1;
 
         if (part_no < 4) {
             dos_partition_dec(block + DOSPARTOFF + part_no * sizeof(struct dos_partition), &part);