commit fdd4766c1edf658a2c611d16dacf73986877a5c6
author Koushik Dutta <koushd@gmail.com> Sun Apr 17 00:49:15 2011 -0700
committer Koushik Dutta <koushd@gmail.com> Sun Apr 17 00:49:15 2011 -0700
tree 68f455dd8b92cf39a7a6111c3d15d40cebeea7b0
parent ed7d296dfabd9d0297514518f41ead36130302e7

Revert "allow precise device detection"

This reverts commit ed7d296dfabd9d0297514518f41ead36130302e7.

flashutils/flashutils.c

diff --git a/flashutils/flashutils.c b/flashutils/flashutils.c
index 5d906c9..0b1467e 100644
--- a/flashutils/flashutils.c
+++ b/flashutils/flashutils.c
@@ -69,7 +69,7 @@
     return (pid == -1 ? -1 : pstat);
 }
 
-static int detect_partition(const char *partitionType, const char *partition)
+static int detect_partition(const char *partition)
 {
     int type = device_flash_type();
     if (strstr(partition, "/dev/block/mtd") != NULL)
@@ -78,21 +78,12 @@
         type = MMC;
     else if (strstr(partition, "/dev/block/bml") != NULL)
         type = BML;
-
-    if (partitionType != NULL) {
-        if (strstr(partitionType, "mtd") != NULL)
-            type = MTD;
-        else if (strstr(partitionType, "emmc") != NULL)
-            type = MMC;
-        else if (strstr(partitionType, "bml") != NULL)
-            type = BML;
-    }
-                
+        
     return type;
 }
-int restore_raw_partition(const char* partitionType, const char *partition, const char *filename)
+int restore_raw_partition(const char *partition, const char *filename)
 {
-    int type = detect_partition(partitionType, partition);
+    int type = detect_partition(partition);
     switch (type) {
         case MTD:
             return cmd_mtd_restore_raw_partition(partition, filename);
@@ -105,9 +96,9 @@
     }
 }
 
-int backup_raw_partition(const char* partitionType, const char *partition, const char *filename)
+int backup_raw_partition(const char *partition, const char *filename)
 {
-    int type = detect_partition(partitionType, partition);
+    int type = detect_partition(partition);
     switch (type) {
         case MTD:
             return cmd_mtd_backup_raw_partition(partition, filename);
@@ -120,9 +111,9 @@
     }
 }
 
-int erase_raw_partition(const char* partitionType, const char *partition)
+int erase_raw_partition(const char *partition)
 {
-    int type = detect_partition(partitionType, partition);
+    int type = detect_partition(partition);
     switch (type) {
         case MTD:
             return cmd_mtd_erase_raw_partition(partition);
@@ -137,7 +128,7 @@
 
 int erase_partition(const char *partition, const char *filesystem)
 {
-    int type = detect_partition(NULL, partition);
+    int type = detect_partition(partition);
     switch (type) {
         case MTD:
             return cmd_mtd_erase_partition(partition, filesystem);
@@ -152,7 +143,7 @@
 
 int mount_partition(const char *partition, const char *mount_point, const char *filesystem, int read_only)
 {
-    int type = detect_partition(NULL, partition);
+    int type = detect_partition(partition);
     switch (type) {
         case MTD:
             return cmd_mtd_mount_partition(partition, mount_point, filesystem, read_only);