fix compile warnings in recovery, change images
gcc 4.4 complains about some of the recovery ui functions not being
declared. To include the header, we have to fix the 'volatile'
declaration (otherwise there's a compiler error).
Move the dream-specific images to vendor/htc/dream, make the default
images a generic phone.
diff --git a/default_recovery_ui.c b/default_recovery_ui.c
index a2e4bea..d4e6204 100644
--- a/default_recovery_ui.c
+++ b/default_recovery_ui.c
@@ -29,11 +29,11 @@
"wipe cache partition",
NULL };
-int device_toggle_display(char* key_pressed, int key_code) {
+int device_toggle_display(volatile char* key_pressed, int key_code) {
return key_code == KEY_HOME;
}
-int device_reboot_now(char* key_pressed, int key_code) {
+int device_reboot_now(volatile char* key_pressed, int key_code) {
return 0;
}
diff --git a/recovery_ui.h b/recovery_ui.h
index 671fe40..8818ef3 100644
--- a/recovery_ui.h
+++ b/recovery_ui.h
@@ -21,13 +21,13 @@
// *key_pressed is an array of KEY_MAX+1 bytes indicating which other
// keys are already pressed. Return true if the text display should
// be toggled.
-extern int device_toggle_display(char* key_pressed, int key_code);
+extern int device_toggle_display(volatile char* key_pressed, int key_code);
// Called in the input thread when a new key (key_code) is pressed.
// *key_pressed is an array of KEY_MAX+1 bytes indicating which other
// keys are already pressed. Return true if the device should reboot
// immediately.
-extern int device_reboot_now(char* key_pressed, int key_code);
+extern int device_reboot_now(volatile char* key_pressed, int key_code);
// Called from the main thread when recovery is waiting for input and
// a key is pressed. key is the code of the key pressed; visible is
diff --git a/res/images/icon_error.png b/res/images/icon_error.png
index 7064c2e..6cb71c0 100644
--- a/res/images/icon_error.png
+++ b/res/images/icon_error.png
Binary files differ
diff --git a/res/images/icon_firmware_install.png b/res/images/icon_firmware_install.png
index ee2afac..8bfe775 100644
--- a/res/images/icon_firmware_install.png
+++ b/res/images/icon_firmware_install.png
Binary files differ
diff --git a/res/images/icon_installing.png b/res/images/icon_installing.png
index f24f2e3..1aeb9d9 100644
--- a/res/images/icon_installing.png
+++ b/res/images/icon_installing.png
Binary files differ
diff --git a/ui.c b/ui.c
index 039d682..0a8b985 100644
--- a/ui.c
+++ b/ui.c
@@ -27,6 +27,7 @@
#include "common.h"
#include "minui/minui.h"
+#include "recovery_ui.h"
#define MAX_COLS 64
#define MAX_ROWS 32
