From b701322fea42c809092f50e252f45ddfc38293c3 Mon Sep 17 00:00:00 2001 From: Jens Arnold Date: Fri, 27 Jul 2007 09:57:27 +0000 Subject: Rockbox compiles and boots now on the 2nd gen, but doesn't work properly yet. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14021 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugins/battery_bench.c | 3 ++- apps/plugins/blackjack.c | 13 +++++++++---- apps/plugins/bounce.c | 3 ++- apps/plugins/brickmania.c | 5 +++-- apps/plugins/bubbles.c | 3 ++- apps/plugins/calculator.c | 3 ++- apps/plugins/chessbox/chessbox.c | 3 ++- apps/plugins/chessbox/chessbox_pgn.c | 3 ++- apps/plugins/chessclock.c | 3 ++- apps/plugins/chip8.c | 3 ++- apps/plugins/chopper.c | 5 +++-- apps/plugins/credits.c | 3 ++- apps/plugins/cube.c | 4 +++- apps/plugins/dict.c | 3 ++- apps/plugins/disktidy.c | 5 +++-- apps/plugins/doom/Makefile | 2 +- apps/plugins/doom/i_video.c | 6 ++++-- apps/plugins/fire.c | 3 ++- apps/plugins/fireworks.c | 3 ++- apps/plugins/flipit.c | 8 +++++--- apps/plugins/grayscale.c | 3 ++- apps/plugins/invadrox.c | 5 +++-- apps/plugins/jewels.c | 6 ++++-- apps/plugins/jpeg.c | 3 ++- apps/plugins/lib/pluginlib_actions.h | 12 +++++++++--- apps/plugins/logo.c | 3 ++- apps/plugins/mandelbrot.c | 3 ++- apps/plugins/maze.c | 3 ++- apps/plugins/mazezam.c | 3 ++- apps/plugins/midiplay.c | 3 ++- apps/plugins/minesweeper.c | 3 ++- apps/plugins/mosaique.c | 3 ++- apps/plugins/mp3_encoder.c | 4 ++-- apps/plugins/mpegplayer/mpegplayer.c | 3 ++- apps/plugins/oscilloscope.c | 3 ++- apps/plugins/plasma.c | 3 ++- apps/plugins/pong.c | 3 ++- apps/plugins/random_folder_advance_config.c | 5 +++-- apps/plugins/reversi/reversi-gui.c | 3 ++- apps/plugins/reversi/reversi-gui.h | 3 ++- apps/plugins/rockblox.c | 6 ++++-- apps/plugins/rockpaint.c | 3 ++- apps/plugins/sliding_puzzle.c | 6 ++++-- apps/plugins/snake.c | 3 ++- apps/plugins/snake2.c | 3 ++- apps/plugins/snow.c | 3 ++- apps/plugins/sokoban.c | 6 ++++-- apps/plugins/solitaire.c | 3 ++- apps/plugins/spacerocks.c | 3 ++- apps/plugins/star.c | 6 ++++-- apps/plugins/starfield.c | 3 ++- apps/plugins/stats.c | 5 +++-- apps/plugins/stopwatch.c | 3 ++- apps/plugins/sudoku/sudoku.h | 3 ++- apps/plugins/test_fps.c | 3 ++- apps/plugins/test_scanrate.c | 6 ++++-- apps/plugins/viewer.c | 5 +++-- apps/plugins/vu_meter.c | 5 +++-- apps/plugins/wormlet.c | 3 ++- apps/plugins/xobox.c | 5 +++-- apps/plugins/zxbox/keymaps.h | 4 ++-- apps/plugins/zxbox/zxbox.c | 8 ++++---- apps/plugins/zxbox/zxbox_keyb.c | 4 +++- 63 files changed, 169 insertions(+), 91 deletions(-) (limited to 'apps') diff --git a/apps/plugins/battery_bench.c b/apps/plugins/battery_bench.c index 9a70fbf..3d8eadb 100644 --- a/apps/plugins/battery_bench.c +++ b/apps/plugins/battery_bench.c @@ -64,7 +64,8 @@ PLUGIN_HEADER #define BATTERY_RC_OFF BUTTON_RC_STOP #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ - (CONFIG_KEYPAD == IPOD_3G_PAD) + (CONFIG_KEYPAD == IPOD_3G_PAD) || \ + (CONFIG_KEYPAD == IPOD_1G2G_PAD) #define BATTERY_ON BUTTON_PLAY #define BATTERY_OFF BUTTON_MENU diff --git a/apps/plugins/blackjack.c b/apps/plugins/blackjack.c index 1cce364..f587ecc 100644 --- a/apps/plugins/blackjack.c +++ b/apps/plugins/blackjack.c @@ -96,8 +96,9 @@ PLUGIN_HEADER #define BJACK_RIGHT BUTTON_RIGHT #define BJACK_LEFT BUTTON_LEFT -#elif (CONFIG_KEYPAD == IPOD_3G_PAD) || \ - (CONFIG_KEYPAD == IPOD_4G_PAD) +#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ + (CONFIG_KEYPAD == IPOD_3G_PAD) || \ + (CONFIG_KEYPAD == IPOD_1G2G_PAD) #define BJACK_START BUTTON_SELECT #define BJACK_QUIT BUTTON_MENU #define BJACK_MAX (BUTTON_SELECT|BUTTON_SCROLL_FWD) @@ -826,7 +827,9 @@ static signed int blackjack_get_amount(char message[20], signed int lower_limit, rb->lcd_putsxy(LCD_WIDTH/2 - 9*w, LCD_HEIGHT/2 - 4*h - 1, message); rb->snprintf(str, 9, "$%d", amount); rb->lcd_putsxy(LCD_WIDTH/2 - 9*w, LCD_HEIGHT/2 - 3*h, str); -#if (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) +#if (CONFIG_KEYPAD == IPOD_4G_PAD) || \ + (CONFIG_KEYPAD == IPOD_3G_PAD) || \ + (CONFIG_KEYPAD == IPOD_1G2G_PAD) rb->lcd_putsxy(LCD_WIDTH/2 - 9*w, LCD_HEIGHT/2 - h-2, " >>|: +1"); rb->lcd_putsxy(LCD_WIDTH/2 - 9*w, LCD_HEIGHT/2 - 1, " |<<: -1"); rb->lcd_putsxy(LCD_WIDTH/2 - 9*w, LCD_HEIGHT/2 + h, "SCROLL+: +10"); @@ -1034,7 +1037,9 @@ static unsigned int blackjack_menu(struct game_context* bj) { rb->snprintf(str, 21, "High Score: $%d", bj->highscores[0]); rb->lcd_puts(0, 8, str); -#elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) +#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ + (CONFIG_KEYPAD == IPOD_3G_PAD) || \ + (CONFIG_KEYPAD == IPOD_1G2G_PAD) #if LCD_WIDTH >=176 rb->lcd_puts(0, 2, "SELECT to start & to hit"); rb->lcd_puts(0, 3, "MENU to exit"); diff --git a/apps/plugins/bounce.c b/apps/plugins/bounce.c index 2b79e36..eac6933 100644 --- a/apps/plugins/bounce.c +++ b/apps/plugins/bounce.c @@ -57,7 +57,8 @@ PLUGIN_HEADER #define BOUNCE_RC_QUIT (BUTTON_RC_STOP | BUTTON_REL) #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ - (CONFIG_KEYPAD == IPOD_3G_PAD) + (CONFIG_KEYPAD == IPOD_3G_PAD) || \ + (CONFIG_KEYPAD == IPOD_1G2G_PAD) #define BOUNCE_UP BUTTON_SCROLL_BACK #define BOUNCE_DOWN BUTTON_SCROLL_FWD #define BOUNCE_QUIT (BUTTON_MENU | BUTTON_REL) diff --git a/apps/plugins/brickmania.c b/apps/plugins/brickmania.c index 93b759d..cc19519 100644 --- a/apps/plugins/brickmania.c +++ b/apps/plugins/brickmania.c @@ -77,8 +77,9 @@ PLUGIN_HEADER #define SCROLL_FWD(x) (0) #define SCROLL_BACK(x) (0) -#elif (CONFIG_KEYPAD == IPOD_3G_PAD) || \ - (CONFIG_KEYPAD == IPOD_4G_PAD) +#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ + (CONFIG_KEYPAD == IPOD_3G_PAD) || \ + (CONFIG_KEYPAD == IPOD_1G2G_PAD) #define QUIT BUTTON_MENU #define LEFT BUTTON_LEFT diff --git a/apps/plugins/bubbles.c b/apps/plugins/bubbles.c index 689e9de..dede076 100644 --- a/apps/plugins/bubbles.c +++ b/apps/plugins/bubbles.c @@ -2457,7 +2457,8 @@ static int bubbles(struct game_context* bb) { rb->lcd_puts(0, 6, " and show high scores"); rb->lcd_puts(0, 7, "LEFT/RIGHT to aim"); rb->lcd_puts(0, 8, "UP/DOWN to change level"); -#elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) +#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \ + (CONFIG_KEYPAD == IPOD_1G2G_PAD) rb->lcd_puts(0, 2, "PLAY to start/pause"); rb->lcd_puts(0, 3, "MENU to save/resume"); rb->lcd_puts(0, 4, "MENU+SELECT to exit"); diff --git a/apps/plugins/calculator.c b/apps/plugins/calculator.c index 04fd4e0..e16f58a 100644 --- a/apps/plugins/calculator.c +++ b/apps/plugins/calculator.c @@ -146,7 +146,8 @@ PLUGIN_HEADER #define CALCULATOR_RC_QUIT BUTTON_RC_STOP #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ - (CONFIG_KEYPAD == IPOD_3G_PAD) + (CONFIG_KEYPAD == IPOD_3G_PAD) || \ + (CONFIG_KEYPAD == IPOD_1G2G_PAD) #define CALCULATOR_UP BUTTON_SCROLL_BACK #define CALCULATOR_DOWN BUTTON_SCROLL_FWD diff --git a/apps/plugins/chessbox/chessbox.c b/apps/plugins/chessbox/chessbox.c index d273888..fce5c72 100644 --- a/apps/plugins/chessbox/chessbox.c +++ b/apps/plugins/chessbox/chessbox.c @@ -41,7 +41,8 @@ extern const fb_data chessbox_pieces[]; PLUGIN_HEADER /* button definitions */ -#if (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) +#if (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \ + (CONFIG_KEYPAD == IPOD_1G2G_PAD) #define CB_SELECT BUTTON_SELECT #define CB_UP BUTTON_MENU #define CB_DOWN BUTTON_PLAY diff --git a/apps/plugins/chessbox/chessbox_pgn.c b/apps/plugins/chessbox/chessbox_pgn.c index 0cdd8d8..4fb083e 100644 --- a/apps/plugins/chessbox/chessbox_pgn.c +++ b/apps/plugins/chessbox/chessbox_pgn.c @@ -21,7 +21,8 @@ #include "plugin.h" /* button definitions */ -#if (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) +#if (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \ + (CONFIG_KEYPAD == IPOD_1G2G_PAD) #define CB_SELECT BUTTON_SELECT #define CB_UP BUTTON_MENU #define CB_DOWN BUTTON_PLAY diff --git a/apps/plugins/chessclock.c b/apps/plugins/chessclock.c index 6efaf44..73c4976 100644 --- a/apps/plugins/chessclock.c +++ b/apps/plugins/chessclock.c @@ -78,7 +78,8 @@ PLUGIN_HEADER #define CHC_SETTINGS_CANCEL2 BUTTON_REC #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ - (CONFIG_KEYPAD == IPOD_3G_PAD) + (CONFIG_KEYPAD == IPOD_3G_PAD) || \ + (CONFIG_KEYPAD == IPOD_1G2G_PAD) #define CHC_QUIT BUTTON_PLAY #define CHC_STARTSTOP BUTTON_SELECT #define CHC_RESET BUTTON_LEFT diff --git a/apps/plugins/chip8.c b/apps/plugins/chip8.c index f76379e..0b06ace 100644 --- a/apps/plugins/chip8.c +++ b/apps/plugins/chip8.c @@ -991,7 +991,8 @@ STATIC void chip8 (void) #define CHIP8_RC_OFF BUTTON_RC_STOP #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ - (CONFIG_KEYPAD == IPOD_3G_PAD) + (CONFIG_KEYPAD == IPOD_3G_PAD) || \ + (CONFIG_KEYPAD == IPOD_1G2G_PAD) #define CHIP8_OFF BUTTON_MENU #define CHIP8_KEY2 BUTTON_SCROLL_BACK #define CHIP8_KEY4 BUTTON_LEFT diff --git a/apps/plugins/chopper.c b/apps/plugins/chopper.c index 1473192..51bd7a8 100644 --- a/apps/plugins/chopper.c +++ b/apps/plugins/chopper.c @@ -39,8 +39,9 @@ PLUGIN_HEADER #define ACTION2 BUTTON_SELECT #define ACTIONTEXT "SELECT" -#elif (CONFIG_KEYPAD == IPOD_3G_PAD) || \ - (CONFIG_KEYPAD == IPOD_4G_PAD) +#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ + (CONFIG_KEYPAD == IPOD_3G_PAD) || \ + (CONFIG_KEYPAD == IPOD_1G2G_PAD) #define QUIT BUTTON_MENU #define ACTION BUTTON_SELECT diff --git a/apps/plugins/credits.c b/apps/plugins/credits.c index 0bd2a51..fc0082b 100644 --- a/apps/plugins/credits.c +++ b/apps/plugins/credits.c @@ -128,7 +128,8 @@ void roll_credits(void) #if (CONFIG_KEYPAD == RECORDER_PAD) #define PAUSE_TIME 1.2 #define ANIM_SPEED 35 -#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) +#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \ + (CONFIG_KEYPAD == IPOD_1G2G_PAD) #define PAUSE_TIME 0 #define ANIM_SPEED 100 #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || (CONFIG_KEYPAD == IRIVER_H300_PAD) diff --git a/apps/plugins/cube.c b/apps/plugins/cube.c index 4088d4e..31e1613 100644 --- a/apps/plugins/cube.c +++ b/apps/plugins/cube.c @@ -95,8 +95,10 @@ PLUGIN_HEADER #define CUBE_HIGHSPEED BUTTON_SELECT #define CUBE_RC_QUIT BUTTON_RC_STOP + #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ - (CONFIG_KEYPAD == IPOD_3G_PAD) + (CONFIG_KEYPAD == IPOD_3G_PAD) || \ + (CONFIG_KEYPAD == IPOD_1G2G_PAD) #define CUBE_QUIT BUTTON_MENU #define CUBE_X_INC BUTTON_RIGHT #define CUBE_X_DEC BUTTON_LEFT diff --git a/apps/plugins/dict.c b/apps/plugins/dict.c index 76b265e..3b0e2f2 100644 --- a/apps/plugins/dict.c +++ b/apps/plugins/dict.c @@ -105,7 +105,8 @@ long reverse (long N) { #if CONFIG_KEYPAD == PLAYER_PAD #define LP_QUIT BUTTON_STOP #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ - (CONFIG_KEYPAD == IPOD_3G_PAD) + (CONFIG_KEYPAD == IPOD_3G_PAD) || \ + (CONFIG_KEYPAD == IPOD_1G2G_PAD) #define LP_QUIT BUTTON_MENU #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD #define LP_QUIT BUTTON_PLAY diff --git a/apps/plugins/disktidy.c b/apps/plugins/disktidy.c index 4340770..aba78af 100644 --- a/apps/plugins/disktidy.c +++ b/apps/plugins/disktidy.c @@ -55,8 +55,9 @@ enum tidy_system (CONFIG_KEYPAD == IRIVER_H300_PAD) #define TIDY_STOP BUTTON_OFF -#elif (CONFIG_KEYPAD == IPOD_3G_PAD) || \ - (CONFIG_KEYPAD == IPOD_4G_PAD) +#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ + (CONFIG_KEYPAD == IPOD_3G_PAD) || \ + (CONFIG_KEYPAD == IPOD_1G2G_PAD) #define TIDY_STOP BUTTON_MENU #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD diff --git a/apps/plugins/doom/Makefile b/apps/plugins/doom/Makefile index 46bd728..2fe2088 100644 --- a/apps/plugins/doom/Makefile +++ b/apps/plugins/doom/Makefile @@ -56,7 +56,7 @@ endif # The arm code compiles too large for the plugin buffer when set to optimize for speed #ifeq ($(CC), arm-elf-gcc) -ifneq (,$(strip $(foreach tgt,SANSA_E200 IPOD_NANO IPOD_COLOR IPOD_VIDEO IPOD_MINI IPOD_3G IPOD_4G IRIVER_H10_5GB IRIVER_H10 GIGABEAT_F,$(findstring $(tgt),$(TARGET))))) +ifneq (,$(strip $(foreach tgt,SANSA_E200 IPOD_NANO IPOD_COLOR IPOD_VIDEO IPOD_MINI IPOD_1G2G IPOD_3G IPOD_4G IRIVER_H10_5GB IRIVER_H10 GIGABEAT_F,$(findstring $(tgt),$(TARGET))))) CFLAGS += -Os ifndef SIMVER ifeq ($(TARGET), IRIVER_H100) diff --git a/apps/plugins/doom/i_video.c b/apps/plugins/doom/i_video.c index 6bac32b..24079a0 100644 --- a/apps/plugins/doom/i_video.c +++ b/apps/plugins/doom/i_video.c @@ -149,7 +149,8 @@ void I_ShutdownGraphics(void) // I_StartTic // -#if (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) +#if (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \ + (CONFIG_KEYPAD == IPOD_1G2G_PAD) //#define DOOMBUTTON_SCROLLWHEEL #define DOOMBUTTON_UP BUTTON_MENU #define DOOMBUTTON_WEAPON BUTTON_SELECT @@ -258,7 +259,8 @@ inline void getkey() event.type = ev_keyup; hswitch=0; } -#if (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) +#if (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \ + (CONFIG_KEYPAD == IPOD_1G2G_PAD) /* Bring up the menu */ event.data1=KEY_ESCAPE; #else diff --git a/apps/plugins/fire.c b/apps/plugins/fire.c index bb921ab..59e8396 100644 --- a/apps/plugins/fire.c +++ b/apps/plugins/fire.c @@ -73,7 +73,8 @@ static unsigned char draw_buffer[8*LCD_WIDTH]; #define FIRE_INCREASE_MULT BUTTON_UP #define FIRE_DECREASE_MULT BUTTON_DOWN -#elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) +#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \ + (CONFIG_KEYPAD == IPOD_1G2G_PAD) #define FIRE_QUIT BUTTON_MENU #define FIRE_SWITCH_FLAMES_TYPE BUTTON_SELECT #define FIRE_SWITCH_FLAMES_MOVING BUTTON_RIGHT diff --git a/apps/plugins/fireworks.c b/apps/plugins/fireworks.c index 08d4e00..dbfe290 100644 --- a/apps/plugins/fireworks.c +++ b/apps/plugins/fireworks.c @@ -34,7 +34,8 @@ static struct plugin_api* rb; #if (CONFIG_KEYPAD == IRIVER_H300_PAD) || (CONFIG_KEYPAD == IRIVER_H100_PAD) #define BTN_MENU BUTTON_OFF #define BTN_FIRE BUTTON_SELECT -#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) +#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \ + (CONFIG_KEYPAD == IPOD_1G2G_PAD) #define BTN_MENU BUTTON_MENU #define BTN_FIRE BUTTON_SELECT #elif (CONFIG_KEYPAD == RECORDER_PAD) diff --git a/apps/plugins/flipit.c b/apps/plugins/flipit.c index 3d28e0d..96d6ea1 100644 --- a/apps/plugins/flipit.c +++ b/apps/plugins/flipit.c @@ -73,7 +73,8 @@ PLUGIN_HEADER #define FLIPIT_RC_QUIT BUTTON_RC_STOP #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ - (CONFIG_KEYPAD == IPOD_3G_PAD) + (CONFIG_KEYPAD == IPOD_3G_PAD) || \ + (CONFIG_KEYPAD == IPOD_1G2G_PAD) #define FLIPIT_UP BUTTON_MENU #define FLIPIT_DOWN BUTTON_PLAY @@ -496,8 +497,9 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) rb->lcd_putsxy(2, 28, "[MODE] shuffle"); rb->lcd_putsxy(2, 38, "[PLAY] solution"); rb->lcd_putsxy(2, 48, "[REC] step by step"); -#elif (CONFIG_KEYPAD == IPOD_3G_PAD) || \ - (CONFIG_KEYPAD == IPOD_4G_PAD) +#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ + (CONFIG_KEYPAD == IPOD_3G_PAD) || \ + (CONFIG_KEYPAD == IPOD_1G2G_PAD) rb->lcd_putsxy(2, 8, "[S-MENU] to stop"); rb->lcd_putsxy(2, 18, "[SELECT] toggle"); rb->lcd_putsxy(2, 28, "[S-LEFT] shuffle"); diff --git a/apps/plugins/grayscale.c b/apps/plugins/grayscale.c index 6d3a83e..5e50020 100644 --- a/apps/plugins/grayscale.c +++ b/apps/plugins/grayscale.c @@ -53,7 +53,8 @@ PLUGIN_HEADER #define GRAYSCALE_RC_OFF BUTTON_RC_STOP -#elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) +#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \ + (CONFIG_KEYPAD == IPOD_1G2G_PAD) #define GRAYSCALE_SHIFT BUTTON_SELECT #define GRAYSCALE_UP BUTTON_SCROLL_BACK #define GRAYSCALE_DOWN BUTTON_SCROLL_FWD diff --git a/apps/plugins/invadrox.c b/apps/plugins/invadrox.c index a99543c..62a1c3e 100644 --- a/apps/plugins/invadrox.c +++ b/apps/plugins/invadrox.c @@ -68,8 +68,9 @@ PLUGIN_HEADER #define RIGHT BUTTON_RIGHT #define FIRE BUTTON_PLAY -#elif (CONFIG_KEYPAD == IPOD_3G_PAD) || \ - (CONFIG_KEYPAD == IPOD_4G_PAD) +#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ + (CONFIG_KEYPAD == IPOD_3G_PAD) || \ + (CONFIG_KEYPAD == IPOD_1G2G_PAD) #define QUIT BUTTON_MENU #define LEFT BUTTON_LEFT diff --git a/apps/plugins/jewels.c b/apps/plugins/jewels.c index bd0803a..b74bf24 100644 --- a/apps/plugins/jewels.c +++ b/apps/plugins/jewels.c @@ -60,7 +60,8 @@ PLUGIN_HEADER #define JEWELS_CANCEL BUTTON_OFF #define JEWELS_RC_CANCEL BUTTON_RC_STOP -#elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) +#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \ + (CONFIG_KEYPAD == IPOD_1G2G_PAD) #define JEWELS_SCROLLWHEEL #define JEWELS_UP BUTTON_MENU #define JEWELS_DOWN BUTTON_PLAY @@ -1449,7 +1450,8 @@ static int jewels_main(struct game_context* bj) { rb->lcd_puts(0, 9, "SELECT to select"); rb->lcd_puts(0, 10, "Long SELECT to show menu"); rb->lcd_puts(0, 11, "OFF to cancel"); -#elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) +#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \ + (CONFIG_KEYPAD == IPOD_1G2G_PAD) rb->lcd_puts(0, 2, "Swap pairs of jewels to"); rb->lcd_puts(0, 3, "form connected segments"); rb->lcd_puts(0, 4, "of three or more of the"); diff --git a/apps/plugins/jpeg.c b/apps/plugins/jpeg.c index f9275fb..54c8c6c 100644 --- a/apps/plugins/jpeg.c +++ b/apps/plugins/jpeg.c @@ -91,7 +91,8 @@ PLUGIN_HEADER #define JPEG_MENU BUTTON_OFF #define JPEG_RC_MENU BUTTON_RC_STOP -#elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) +#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \ + (CONFIG_KEYPAD == IPOD_1G2G_PAD) #define JPEG_ZOOM_IN BUTTON_SCROLL_FWD #define JPEG_ZOOM_OUT BUTTON_SCROLL_BACK #define JPEG_UP BUTTON_MENU diff --git a/apps/plugins/lib/pluginlib_actions.h b/apps/plugins/lib/pluginlib_actions.h index 26370d2..e350d31 100644 --- a/apps/plugins/lib/pluginlib_actions.h +++ b/apps/plugins/lib/pluginlib_actions.h @@ -103,7 +103,9 @@ static const struct button_mapping generic_directions[] = { PLA_DOWN_REPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE}, { PLA_LEFT_REPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE}, { PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE}, -#elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) +#elif (CONFIG_KEYPAD == IPOD_1G2G_PAD) \ + || (CONFIG_KEYPAD == IPOD_3G_PAD) \ + || (CONFIG_KEYPAD == IPOD_4G_PAD) { PLA_UP, BUTTON_SCROLL_FWD, BUTTON_NONE}, { PLA_DOWN, BUTTON_SCROLL_BACK, BUTTON_NONE}, { PLA_LEFT, BUTTON_LEFT, BUTTON_NONE}, @@ -159,7 +161,9 @@ static const struct button_mapping generic_left_right_fire[] = { PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE}, { PLA_FIRE, BUTTON_SELECT, BUTTON_NONE}, { PLA_FIRE_REPEAT, BUTTON_SELECT|BUTTON_REPEAT,BUTTON_NONE}, -#elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) +#elif (CONFIG_KEYPAD == IPOD_1G2G_PAD) \ + || (CONFIG_KEYPAD == IPOD_3G_PAD) \ + || (CONFIG_KEYPAD == IPOD_4G_PAD) { PLA_LEFT, BUTTON_SCROLL_BACK, BUTTON_NONE}, { PLA_RIGHT, BUTTON_SCROLL_FWD, BUTTON_NONE}, { PLA_LEFT_REPEAT, BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE}, @@ -225,7 +229,9 @@ static const struct button_mapping generic_actions[] = {PLA_MENU, BUTTON_MODE, BUTTON_NONE}, {PLA_FIRE, BUTTON_SELECT, BUTTON_NONE}, {PLA_FIRE_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE}, -#elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) +#elif (CONFIG_KEYPAD == IPOD_1G2G_PAD) \ + || (CONFIG_KEYPAD == IPOD_3G_PAD) \ + || (CONFIG_KEYPAD == IPOD_4G_PAD) {PLA_QUIT, BUTTON_MENU|BUTTON_SELECT, BUTTON_NONE}, {PLA_START, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY}, {PLA_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_NONE}, diff --git a/apps/plugins/logo.c b/apps/plugins/logo.c index f030e13..6a37e36 100644 --- a/apps/plugins/logo.c +++ b/apps/plugins/logo.c @@ -184,7 +184,8 @@ const unsigned char rockbox16x7[] = { #define LP_DEC_Y (BUTTON_ON | BUTTON_LEFT) #define LP_INC_Y (BUTTON_ON | BUTTON_RIGHT) #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ - (CONFIG_KEYPAD == IPOD_3G_PAD) + (CONFIG_KEYPAD == IPOD_3G_PAD) || \ + (CONFIG_KEYPAD == IPOD_1G2G_PAD) #define LP_QUIT BUTTON_MENU #define LP_DEC_X BUTTON_LEFT #define LP_INC_X BUTTON_RIGHT diff --git a/apps/plugins/mandelbrot.c b/apps/plugins/mandelbrot.c index b1e8587..48450ae 100644 --- a/apps/plugins/mandelbrot.c +++ b/apps/plugins/mandelbrot.c @@ -81,7 +81,8 @@ PLUGIN_HEADER #define MANDELBROT_RC_QUIT BUTTON_RC_STOP #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ - (CONFIG_KEYPAD == IPOD_3G_PAD) + (CONFIG_KEYPAD == IPOD_3G_PAD) || \ + (CONFIG_KEYPAD == IPOD_1G2G_PAD) #define MANDELBROT_QUIT (BUTTON_SELECT | BUTTON_MENU) #define MANDELBROT_UP BUTTON_MENU #define MANDELBROT_DOWN BUTTON_PLAY diff --git a/apps/plugins/maze.c b/apps/plugins/maze.c index e0f9e01..952edff 100644 --- a/apps/plugins/maze.c +++ b/apps/plugins/maze.c @@ -34,7 +34,8 @@ PLUGIN_HEADER #if (CONFIG_KEYPAD == IPOD_4G_PAD) || \ - (CONFIG_KEYPAD == IPOD_3G_PAD) + (CONFIG_KEYPAD == IPOD_3G_PAD) || \ + (CONFIG_KEYPAD == IPOD_1G2G_PAD) # undef __PLUGINLIB_ACTIONS_H__ # define MAZE_NEW (BUTTON_SELECT | BUTTON_REPEAT) # define MAZE_NEW_PRE BUTTON_SELECT diff --git a/apps/plugins/mazezam.c b/apps/plugins/mazezam.c index 6f68f98..e00049e 100644 --- a/apps/plugins/mazezam.c +++ b/apps/plugins/mazezam.c @@ -77,7 +77,8 @@ MEM_FUNCTION_WRAPPERS(rb); #define MAZEZAM_QUIT_KEYNAME "[POWER]" #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ - (CONFIG_KEYPAD == IPOD_3G_PAD) + (CONFIG_KEYPAD == IPOD_3G_PAD) || \ + (CONFIG_KEYPAD == IPOD_1G2G_PAD) #define MAZEZAM_UP BUTTON_MENU #define MAZEZAM_DOWN BUTTON_PLAY #define MAZEZAM_LEFT BUTTON_LEFT diff --git a/apps/plugins/midiplay.c b/apps/plugins/midiplay.c index 6dc1188..c19ca04 100644 --- a/apps/plugins/midiplay.c +++ b/apps/plugins/midiplay.c @@ -42,7 +42,8 @@ PLUGIN_IRAM_DECLARE #define BTN_RC_QUIT BUTTON_RC_STOP -#elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) +#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \ + (CONFIG_KEYPAD == IPOD_1G2G_PAD) #define BTN_QUIT (BUTTON_SELECT | BUTTON_MENU) #define BTN_RIGHT BUTTON_RIGHT #define BTN_UP BUTTON_SCROLL_FWD diff --git a/apps/plugins/minesweeper.c b/apps/plugins/minesweeper.c index 41d0a1e..4ea9aa1 100644 --- a/apps/plugins/minesweeper.c +++ b/apps/plugins/minesweeper.c @@ -74,7 +74,8 @@ enum minesweeper_status { # define MINESWP_RC_QUIT BUTTON_RC_STOP #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ - (CONFIG_KEYPAD == IPOD_3G_PAD) + (CONFIG_KEYPAD == IPOD_3G_PAD) || \ + (CONFIG_KEYPAD == IPOD_1G2G_PAD) # define MINESWP_SCROLLWHEEL # define MINESWP_UP BUTTON_MENU # define MINESWP_DOWN BUTTON_PLAY diff --git a/apps/plugins/mosaique.c b/apps/plugins/mosaique.c index 0ccda0e..bfcd53a 100644 --- a/apps/plugins/mosaique.c +++ b/apps/plugins/mosaique.c @@ -70,7 +70,8 @@ PLUGIN_HEADER #define MOSAIQUE_RC_QUIT BUTTON_RC_STOP #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ - (CONFIG_KEYPAD == IPOD_3G_PAD) + (CONFIG_KEYPAD == IPOD_3G_PAD) || \ + (CONFIG_KEYPAD == IPOD_1G2G_PAD) #define MOSAIQUE_QUIT BUTTON_MENU #define MOSAIQUE_SPEED BUTTON_SELECT #define MOSAIQUE_RESTART BUTTON_PLAY diff --git a/apps/plugins/mp3_encoder.c b/apps/plugins/mp3_encoder.c index 8a4560a..55cfac3 100644 --- a/apps/plugins/mp3_encoder.c +++ b/apps/plugins/mp3_encoder.c @@ -2327,8 +2327,8 @@ void get_mp3_filename(char *wav_name) #define MP3ENC_NEXT BUTTON_DOWN #define MP3ENC_DONE BUTTON_OFF #define MP3ENC_SELECT BUTTON_SELECT -#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ - (CONFIG_KEYPAD == IPOD_3G_PAD) +#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \ + (CONFIG_KEYPAD == IPOD_1G2G_PAD) #define MP3ENC_PREV BUTTON_SCROLL_BACK #define MP3ENC_NEXT BUTTON_SCROLL_FWD #define MP3ENC_DONE BUTTON_MENU diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c index c28aca0..a0659a9 100644 --- a/apps/plugins/mpegplayer/mpegplayer.c +++ b/apps/plugins/mpegplayer/mpegplayer.c @@ -121,7 +121,8 @@ PLUGIN_IRAM_DECLARE #define MPEG_VOLDOWN BUTTON_DOWN #define MPEG_VOLUP BUTTON_UP -#elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) +#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \ + (CONFIG_KEYPAD == IPOD_1G2G_PAD) #define MPEG_MENU BUTTON_MENU #define MPEG_PAUSE (BUTTON_PLAY | BUTTON_REL) #define MPEG_STOP (BUTTON_PLAY | BUTTON_REPEAT) diff --git a/apps/plugins/oscilloscope.c b/apps/plugins/oscilloscope.c index 67d258d..3291580 100644 --- a/apps/plugins/oscilloscope.c +++ b/apps/plugins/oscilloscope.c @@ -74,7 +74,8 @@ PLUGIN_HEADER #define OSCILLOSCOPE_VOL_DOWN BUTTON_DOWN #define OSCILLOSCOPE_RC_QUIT BUTTON_RC_STOP -#elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) +#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \ + (CONFIG_KEYPAD == IPOD_1G2G_PAD) #define OSCILLOSCOPE_QUIT (BUTTON_SELECT | BUTTON_MENU) #define OSCILLOSCOPE_DRAWMODE (BUTTON_SELECT | BUTTON_PLAY) #define OSCILLOSCOPE_ADVMODE (BUTTON_SELECT | BUTTON_RIGHT) diff --git a/apps/plugins/plasma.c b/apps/plugins/plasma.c index 09249d9..df22444 100644 --- a/apps/plugins/plasma.c +++ b/apps/plugins/plasma.c @@ -51,7 +51,8 @@ static unsigned char sp1, sp2, sp3, sp4; /* Speed of plasma */ static int plasma_frequency; /* Key assignement, all bitmapped models */ -#if (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) +#if (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \ + (CONFIG_KEYPAD == IPOD_1G2G_PAD) #define PLASMA_QUIT BUTTON_MENU #define PLASMA_INCREASE_FREQUENCY BUTTON_SCROLL_FWD #define PLASMA_DECREASE_FREQUENCY BUTTON_SCROLL_BACK diff --git a/apps/plugins/pong.c b/apps/plugins/pong.c index 1ffe8b7..a1a1d58 100644 --- a/apps/plugins/pong.c +++ b/apps/plugins/pong.c @@ -77,7 +77,8 @@ PLUGIN_HEADER #define PONG_RC_QUIT BUTTON_RC_STOP #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ - (CONFIG_KEYPAD == IPOD_3G_PAD) + (CONFIG_KEYPAD == IPOD_3G_PAD) || \ + (CONFIG_KEYPAD == IPOD_1G2G_PAD) #define PONG_QUIT BUTTON_SELECT #define PONG_LEFT_UP BUTTON_MENU #define PONG_LEFT_DOWN BUTTON_LEFT diff --git a/apps/plugins/random_folder_advance_config.c b/apps/plugins/random_folder_advance_config.c index abe7bfd..27e8c0b 100644 --- a/apps/plugins/random_folder_advance_config.c +++ b/apps/plugins/random_folder_advance_config.c @@ -42,8 +42,9 @@ struct file_format *list = NULL; #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) \ || (CONFIG_KEYPAD == IRIVER_H300_PAD) -#elif (CONFIG_KEYPAD == IPOD_4G_PAD) \ - || (CONFIG_KEYPAD == IPOD_3G_PAD) +#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ + (CONFIG_KEYPAD == IPOD_3G_PAD) || \ + (CONFIG_KEYPAD == IPOD_1G2G_PAD) #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD diff --git a/apps/plugins/reversi/reversi-gui.c b/apps/plugins/reversi/reversi-gui.c index 23ed5d7..374cc0f 100644 --- a/apps/plugins/reversi/reversi-gui.c +++ b/apps/plugins/reversi/reversi-gui.c @@ -566,7 +566,8 @@ enum plugin_status plugin_start(struct plugin_api *api, void *parameter) { reversi_gui_init(); #if (CONFIG_KEYPAD == IPOD_4G_PAD) || \ - (CONFIG_KEYPAD == IPOD_3G_PAD) + (CONFIG_KEYPAD == IPOD_3G_PAD) || \ + (CONFIG_KEYPAD == IPOD_1G2G_PAD) cursor_wrap_mode = WRAP_TORUS; #else cursor_wrap_mode = WRAP_FLAT; diff --git a/apps/plugins/reversi/reversi-gui.h b/apps/plugins/reversi/reversi-gui.h index 293be24..43dab46 100644 --- a/apps/plugins/reversi/reversi-gui.h +++ b/apps/plugins/reversi/reversi-gui.h @@ -57,7 +57,8 @@ #define REVERSI_BUTTON_MENU BUTTON_MODE #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ - (CONFIG_KEYPAD == IPOD_3G_PAD) + (CONFIG_KEYPAD == IPOD_3G_PAD) || \ + (CONFIG_KEYPAD == IPOD_1G2G_PAD) #define REVERSI_BUTTON_UP BUTTON_MENU #define REVERSI_BUTTON_DOWN BUTTON_PLAY #define REVERSI_BUTTON_LEFT BUTTON_LEFT diff --git a/apps/plugins/rockblox.c b/apps/plugins/rockblox.c index 2484d6e..e66d242 100644 --- a/apps/plugins/rockblox.c +++ b/apps/plugins/rockblox.c @@ -24,8 +24,9 @@ PLUGIN_HEADER -#if (CONFIG_KEYPAD == IPOD_3G_PAD) || \ - (CONFIG_KEYPAD == IPOD_4G_PAD) +#if (CONFIG_KEYPAD == IPOD_4G_PAD) || \ + (CONFIG_KEYPAD == IPOD_3G_PAD) || \ + (CONFIG_KEYPAD == IPOD_1G2G_PAD) #define ROCKBLOX_OFF (BUTTON_MENU | BUTTON_SELECT) #define ROCKBLOX_ROTATE_RIGHT BUTTON_SCROLL_BACK @@ -52,6 +53,7 @@ PLUGIN_HEADER #define ROCKBLOX_RESTART BUTTON_ON #define ROCKBLOX_RC_OFF BUTTON_RC_STOP + #elif CONFIG_KEYPAD == RECORDER_PAD #define ROCKBLOX_OFF BUTTON_OFF diff --git a/apps/plugins/rockpaint.c b/apps/plugins/rockpaint.c index 184add1..ae4517d 100644 --- a/apps/plugins/rockpaint.c +++ b/apps/plugins/rockpaint.c @@ -48,7 +48,8 @@ PLUGIN_HEADER #define ROCKPAINT_LEFT BUTTON_LEFT #define ROCKPAINT_RIGHT BUTTON_RIGHT -#elif ( CONFIG_KEYPAD == IPOD_4G_PAD ) || ( CONFIG_KEYPAD == IPOD_3G_PAD ) +#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \ + (CONFIG_KEYPAD == IPOD_1G2G_PAD) #define ROCKPAINT_QUIT ( ~BUTTON_MAIN ) #define ROCKPAINT_DRAW BUTTON_SELECT #define ROCKPAINT_MENU ( BUTTON_SELECT | BUTTON_MENU ) diff --git a/apps/plugins/sliding_puzzle.c b/apps/plugins/sliding_puzzle.c index fa1ee0e..b819f35 100644 --- a/apps/plugins/sliding_puzzle.c +++ b/apps/plugins/sliding_puzzle.c @@ -55,7 +55,8 @@ PLUGIN_HEADER #define PUZZLE_RC_QUIT BUTTON_RC_STOP #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ - (CONFIG_KEYPAD == IPOD_3G_PAD) + (CONFIG_KEYPAD == IPOD_3G_PAD) || \ + (CONFIG_KEYPAD == IPOD_1G2G_PAD) #define PUZZLE_QUIT (BUTTON_SELECT | BUTTON_MENU) #define PUZZLE_UP BUTTON_MENU #define PUZZLE_DOWN BUTTON_PLAY @@ -400,7 +401,8 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) rb->lcd_putsxy(0, 28, "[MODE..] shuffle"); rb->lcd_putsxy(0, 38, "[MODE] change pic"); #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ - (CONFIG_KEYPAD == IPOD_3G_PAD) + (CONFIG_KEYPAD == IPOD_3G_PAD) || \ + (CONFIG_KEYPAD == IPOD_1G2G_PAD) rb->lcd_putsxy(0, 18, "[S-MENU] to stop"); rb->lcd_putsxy(0, 28, "[S-LEFT] shuffle"); rb->lcd_putsxy(0, 38, "[S-RIGHT] change pic"); diff --git a/apps/plugins/snake.c b/apps/plugins/snake.c index 6acbb80..eeca6bd 100644 --- a/apps/plugins/snake.c +++ b/apps/plugins/snake.c @@ -64,7 +64,8 @@ PLUGIN_HEADER #define SNAKE_RC_QUIT BUTTON_RC_STOP #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ - (CONFIG_KEYPAD == IPOD_3G_PAD) + (CONFIG_KEYPAD == IPOD_3G_PAD) || \ + (CONFIG_KEYPAD == IPOD_1G2G_PAD) #define SNAKE_QUIT (BUTTON_SELECT|BUTTON_MENU) #define SNAKE_UP BUTTON_MENU #define SNAKE_DOWN BUTTON_PLAY diff --git a/apps/plugins/snake2.c b/apps/plugins/snake2.c index 2a2665c..8b49a7c 100644 --- a/apps/plugins/snake2.c +++ b/apps/plugins/snake2.c @@ -195,7 +195,8 @@ PLUGIN_HEADER #define SNAKE2_RC_QUIT BUTTON_RC_STOP #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ - (CONFIG_KEYPAD == IPOD_3G_PAD) + (CONFIG_KEYPAD == IPOD_3G_PAD) || \ + (CONFIG_KEYPAD == IPOD_1G2G_PAD) #define SNAKE2_UP BUTTON_MENU #define SNAKE2_DOWN BUTTON_PLAY #define SNAKE2_QUIT (BUTTON_SELECT | BUTTON_MENU) diff --git a/apps/plugins/snow.c b/apps/plugins/snow.c index 87422c1..c7ebb18 100644 --- a/apps/plugins/snow.c +++ b/apps/plugins/snow.c @@ -37,7 +37,8 @@ PLUGIN_HEADER #if CONFIG_KEYPAD == PLAYER_PAD #define SNOW_QUIT BUTTON_STOP #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ - (CONFIG_KEYPAD == IPOD_3G_PAD) + (CONFIG_KEYPAD == IPOD_3G_PAD) || \ + (CONFIG_KEYPAD == IPOD_1G2G_PAD) #define SNOW_QUIT BUTTON_MENU #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD #define SNOW_QUIT BUTTON_PLAY diff --git a/apps/plugins/sokoban.c b/apps/plugins/sokoban.c index 5091637..004494f 100644 --- a/apps/plugins/sokoban.c +++ b/apps/plugins/sokoban.c @@ -148,7 +148,8 @@ extern const fb_data sokoban_tiles[]; #define SOKOBAN_RC_MENU BUTTON_RC_STOP #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ - (CONFIG_KEYPAD == IPOD_3G_PAD) + (CONFIG_KEYPAD == IPOD_3G_PAD) || \ + (CONFIG_KEYPAD == IPOD_1G2G_PAD) #define SOKOBAN_UP BUTTON_MENU #define SOKOBAN_DOWN BUTTON_PLAY #define SOKOBAN_MENU (BUTTON_SELECT | BUTTON_MENU) @@ -1147,7 +1148,8 @@ static int sokoban_menu(void) rb->lcd_putsxy(3, 46, "[PLAY] Restart Level"); rb->lcd_putsxy(3, 56, "[PLAY+UP] Next Level"); #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ - (CONFIG_KEYPAD == IPOD_3G_PAD) + (CONFIG_KEYPAD == IPOD_3G_PAD) || \ + (CONFIG_KEYPAD == IPOD_1G2G_PAD) rb->lcd_putsxy(3, 6, "[SELECT+MENU] Menu"); rb->lcd_putsxy(3, 16, "[SELECT] Undo"); rb->lcd_putsxy(3, 26, "[SELECT+PLAY] Redo"); diff --git a/apps/plugins/solitaire.c b/apps/plugins/solitaire.c index 0b5b9a5..92441ba 100644 --- a/apps/plugins/solitaire.c +++ b/apps/plugins/solitaire.c @@ -131,7 +131,8 @@ static struct plugin_api* rb; # define HK_CUR2STACK "NAVI.." # define HK_REM2STACK "PLAY+RIGHT" -#elif (CONFIG_KEYPAD == IPOD_4G_PAD) ||(CONFIG_KEYPAD == IPOD_3G_PAD) +#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \ + (CONFIG_KEYPAD == IPOD_1G2G_PAD) # define SOL_QUIT (BUTTON_SELECT | BUTTON_MENU) # define SOL_UP BUTTON_SCROLL_BACK # define SOL_DOWN BUTTON_SCROLL_FWD diff --git a/apps/plugins/spacerocks.c b/apps/plugins/spacerocks.c index fd8637c..f4208f0 100644 --- a/apps/plugins/spacerocks.c +++ b/apps/plugins/spacerocks.c @@ -93,7 +93,8 @@ static struct plugin_api* rb; /* global api struct pointer */ #define AST_FIRE BUTTON_SELECT #define AST_FIRE_REP BUTTON_SELECT | BUTTON_REPEAT -#elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) +#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \ + (CONFIG_KEYPAD == IPOD_1G2G_PAD) #define AST_PAUSE (BUTTON_SELECT | BUTTON_PLAY) #define AST_QUIT (BUTTON_SELECT | BUTTON_MENU) #define AST_THRUST BUTTON_MENU diff --git a/apps/plugins/star.c b/apps/plugins/star.c index 415c6d2..c9d31a6 100644 --- a/apps/plugins/star.c +++ b/apps/plugins/star.c @@ -105,7 +105,8 @@ PLUGIN_HEADER #define STAR_RC_QUIT BUTTON_RC_STOP #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ - (CONFIG_KEYPAD == IPOD_3G_PAD) + (CONFIG_KEYPAD == IPOD_3G_PAD) || \ + (CONFIG_KEYPAD == IPOD_1G2G_PAD) #define STAR_QUIT (BUTTON_SELECT | BUTTON_MENU) #define STAR_UP BUTTON_MENU @@ -920,7 +921,8 @@ static int star_menu(void) "[ON + LEFT] Prev. level\n" "[ON + NAVI] Reset level\n" "[ON + RIGHT] Next level", true); -#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) +#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \ + (CONFIG_KEYPAD == IPOD_1G2G_PAD) star_display_text("KEYS\n\n" "[SELECT] Toggle Ctl\n" "[S + MENU] Exit\n" diff --git a/apps/plugins/starfield.c b/apps/plugins/starfield.c index d0d2d32..7c1613c 100644 --- a/apps/plugins/starfield.c +++ b/apps/plugins/starfield.c @@ -27,7 +27,8 @@ static struct plugin_api* rb; /* global api struct pointer */ /* Key assignement */ #if (CONFIG_KEYPAD == IPOD_4G_PAD) || \ - (CONFIG_KEYPAD == IPOD_3G_PAD) + (CONFIG_KEYPAD == IPOD_3G_PAD) || \ + (CONFIG_KEYPAD == IPOD_1G2G_PAD) #define STARFIELD_QUIT BUTTON_MENU #define STARFIELD_INCREASE_ZMOVE BUTTON_SCROLL_FWD #define STARFIELD_DECREASE_ZMOVE BUTTON_SCROLL_BACK diff --git a/apps/plugins/stats.c b/apps/plugins/stats.c index 0f52954..dca5e89 100644 --- a/apps/plugins/stats.c +++ b/apps/plugins/stats.c @@ -38,8 +38,9 @@ static bool abort; #define STATS_STOP BUTTON_OFF #define STATS_STOP_REMOTE BUTTON_RC_STOP -#elif (CONFIG_KEYPAD == IPOD_4G_PAD) \ - || (CONFIG_KEYPAD == IPOD_3G_PAD) +#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ + (CONFIG_KEYPAD == IPOD_3G_PAD) || \ + (CONFIG_KEYPAD == IPOD_1G2G_PAD) #define STATS_STOP BUTTON_MENU #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD diff --git a/apps/plugins/stopwatch.c b/apps/plugins/stopwatch.c index 9a66103..6f18617 100644 --- a/apps/plugins/stopwatch.c +++ b/apps/plugins/stopwatch.c @@ -71,7 +71,8 @@ PLUGIN_HEADER #define STOPWATCH_RC_QUIT BUTTON_RC_STOP #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ - (CONFIG_KEYPAD == IPOD_3G_PAD) + (CONFIG_KEYPAD == IPOD_3G_PAD) || \ + (CONFIG_KEYPAD == IPOD_1G2G_PAD) #define STOPWATCH_QUIT BUTTON_MENU #define STOPWATCH_START_STOP BUTTON_SELECT #define STOPWATCH_RESET_TIMER BUTTON_LEFT diff --git a/apps/plugins/sudoku/sudoku.h b/apps/plugins/sudoku/sudoku.h index f850fcf..20e7c43 100644 --- a/apps/plugins/sudoku/sudoku.h +++ b/apps/plugins/sudoku/sudoku.h @@ -71,7 +71,8 @@ #define SUDOKU_BUTTON_POSSIBLE BUTTON_REC #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ - (CONFIG_KEYPAD == IPOD_3G_PAD) + (CONFIG_KEYPAD == IPOD_3G_PAD) || \ + (CONFIG_KEYPAD == IPOD_1G2G_PAD) #define SUDOKU_BUTTON_MENU BUTTON_MENU #define SUDOKU_BUTTON_LEFT BUTTON_SCROLL_BACK #define SUDOKU_BUTTON_RIGHT BUTTON_SCROLL_FWD diff --git a/apps/plugins/test_fps.c b/apps/plugins/test_fps.c index 2ff7fff..ef1973f 100644 --- a/apps/plugins/test_fps.c +++ b/apps/plugins/test_fps.c @@ -20,7 +20,8 @@ #ifdef HAVE_LCD_BITMAP -#if (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) +#if (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \ + (CONFIG_KEYPAD == IPOD_1G2G_PAD) #define FPS_QUIT BUTTON_MENU #elif defined(BUTTON_OFF) #define FPS_QUIT BUTTON_OFF diff --git a/apps/plugins/test_scanrate.c b/apps/plugins/test_scanrate.c index 22ec44b..6f3aaad 100644 --- a/apps/plugins/test_scanrate.c +++ b/apps/plugins/test_scanrate.c @@ -31,7 +31,8 @@ PLUGIN_HEADER #define SCANRATE_INC BUTTON_RIGHT #define SCANRATE_DEC BUTTON_LEFT -#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) +#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) \ + || (CONFIG_KEYPAD == IPOD_1G2G_PAD) #define SCANRATE_DONE BUTTON_MENU #define SCANRATE_FASTINC BUTTON_SCROLL_FWD #define SCANRATE_FASTDEC BUTTON_SCROLL_BACK @@ -97,7 +98,8 @@ int plugin_main(void) #if (CONFIG_KEYPAD == RECORDER_PAD) || (CONFIG_KEYPAD == ONDIO_PAD) \ || (CONFIG_KEYPAD == IRIVER_H100_PAD) rb->lcd_putsxy(TEXT_X, 40, "U/D: Coarse"); -#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) +#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) \ + || (CONFIG_KEYPAD == IPOD_1G2G_PAD) rb->lcd_putsxy(TEXT_X, 40, "Scroll: Coarse"); #endif rb->lcd_putsxy(TEXT_X, 48, "L/R: Fine"); diff --git a/apps/plugins/viewer.c b/apps/plugins/viewer.c index d3f74e6..2c543ed 100644 --- a/apps/plugins/viewer.c +++ b/apps/plugins/viewer.c @@ -129,9 +129,10 @@ PLUGIN_HEADER #define VIEWER_RC_QUIT BUTTON_RC_STOP -/* iPods with the 4G pad */ +/* iPods */ #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ - (CONFIG_KEYPAD == IPOD_3G_PAD) + (CONFIG_KEYPAD == IPOD_3G_PAD) || \ + (CONFIG_KEYPAD == IPOD_1G2G_PAD) #define VIEWER_QUIT_PRE BUTTON_SELECT #define VIEWER_QUIT (BUTTON_SELECT | BUTTON_MENU) #define VIEWER_PAGE_UP BUTTON_SCROLL_BACK diff --git a/apps/plugins/vu_meter.c b/apps/plugins/vu_meter.c index 64ad8f2..308ff74 100644 --- a/apps/plugins/vu_meter.c +++ b/apps/plugins/vu_meter.c @@ -64,8 +64,9 @@ PLUGIN_HEADER #define VUMETER_RC_QUIT BUTTON_RC_STOP -#elif (CONFIG_KEYPAD == IPOD_3G_PAD) || \ - (CONFIG_KEYPAD == IPOD_4G_PAD) +#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ + (CONFIG_KEYPAD == IPOD_3G_PAD) || \ + (CONFIG_KEYPAD == IPOD_1G2G_PAD) #define VUMETER_QUIT BUTTON_MENU #define VUMETER_HELP BUTTON_PLAY #define VUMETER_MENU BUTTON_SELECT diff --git a/apps/plugins/wormlet.c b/apps/plugins/wormlet.c index 94cf1bd..6abcc43 100644 --- a/apps/plugins/wormlet.c +++ b/apps/plugins/wormlet.c @@ -91,7 +91,8 @@ PLUGIN_HEADER #define PLAYERS_TEXT "UP/DN" #define WORMS_TEXT "L/R" -#elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) +#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \ + (CONFIG_KEYPAD == IPOD_1G2G_PAD) #define BTN_DIR_UP BUTTON_MENU #define BTN_DIR_DOWN BUTTON_PLAY diff --git a/apps/plugins/xobox.c b/apps/plugins/xobox.c index def11b3..616a456 100644 --- a/apps/plugins/xobox.c +++ b/apps/plugins/xobox.c @@ -42,8 +42,9 @@ PLUGIN_HEADER #define UP BUTTON_UP #define DOWN BUTTON_DOWN -#elif (CONFIG_KEYPAD == IPOD_3G_PAD) || \ - (CONFIG_KEYPAD == IPOD_4G_PAD) +#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ + (CONFIG_KEYPAD == IPOD_3G_PAD) || \ + (CONFIG_KEYPAD == IPOD_1G2G_PAD) #define QUIT (BUTTON_SELECT | BUTTON_MENU) #define LEFT BUTTON_LEFT diff --git a/apps/plugins/zxbox/keymaps.h b/apps/plugins/zxbox/keymaps.h index 9bac747..603869d 100644 --- a/apps/plugins/zxbox/keymaps.h +++ b/apps/plugins/zxbox/keymaps.h @@ -1,8 +1,8 @@ #ifndef KEYMAPS_H #define KEYMAPS_H -#if (CONFIG_KEYPAD == IPOD_4G_PAD) || \ - (CONFIG_KEYPAD == IPOD_3G_PAD) +#if (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \ + (CONFIG_KEYPAD == IPOD_1G2G_PAD) #define ZX_UP BUTTON_MENU #define ZX_DOWN BUTTON_PLAY diff --git a/apps/plugins/zxbox/zxbox.c b/apps/plugins/zxbox/zxbox.c index 1faec08..c7e3d0a 100644 --- a/apps/plugins/zxbox/zxbox.c +++ b/apps/plugins/zxbox/zxbox.c @@ -125,8 +125,8 @@ void spkb_process_events( int evenframe ) if(evenframe){ int ki; -#if (CONFIG_KEYPAD == IPOD_4G_PAD) || \ - (CONFIG_KEYPAD == IPOD_3G_PAD) +#if (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \ + (CONFIG_KEYPAD == IPOD_1G2G_PAD) if (rb->button_hold()) { #if defined(HAVE_ADJUSTABLE_CPU_FREQ) @@ -143,8 +143,8 @@ void spkb_process_events( int evenframe ) if ( buttons == previous_state ) return; previous_state = buttons; -#if (CONFIG_KEYPAD != IPOD_4G_PAD) && \ - (CONFIG_KEYPAD != IPOD_3G_PAD) +#if (CONFIG_KEYPAD != IPOD_4G_PAD) && (CONFIG_KEYPAD != IPOD_3G_PAD) && \ + (CONFIG_KEYPAD != IPOD_1G2G_PAD) if (buttons & ZX_MENU) { #if defined(HAVE_ADJUSTABLE_CPU_FREQ) diff --git a/apps/plugins/zxbox/zxbox_keyb.c b/apps/plugins/zxbox/zxbox_keyb.c index 39cbaa9..5bea491 100644 --- a/apps/plugins/zxbox/zxbox_keyb.c +++ b/apps/plugins/zxbox/zxbox_keyb.c @@ -48,7 +48,9 @@ #define KBD_UP BUTTON_UP #define KBD_DOWN BUTTON_DOWN -#elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) +#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ + (CONFIG_KEYPAD == IPOD_3G_PAD) || \ + (CONFIG_KEYPAD == IPOD_1G2G_PAD) #define KBD_SELECT BUTTON_SELECT #define KBD_ABORT BUTTON_MENU -- cgit v1.1