From f573510b501b65b1be8003f6e9d900df01530f1d Mon Sep 17 00:00:00 2001 From: Koushik Dutta Date: Fri, 22 Apr 2011 12:12:32 -0700 Subject: [PATCH] bml fixes Change-Id: I442ef3c155bab36db578ca5735215aedda353c29 --- Android.mk | 2 +- flashutils/flashutils.c | 5 +++-- roots.c | 1 - 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Android.mk b/Android.mk index 3f9f1e8..214f031 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.4 +RECOVERY_VERSION := ClockworkMod Recovery v3.0.2.5 LOCAL_CFLAGS += -DRECOVERY_VERSION="$(RECOVERY_VERSION)" RECOVERY_API_VERSION := 2 LOCAL_CFLAGS += -DRECOVERY_API_VERSION=$(RECOVERY_API_VERSION) diff --git a/flashutils/flashutils.c b/flashutils/flashutils.c index 0b1467e..7504e4a 100644 --- a/flashutils/flashutils.c +++ b/flashutils/flashutils.c @@ -10,7 +10,7 @@ int the_flash_type = UNKNOWN; int device_flash_type() { if (the_flash_type == UNKNOWN) { - if (access("/dev/block/bml1", F_OK) == 0) { + if (access("/dev/block/bml7", F_OK) == 0) { the_flash_type = BML; } else if (access("/proc/emmc", F_OK) == 0) { the_flash_type = MMC; @@ -78,7 +78,7 @@ static int detect_partition(const char *partition) type = MMC; else if (strstr(partition, "/dev/block/bml") != NULL) type = BML; - + return type; } int restore_raw_partition(const char *partition, const char *filename) @@ -107,6 +107,7 @@ int backup_raw_partition(const char *partition, const char *filename) case BML: return cmd_bml_backup_raw_partition(partition, filename); default: + printf("unable to detect device type"); return -1; } } diff --git a/roots.c b/roots.c index a3c4677..a33190a 100644 --- a/roots.c +++ b/roots.c @@ -153,7 +153,6 @@ int try_mount(const char* device, const char* mount_point, const char* fs_type, else { char mount_cmd[PATH_MAX]; sprintf(mount_cmd, "mount -t %s -o%s %s %s", fs_type, fs_options, device, mount_point); - LOGE("%s\n", mount_cmd); ret = __system(mount_cmd); } if (ret == 0)