Revert "allow precise device detection"
This reverts commit ed7d296dfabd9d0297514518f41ead36130302e7.
diff --git a/flashutils/dump_image.c b/flashutils/dump_image.c
index 64c4e1c..4db1f74 100644
--- a/flashutils/dump_image.c
+++ b/flashutils/dump_image.c
@@ -146,5 +146,5 @@
return 2;
}
- return backup_raw_partition(NULL, argv[1], argv[2]);
+ return backup_raw_partition(argv[1], argv[2]);
}
diff --git a/flashutils/erase_image.c b/flashutils/erase_image.c
index b09a424..c495255 100644
--- a/flashutils/erase_image.c
+++ b/flashutils/erase_image.c
@@ -99,5 +99,5 @@
return 2;
}
- return erase_raw_partition(NULL, argv[1]);
+ return erase_raw_partition(argv[1]);
}
diff --git a/flashutils/flash_image.c b/flashutils/flash_image.c
index e9fa570..3966c42 100644
--- a/flashutils/flash_image.c
+++ b/flashutils/flash_image.c
@@ -147,7 +147,7 @@
return 2;
}
- int ret = restore_raw_partition(NULL, argv[1], argv[2]);
+ int ret = restore_raw_partition(argv[1], argv[2]);
if (ret != 0)
fprintf(stderr, "failed with error: %d\n", ret);
return ret;
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);
diff --git a/flashutils/flashutils.h b/flashutils/flashutils.h
index 4c63c67..d5dadcb 100644
--- a/flashutils/flashutils.h
+++ b/flashutils/flashutils.h
@@ -1,9 +1,9 @@
#ifndef FLASHUTILS_H
#define FLASHUTILS_H
-int restore_raw_partition(const char* partitionType, const char *partition, const char *filename);
-int backup_raw_partition(const char* partitionType, const char *partition, const char *filename);
-int erase_raw_partition(const char* partitionType, const char *partition);
+int restore_raw_partition(const char *partition, const char *filename);
+int backup_raw_partition(const char *partition, const char *filename);
+int erase_raw_partition(const char *partition);
int erase_partition(const char *partition, const char *filesystem);
int mount_partition(const char *partition, const char *mount_point, const char *filesystem, int read_only);
int get_partition_device(const char *partition, char *device);