From 0dc63c1b7145b0b37476bdd701b8d5c15ad038b3 Mon Sep 17 00:00:00 2001 From: Dave Chapman Date: Mon, 19 Dec 2005 00:11:28 +0000 Subject: Remove IPOD_NANO_PAD definition - the Nano's keypad has turned out to be identical to the other 4G models git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8262 a1c6a512-1295-4272-9138-f99709370657 --- apps/bookmark.h | 3 +-- apps/gui/gwps.h | 3 +-- apps/gui/list.h | 3 +-- apps/gui/select.h | 3 +-- apps/gui/yesno.h | 2 +- apps/menu.h | 2 +- apps/plugins/battery_test.c | 2 +- apps/plugins/bounce.c | 2 +- apps/plugins/calculator.c | 2 +- apps/plugins/chessclock.c | 2 +- apps/plugins/chip8.c | 2 +- apps/plugins/cube.c | 2 +- apps/plugins/databox/databox.c | 2 +- apps/plugins/demystify.c | 2 +- apps/plugins/dict.c | 2 +- apps/plugins/flipit.c | 2 +- apps/plugins/jewels.c | 4 ++-- apps/plugins/logo.c | 2 +- apps/plugins/minesweeper.c | 2 +- apps/plugins/mosaique.c | 2 +- apps/plugins/pong.c | 2 +- apps/plugins/rockblox.c | 2 +- apps/plugins/sliding_puzzle.c | 2 +- apps/plugins/snake.c | 3 +-- apps/plugins/snake2.c | 3 +-- apps/plugins/snow.c | 2 +- apps/plugins/sokoban.c | 2 +- apps/plugins/solitaire.c | 4 ++-- apps/plugins/star.c | 2 +- apps/plugins/starfield.c | 2 +- apps/plugins/stats.c | 2 +- apps/plugins/stopwatch.c | 2 +- apps/plugins/sudoku.c | 3 +-- apps/plugins/viewer.c | 4 ++-- apps/recorder/keyboard.c | 2 +- apps/settings.h | 3 +-- apps/tree.h | 3 +-- firmware/drivers/button.c | 8 ++++---- firmware/export/button.h | 2 +- firmware/export/config-ipodnano.h | 2 +- firmware/export/config.h | 1 - uisimulator/x11/screenhack.c | 2 +- 42 files changed, 47 insertions(+), 57 deletions(-) diff --git a/apps/bookmark.h b/apps/bookmark.h index 6d281700f4..dff4473167 100644 --- a/apps/bookmark.h +++ b/apps/bookmark.h @@ -33,8 +33,7 @@ #define BOOKMARK_DELETE (BUTTON_ON | BUTTON_SELECT) #define BOOKMARK_DOWN BUTTON_DOWN -#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ - (CONFIG_KEYPAD == IPOD_NANO_PAD) +#elif (CONFIG_KEYPAD == IPOD_4G_PAD) #define BOOKMARK_SELECT BUTTON_SELECT #define BOOKMARK_DELETE (BUTTON_RIGHT | BUTTON_REPEAT) #define BOOKMARK_DOWN BUTTON_SCROLL_FWD diff --git a/apps/gui/gwps.h b/apps/gui/gwps.h index 54b3d1ec64..610c3021bf 100644 --- a/apps/gui/gwps.h +++ b/apps/gui/gwps.h @@ -172,8 +172,7 @@ #define WPS_KEYLOCK (BUTTON_MENU | BUTTON_DOWN) #define WPS_ID3 (BUTTON_MENU | BUTTON_ON) -#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ -(CONFIG_KEYPAD == IPOD_NANO_PAD) +#elif (CONFIG_KEYPAD == IPOD_4G_PAD) /* TODO: Check WPS button assignments */ diff --git a/apps/gui/list.h b/apps/gui/list.h index 5ba7983e0d..3ae1b80dc2 100644 --- a/apps/gui/list.h +++ b/apps/gui/list.h @@ -65,8 +65,7 @@ #define LIST_NEXT BUTTON_DOWN #define LIST_PREV BUTTON_UP -#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ - (CONFIG_KEYPAD == IPOD_NANO_PAD) +#elif (CONFIG_KEYPAD == IPOD_4G_PAD) #define LIST_NEXT BUTTON_SCROLL_FWD #define LIST_PREV BUTTON_SCROLL_BACK diff --git a/apps/gui/select.h b/apps/gui/select.h index 9bbfddf221..b6a9afd55c 100644 --- a/apps/gui/select.h +++ b/apps/gui/select.h @@ -54,8 +54,7 @@ #define SELECT_CANCEL BUTTON_STOP #define SELECT_CANCEL2 BUTTON_MENU -#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ - (CONFIG_KEYPAD == IPOD_NANO_PAD) +#elif (CONFIG_KEYPAD == IPOD_4G_PAD) #define SELECT_INC BUTTON_SCROLL_FWD #define SELECT_DEC BUTTON_SCROLL_BACK #define SELECT_OK BUTTON_SELECT diff --git a/apps/gui/yesno.h b/apps/gui/yesno.h index ac6500daf8..5399c88391 100644 --- a/apps/gui/yesno.h +++ b/apps/gui/yesno.h @@ -23,7 +23,7 @@ #elif CONFIG_KEYPAD == GMINI100_PAD #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 #endif enum yesno_res diff --git a/apps/menu.h b/apps/menu.h index 98cbf9417c..2d5c036a34 100644 --- a/apps/menu.h +++ b/apps/menu.h @@ -68,7 +68,7 @@ #define MENU_ENTER BUTTON_RIGHT #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 */ diff --git a/apps/plugins/battery_test.c b/apps/plugins/battery_test.c index 87d60c85a5..b559ed53af 100644 --- a/apps/plugins/battery_test.c +++ b/apps/plugins/battery_test.c @@ -39,7 +39,7 @@ #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ (CONFIG_KEYPAD == IRIVER_H300_PAD) #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 #endif diff --git a/apps/plugins/bounce.c b/apps/plugins/bounce.c index ed2f9337b2..2a2d520371 100644 --- a/apps/plugins/bounce.c +++ b/apps/plugins/bounce.c @@ -50,7 +50,7 @@ #define BOUNCE_QUIT (BUTTON_OFF | 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_DOWN BUTTON_SCROLL_FWD #define BOUNCE_QUIT (BUTTON_MENU | BUTTON_REL) diff --git a/apps/plugins/calculator.c b/apps/plugins/calculator.c index 70104391d6..51b9cfacc7 100644 --- a/apps/plugins/calculator.c +++ b/apps/plugins/calculator.c @@ -132,7 +132,7 @@ F3: equal to "=" #define CALCULATOR_OPERATORS BUTTON_MODE #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_DOWN BUTTON_SCROLL_FWD diff --git a/apps/plugins/chessclock.c b/apps/plugins/chessclock.c index b53980f9e4..3291f3e32e 100644 --- a/apps/plugins/chessclock.c +++ b/apps/plugins/chessclock.c @@ -64,7 +64,7 @@ #define CHC_SETTINGS_CANCEL BUTTON_OFF #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_STARTSTOP BUTTON_SELECT #define CHC_RESET BUTTON_LEFT diff --git a/apps/plugins/chip8.c b/apps/plugins/chip8.c index 295ac35dc3..56ce12a388 100644 --- a/apps/plugins/chip8.c +++ b/apps/plugins/chip8.c @@ -974,7 +974,7 @@ STATIC void chip8 (void) #define CHIP8_KEY6 BUTTON_RIGHT #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_KEY2 BUTTON_SCROLL_BACK #define CHIP8_KEY4 BUTTON_LEFT diff --git a/apps/plugins/cube.c b/apps/plugins/cube.c index f081f88e4a..cebc36a016 100644 --- a/apps/plugins/cube.c +++ b/apps/plugins/cube.c @@ -79,7 +79,7 @@ #define CUBE_PAUSE (BUTTON_ON | BUTTON_REL) #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_X_INC BUTTON_LEFT #define CUBE_X_DEC BUTTON_RIGHT diff --git a/apps/plugins/databox/databox.c b/apps/plugins/databox/databox.c index c2a33b7331..d9b513c378 100644 --- a/apps/plugins/databox/databox.c +++ b/apps/plugins/databox/databox.c @@ -29,7 +29,7 @@ #elif CONFIG_KEYPAD == ONDIO_PAD #define DBX_SELECT BUTTON_MENU #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_STOP BUTTON_MENU #elif CONFIG_KEYPAD == PLAYER_PAD diff --git a/apps/plugins/demystify.c b/apps/plugins/demystify.c index 67674b099d..8cb3315bdf 100644 --- a/apps/plugins/demystify.c +++ b/apps/plugins/demystify.c @@ -24,7 +24,7 @@ #ifdef HAVE_LCD_BITMAP /* 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_ADD_POLYGON BUTTON_RIGHT #define DEMYSTIFY_REMOVE_POLYGON BUTTON_LEFT diff --git a/apps/plugins/dict.c b/apps/plugins/dict.c index a80ace2871..aea7c44a6c 100644 --- a/apps/plugins/dict.c +++ b/apps/plugins/dict.c @@ -102,7 +102,7 @@ long reverse (long N) { /* Button definitions */ #if CONFIG_KEYPAD == PLAYER_PAD #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 #else #define LP_QUIT BUTTON_OFF diff --git a/apps/plugins/flipit.c b/apps/plugins/flipit.c index da449d397c..f921a2e95d 100644 --- a/apps/plugins/flipit.c +++ b/apps/plugins/flipit.c @@ -50,7 +50,7 @@ #define FLIPIT_TOGGLE_PRE BUTTON_SELECT #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_DOWN BUTTON_SCROLL_BACK diff --git a/apps/plugins/jewels.c b/apps/plugins/jewels.c index 2031a1cc3b..739e8141a6 100644 --- a/apps/plugins/jewels.c +++ b/apps/plugins/jewels.c @@ -67,7 +67,7 @@ #define BEJEWELED_SELECT BUTTON_SELECT #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_UP BUTTON_MENU #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->snprintf(str, 18, "High Score: %d", bj->highscores[0]); 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, 3, "SELECT+PLAY to save/resume"); rb->lcd_puts(0, 4, "SELECT+MENU to exit"); diff --git a/apps/plugins/logo.c b/apps/plugins/logo.c index 40f131861a..ba5451410b 100644 --- a/apps/plugins/logo.c +++ b/apps/plugins/logo.c @@ -181,7 +181,7 @@ const unsigned char rockbox16x7[] = { #define LP_INC_X BUTTON_RIGHT #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_NANO_PAD) +#elif (CONFIG_KEYPAD == IPOD_4G_PAD) #define LP_QUIT BUTTON_MENU #define LP_DEC_X BUTTON_LEFT #define LP_INC_X BUTTON_RIGHT diff --git a/apps/plugins/minesweeper.c b/apps/plugins/minesweeper.c index ea278df59c..624c807b92 100644 --- a/apps/plugins/minesweeper.c +++ b/apps/plugins/minesweeper.c @@ -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_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_DOWN BUTTON_SCROLL_FWD #define MINESWP_QUIT BUTTON_MENU diff --git a/apps/plugins/mosaique.c b/apps/plugins/mosaique.c index a05d1656c8..0773236140 100644 --- a/apps/plugins/mosaique.c +++ b/apps/plugins/mosaique.c @@ -51,7 +51,7 @@ #define MOSAIQUE_SPEED BUTTON_MODE #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_SPEED BUTTON_SELECT #define MOSAIQUE_RESTART BUTTON_PLAY diff --git a/apps/plugins/pong.c b/apps/plugins/pong.c index 68bc3968bf..41507c5ff4 100644 --- a/apps/plugins/pong.c +++ b/apps/plugins/pong.c @@ -56,7 +56,7 @@ #define PONG_RIGHT_UP BUTTON_ON #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_LEFT_UP BUTTON_MENU #define PONG_LEFT_DOWN BUTTON_LEFT diff --git a/apps/plugins/rockblox.c b/apps/plugins/rockblox.c index 9fcc8cf563..786e590571 100644 --- a/apps/plugins/rockblox.c +++ b/apps/plugins/rockblox.c @@ -22,7 +22,7 @@ #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_UP BUTTON_SCROLL_BACK #define ROCKBLOX_DOWN BUTTON_SCROLL_FWD diff --git a/apps/plugins/sliding_puzzle.c b/apps/plugins/sliding_puzzle.c index d85d011e13..a153467a75 100644 --- a/apps/plugins/sliding_puzzle.c +++ b/apps/plugins/sliding_puzzle.c @@ -43,7 +43,7 @@ #define PUZZLE_SHUFFLE BUTTON_SELECT #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_UP BUTTON_SCROLL_BACK #define PUZZLE_DOWN BUTTON_SCROLL_FWD diff --git a/apps/plugins/snake.c b/apps/plugins/snake.c index 01716b2d0b..bf5d8f9795 100644 --- a/apps/plugins/snake.c +++ b/apps/plugins/snake.c @@ -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_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_UP BUTTON_MENU #define SNAKE_DOWN BUTTON_PLAY diff --git a/apps/plugins/snake2.c b/apps/plugins/snake2.c index f5ee34b2cb..ea526b3871 100644 --- a/apps/plugins/snake2.c +++ b/apps/plugins/snake2.c @@ -91,8 +91,7 @@ Head and Tail are stored #define SNAKE2_SELECT_TYPE BUTTON_MODE #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_DOWN BUTTON_PLAY #define SNAKE2_QUIT (BUTTON_SELECT | BUTTON_MENU) diff --git a/apps/plugins/snow.c b/apps/plugins/snow.c index 06ec4ac5f6..ec4a240894 100644 --- a/apps/plugins/snow.c +++ b/apps/plugins/snow.c @@ -34,7 +34,7 @@ /* variable button definitions */ #if CONFIG_KEYPAD == PLAYER_PAD #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 #else #define SNOW_QUIT BUTTON_OFF diff --git a/apps/plugins/sokoban.c b/apps/plugins/sokoban.c index 545ea771ef..515997379d 100644 --- a/apps/plugins/sokoban.c +++ b/apps/plugins/sokoban.c @@ -63,7 +63,7 @@ #define SOKOBAN_LEVEL_DOWN BUTTON_REC #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_DOWN BUTTON_PLAY #define SOKOBAN_QUIT (BUTTON_SELECT | BUTTON_MENU) diff --git a/apps/plugins/solitaire.c b/apps/plugins/solitaire.c index efecaa854b..ea56e2a693 100644 --- a/apps/plugins/solitaire.c +++ b/apps/plugins/solitaire.c @@ -102,7 +102,7 @@ static struct plugin_api* rb; #define SOL_MENU_INFO BUTTON_MODE #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_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_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_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." diff --git a/apps/plugins/star.c b/apps/plugins/star.c index ac85738577..c6a2853231 100644 --- a/apps/plugins/star.c +++ b/apps/plugins/star.c @@ -96,7 +96,7 @@ #define STAR_LEVEL_REPEAT (BUTTON_MODE | BUTTON_UP) #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_UP BUTTON_SCROLL_BACK diff --git a/apps/plugins/starfield.c b/apps/plugins/starfield.c index 8462c2f478..407e79f3c1 100644 --- a/apps/plugins/starfield.c +++ b/apps/plugins/starfield.c @@ -24,7 +24,7 @@ static struct plugin_api* rb; /* global api struct pointer */ /* 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_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 8023341350..0dfac24c6d 100644 --- a/apps/plugins/stats.c +++ b/apps/plugins/stats.c @@ -28,7 +28,7 @@ static int fontwidth, fontheight; #if CONFIG_KEYPAD == PLAYER_PAD #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 #else #define STATS_STOP BUTTON_OFF diff --git a/apps/plugins/stopwatch.c b/apps/plugins/stopwatch.c index c4aeaf2711..9df064d36f 100644 --- a/apps/plugins/stopwatch.c +++ b/apps/plugins/stopwatch.c @@ -61,7 +61,7 @@ #define STOPWATCH_LAP_TIMER BUTTON_ON #define STOPWATCH_SCROLL_UP BUTTON_RIGHT #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_START_STOP BUTTON_SELECT #define STOPWATCH_RESET_TIMER BUTTON_LEFT diff --git a/apps/plugins/sudoku.c b/apps/plugins/sudoku.c index 586b94b721..453a4447b1 100644 --- a/apps/plugins/sudoku.c +++ b/apps/plugins/sudoku.c @@ -95,8 +95,7 @@ Example ".ss" file, and one with a saved state: #define SUDOKU_BUTTON_MENU BUTTON_MODE #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_UP BUTTON_SCROLL_BACK #define SUDOKU_BUTTON_DOWN BUTTON_SCROLL_FWD diff --git a/apps/plugins/viewer.c b/apps/plugins/viewer.c index 99e1f5e461..60438c9dc9 100644 --- a/apps/plugins/viewer.c +++ b/apps/plugins/viewer.c @@ -119,7 +119,7 @@ #define VIEWER_COLUMN_LEFT (BUTTON_ON | BUTTON_LEFT) #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_PAGE_UP BUTTON_SCROLL_FWD #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) \ || (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: /* Page-overlap mode */ if (++page_mode == PAGE_MODES) diff --git a/apps/recorder/keyboard.c b/apps/recorder/keyboard.c index c2ff8b6f17..d4cc8fbfd0 100644 --- a/apps/recorder/keyboard.c +++ b/apps/recorder/keyboard.c @@ -101,7 +101,7 @@ #define KBD_UP BUTTON_UP #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_SELECT (BUTTON_SELECT | BUTTON_REL) /* backspace in line edit */ diff --git a/apps/settings.h b/apps/settings.h index 7f463c01fe..7378f1daeb 100644 --- a/apps/settings.h +++ b/apps/settings.h @@ -88,8 +88,7 @@ #define SETTINGS_NEXT BUTTON_RIGHT #define SETTINGS_ACCEPT BUTTON_MENU -#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ - (CONFIG_KEYPAD == IPOD_NANO_PAD) +#elif (CONFIG_KEYPAD == IPOD_4G_PAD) #define SETTINGS_INC BUTTON_SCROLL_FWD #define SETTINGS_DEC BUTTON_SCROLL_BACK #define SETTINGS_OK BUTTON_SELECT diff --git a/apps/tree.h b/apps/tree.h index d0da72643e..05800ae68a 100644 --- a/apps/tree.h +++ b/apps/tree.h @@ -135,8 +135,7 @@ #define TREE_CONTEXT2 (BUTTON_ON | BUTTON_PLAY) #define TREE_POWER_BTN BUTTON_ON -#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ - (CONFIG_KEYPAD == IPOD_NANO_PAD) +#elif (CONFIG_KEYPAD == IPOD_4G_PAD) #define TREE_NEXT BUTTON_SCROLL_FWD #define TREE_PREV BUTTON_SCROLL_BACK diff --git a/firmware/drivers/button.c b/firmware/drivers/button.c index 307b424d09..15276a985e 100644 --- a/firmware/drivers/button.c +++ b/firmware/drivers/button.c @@ -63,7 +63,7 @@ static int button_read(void); static bool remote_button_hold_only(void); #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 */ int int_btn = BUTTON_NONE; @@ -371,7 +371,7 @@ void button_init(void) /* nothing to initialize here */ #elif CONFIG_KEYPAD == GMINI100_PAD /* nothing to initialize here */ -#elif CONFIG_KEYPAD == IPOD_4G_PAD || CONFIG_KEYPAD == IPOD_NANO_PAD +#elif CONFIG_KEYPAD == IPOD_4G_PAD opto_i2c_init(); /* hold button - enable as input */ GPIOA_ENABLE |= 0x20; @@ -397,7 +397,7 @@ void button_init(void) } #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) */ @@ -821,7 +821,7 @@ static int button_read(void) if (data & 0x01) btn |= BUTTON_ON; -#elif CONFIG_KEYPAD == IPOD_4G_PAD || CONFIG_KEYPAD == IPOD_NANO_PAD +#elif CONFIG_KEYPAD == IPOD_4G_PAD (void)data; /* The int_btn variable is set in the button interrupt handler */ btn = int_btn; diff --git a/firmware/export/button.h b/firmware/export/button.h index 4bf5edde5b..47912ef1df 100644 --- a/firmware/export/button.h +++ b/firmware/export/button.h @@ -149,7 +149,7 @@ bool remote_button_hold(void); #define BUTTON_DOWN 0x0020 #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 */ diff --git a/firmware/export/config-ipodnano.h b/firmware/export/config-ipodnano.h index 6657ba8aaa..8c7a3b2f8c 100644 --- a/firmware/export/config-ipodnano.h +++ b/firmware/export/config-ipodnano.h @@ -21,7 +21,7 @@ #define LCD_DEPTH 16 /* 65536 colours */ #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 CONFIG_CODEC SWCODEC diff --git a/firmware/export/config.h b/firmware/export/config.h index 858b348ed3..3f563ca9df 100644 --- a/firmware/export/config.h +++ b/firmware/export/config.h @@ -51,7 +51,6 @@ #define IRIVER_H300_PAD 5 #define IAUDIO_X5_PAD 6 #define IPOD_4G_PAD 7 -#define IPOD_NANO_PAD 8 /* CONFIG_REMOTE_KEYPAD */ #define H100_REMOTE 1 diff --git a/uisimulator/x11/screenhack.c b/uisimulator/x11/screenhack.c index 4cd2802aa2..5270990029 100644 --- a/uisimulator/x11/screenhack.c +++ b/uisimulator/x11/screenhack.c @@ -122,7 +122,7 @@ "Enter, A OFF\n" \ "., INS MENU\n" -#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) +#elif (CONFIG_KEYPAD == IPOD_4G_PAD) #define KEYBOARD_SPECIFIC \ "[not written yet]" -- cgit v1.2.3