fix Triumph CWM

Author: ikarosdev

BoardConfig.mk

@@ -77,5 +77,3 @@ BOARD_HAS_NO_MISC_PARTITION := true
 BOARD_USES_MMCUTILS := true
 BOARD_CUSTOM_RECOVERY_KEYMAPPING := ../../device/motorola/triumph/recovery/recovery_ui.c
 BOARD_CUSTOM_GRAPHICS := ../../../device/motorola/triumph/recovery/minui/graphics.c
-BOARD_HAS_NO_SELECT_BUTTON := true
-TARGET_PREBUILT_RECOVERY_KERNEL := device/motorola/triumph/recovery_kernel

recovery.fstab

@@ -2,8 +2,7 @@
 
 /boot           emmc        /dev/block/mmcblk0p5      NULL                              NULL
 /fat            vfat        /dev/block/mmcblk0p1      NULL                              NULL
-/cache          ext4	    /dev/block/mmcblk0p11     NULL                              ext3
-/data           ext4        /dev/block/mmcblk0p8      NULL                              ext3
-/system         ext4        /dev/block/mmcblk0p7      NULL                              ext3
-/recovery         ext4        /dev/block/mmcblk0p99      NULL                              ext3
+/cache          ext3	    /dev/block/mmcblk0p11     NULL                              NULL
+/data           ext3        /dev/block/mmcblk0p8      NULL                              NULL
+/system         ext3        /dev/block/mmcblk0p7      NULL                              NULL
 /sdcard	        vfat	    /dev/block/mmcblk1p1      /dev/block/mmcblk1                NULL

recovery/minui/graphics.c

@@ -28,6 +28,7 @@
 #include <linux/kd.h>
 
 #include <pixelflinger/pixelflinger.h>
+#include <cutils/memory.h>
 
 #ifndef BOARD_LDPI_RECOVERY
 	#include "font_10x18.h"
@@ -109,7 +110,7 @@ static int get_framebuffer(GGLSurface *fb)
     fb->data = (void*) (((unsigned) bits) + vi.yres * fi.line_length);
 #else
     fb->stride = vi.xres;
-    fb->data = (void*) (((unsigned) bits) + vi.yres * vi.xres * 2);
+    fb->data = (void*) (((unsigned) bits) + (vi.yres * vi.xres * vi.bits_per_pixel / 8));
 #endif
     fb->format = GGL_PIXEL_FORMAT_RGB_565;
     memset(fb->data, 0, vi.yres * vi.xres * 2);
@@ -129,14 +130,35 @@ static void get_memory_surface(GGLSurface* ms) {
 static void set_active_framebuffer(unsigned n)
 {
     if (n > 1) return;
-    //vi.yres_virtual = vi.yres * 2;
+    vi.yres_virtual = vi.yres * 2;
     vi.yoffset = n * vi.yres;
-    vi.bits_per_pixel = 16;
     if (ioctl(gr_fb_fd, FBIOPUT_VSCREENINFO, &vi) < 0) {
         perror("active fb swap failed");
     }
 }
 
+void gr_flip_32(unsigned *bits, unsigned short *ptr, unsigned count)
+{
+   unsigned i=0;
+   while (i<count) {
+        uint32_t rgb32, red, green, blue, alpha;
+
+        /* convert 16 bits to 32 bits */
+        rgb32 = ((ptr[i] >> 11) & 0x1F);
+        red = (rgb32 << 3) | (rgb32 >> 2);
+        rgb32 = ((ptr[i] >> 5) & 0x3F);
+        green = (rgb32 << 2) | (rgb32 >> 4);
+        rgb32 = ((ptr[i]) & 0x1F);
+        blue = (rgb32 << 3) | (rgb32 >> 2);
+        alpha = 0xff;
+        rgb32 = (alpha << 24) | (blue << 16)
+        | (green << 8) | (red);
+        android_memset32((uint32_t *)bits, rgb32, 4);
+        i++;
+        bits++;
+    }
+}
+
 void gr_flip(void)
 {
     GGLContext *gl = gr_context;
@@ -156,8 +178,17 @@ void gr_flip(void)
 
     /* copy data from the in-memory surface to the buffer we're about
      * to make active. */
-    memcpy(gr_framebuffer[gr_active_fb].data, gr_mem_surface.data,
-           vi.xres * vi.yres * 2);
+    if( vi.bits_per_pixel == 16)
+    {
+        memcpy(gr_framebuffer[gr_active_fb].data, gr_mem_surface.data,
+               vi.xres * vi.yres * 2);
+    }
+    else
+    {
+        gr_flip_32((unsigned *)gr_framebuffer[gr_active_fb].data,
+                   (unsigned short *)gr_mem_surface.data,
+                   (vi.xres * vi.yres));
+    }
 
     /* inform the display driver */
     set_active_framebuffer(gr_active_fb);

recovery/recovery_ui.c

@@ -59,11 +59,11 @@ int device_handle_key(int key_code, int visible) {
     if (visible) {
         switch (key_code) {
             //case KEY_VOLUMEDOWN:
-	    case 115:
+	    case 114:
                 return HIGHLIGHT_DOWN;
 
             //case KEY_VOLUMEUP:
-	    case 114:
+	    case 115:
                 return HIGHLIGHT_UP;
 
             //case KEY_MENU: