From 9ad02de6236dab85a11177c706a582bc7a7be75d Mon Sep 17 00:00:00 2001 From: Marcoen Hirschberg Date: Mon, 22 May 2006 16:28:19 +0000 Subject: fix simulator build for the gigabeat git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9973 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugins/cube.c | 2 +- apps/plugins/spacerocks.c | 16 +++++++++++++++- apps/plugins/text_editor.c | 5 +++++ apps/plugins/wormlet.c | 18 ++++++++++++++++++ 4 files changed, 39 insertions(+), 2 deletions(-) diff --git a/apps/plugins/cube.c b/apps/plugins/cube.c index 854b190797..1db8b24b9c 100644 --- a/apps/plugins/cube.c +++ b/apps/plugins/cube.c @@ -138,7 +138,7 @@ PLUGIN_HEADER #ifdef HAVE_LCD_BITMAP -#define DIST (10*LCD_HEIGHT/16) +#define DIST (10 * MIN(LCD_HEIGHT, LCD_WIDTH) / 16) static int x_off = LCD_WIDTH/2; static int y_off = LCD_HEIGHT/2; diff --git a/apps/plugins/spacerocks.c b/apps/plugins/spacerocks.c index 384fbd4e8d..c865af69b1 100755 --- a/apps/plugins/spacerocks.c +++ b/apps/plugins/spacerocks.c @@ -90,6 +90,19 @@ static struct plugin_api* rb; /* global api struct pointer */ #define AST_RIGHT_REP (BUTTON_SCROLL_FWD | BUTTON_REPEAT) #define AST_FIRE BUTTON_SELECT #define AST_FIRE_REP (BUTTON_SELECT | BUTTON_REPEAT) + +#elif (CONFIG_KEYPAD == GIGABEAT_PAD) +#define AST_PAUSE BUTTON_POWER +#define AST_QUIT BUTTON_A +#define AST_THRUST_REP BUTTON_UP | BUTTON_REPEAT +#define AST_THRUST BUTTON_UP +#define AST_HYPERSPACE BUTTON_DOWN +#define AST_LEFT BUTTON_LEFT +#define AST_LEFT_REP BUTTON_LEFT | BUTTON_REPEAT +#define AST_RIGHT BUTTON_RIGHT +#define AST_RIGHT_REP (BUTTON_RIGHT | BUTTON_REPEAT) +#define AST_FIRE BUTTON_SELECT +#define AST_FIRE_REP BUTTON_SELECT | BUTTON_REPEAT #endif #define SHOW_COL 0 @@ -111,7 +124,8 @@ static struct plugin_api* rb; /* global api struct pointer */ (CONFIG_KEYPAD == IRIVER_H300_PAD) || \ (CONFIG_KEYPAD == IAUDIO_X5_PAD) || \ (CONFIG_KEYPAD == IPOD_3G_PAD) || \ - (CONFIG_KEYPAD == IPOD_4G_PAD) + (CONFIG_KEYPAD == IPOD_4G_PAD) || \ + (CONFIG_KEYPAD == GIGABEAT_PAD) #define ENEMY_MISSILE_SURVIVAL_LENGTH 120 #define MISSILE_SURVIVAL_LENGTH 80 #endif diff --git a/apps/plugins/text_editor.c b/apps/plugins/text_editor.c index 450155e180..e86606344d 100644 --- a/apps/plugins/text_editor.c +++ b/apps/plugins/text_editor.c @@ -50,6 +50,11 @@ #define TEXT_EDITOR_CANCEL BUTTON_POWER #define TEXT_EDITOR_ITEM_MENU BUTTON_PLAY +#elif CONFIG_KEYPAD == GIGABEAT_PAD +#define TEXT_EDITOR_SELECT BUTTON_SELECT +#define TEXT_EDITOR_CANCEL BUTTON_A +#define TEXT_EDITOR_ITEM_MENU BUTTON_MENU + #else #error TEXT_EDITOR: Unsupported keypad #endif diff --git a/apps/plugins/wormlet.c b/apps/plugins/wormlet.c index d872e8be19..95ccc4a9f2 100644 --- a/apps/plugins/wormlet.c +++ b/apps/plugins/wormlet.c @@ -99,6 +99,19 @@ PLUGIN_HEADER #define PLAYERS_TEXT "Up/Down" #define WORMS_TEXT "Left/Right" +#elif (CONFIG_KEYPAD == GIGABEAT_PAD) + +#define BTN_DIR_UP BUTTON_UP +#define BTN_DIR_DOWN BUTTON_DOWN +#define BTN_DIR_LEFT BUTTON_LEFT +#define BTN_DIR_RIGHT BUTTON_RIGHT +#define BTN_STARTPAUSE BUTTON_SELECT +#define BTN_QUIT BUTTON_A +#define BTN_STOPRESET BUTTON_POWER + +#define PLAYERS_TEXT "Up/Down" +#define WORMS_TEXT "Left/Right" + #endif #if (LCD_WIDTH == 112) && (LCD_HEIGHT == 64) @@ -131,6 +144,11 @@ PLUGIN_HEADER #define ARGH_SIZE 8 #define SPEED 4 #define MAX_WORM_SEGMENTS 512 +#elif (LCD_WIDTH == 240) && (LCD_HEIGHT == 320) +#define FOOD_SIZE 7 +#define ARGH_SIZE 8 +#define SPEED 4 +#define MAX_WORM_SEGMENTS 512 #endif #ifdef HAVE_LCD_COLOR -- cgit v1.2.3