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.
This commit is contained in:
Doug Zongker 2009-07-23 10:16:07 -07:00
parent 608fa02e1a
commit 23412e6f14
6 changed files with 5 additions and 4 deletions

View File

@ -29,11 +29,11 @@ char* MENU_ITEMS[] = { "reboot system now",
"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;
}

View File

@ -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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.4 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.9 KiB

After

Width:  |  Height:  |  Size: 16 KiB

1
ui.c
View File

@ -27,6 +27,7 @@
#include "common.h"
#include "minui/minui.h"
#include "recovery_ui.h"
#define MAX_COLS 64
#define MAX_ROWS 32