len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-13 18:17:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove IPOD_NANO_PAD definition - the Nano's keypad has turned out to be identical to the other 4G models

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8262 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dave Chapman 2005-12-19 00:11:28 +00:00
parent 2a7bd9fb7b
commit 0dc63c1b71
42 changed files with 47 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

3
apps/bookmark.h
View file

@ -33,8 +33,7 @@
#define BOOKMARK_DELETE (BUTTON_ON | BUTTON_SELECT) #define BOOKMARK_DELETE (BUTTON_ON | BUTTON_SELECT)
#define BOOKMARK_DOWN BUTTON_DOWN #define BOOKMARK_DOWN BUTTON_DOWN
#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ #elif (CONFIG_KEYPAD == IPOD_4G_PAD)
(CONFIG_KEYPAD == IPOD_NANO_PAD)
#define BOOKMARK_SELECT BUTTON_SELECT #define BOOKMARK_SELECT BUTTON_SELECT
#define BOOKMARK_DELETE (BUTTON_RIGHT | BUTTON_REPEAT) #define BOOKMARK_DELETE (BUTTON_RIGHT | BUTTON_REPEAT)
#define BOOKMARK_DOWN BUTTON_SCROLL_FWD #define BOOKMARK_DOWN BUTTON_SCROLL_FWD

3
apps/gui/gwps.h
View file

@ -172,8 +172,7 @@
#define WPS_KEYLOCK (BUTTON_MENU | BUTTON_DOWN) #define WPS_KEYLOCK (BUTTON_MENU | BUTTON_DOWN)
#define WPS_ID3 (BUTTON_MENU | BUTTON_ON) #define WPS_ID3 (BUTTON_MENU | BUTTON_ON)
#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ #elif (CONFIG_KEYPAD == IPOD_4G_PAD)
(CONFIG_KEYPAD == IPOD_NANO_PAD)
/* TODO: Check WPS button assignments */ /* TODO: Check WPS button assignments */

3
apps/gui/list.h
View file

@ -65,8 +65,7 @@
#define LIST_NEXT BUTTON_DOWN #define LIST_NEXT BUTTON_DOWN
#define LIST_PREV BUTTON_UP #define LIST_PREV BUTTON_UP
#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ #elif (CONFIG_KEYPAD == IPOD_4G_PAD)
(CONFIG_KEYPAD == IPOD_NANO_PAD)
#define LIST_NEXT BUTTON_SCROLL_FWD #define LIST_NEXT BUTTON_SCROLL_FWD
#define LIST_PREV BUTTON_SCROLL_BACK #define LIST_PREV BUTTON_SCROLL_BACK

3
apps/gui/select.h
View file

@ -54,8 +54,7 @@
#define SELECT_CANCEL BUTTON_STOP #define SELECT_CANCEL BUTTON_STOP
#define SELECT_CANCEL2 BUTTON_MENU #define SELECT_CANCEL2 BUTTON_MENU
#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ #elif (CONFIG_KEYPAD == IPOD_4G_PAD)
(CONFIG_KEYPAD == IPOD_NANO_PAD)
#define SELECT_INC BUTTON_SCROLL_FWD #define SELECT_INC BUTTON_SCROLL_FWD
#define SELECT_DEC BUTTON_SCROLL_BACK #define SELECT_DEC BUTTON_SCROLL_BACK
#define SELECT_OK BUTTON_SELECT #define SELECT_OK BUTTON_SELECT

2
apps/gui/yesno.h
View file

@ -23,7 +23,7 @@
#elif CONFIG_KEYPAD == GMINI100_PAD #elif CONFIG_KEYPAD == GMINI100_PAD
#define YESNO_OK BUTTON_PLAY #define YESNO_OK BUTTON_PLAY
#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) #elif (CONFIG_KEYPAD == IPOD_4G_PAD)
#define YESNO_OK BUTTON_RIGHT #define YESNO_OK BUTTON_RIGHT
#endif #endif
enum yesno_res enum yesno_res

2
apps/menu.h
View file

@ -68,7 +68,7 @@
#define MENU_ENTER BUTTON_RIGHT #define MENU_ENTER BUTTON_RIGHT
#define MENU_ENTER2 BUTTON_PLAY #define MENU_ENTER2 BUTTON_PLAY
#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) #elif (CONFIG_KEYPAD == IPOD_4G_PAD)
/* TODO: Check menu button assignments */ /* TODO: Check menu button assignments */

2
apps/plugins/battery_test.c
View file

@ -39,7 +39,7 @@
#elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \
(CONFIG_KEYPAD == IRIVER_H300_PAD) (CONFIG_KEYPAD == IRIVER_H300_PAD)
#define BATTERY_TEST_QUIT BUTTON_OFF #define BATTERY_TEST_QUIT BUTTON_OFF
#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) #elif (CONFIG_KEYPAD == IPOD_4G_PAD)
#define BATTERY_TEST_QUIT BUTTON_MENU #define BATTERY_TEST_QUIT BUTTON_MENU
#endif #endif

2
apps/plugins/bounce.c
View file

@ -50,7 +50,7 @@
#define BOUNCE_QUIT (BUTTON_OFF | BUTTON_REL) #define BOUNCE_QUIT (BUTTON_OFF | BUTTON_REL)
#define BOUNCE_MODE (BUTTON_SELECT | BUTTON_REL) #define BOUNCE_MODE (BUTTON_SELECT | BUTTON_REL)
#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) #elif (CONFIG_KEYPAD == IPOD_4G_PAD)
#define BOUNCE_UP BUTTON_SCROLL_BACK #define BOUNCE_UP BUTTON_SCROLL_BACK
#define BOUNCE_DOWN BUTTON_SCROLL_FWD #define BOUNCE_DOWN BUTTON_SCROLL_FWD
#define BOUNCE_QUIT (BUTTON_MENU | BUTTON_REL) #define BOUNCE_QUIT (BUTTON_MENU | BUTTON_REL)

2
apps/plugins/calculator.c
View file

@ -132,7 +132,7 @@ F3: equal to "="
#define CALCULATOR_OPERATORS BUTTON_MODE #define CALCULATOR_OPERATORS BUTTON_MODE
#define CALCULATOR_CLEAR BUTTON_REC #define CALCULATOR_CLEAR BUTTON_REC
#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) #elif (CONFIG_KEYPAD == IPOD_4G_PAD)
#define CALCULATOR_UP BUTTON_SCROLL_BACK #define CALCULATOR_UP BUTTON_SCROLL_BACK
#define CALCULATOR_DOWN BUTTON_SCROLL_FWD #define CALCULATOR_DOWN BUTTON_SCROLL_FWD

2
apps/plugins/chessclock.c
View file

@ -64,7 +64,7 @@
#define CHC_SETTINGS_CANCEL BUTTON_OFF #define CHC_SETTINGS_CANCEL BUTTON_OFF
#define CHC_SETTINGS_CANCEL2 BUTTON_REC #define CHC_SETTINGS_CANCEL2 BUTTON_REC
#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) #elif (CONFIG_KEYPAD == IPOD_4G_PAD)
#define CHC_QUIT BUTTON_PLAY #define CHC_QUIT BUTTON_PLAY
#define CHC_STARTSTOP BUTTON_SELECT #define CHC_STARTSTOP BUTTON_SELECT
#define CHC_RESET BUTTON_LEFT #define CHC_RESET BUTTON_LEFT

2
apps/plugins/chip8.c
View file

@ -974,7 +974,7 @@ STATIC void chip8 (void)
#define CHIP8_KEY6 BUTTON_RIGHT #define CHIP8_KEY6 BUTTON_RIGHT
#define CHIP8_KEY8 BUTTON_DOWN #define CHIP8_KEY8 BUTTON_DOWN
#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) #elif (CONFIG_KEYPAD == IPOD_4G_PAD)
#define CHIP8_OFF BUTTON_MENU #define CHIP8_OFF BUTTON_MENU
#define CHIP8_KEY2 BUTTON_SCROLL_BACK #define CHIP8_KEY2 BUTTON_SCROLL_BACK
#define CHIP8_KEY4 BUTTON_LEFT #define CHIP8_KEY4 BUTTON_LEFT

2
apps/plugins/cube.c
View file

@ -79,7 +79,7 @@
#define CUBE_PAUSE (BUTTON_ON | BUTTON_REL) #define CUBE_PAUSE (BUTTON_ON | BUTTON_REL)
#define CUBE_HIGHSPEED BUTTON_SELECT #define CUBE_HIGHSPEED BUTTON_SELECT
#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) #elif (CONFIG_KEYPAD == IPOD_4G_PAD)
#define CUBE_QUIT BUTTON_MENU #define CUBE_QUIT BUTTON_MENU
#define CUBE_X_INC BUTTON_LEFT #define CUBE_X_INC BUTTON_LEFT
#define CUBE_X_DEC BUTTON_RIGHT #define CUBE_X_DEC BUTTON_RIGHT

2
apps/plugins/databox/databox.c
View file

@ -29,7 +29,7 @@
#elif CONFIG_KEYPAD == ONDIO_PAD #elif CONFIG_KEYPAD == ONDIO_PAD
#define DBX_SELECT BUTTON_MENU #define DBX_SELECT BUTTON_MENU
#define DBX_STOP BUTTON_OFF #define DBX_STOP BUTTON_OFF
#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) #elif (CONFIG_KEYPAD == IPOD_4G_PAD)
#define DBX_SELECT BUTTON_SELECT #define DBX_SELECT BUTTON_SELECT
#define DBX_STOP BUTTON_MENU #define DBX_STOP BUTTON_MENU
#elif CONFIG_KEYPAD == PLAYER_PAD #elif CONFIG_KEYPAD == PLAYER_PAD

2
apps/plugins/demystify.c
View file

@ -24,7 +24,7 @@
#ifdef HAVE_LCD_BITMAP #ifdef HAVE_LCD_BITMAP
/* Key assignement */ /* Key assignement */
#if (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) #if (CONFIG_KEYPAD == IPOD_4G_PAD)
#define DEMYSTIFY_QUIT BUTTON_MENU #define DEMYSTIFY_QUIT BUTTON_MENU
#define DEMYSTIFY_ADD_POLYGON BUTTON_RIGHT #define DEMYSTIFY_ADD_POLYGON BUTTON_RIGHT
#define DEMYSTIFY_REMOVE_POLYGON BUTTON_LEFT #define DEMYSTIFY_REMOVE_POLYGON BUTTON_LEFT

2
apps/plugins/dict.c
View file

@ -102,7 +102,7 @@ long reverse (long N) {
/* Button definitions */ /* Button definitions */
#if CONFIG_KEYPAD == PLAYER_PAD #if CONFIG_KEYPAD == PLAYER_PAD
#define LP_QUIT BUTTON_STOP #define LP_QUIT BUTTON_STOP
#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) #elif (CONFIG_KEYPAD == IPOD_4G_PAD)
#define LP_QUIT BUTTON_MENU #define LP_QUIT BUTTON_MENU
#else #else
#define LP_QUIT BUTTON_OFF #define LP_QUIT BUTTON_OFF

2
apps/plugins/flipit.c
View file

@ -50,7 +50,7 @@
#define FLIPIT_TOGGLE_PRE BUTTON_SELECT #define FLIPIT_TOGGLE_PRE BUTTON_SELECT
#define FLIPIT_TOGGLE (BUTTON_SELECT | BUTTON_REL) #define FLIPIT_TOGGLE (BUTTON_SELECT | BUTTON_REL)
#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) #elif (CONFIG_KEYPAD == IPOD_4G_PAD)
#define FLIPIT_UP BUTTON_SCROLL_FWD #define FLIPIT_UP BUTTON_SCROLL_FWD
#define FLIPIT_DOWN BUTTON_SCROLL_BACK #define FLIPIT_DOWN BUTTON_SCROLL_BACK

4
apps/plugins/jewels.c
View file

@ -67,7 +67,7 @@
#define BEJEWELED_SELECT BUTTON_SELECT #define BEJEWELED_SELECT BUTTON_SELECT
#define BEJEWELED_RESUME BUTTON_MODE #define BEJEWELED_RESUME BUTTON_MODE
#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) #elif (CONFIG_KEYPAD == IPOD_4G_PAD)
#define BEJEWELED_SCROLLWHEEL #define BEJEWELED_SCROLLWHEEL
#define BEJEWELED_UP BUTTON_MENU #define BEJEWELED_UP BUTTON_MENU
#define BEJEWELED_DOWN BUTTON_PLAY #define BEJEWELED_DOWN BUTTON_PLAY
@ -2241,7 +2241,7 @@ static int bejeweled(struct game_context* bj) {
rb->lcd_puts(0, 7, "Directions to move"); rb->lcd_puts(0, 7, "Directions to move");
rb->snprintf(str, 18, "High Score: %d", bj->highscores[0]); rb->snprintf(str, 18, "High Score: %d", bj->highscores[0]);
rb->lcd_puts(0, 9, str); rb->lcd_puts(0, 9, str);
#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) #elif (CONFIG_KEYPAD == IPOD_4G_PAD)
rb->lcd_puts(0, 2, "PLAY to start"); rb->lcd_puts(0, 2, "PLAY to start");
rb->lcd_puts(0, 3, "SELECT+PLAY to save/resume"); rb->lcd_puts(0, 3, "SELECT+PLAY to save/resume");
rb->lcd_puts(0, 4, "SELECT+MENU to exit"); rb->lcd_puts(0, 4, "SELECT+MENU to exit");

2
apps/plugins/logo.c
View file

@ -181,7 +181,7 @@ const unsigned char rockbox16x7[] = {
#define LP_INC_X BUTTON_RIGHT #define LP_INC_X BUTTON_RIGHT
#define LP_DEC_Y (BUTTON_ON | BUTTON_LEFT) #define LP_DEC_Y (BUTTON_ON | BUTTON_LEFT)
#define LP_INC_Y (BUTTON_ON | BUTTON_RIGHT) #define LP_INC_Y (BUTTON_ON | BUTTON_RIGHT)
#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) #elif (CONFIG_KEYPAD == IPOD_4G_PAD)
#define LP_QUIT BUTTON_MENU #define LP_QUIT BUTTON_MENU
#define LP_DEC_X BUTTON_LEFT #define LP_DEC_X BUTTON_LEFT
#define LP_INC_X BUTTON_RIGHT #define LP_INC_X BUTTON_RIGHT

2
apps/plugins/minesweeper.c
View file

@ -71,7 +71,7 @@ use F3 to see how many mines are left (supposing all your flags are correct)
#define MINESWP_DISCOVER BUTTON_ON #define MINESWP_DISCOVER BUTTON_ON
#define MINESWP_INFO BUTTON_MODE #define MINESWP_INFO BUTTON_MODE
#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) #elif (CONFIG_KEYPAD == IPOD_4G_PAD)
#define MINESWP_UP BUTTON_SCROLL_BACK #define MINESWP_UP BUTTON_SCROLL_BACK
#define MINESWP_DOWN BUTTON_SCROLL_FWD #define MINESWP_DOWN BUTTON_SCROLL_FWD
#define MINESWP_QUIT BUTTON_MENU #define MINESWP_QUIT BUTTON_MENU

2
apps/plugins/mosaique.c
View file

@ -51,7 +51,7 @@
#define MOSAIQUE_SPEED BUTTON_MODE #define MOSAIQUE_SPEED BUTTON_MODE
#define MOSAIQUE_RESTART BUTTON_ON #define MOSAIQUE_RESTART BUTTON_ON
#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) #elif (CONFIG_KEYPAD == IPOD_4G_PAD)
#define MOSAIQUE_QUIT BUTTON_MENU #define MOSAIQUE_QUIT BUTTON_MENU
#define MOSAIQUE_SPEED BUTTON_SELECT #define MOSAIQUE_SPEED BUTTON_SELECT
#define MOSAIQUE_RESTART BUTTON_PLAY #define MOSAIQUE_RESTART BUTTON_PLAY

2
apps/plugins/pong.c
View file

@ -56,7 +56,7 @@
#define PONG_RIGHT_UP BUTTON_ON #define PONG_RIGHT_UP BUTTON_ON
#define PONG_RIGHT_DOWN BUTTON_MODE #define PONG_RIGHT_DOWN BUTTON_MODE
#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) #elif (CONFIG_KEYPAD == IPOD_4G_PAD)
#define PONG_QUIT BUTTON_SELECT #define PONG_QUIT BUTTON_SELECT
#define PONG_LEFT_UP BUTTON_MENU #define PONG_LEFT_UP BUTTON_MENU
#define PONG_LEFT_DOWN BUTTON_LEFT #define PONG_LEFT_DOWN BUTTON_LEFT

2
apps/plugins/rockblox.c
View file

@ -22,7 +22,7 @@
#ifdef HAVE_LCD_BITMAP #ifdef HAVE_LCD_BITMAP
#if (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) #if (CONFIG_KEYPAD == IPOD_4G_PAD)
#define ROCKBLOX_OFF BUTTON_MENU #define ROCKBLOX_OFF BUTTON_MENU
#define ROCKBLOX_UP BUTTON_SCROLL_BACK #define ROCKBLOX_UP BUTTON_SCROLL_BACK
#define ROCKBLOX_DOWN BUTTON_SCROLL_FWD #define ROCKBLOX_DOWN BUTTON_SCROLL_FWD

2
apps/plugins/sliding_puzzle.c
View file

@ -43,7 +43,7 @@
#define PUZZLE_SHUFFLE BUTTON_SELECT #define PUZZLE_SHUFFLE BUTTON_SELECT
#define PUZZLE_PICTURE BUTTON_ON #define PUZZLE_PICTURE BUTTON_ON
#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) #elif (CONFIG_KEYPAD == IPOD_4G_PAD)
#define PUZZLE_QUIT BUTTON_MENU #define PUZZLE_QUIT BUTTON_MENU
#define PUZZLE_UP BUTTON_SCROLL_BACK #define PUZZLE_UP BUTTON_SCROLL_BACK
#define PUZZLE_DOWN BUTTON_SCROLL_FWD #define PUZZLE_DOWN BUTTON_SCROLL_FWD

3
apps/plugins/snake.c
View file

@ -53,8 +53,7 @@ dir is the current direction of the snake - 0=up, 1=right, 2=down, 3=left;
#define SNAKE_DOWN BUTTON_DOWN #define SNAKE_DOWN BUTTON_DOWN
#define SNAKE_PLAYPAUSE BUTTON_ON #define SNAKE_PLAYPAUSE BUTTON_ON
#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) #elif (CONFIG_KEYPAD == IPOD_4G_PAD)
#define SNAKE_QUIT (BUTTON_SELECT|BUTTON_MENU) #define SNAKE_QUIT (BUTTON_SELECT|BUTTON_MENU)
#define SNAKE_UP BUTTON_MENU #define SNAKE_UP BUTTON_MENU
#define SNAKE_DOWN BUTTON_PLAY #define SNAKE_DOWN BUTTON_PLAY

3
apps/plugins/snake2.c
View file

@ -91,8 +91,7 @@ Head and Tail are stored
#define SNAKE2_SELECT_TYPE BUTTON_MODE #define SNAKE2_SELECT_TYPE BUTTON_MODE
#define SNAKE2_PLAYPAUSE BUTTON_ON #define SNAKE2_PLAYPAUSE BUTTON_ON
#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) #elif (CONFIG_KEYPAD == IPOD_4G_PAD)
#define SNAKE2_UP BUTTON_MENU #define SNAKE2_UP BUTTON_MENU
#define SNAKE2_DOWN BUTTON_PLAY #define SNAKE2_DOWN BUTTON_PLAY
#define SNAKE2_QUIT (BUTTON_SELECT | BUTTON_MENU) #define SNAKE2_QUIT (BUTTON_SELECT | BUTTON_MENU)

2
apps/plugins/snow.c
View file

@ -34,7 +34,7 @@
/* variable button definitions */ /* variable button definitions */
#if CONFIG_KEYPAD == PLAYER_PAD #if CONFIG_KEYPAD == PLAYER_PAD
#define SNOW_QUIT BUTTON_STOP #define SNOW_QUIT BUTTON_STOP
#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) #elif (CONFIG_KEYPAD == IPOD_4G_PAD)
#define SNOW_QUIT BUTTON_MENU #define SNOW_QUIT BUTTON_MENU
#else #else
#define SNOW_QUIT BUTTON_OFF #define SNOW_QUIT BUTTON_OFF

2
apps/plugins/sokoban.c
View file

@ -63,7 +63,7 @@
#define SOKOBAN_LEVEL_DOWN BUTTON_REC #define SOKOBAN_LEVEL_DOWN BUTTON_REC
#define SOKOBAN_LEVEL_REPEAT BUTTON_SELECT #define SOKOBAN_LEVEL_REPEAT BUTTON_SELECT
#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) #elif (CONFIG_KEYPAD == IPOD_4G_PAD)
#define SOKOBAN_UP BUTTON_MENU #define SOKOBAN_UP BUTTON_MENU
#define SOKOBAN_DOWN BUTTON_PLAY #define SOKOBAN_DOWN BUTTON_PLAY
#define SOKOBAN_QUIT (BUTTON_SELECT | BUTTON_MENU) #define SOKOBAN_QUIT (BUTTON_SELECT | BUTTON_MENU)

4
apps/plugins/solitaire.c
View file

@ -102,7 +102,7 @@ static struct plugin_api* rb;
#define SOL_MENU_INFO BUTTON_MODE #define SOL_MENU_INFO BUTTON_MODE
#define SOL_MENU_INFO2 BUTTON_REC #define SOL_MENU_INFO2 BUTTON_REC
#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) #elif (CONFIG_KEYPAD == IPOD_4G_PAD)
#define SOL_QUIT (BUTTON_SELECT | BUTTON_MENU) #define SOL_QUIT (BUTTON_SELECT | BUTTON_MENU)
#define SOL_UP BUTTON_MENU #define SOL_UP BUTTON_MENU
@ -148,7 +148,7 @@ static struct plugin_api* rb;
#define HELP_SOL_CUR2STACK "SELECT..: Put the card under the cursor on one of the 4 final stacks." #define HELP_SOL_CUR2STACK "SELECT..: Put the card under the cursor on one of the 4 final stacks."
#define HELP_SOL_REM2STACK "PLAY+RIGHT: Put the card on top of the remains' stack on one of the 4 final stacks." #define HELP_SOL_REM2STACK "PLAY+RIGHT: Put the card on top of the remains' stack on one of the 4 final stacks."
#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) #elif (CONFIG_KEYPAD == IPOD_4G_PAD)
#define HELP_SOL_MOVE "SELECT: Select cards, Move cards, reveal hidden cards ..." #define HELP_SOL_MOVE "SELECT: Select cards, Move cards, reveal hidden cards ..."
#define HELP_SOL_DRAW "SELECT+PLAY: Un-select a card if it was selected. Else, draw 3 new cards out of the remains' stack." #define HELP_SOL_DRAW "SELECT+PLAY: Un-select a card if it was selected. Else, draw 3 new cards out of the remains' stack."
#define HELP_SOL_REM2CUR "SELECT+LEFT: Put the card on top of the remains' stack on top of the cursor." #define HELP_SOL_REM2CUR "SELECT+LEFT: Put the card on top of the remains' stack on top of the cursor."

2
apps/plugins/star.c
View file

@ -96,7 +96,7 @@
#define STAR_LEVEL_REPEAT (BUTTON_MODE | BUTTON_UP) #define STAR_LEVEL_REPEAT (BUTTON_MODE | BUTTON_UP)
#define STAR_MENU_RUN BUTTON_RIGHT #define STAR_MENU_RUN BUTTON_RIGHT
#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) #elif (CONFIG_KEYPAD == IPOD_4G_PAD)
#define STAR_QUIT (BUTTON_SELECT | BUTTON_MENU) #define STAR_QUIT (BUTTON_SELECT | BUTTON_MENU)
#define STAR_UP BUTTON_SCROLL_BACK #define STAR_UP BUTTON_SCROLL_BACK

2
apps/plugins/starfield.c
View file

@ -24,7 +24,7 @@
static struct plugin_api* rb; /* global api struct pointer */ static struct plugin_api* rb; /* global api struct pointer */
/* Key assignement */ /* Key assignement */
#if (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) #if (CONFIG_KEYPAD == IPOD_4G_PAD)
#define STARFIELD_QUIT BUTTON_MENU #define STARFIELD_QUIT BUTTON_MENU
#define STARFIELD_INCREASE_ZMOVE BUTTON_SCROLL_FWD #define STARFIELD_INCREASE_ZMOVE BUTTON_SCROLL_FWD
#define STARFIELD_DECREASE_ZMOVE BUTTON_SCROLL_BACK #define STARFIELD_DECREASE_ZMOVE BUTTON_SCROLL_BACK

2
apps/plugins/stats.c
View file

@ -28,7 +28,7 @@ static int fontwidth, fontheight;
#if CONFIG_KEYPAD == PLAYER_PAD #if CONFIG_KEYPAD == PLAYER_PAD
#define STATS_STOP BUTTON_STOP #define STATS_STOP BUTTON_STOP
#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) #elif (CONFIG_KEYPAD == IPOD_4G_PAD)
#define STATS_STOP BUTTON_MENU #define STATS_STOP BUTTON_MENU
#else #else
#define STATS_STOP BUTTON_OFF #define STATS_STOP BUTTON_OFF

2
apps/plugins/stopwatch.c
View file

@ -61,7 +61,7 @@
#define STOPWATCH_LAP_TIMER BUTTON_ON #define STOPWATCH_LAP_TIMER BUTTON_ON
#define STOPWATCH_SCROLL_UP BUTTON_RIGHT #define STOPWATCH_SCROLL_UP BUTTON_RIGHT
#define STOPWATCH_SCROLL_DOWN BUTTON_LEFT #define STOPWATCH_SCROLL_DOWN BUTTON_LEFT
#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) #elif (CONFIG_KEYPAD == IPOD_4G_PAD)
#define STOPWATCH_QUIT BUTTON_MENU #define STOPWATCH_QUIT BUTTON_MENU
#define STOPWATCH_START_STOP BUTTON_SELECT #define STOPWATCH_START_STOP BUTTON_SELECT
#define STOPWATCH_RESET_TIMER BUTTON_LEFT #define STOPWATCH_RESET_TIMER BUTTON_LEFT

3
apps/plugins/sudoku.c
View file

@ -95,8 +95,7 @@ Example ".ss" file, and one with a saved state:
#define SUDOKU_BUTTON_MENU BUTTON_MODE #define SUDOKU_BUTTON_MENU BUTTON_MODE
#define SUDOKU_BUTTON_POSSIBLE BUTTON_REC #define SUDOKU_BUTTON_POSSIBLE BUTTON_REC
#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) #elif (CONFIG_KEYPAD == IPOD_4G_PAD)
#define SUDOKU_BUTTON_QUIT (BUTTON_SELECT | BUTTON_MENU) #define SUDOKU_BUTTON_QUIT (BUTTON_SELECT | BUTTON_MENU)
#define SUDOKU_BUTTON_UP BUTTON_SCROLL_BACK #define SUDOKU_BUTTON_UP BUTTON_SCROLL_BACK
#define SUDOKU_BUTTON_DOWN BUTTON_SCROLL_FWD #define SUDOKU_BUTTON_DOWN BUTTON_SCROLL_FWD

4
apps/plugins/viewer.c
View file

@ -119,7 +119,7 @@
#define VIEWER_COLUMN_LEFT (BUTTON_ON | BUTTON_LEFT) #define VIEWER_COLUMN_LEFT (BUTTON_ON | BUTTON_LEFT)
#define VIEWER_COLUMN_RIGHT (BUTTON_ON | BUTTON_RIGHT) #define VIEWER_COLUMN_RIGHT (BUTTON_ON | BUTTON_RIGHT)
#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) #elif (CONFIG_KEYPAD == IPOD_4G_PAD)
#define VIEWER_QUIT BUTTON_MENU #define VIEWER_QUIT BUTTON_MENU
#define VIEWER_PAGE_UP BUTTON_SCROLL_FWD #define VIEWER_PAGE_UP BUTTON_SCROLL_FWD
#define VIEWER_PAGE_DOWN BUTTON_SCROLL_BACK #define VIEWER_PAGE_DOWN BUTTON_SCROLL_BACK
@ -1172,7 +1172,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* file)
#if (CONFIG_KEYPAD == RECORDER_PAD) || (CONFIG_KEYPAD == ONDIO_PAD) \ #if (CONFIG_KEYPAD == RECORDER_PAD) || (CONFIG_KEYPAD == ONDIO_PAD) \
|| (CONFIG_KEYPAD == IRIVER_H100_PAD) || (CONFIG_KEYPAD == IRIVER_H300_PAD) \ || (CONFIG_KEYPAD == IRIVER_H100_PAD) || (CONFIG_KEYPAD == IRIVER_H300_PAD) \
|| (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD)
case VIEWER_MODE_PAGE: case VIEWER_MODE_PAGE:
/* Page-overlap mode */ /* Page-overlap mode */
if (++page_mode == PAGE_MODES) if (++page_mode == PAGE_MODES)

2
apps/recorder/keyboard.c
View file

@ -101,7 +101,7 @@
#define KBD_UP BUTTON_UP #define KBD_UP BUTTON_UP
#define KBD_DOWN BUTTON_DOWN #define KBD_DOWN BUTTON_DOWN
#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) #elif (CONFIG_KEYPAD == IPOD_4G_PAD)
#define KBD_MODES /* iPod uses 2 modes, picker and line edit */ #define KBD_MODES /* iPod uses 2 modes, picker and line edit */
#define KBD_SELECT (BUTTON_SELECT | BUTTON_REL) /* backspace in line edit */ #define KBD_SELECT (BUTTON_SELECT | BUTTON_REL) /* backspace in line edit */

3
apps/settings.h
View file

@ -88,8 +88,7 @@
#define SETTINGS_NEXT BUTTON_RIGHT #define SETTINGS_NEXT BUTTON_RIGHT
#define SETTINGS_ACCEPT BUTTON_MENU #define SETTINGS_ACCEPT BUTTON_MENU
#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ #elif (CONFIG_KEYPAD == IPOD_4G_PAD)
(CONFIG_KEYPAD == IPOD_NANO_PAD)
#define SETTINGS_INC BUTTON_SCROLL_FWD #define SETTINGS_INC BUTTON_SCROLL_FWD
#define SETTINGS_DEC BUTTON_SCROLL_BACK #define SETTINGS_DEC BUTTON_SCROLL_BACK
#define SETTINGS_OK BUTTON_SELECT #define SETTINGS_OK BUTTON_SELECT

3
apps/tree.h
View file

@ -135,8 +135,7 @@
#define TREE_CONTEXT2 (BUTTON_ON | BUTTON_PLAY) #define TREE_CONTEXT2 (BUTTON_ON | BUTTON_PLAY)
#define TREE_POWER_BTN BUTTON_ON #define TREE_POWER_BTN BUTTON_ON
#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ #elif (CONFIG_KEYPAD == IPOD_4G_PAD)
(CONFIG_KEYPAD == IPOD_NANO_PAD)
#define TREE_NEXT BUTTON_SCROLL_FWD #define TREE_NEXT BUTTON_SCROLL_FWD
#define TREE_PREV BUTTON_SCROLL_BACK #define TREE_PREV BUTTON_SCROLL_BACK

8
firmware/drivers/button.c
View file

@ -63,7 +63,7 @@ static int button_read(void);
static bool remote_button_hold_only(void); static bool remote_button_hold_only(void);
#endif #endif
#if CONFIG_KEYPAD == IPOD_4G_PAD || CONFIG_KEYPAD == IPOD_NANO_PAD #if CONFIG_KEYPAD == IPOD_4G_PAD
/* Variable to use for setting button status in interrupt handler */ /* Variable to use for setting button status in interrupt handler */
int int_btn = BUTTON_NONE; int int_btn = BUTTON_NONE;
@ -371,7 +371,7 @@ void button_init(void)
/* nothing to initialize here */ /* nothing to initialize here */
#elif CONFIG_KEYPAD == GMINI100_PAD #elif CONFIG_KEYPAD == GMINI100_PAD
/* nothing to initialize here */ /* nothing to initialize here */
#elif CONFIG_KEYPAD == IPOD_4G_PAD || CONFIG_KEYPAD == IPOD_NANO_PAD #elif CONFIG_KEYPAD == IPOD_4G_PAD
opto_i2c_init(); opto_i2c_init();
/* hold button - enable as input */ /* hold button - enable as input */
GPIOA_ENABLE |= 0x20; GPIOA_ENABLE |= 0x20;
@ -397,7 +397,7 @@ void button_init(void)
} }
#ifdef HAVE_LCD_BITMAP /* only bitmap displays can be flipped */ #ifdef HAVE_LCD_BITMAP /* only bitmap displays can be flipped */
#if (CONFIG_KEYPAD != IPOD_4G_PAD) && (CONFIG_KEYPAD != IPOD_NANO_PAD) #if (CONFIG_KEYPAD != IPOD_4G_PAD)
/* /*
* helper function to swap UP/DOWN, LEFT/RIGHT (and F1/F3 for Recorder) * helper function to swap UP/DOWN, LEFT/RIGHT (and F1/F3 for Recorder)
*/ */
@ -821,7 +821,7 @@ static int button_read(void)
if (data & 0x01) if (data & 0x01)
btn |= BUTTON_ON; btn |= BUTTON_ON;
#elif CONFIG_KEYPAD == IPOD_4G_PAD || CONFIG_KEYPAD == IPOD_NANO_PAD #elif CONFIG_KEYPAD == IPOD_4G_PAD
(void)data; (void)data;
/* The int_btn variable is set in the button interrupt handler */ /* The int_btn variable is set in the button interrupt handler */
btn = int_btn; btn = int_btn;

2
firmware/export/button.h
View file

@ -149,7 +149,7 @@ bool remote_button_hold(void);
#define BUTTON_DOWN 0x0020 #define BUTTON_DOWN 0x0020
#define BUTTON_MENU 0x0100 #define BUTTON_MENU 0x0100
#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) #elif (CONFIG_KEYPAD == IPOD_4G_PAD)
/* TODO: These codes should relate to the hardware */ /* TODO: These codes should relate to the hardware */

2
firmware/export/config-ipodnano.h
View file

@ -21,7 +21,7 @@
#define LCD_DEPTH 16 /* 65536 colours */ #define LCD_DEPTH 16 /* 65536 colours */
#define LCD_PIXELFORMAT RGB565SWAPPED /* rgb565 byte-swapped */ #define LCD_PIXELFORMAT RGB565SWAPPED /* rgb565 byte-swapped */
#define CONFIG_KEYPAD IPOD_NANO_PAD #define CONFIG_KEYPAD IPOD_4G_PAD
/* Define this if you do software codec */ /* Define this if you do software codec */
#define CONFIG_CODEC SWCODEC #define CONFIG_CODEC SWCODEC

1
firmware/export/config.h
View file

@ -51,7 +51,6 @@
#define IRIVER_H300_PAD 5 #define IRIVER_H300_PAD 5
#define IAUDIO_X5_PAD 6 #define IAUDIO_X5_PAD 6
#define IPOD_4G_PAD 7 #define IPOD_4G_PAD 7
#define IPOD_NANO_PAD 8
/* CONFIG_REMOTE_KEYPAD */ /* CONFIG_REMOTE_KEYPAD */
#define H100_REMOTE 1 #define H100_REMOTE 1

2
uisimulator/x11/screenhack.c
View file

@ -122,7 +122,7 @@
"Enter, A OFF\n" \ "Enter, A OFF\n" \
"., INS MENU\n" "., INS MENU\n"
#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) #elif (CONFIG_KEYPAD == IPOD_4G_PAD)
#define KEYBOARD_SPECIFIC \ #define KEYBOARD_SPECIFIC \
"[not written yet]" "[not written yet]"