From fdd4766c1edf658a2c611d16dacf73986877a5c6 Mon Sep 17 00:00:00 2001 From: Koushik Dutta Date: Sun, 17 Apr 2011 00:49:15 -0700 Subject: [PATCH] Revert "allow precise device detection" This reverts commit ed7d296dfabd9d0297514518f41ead36130302e7. --- Android.mk | 2 +- extendedcommands.c | 2 +- flashutils/dump_image.c | 2 +- flashutils/erase_image.c | 2 +- flashutils/flash_image.c | 2 +- flashutils/flashutils.c | 29 ++++++++++------------------- flashutils/flashutils.h | 6 +++--- nandroid.c | 4 ++-- 8 files changed, 20 insertions(+), 29 deletions(-) diff --git a/Android.mk b/Android.mk index 214f031..3f9f1e8 100644 --- a/Android.mk +++ b/Android.mk @@ -26,7 +26,7 @@ LOCAL_MODULE := recovery LOCAL_FORCE_STATIC_EXECUTABLE := true -RECOVERY_VERSION := ClockworkMod Recovery v3.0.2.5 +RECOVERY_VERSION := ClockworkMod Recovery v3.0.2.4 LOCAL_CFLAGS += -DRECOVERY_VERSION="$(RECOVERY_VERSION)" RECOVERY_API_VERSION := 2 LOCAL_CFLAGS += -DRECOVERY_API_VERSION=$(RECOVERY_API_VERSION) diff --git a/extendedcommands.c b/extendedcommands.c index 5280c54..3ee1cce 100644 --- a/extendedcommands.c +++ b/extendedcommands.c @@ -421,7 +421,7 @@ int format_unknown_device(const char *device, const char* path, const char *fs_t // device may simply be a name, like "system" if (device[0] != '/') - return erase_raw_partition(fs_type, device); + return erase_raw_partition(device); // if this is SDEXT:, don't worry about it if it does not exist. if (0 == strcmp(path, "/sd-ext")) 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 @@ int main(int argc, char **argv) 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 @@ int main(int argc, char **argv) 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 @@ int main(int argc, char **argv) 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 @@ __system(const char *command) 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 @@ static int detect_partition(const char *partitionType, const char *partition) 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 restore_raw_partition(const char* partitionType, const char *partition, cons } } -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 backup_raw_partition(const char* partitionType, const char *partition, const } } -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_raw_partition(const char* partitionType, const char *partition) 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 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 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); diff --git a/nandroid.c b/nandroid.c index a55884d..933faa3 100644 --- a/nandroid.c +++ b/nandroid.c @@ -115,7 +115,7 @@ int nandroid_backup_partition(const char* backup_path, const char* root) { const char* name = basename(root); sprintf(tmp, "%s/%s.img", backup_path, name); ui_print("Backing up %s image...\n", name); - if (0 != (ret = backup_raw_partition(vol->fs_type, vol->device, tmp))) { + if (0 != (ret = backup_raw_partition(vol->device, tmp))) { ui_print("Error while backing up %s image!", name); return ret; } @@ -294,7 +294,7 @@ int nandroid_restore_partition(const char* backup_path, const char* root) { } sprintf(tmp, "%s%s.img", backup_path, root); ui_print("Restoring %s image...\n", name); - if (0 != (ret = restore_raw_partition(vol->fs_type, vol->device, tmp))) { + if (0 != (ret = restore_raw_partition(vol->device, tmp))) { ui_print("Error while flashing %s image!", name); return ret; }