recovery: Remove condition around get_root_mtd_partition

Change-Id: I2e763000f65aba342f1851c7e94778a815bbaa6f

Android.mk

@@ -27,12 +27,6 @@ ifndef BOARD_HAS_NO_MISC_PARTITION
     LOCAL_SRC_FILES += \
         firmware.c \
         bootloader.c
-else
-    LOCAL_CFLAGS += -DBOARD_HAS_NO_MISC_PARTITION
-endif
-
-ifdef BOARD_RECOVERY_IGNORE_BOOTABLES
-    LOCAL_CFLAGS += -DBOARD_RECOVERY_IGNORE_BOOTABLES
 endif
 
 ifdef BOARD_HIJACK_RECOVERY_PATH
@@ -45,12 +39,12 @@ LOCAL_MODULE := recovery
 
 LOCAL_FORCE_STATIC_EXECUTABLE := true
 
-RECOVERY_VERSION := ClockworkMod Recovery v2.5.1.3
+RECOVERY_VERSION := ClockworkMod Recovery v2.5.1.8
 LOCAL_CFLAGS += -DRECOVERY_VERSION="$(RECOVERY_VERSION)"
 RECOVERY_API_VERSION := 2
 LOCAL_CFLAGS += -DRECOVERY_API_VERSION=$(RECOVERY_API_VERSION)
 
-BOARD_RECOVERY_DEFINES := BOARD_HAS_NO_SELECT_BUTTON BOARD_SDCARD_DEVICE_PRIMARY BOARD_SDCARD_DEVICE_SECONDARY BOARD_SDEXT_DEVICE BOARD_SDEXT_FILESYSTEM BOARD_DATA_DEVICE BOARD_DATA_FILESYSTEM BOARD_DATADATA_DEVICE BOARD_DATADATA_FILESYSTEM BOARD_CACHE_DEVICE BOARD_CACHE_FILESYSTEM BOARD_SYSTEM_DEVICE BOARD_SYSTEM_FILESYSTEM BOARD_HAS_DATADATA BOARD_DATA_FILESYSTEM_OPTIONS BOARD_DATADATA_FILESYSTEM_OPTIONS BOARD_CACHE_FILESYSTEM_OPTIONS BOARD_SYSTEM_FILESYSTEM_OPTIONS BOARD_HAS_MTD_CACHE BOARD_USES_BMLUTILS BOARD_USES_MMCUTILS BOARD_HAS_SMALL_RECOVERY BOARD_LDPI_RECOVERY
+BOARD_RECOVERY_DEFINES := BOARD_HAS_NO_SELECT_BUTTON BOARD_SDCARD_DEVICE_PRIMARY BOARD_SDCARD_DEVICE_SECONDARY BOARD_SDEXT_DEVICE BOARD_SDEXT_FILESYSTEM BOARD_DATA_DEVICE BOARD_DATA_FILESYSTEM BOARD_DATADATA_DEVICE BOARD_DATADATA_FILESYSTEM BOARD_CACHE_DEVICE BOARD_CACHE_FILESYSTEM BOARD_SYSTEM_DEVICE BOARD_SYSTEM_FILESYSTEM BOARD_HAS_DATADATA BOARD_DATA_FILESYSTEM_OPTIONS BOARD_DATADATA_FILESYSTEM_OPTIONS BOARD_CACHE_FILESYSTEM_OPTIONS BOARD_SYSTEM_FILESYSTEM_OPTIONS BOARD_HAS_MTD_CACHE BOARD_USES_BMLUTILS BOARD_USES_MMCUTILS BOARD_HAS_SMALL_RECOVERY BOARD_LDPI_RECOVERY BOARD_RECOVERY_IGNORE_BOOTABLES BOARD_HAS_NO_MISC_PARTITION BOARD_HAS_SDCARD_INTERNAL BOARD_SDCARD_DEVICE_INTERNAL
 
 $(foreach board_define,$(BOARD_RECOVERY_DEFINES), \
   $(if $($(board_define)), \

bmlutils/bmlutils.c

@@ -21,18 +21,60 @@
 #include <sys/wait.h>
 
 extern int __system(const char *command);
+#define BML_UNLOCK_ALL				0x8A29		///< unlock all partition RO -> RW
+
+static int restore_internal(const char* bml, const char* filename)
+{
+    char buf[4096];
+    int dstfd, srcfd, bytes_read, bytes_written, total_read = 0;
+    if (filename == NULL)
+        srcfd = 0;
+    else {
+        srcfd = open(filename, O_RDONLY | O_LARGEFILE);
+        if (srcfd < 0)
+            return 2;
+    }
+    dstfd = open(bml, O_RDWR | O_LARGEFILE);
+    if (dstfd < 0)
+        return 3;
+    if (ioctl(dstfd, BML_UNLOCK_ALL, 0))
+        return 4;
+    do {
+        total_read += bytes_read = read(srcfd, buf, 4096);
+        if (!bytes_read)
+            break;
+        if (bytes_read < 4096)
+            memset(&buf[bytes_read], 0, 4096 - bytes_read);
+        if (write(dstfd, buf, 4096) < 4096)
+            return 5;
+    } while(bytes_read == 4096);
+    
+    close(dstfd);
+    close(srcfd);
+    
+    return 0;
+}
 
 int cmd_bml_restore_raw_partition(const char *partition, const char *filename)
 {
-    char tmp[PATH_MAX];
-    sprintf("dd if=%s of=/dev/block/bml7 bs=4096", filename);
-    return __system(tmp);
+    char *bml;
+    if (strcmp(partition, "boot") == 0 || strcmp(partition, "recovery") == 0)
+        bml = "/dev/block/bml7";
+    else
+        return 6;
+
+    int ret = restore_internal("/dev/block/bml7", filename);
+    if (ret != 0)
+        return ret;
+
+    ret = restore_internal("/dev/block/bml8", filename);
+    return ret;
 }
 
 int cmd_bml_backup_raw_partition(const char *partition, const char *filename)
 {
     char tmp[PATH_MAX];
-    sprintf("dd of=%s if=/dev/block/bml7 bs=4096", filename);
+    sprintf(tmp, "dd of=%s if=/dev/block/bml7 bs=4096", filename);
     return __system(tmp);
 }
 

commands.c

@@ -40,6 +40,7 @@
 #include "roots.h"
 
 #include "extendedcommands.h"
+#include "flashutils/flashutils.h"
 
 static int gDidShowProgress = 0;
 
@@ -653,7 +654,11 @@ static int
 cmd_write_raw_image(const char *name, void *cookie,
         int argc, const char *argv[], PermissionRequestList *permissions)
 {
-#ifdef BOARD_USES_MTDUTILS
+    if (device_flash_type() != MTD) {
+        LOGE("Board does not support mtd utils.");
+        return -1;
+    }
+    
     UNUSED(cookie);
     CHECK_WORDS();
 //xxx permissions
@@ -739,10 +744,6 @@ cmd_write_raw_image(const char *name, void *cookie,
         return -1;
     }
     return 0;
-#else
-    LOGE("Board does not support mtd utils.");
-    return -1;
-#endif
 }
 
 /* mark <resource> dirty|clean

etc/init.rc

@@ -8,6 +8,7 @@ on init
     symlink /system/etc /etc
 
     mkdir /sdcard
+    mkdir /emmc
     mkdir /system
     mkdir /data
     mkdir /cache

extendedcommands.c

@@ -446,6 +446,9 @@ void show_partition_menu()
         { "mount /data", "unmount /data", "DATA:" },
         { "mount /cache", "unmount /cache", "CACHE:" },
         { "mount /sdcard", "unmount /sdcard", "SDCARD:" },
+#ifdef BOARD_HAS_SDCARD_INTERNAL
+        { "mount /emmc", "unmount /emmc", "SDINTERNAL:" },
+#endif
         { "mount /sd-ext", "unmount /sd-ext", "SDEXT:" }
         };
 
@@ -458,6 +461,9 @@ void show_partition_menu()
 
     string mmcs[MMC_COUNT][3] = {
       { "format sdcard", "SDCARD:" },
+#ifdef BOARD_HAS_SDCARD_INTERNAL
+      { "format internal sdcard", "SDINTERNAL:" },
+#endif
       { "format sd-ext", "SDEXT:" }
     };
 
@@ -760,6 +766,9 @@ void show_advanced_menu()
 #ifndef BOARD_HAS_SMALL_RECOVERY
                             "Partition SD Card",
                             "Fix Permissions",
+#ifdef BOARD_HAS_SDCARD_INTERNAL
+                            "Partition Internal SD Card",
+#endif
 #endif
                             NULL
     };
@@ -865,6 +874,49 @@ void show_advanced_menu()
                 ui_print("Done!\n");
                 break;
             }
+            case 7:
+            {
+                static char* ext_sizes[] = { "128M",
+                                             "256M",
+                                             "512M",
+                                             "1024M",
+                                             "2048M",
+                                             "4096M",
+                                             NULL };
+
+                static char* swap_sizes[] = { "0M",
+                                              "32M",
+                                              "64M",
+                                              "128M",
+                                              "256M",
+                                              NULL };
+
+                static char* ext_headers[] = { "Data Size", "", NULL };
+                static char* swap_headers[] = { "Swap Size", "", NULL };
+
+                int ext_size = get_menu_selection(ext_headers, ext_sizes, 0);
+                if (ext_size == GO_BACK)
+                    continue;
+
+                int swap_size = 0;
+                if (swap_size == GO_BACK)
+                    continue;
+
+                char sddevice[256];
+                const RootInfo *ri = get_root_info_for_path("SDINTERNAL:");
+                strcpy(sddevice, ri->device);
+                // we only want the mmcblk, not the partition
+                sddevice[strlen("/dev/block/mmcblkX")] = NULL;
+                char cmd[PATH_MAX];
+                setenv("SDPATH", sddevice, 1);
+                sprintf(cmd, "sdparted -es %s -ss %s -efs ext3 -s", ext_sizes[ext_size], swap_sizes[swap_size]);
+                ui_print("Partitioning Internal SD Card... please wait...\n");
+                if (0 == __system(cmd))
+                    ui_print("Done!\n");
+                else
+                    ui_print("An error occured while partitioning your Internal SD Card. Please see /tmp/recovery.log for more details.\n");
+                break;
+            }
         }
     }
 }

flashutils/flash_image.c

@@ -147,5 +147,8 @@ int main(int argc, char **argv)
         return 2;
     }
 
-    return restore_raw_partition(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;
 }

flashutils/flashutils.c

@@ -5,14 +5,6 @@
 
 #include "flashutils/flashutils.h"
 
-enum flash_type {
-    UNSUPPORTED = -1,
-    UNKNOWN = 0,
-    MTD = 1,
-    MMC = 2,
-    BML = 3
-};
-
 int the_flash_type = UNKNOWN;
 
 int device_flash_type()

flashutils/flashutils.h

@@ -1,3 +1,6 @@
+#ifndef FLASHUTILS_H
+#define FLASHUTILS_H
+
 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);
@@ -35,4 +38,14 @@ extern int cmd_bml_erase_partition(const char *partition, const char *filesystem
 extern int cmd_bml_mount_partition(const char *partition, const char *mount_point, const char *filesystem, int read_only);
 extern int cmd_bml_get_partition_device(const char *partition, char *device);
 
+extern int device_flash_type();
 
+enum flash_type {
+    UNSUPPORTED = -1,
+    UNKNOWN = 0,
+    MTD = 1,
+    MMC = 2,
+    BML = 3
+};
+
+#endif

minui/graphics.c

@@ -90,7 +90,7 @@ static int get_framebuffer(GGLSurface *fb)
     fb->version = sizeof(*fb);
     fb->width = vi.xres;
     fb->height = vi.yres;
-    fb->stride = vi.xres;
+    fb->stride = fi.line_length/2; /* stride is the number of pixels until the data of next row, >= xres */;
     fb->data = bits;
     fb->format = GGL_PIXEL_FORMAT_RGB_565;
 
@@ -99,8 +99,8 @@ static int get_framebuffer(GGLSurface *fb)
     fb->version = sizeof(*fb);
     fb->width = vi.xres;
     fb->height = vi.yres;
-    fb->stride = vi.xres;
-    fb->data = (void*) (((unsigned) bits) + vi.yres * vi.xres * 2);
+    fb->stride = fi.line_length/2;
+    fb->data = (void*) (((unsigned) bits) + vi.yres * fi.line_length);
     fb->format = GGL_PIXEL_FORMAT_RGB_565;
 
     return fd;

roots.c

@@ -50,6 +50,9 @@ static RootInfo g_roots[] = {
     { "PACKAGE:", NULL, NULL, NULL, NULL, g_package_file, NULL },
     { "RECOVERY:", g_default_device, NULL, "recovery", "/", g_raw, NULL },
     { "SDCARD:", BOARD_SDCARD_DEVICE_PRIMARY, BOARD_SDCARD_DEVICE_SECONDARY, NULL, "/sdcard", "vfat", NULL },
+#ifdef BOARD_HAS_SDCARD_INTERNAL
+    { "SDINTERNAL:", BOARD_SDCARD_DEVICE_INTERNAL, NULL, NULL, "/emmc", "vfat", NULL },
+#endif
     { "SDEXT:", BOARD_SDEXT_DEVICE, NULL, NULL, "/sd-ext", BOARD_SDEXT_FILESYSTEM, NULL },
     { "SYSTEM:", BOARD_SYSTEM_DEVICE, NULL, "system", "/system", BOARD_SYSTEM_FILESYSTEM, BOARD_SYSTEM_FILESYSTEM_OPTIONS },
     { "MBM:", g_default_device, NULL, "mbm", NULL, g_raw, NULL },
@@ -311,7 +314,6 @@ get_root_partition_device(const char *root_path, char *device)
     return info->device;
 }
 
-#ifndef BOARD_HAS_NO_MISC_PARTITION
 const MtdPartition *
 get_root_mtd_partition(const char *root_path)
 {
@@ -329,7 +331,6 @@ get_root_mtd_partition(const char *root_path)
     mtd_scan_partitions();
     return mtd_find_partition_by_name(info->partition_name);
 }
-#endif
 
 int
 format_root_device(const char *root)

roots.h

@@ -37,6 +37,10 @@
 #define BOARD_SDCARD_DEVICE_SECONDARY "/dev/block/mmcblk0"
 #endif
 
+#ifndef BOARD_SDCARD_DEVICE_INTERNAL
+#define BOARD_SDCARD_DEVICE_INTERNAL g_default_device
+#endif
+
 #ifndef BOARD_SDEXT_DEVICE
 #define BOARD_SDEXT_DEVICE "/dev/block/mmcblk0p2"
 #endif