diff options
author | Daniel Stenberg <daniel@haxx.se> | 2005-06-29 12:47:24 +0000 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2005-06-29 12:47:24 +0000 |
commit | 01377e2e5791ae72f112c722405efb6e12e00db5 (patch) | |
tree | d3c6cd2055e262d20cbcc767783275a6d29ef532 | |
parent | 9e8918b0866b249a55c06a16a243cdd3dcdad305 (diff) | |
download | rockbox-01377e2e5791ae72f112c722405efb6e12e00db5.tar.gz rockbox-01377e2e5791ae72f112c722405efb6e12e00db5.zip |
Hristo Kovachev's keypad fixes for the H300 build
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6912 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/debug_menu.c | 3 | ||||
-rw-r--r-- | apps/menu.h | 3 | ||||
-rw-r--r-- | apps/plugins/battery_test.c | 3 | ||||
-rw-r--r-- | apps/plugins/bounce.c | 3 | ||||
-rw-r--r-- | apps/plugins/calculator.c | 3 | ||||
-rw-r--r-- | apps/plugins/chessclock.c | 3 | ||||
-rw-r--r-- | apps/plugins/chip8.c | 3 | ||||
-rw-r--r-- | apps/plugins/cube.c | 3 | ||||
-rw-r--r-- | apps/plugins/databox/databox.c | 3 | ||||
-rw-r--r-- | apps/plugins/flipit.c | 3 | ||||
-rw-r--r-- | apps/plugins/logo.c | 3 | ||||
-rw-r--r-- | apps/plugins/minesweeper.c | 3 | ||||
-rw-r--r-- | apps/plugins/mosaique.c | 3 | ||||
-rw-r--r-- | apps/plugins/pong.c | 3 | ||||
-rw-r--r-- | apps/plugins/rockboy/sys_rockbox.c | 3 | ||||
-rw-r--r-- | apps/plugins/sliding_puzzle.c | 3 | ||||
-rw-r--r-- | apps/plugins/snake.c | 3 | ||||
-rw-r--r-- | apps/plugins/snake2.c | 3 | ||||
-rw-r--r-- | apps/plugins/sokoban.c | 3 | ||||
-rw-r--r-- | apps/plugins/solitaire.c | 6 | ||||
-rw-r--r-- | apps/plugins/star.c | 3 | ||||
-rw-r--r-- | apps/plugins/stopwatch.c | 3 | ||||
-rw-r--r-- | apps/plugins/viewer.c | 5 | ||||
-rw-r--r-- | apps/recorder/keyboard.c | 3 | ||||
-rw-r--r-- | apps/tree.h | 3 | ||||
-rw-r--r-- | apps/wps.h | 3 | ||||
-rw-r--r-- | docs/CREDITS | 1 | ||||
-rw-r--r-- | firmware/export/button.h | 2 |
28 files changed, 57 insertions, 29 deletions
diff --git a/apps/debug_menu.c b/apps/debug_menu.c index 805c8db2ba..000c557906 100644 --- a/apps/debug_menu.c +++ b/apps/debug_menu.c | |||
@@ -927,7 +927,8 @@ bool dbg_cpufreq(void) | |||
927 | cpu_boost(false); | 927 | cpu_boost(false); |
928 | break; | 928 | break; |
929 | 929 | ||
930 | #if CONFIG_KEYPAD == IRIVER_H100_PAD | 930 | #if (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ |
931 | (CONFIG_KEYPAD == IRIVER_H300_PAD) | ||
931 | case BUTTON_SELECT: | 932 | case BUTTON_SELECT: |
932 | #else | 933 | #else |
933 | case BUTTON_PLAY: | 934 | case BUTTON_PLAY: |
diff --git a/apps/menu.h b/apps/menu.h index 9d682dad77..a378bd8402 100644 --- a/apps/menu.h +++ b/apps/menu.h | |||
@@ -23,7 +23,8 @@ | |||
23 | #include <stdbool.h> | 23 | #include <stdbool.h> |
24 | 24 | ||
25 | /* button definitions */ | 25 | /* button definitions */ |
26 | #if CONFIG_KEYPAD == IRIVER_H100_PAD | 26 | #if (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ |
27 | (CONFIG_KEYPAD == IRIVER_H300_PAD) | ||
27 | #define MENU_NEXT BUTTON_DOWN | 28 | #define MENU_NEXT BUTTON_DOWN |
28 | #define MENU_PREV BUTTON_UP | 29 | #define MENU_PREV BUTTON_UP |
29 | #define MENU_EXIT BUTTON_LEFT | 30 | #define MENU_EXIT BUTTON_LEFT |
diff --git a/apps/plugins/battery_test.c b/apps/plugins/battery_test.c index 47042e6cf0..adb1a2d86e 100644 --- a/apps/plugins/battery_test.c +++ b/apps/plugins/battery_test.c | |||
@@ -36,7 +36,8 @@ | |||
36 | #define BATTERY_TEST_QUIT BUTTON_OFF | 36 | #define BATTERY_TEST_QUIT BUTTON_OFF |
37 | #elif CONFIG_KEYPAD == PLAYER_PAD | 37 | #elif CONFIG_KEYPAD == PLAYER_PAD |
38 | #define BATTERY_TEST_QUIT BUTTON_STOP | 38 | #define BATTERY_TEST_QUIT BUTTON_STOP |
39 | #elif CONFIG_KEYPAD == IRIVER_H100_PAD | 39 | #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ |
40 | (CONFIG_KEYPAD == IRIVER_H300_PAD) | ||
40 | #define BATTERY_TEST_QUIT BUTTON_OFF | 41 | #define BATTERY_TEST_QUIT BUTTON_OFF |
41 | #endif | 42 | #endif |
42 | 43 | ||
diff --git a/apps/plugins/bounce.c b/apps/plugins/bounce.c index fa0e22f196..98dcd5ff66 100644 --- a/apps/plugins/bounce.c +++ b/apps/plugins/bounce.c | |||
@@ -39,7 +39,8 @@ | |||
39 | #define BOUNCE_QUIT (BUTTON_OFF | BUTTON_REL) | 39 | #define BOUNCE_QUIT (BUTTON_OFF | BUTTON_REL) |
40 | #define BOUNCE_MODE (BUTTON_MENU | BUTTON_REL) | 40 | #define BOUNCE_MODE (BUTTON_MENU | BUTTON_REL) |
41 | 41 | ||
42 | #elif CONFIG_KEYPAD == IRIVER_H100_PAD | 42 | #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ |
43 | (CONFIG_KEYPAD == IRIVER_H300_PAD) | ||
43 | #define BOUNCE_QUIT (BUTTON_OFF | BUTTON_REL) | 44 | #define BOUNCE_QUIT (BUTTON_OFF | BUTTON_REL) |
44 | #define BOUNCE_MODE (BUTTON_SELECT | BUTTON_REL) | 45 | #define BOUNCE_MODE (BUTTON_SELECT | BUTTON_REL) |
45 | #endif | 46 | #endif |
diff --git a/apps/plugins/calculator.c b/apps/plugins/calculator.c index 9d5ae205b9..e9de760b22 100644 --- a/apps/plugins/calculator.c +++ b/apps/plugins/calculator.c | |||
@@ -118,7 +118,8 @@ F3: equal to "=" | |||
118 | #define CALCULATOR_INPUT (BUTTON_MENU | BUTTON_REL) | 118 | #define CALCULATOR_INPUT (BUTTON_MENU | BUTTON_REL) |
119 | #define CALCULATOR_CALC (BUTTON_MENU | BUTTON_REPEAT) | 119 | #define CALCULATOR_CALC (BUTTON_MENU | BUTTON_REPEAT) |
120 | 120 | ||
121 | #elif CONFIG_KEYPAD == IRIVER_H100_PAD | 121 | #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ |
122 | (CONFIG_KEYPAD == IRIVER_H300_PAD) | ||
122 | #define CALCULATOR_QUIT BUTTON_OFF | 123 | #define CALCULATOR_QUIT BUTTON_OFF |
123 | #define CALCULATOR_INPUT BUTTON_SELECT | 124 | #define CALCULATOR_INPUT BUTTON_SELECT |
124 | #define CALCULATOR_CALC BUTTON_ON | 125 | #define CALCULATOR_CALC BUTTON_ON |
diff --git a/apps/plugins/chessclock.c b/apps/plugins/chessclock.c index b66ed2a385..1c394df9de 100644 --- a/apps/plugins/chessclock.c +++ b/apps/plugins/chessclock.c | |||
@@ -52,7 +52,8 @@ | |||
52 | #define CHC_SETTINGS_CANCEL BUTTON_STOP | 52 | #define CHC_SETTINGS_CANCEL BUTTON_STOP |
53 | #define CHC_SETTINGS_CANCEL2 BUTTON_MENU | 53 | #define CHC_SETTINGS_CANCEL2 BUTTON_MENU |
54 | 54 | ||
55 | #elif CONFIG_KEYPAD == IRIVER_H100_PAD | 55 | #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ |
56 | (CONFIG_KEYPAD == IRIVER_H300_PAD) | ||
56 | #define CHC_QUIT BUTTON_SELECT | 57 | #define CHC_QUIT BUTTON_SELECT |
57 | #define CHC_STARTSTOP BUTTON_ON | 58 | #define CHC_STARTSTOP BUTTON_ON |
58 | #define CHC_RESET BUTTON_OFF | 59 | #define CHC_RESET BUTTON_OFF |
diff --git a/apps/plugins/chip8.c b/apps/plugins/chip8.c index 0830279671..544ee9f959 100644 --- a/apps/plugins/chip8.c +++ b/apps/plugins/chip8.c | |||
@@ -42,7 +42,8 @@ | |||
42 | #define CHIP8_KEY6 BUTTON_RIGHT | 42 | #define CHIP8_KEY6 BUTTON_RIGHT |
43 | #define CHIP8_KEY8 BUTTON_DOWN | 43 | #define CHIP8_KEY8 BUTTON_DOWN |
44 | 44 | ||
45 | #elif CONFIG_KEYPAD == IRIVER_H100_PAD | 45 | #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ |
46 | (CONFIG_KEYPAD == IRIVER_H300_PAD) | ||
46 | #define CHIP8_KEY2 BUTTON_UP | 47 | #define CHIP8_KEY2 BUTTON_UP |
47 | #define CHIP8_KEY4 BUTTON_LEFT | 48 | #define CHIP8_KEY4 BUTTON_LEFT |
48 | #define CHIP8_KEY5 BUTTON_SELECT | 49 | #define CHIP8_KEY5 BUTTON_SELECT |
diff --git a/apps/plugins/cube.c b/apps/plugins/cube.c index 97bca2dbc4..46fc633ab6 100644 --- a/apps/plugins/cube.c +++ b/apps/plugins/cube.c | |||
@@ -55,7 +55,8 @@ | |||
55 | #define CUBE_HIGHSPEED_PRE BUTTON_MENU | 55 | #define CUBE_HIGHSPEED_PRE BUTTON_MENU |
56 | #define CUBE_HIGHSPEED (BUTTON_MENU | BUTTON_REL) | 56 | #define CUBE_HIGHSPEED (BUTTON_MENU | BUTTON_REL) |
57 | 57 | ||
58 | #elif CONFIG_KEYPAD == IRIVER_H100_PAD | 58 | #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ |
59 | (CONFIG_KEYPAD == IRIVER_H300_PAD) | ||
59 | #define CUBE_QUIT (BUTTON_OFF | BUTTON_REL) | 60 | #define CUBE_QUIT (BUTTON_OFF | BUTTON_REL) |
60 | #define CUBE_X_INC BUTTON_RIGHT | 61 | #define CUBE_X_INC BUTTON_RIGHT |
61 | #define CUBE_X_DEC BUTTON_LEFT | 62 | #define CUBE_X_DEC BUTTON_LEFT |
diff --git a/apps/plugins/databox/databox.c b/apps/plugins/databox/databox.c index 4e3722b671..7663a1ec82 100644 --- a/apps/plugins/databox/databox.c +++ b/apps/plugins/databox/databox.c | |||
@@ -19,7 +19,8 @@ | |||
19 | #include "databox.h" | 19 | #include "databox.h" |
20 | 20 | ||
21 | /* variable button definitions */ | 21 | /* variable button definitions */ |
22 | #if CONFIG_KEYPAD == IRIVER_H100_PAD | 22 | #if (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ |
23 | (CONFIG_KEYPAD == IRIVER_H300_PAD) | ||
23 | #define DBX_SELECT BUTTON_SELECT | 24 | #define DBX_SELECT BUTTON_SELECT |
24 | #define DBX_STOP BUTTON_OFF | 25 | #define DBX_STOP BUTTON_OFF |
25 | #elif CONFIG_KEYPAD == RECORDER_PAD | 26 | #elif CONFIG_KEYPAD == RECORDER_PAD |
diff --git a/apps/plugins/flipit.c b/apps/plugins/flipit.c index d6774fc968..d8d8eeb2ec 100644 --- a/apps/plugins/flipit.c +++ b/apps/plugins/flipit.c | |||
@@ -35,7 +35,8 @@ | |||
35 | #define FLIPIT_TOGGLE_PRE BUTTON_MENU | 35 | #define FLIPIT_TOGGLE_PRE BUTTON_MENU |
36 | #define FLIPIT_TOGGLE (BUTTON_MENU | BUTTON_REL) | 36 | #define FLIPIT_TOGGLE (BUTTON_MENU | BUTTON_REL) |
37 | 37 | ||
38 | #elif CONFIG_KEYPAD == IRIVER_H100_PAD | 38 | #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ |
39 | (CONFIG_KEYPAD == IRIVER_H300_PAD) | ||
39 | #define FLIPIT_QUIT BUTTON_OFF | 40 | #define FLIPIT_QUIT BUTTON_OFF |
40 | #define FLIPIT_SHUFFLE BUTTON_MODE | 41 | #define FLIPIT_SHUFFLE BUTTON_MODE |
41 | #define FLIPIT_SOLVE BUTTON_ON | 42 | #define FLIPIT_SOLVE BUTTON_ON |
diff --git a/apps/plugins/logo.c b/apps/plugins/logo.c index abe4e0bc3b..ba3c86c9f2 100644 --- a/apps/plugins/logo.c +++ b/apps/plugins/logo.c | |||
@@ -190,7 +190,8 @@ const unsigned char rockbox16x7[] = { | |||
190 | #endif | 190 | #endif |
191 | 191 | ||
192 | #ifdef CONFIG_REMOTE_KEYPAD | 192 | #ifdef CONFIG_REMOTE_KEYPAD |
193 | #if CONFIG_REMOTE_KEYPAD == H100_REMOTE | 193 | #if (CONFIG_REMOTE_KEYPAD == H100_REMOTE) || \ |
194 | (CONFIG_REMOTE_KEYPAD == H300_REMOTE) | ||
194 | #define LP_R_QUIT BUTTON_RC_STOP | 195 | #define LP_R_QUIT BUTTON_RC_STOP |
195 | #define LP_R_DEC_X BUTTON_RC_REW | 196 | #define LP_R_DEC_X BUTTON_RC_REW |
196 | #define LP_R_INC_X BUTTON_RC_FF | 197 | #define LP_R_INC_X BUTTON_RC_FF |
diff --git a/apps/plugins/minesweeper.c b/apps/plugins/minesweeper.c index 18b57c42f2..907aaf71b3 100644 --- a/apps/plugins/minesweeper.c +++ b/apps/plugins/minesweeper.c | |||
@@ -57,7 +57,8 @@ use F3 to see how many mines are left (supposing all your flags are correct) | |||
57 | #define MINESWP_DISCOVER (BUTTON_MENU | BUTTON_REPEAT) | 57 | #define MINESWP_DISCOVER (BUTTON_MENU | BUTTON_REPEAT) |
58 | #define MINESWP_INFO (BUTTON_MENU | BUTTON_OFF) | 58 | #define MINESWP_INFO (BUTTON_MENU | BUTTON_OFF) |
59 | 59 | ||
60 | #elif CONFIG_KEYPAD == IRIVER_H100_PAD | 60 | #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ |
61 | (CONFIG_KEYPAD == IRIVER_H300_PAD) | ||
61 | #define MINESWP_QUIT BUTTON_OFF | 62 | #define MINESWP_QUIT BUTTON_OFF |
62 | #define MINESWP_START BUTTON_SELECT | 63 | #define MINESWP_START BUTTON_SELECT |
63 | #define MINESWP_TOGGLE BUTTON_SELECT | 64 | #define MINESWP_TOGGLE BUTTON_SELECT |
diff --git a/apps/plugins/mosaique.c b/apps/plugins/mosaique.c index 3d0bfb816a..87ff3a4fdc 100644 --- a/apps/plugins/mosaique.c +++ b/apps/plugins/mosaique.c | |||
@@ -43,7 +43,8 @@ | |||
43 | #define MOSAIQUE_SPEED BUTTON_MENU | 43 | #define MOSAIQUE_SPEED BUTTON_MENU |
44 | #define MOSAIQUE_RESTART BUTTON_RIGHT | 44 | #define MOSAIQUE_RESTART BUTTON_RIGHT |
45 | 45 | ||
46 | #elif CONFIG_KEYPAD == IRIVER_H100_PAD | 46 | #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ |
47 | (CONFIG_KEYPAD == IRIVER_H300_PAD) | ||
47 | #define MOSAIQUE_QUIT BUTTON_OFF | 48 | #define MOSAIQUE_QUIT BUTTON_OFF |
48 | #define MOSAIQUE_SPEED BUTTON_MODE | 49 | #define MOSAIQUE_SPEED BUTTON_MODE |
49 | #define MOSAIQUE_RESTART BUTTON_ON | 50 | #define MOSAIQUE_RESTART BUTTON_ON |
diff --git a/apps/plugins/pong.c b/apps/plugins/pong.c index 438bfbbc4e..34aea07441 100644 --- a/apps/plugins/pong.c +++ b/apps/plugins/pong.c | |||
@@ -48,7 +48,8 @@ | |||
48 | #define PONG_RIGHT_UP BUTTON_UP | 48 | #define PONG_RIGHT_UP BUTTON_UP |
49 | #define PONG_RIGHT_DOWN BUTTON_DOWN | 49 | #define PONG_RIGHT_DOWN BUTTON_DOWN |
50 | 50 | ||
51 | #elif CONFIG_KEYPAD == IRIVER_H100_PAD | 51 | #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ |
52 | (CONFIG_KEYPAD == IRIVER_H300_PAD) | ||
52 | #define PONG_QUIT BUTTON_OFF | 53 | #define PONG_QUIT BUTTON_OFF |
53 | #define PONG_LEFT_UP BUTTON_UP | 54 | #define PONG_LEFT_UP BUTTON_UP |
54 | #define PONG_LEFT_DOWN BUTTON_DOWN | 55 | #define PONG_LEFT_DOWN BUTTON_DOWN |
diff --git a/apps/plugins/rockboy/sys_rockbox.c b/apps/plugins/rockboy/sys_rockbox.c index 1b0bed8b81..0d4426987a 100644 --- a/apps/plugins/rockboy/sys_rockbox.c +++ b/apps/plugins/rockboy/sys_rockbox.c | |||
@@ -55,7 +55,8 @@ void joy_close(void) | |||
55 | { | 55 | { |
56 | } | 56 | } |
57 | 57 | ||
58 | #if CONFIG_KEYPAD == IRIVER_H100_PAD | 58 | #if (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ |
59 | (CONFIG_KEYPAD == IRIVER_H300_PAD) | ||
59 | #define ROCKBOY_PAD_A BUTTON_ON | 60 | #define ROCKBOY_PAD_A BUTTON_ON |
60 | #define ROCKBOY_PAD_B BUTTON_OFF | 61 | #define ROCKBOY_PAD_B BUTTON_OFF |
61 | #define ROCKBOY_PAD_START BUTTON_REC | 62 | #define ROCKBOY_PAD_START BUTTON_REC |
diff --git a/apps/plugins/sliding_puzzle.c b/apps/plugins/sliding_puzzle.c index e222995e01..3b9fe01bc8 100644 --- a/apps/plugins/sliding_puzzle.c +++ b/apps/plugins/sliding_puzzle.c | |||
@@ -31,7 +31,8 @@ | |||
31 | #define PUZZLE_SHUFFLE (BUTTON_MENU | BUTTON_REPEAT) | 31 | #define PUZZLE_SHUFFLE (BUTTON_MENU | BUTTON_REPEAT) |
32 | #define PUZZLE_PICTURE (BUTTON_MENU | BUTTON_REL) | 32 | #define PUZZLE_PICTURE (BUTTON_MENU | BUTTON_REL) |
33 | 33 | ||
34 | #elif CONFIG_KEYPAD == IRIVER_H100_PAD | 34 | #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ |
35 | (CONFIG_KEYPAD == IRIVER_H300_PAD) | ||
35 | #define PUZZLE_QUIT BUTTON_OFF | 36 | #define PUZZLE_QUIT BUTTON_OFF |
36 | #define PUZZLE_SHUFFLE BUTTON_SELECT | 37 | #define PUZZLE_SHUFFLE BUTTON_SELECT |
37 | #define PUZZLE_PICTURE BUTTON_ON | 38 | #define PUZZLE_PICTURE BUTTON_ON |
diff --git a/apps/plugins/snake.c b/apps/plugins/snake.c index e13fdf560b..693aabb44d 100644 --- a/apps/plugins/snake.c +++ b/apps/plugins/snake.c | |||
@@ -42,7 +42,8 @@ dir is the current direction of the snake - 0=up, 1=right, 2=down, 3=left; | |||
42 | #define SNAKE_QUIT BUTTON_OFF | 42 | #define SNAKE_QUIT BUTTON_OFF |
43 | #define SNAKE_PLAYPAUSE BUTTON_MENU | 43 | #define SNAKE_PLAYPAUSE BUTTON_MENU |
44 | 44 | ||
45 | #elif CONFIG_KEYPAD == IRIVER_H100_PAD | 45 | #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ |
46 | (CONFIG_KEYPAD == IRIVER_H300_PAD) | ||
46 | #define SNAKE_QUIT BUTTON_OFF | 47 | #define SNAKE_QUIT BUTTON_OFF |
47 | #define SNAKE_PLAYPAUSE BUTTON_ON | 48 | #define SNAKE_PLAYPAUSE BUTTON_ON |
48 | 49 | ||
diff --git a/apps/plugins/snake2.c b/apps/plugins/snake2.c index fdc317b7ef..eb02d22cfc 100644 --- a/apps/plugins/snake2.c +++ b/apps/plugins/snake2.c | |||
@@ -74,7 +74,8 @@ Head and Tail are stored | |||
74 | #define SNAKE2_SELECT_TYPE BUTTON_RIGHT | 74 | #define SNAKE2_SELECT_TYPE BUTTON_RIGHT |
75 | #define SNAKE2_PLAYPAUSE BUTTON_MENU | 75 | #define SNAKE2_PLAYPAUSE BUTTON_MENU |
76 | 76 | ||
77 | #elif CONFIG_KEYPAD == IRIVER_H100_PAD | 77 | #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ |
78 | (CONFIG_KEYPAD == IRIVER_H300_PAD) | ||
78 | #define SNAKE2_QUIT BUTTON_OFF | 79 | #define SNAKE2_QUIT BUTTON_OFF |
79 | #define SNAKE2_LEVEL_UP BUTTON_UP | 80 | #define SNAKE2_LEVEL_UP BUTTON_UP |
80 | #define SNAKE2_LEVEL_UP2 BUTTON_RIGHT | 81 | #define SNAKE2_LEVEL_UP2 BUTTON_RIGHT |
diff --git a/apps/plugins/sokoban.c b/apps/plugins/sokoban.c index f7dc165a13..fcadc93897 100644 --- a/apps/plugins/sokoban.c +++ b/apps/plugins/sokoban.c | |||
@@ -49,7 +49,8 @@ | |||
49 | #define SOKOBAN_LEVEL_DOWN (BUTTON_MENU | BUTTON_LEFT) | 49 | #define SOKOBAN_LEVEL_DOWN (BUTTON_MENU | BUTTON_LEFT) |
50 | #define SOKOBAN_LEVEL_REPEAT (BUTTON_MENU | BUTTON_UP) | 50 | #define SOKOBAN_LEVEL_REPEAT (BUTTON_MENU | BUTTON_UP) |
51 | 51 | ||
52 | #elif CONFIG_KEYPAD == IRIVER_H100_PAD | 52 | #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ |
53 | (CONFIG_KEYPAD == IRIVER_H300_PAD) | ||
53 | #define SOKOBAN_QUIT BUTTON_OFF | 54 | #define SOKOBAN_QUIT BUTTON_OFF |
54 | #define SOKOBAN_UNDO BUTTON_ON | 55 | #define SOKOBAN_UNDO BUTTON_ON |
55 | #define SOKOBAN_LEVEL_UP BUTTON_MODE | 56 | #define SOKOBAN_LEVEL_UP BUTTON_MODE |
diff --git a/apps/plugins/solitaire.c b/apps/plugins/solitaire.c index fca36aad82..880b5a0ad9 100644 --- a/apps/plugins/solitaire.c +++ b/apps/plugins/solitaire.c | |||
@@ -85,7 +85,8 @@ static struct plugin_api* rb; | |||
85 | #define SOL_MENU_RUN BUTTON_RIGHT | 85 | #define SOL_MENU_RUN BUTTON_RIGHT |
86 | #define SOL_MENU_INFO BUTTON_MENU | 86 | #define SOL_MENU_INFO BUTTON_MENU |
87 | 87 | ||
88 | #elif CONFIG_KEYPAD == IRIVER_H100_PAD | 88 | #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ |
89 | (CONFIG_KEYPAD == IRIVER_H300_PAD) | ||
89 | #define SOL_QUIT BUTTON_OFF | 90 | #define SOL_QUIT BUTTON_OFF |
90 | #define SOL_UP BUTTON_UP | 91 | #define SOL_UP BUTTON_UP |
91 | #define SOL_DOWN BUTTON_DOWN | 92 | #define SOL_DOWN BUTTON_DOWN |
@@ -124,7 +125,8 @@ static struct plugin_api* rb; | |||
124 | #define HELP_SOL_CUR2STACK "RIGHT..: Put the card under the cursor on one of the 4 final color stacks." | 125 | #define HELP_SOL_CUR2STACK "RIGHT..: Put the card under the cursor on one of the 4 final color stacks." |
125 | #define HELP_SOL_REM2STACK "UP..: Put the card on top of the remains' stack on one of the 4 final color stacks." | 126 | #define HELP_SOL_REM2STACK "UP..: Put the card on top of the remains' stack on one of the 4 final color stacks." |
126 | 127 | ||
127 | #elif CONFIG_KEYPAD == IRIVER_H100_PAD | 128 | #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ |
129 | (CONFIG_KEYPAD == IRIVER_H300_PAD) | ||
128 | #define HELP_SOL_MOVE "SELECT: Select cards, Move cards, reveal hidden cards ..." | 130 | #define HELP_SOL_MOVE "SELECT: Select cards, Move cards, reveal hidden cards ..." |
129 | #define HELP_SOL_DRAW "REC: Un-select a card if it was selected. Else, draw 3 new cards out of the remains' stack." | 131 | #define HELP_SOL_DRAW "REC: Un-select a card if it was selected. Else, draw 3 new cards out of the remains' stack." |
130 | #define HELP_SOL_REM2CUR "PLAY+LEFT: Put the card on top of the remains' stack on top of the cursor." | 132 | #define HELP_SOL_REM2CUR "PLAY+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 acf34275be..9b2e0bb010 100644 --- a/apps/plugins/star.c +++ b/apps/plugins/star.c | |||
@@ -80,7 +80,8 @@ | |||
80 | #define STAR_LEVEL_REPEAT (BUTTON_MENU | BUTTON_UP) | 80 | #define STAR_LEVEL_REPEAT (BUTTON_MENU | BUTTON_UP) |
81 | #define STAR_MENU_RUN BUTTON_RIGHT | 81 | #define STAR_MENU_RUN BUTTON_RIGHT |
82 | 82 | ||
83 | #elif CONFIG_KEYPAD == IRIVER_H100_PAD | 83 | #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ |
84 | (CONFIG_KEYPAD == IRIVER_H300_PAD) | ||
84 | #define STAR_QUIT BUTTON_OFF | 85 | #define STAR_QUIT BUTTON_OFF |
85 | #define STAR_TOGGLE_CONTROL_PRE BUTTON_MODE | 86 | #define STAR_TOGGLE_CONTROL_PRE BUTTON_MODE |
86 | #define STAR_TOGGLE_CONTROL (BUTTON_MODE | BUTTON_REL) | 87 | #define STAR_TOGGLE_CONTROL (BUTTON_MODE | BUTTON_REL) |
diff --git a/apps/plugins/stopwatch.c b/apps/plugins/stopwatch.c index 7f0bcd699c..05e57905ac 100644 --- a/apps/plugins/stopwatch.c +++ b/apps/plugins/stopwatch.c | |||
@@ -53,7 +53,8 @@ | |||
53 | #define STOPWATCH_LAP_TIMER BUTTON_ON | 53 | #define STOPWATCH_LAP_TIMER BUTTON_ON |
54 | #define STOPWATCH_SCROLL_UP BUTTON_RIGHT | 54 | #define STOPWATCH_SCROLL_UP BUTTON_RIGHT |
55 | #define STOPWATCH_SCROLL_DOWN BUTTON_LEFT | 55 | #define STOPWATCH_SCROLL_DOWN BUTTON_LEFT |
56 | #elif CONFIG_KEYPAD == IRIVER_H100_PAD | 56 | #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ |
57 | (CONFIG_KEYPAD == IRIVER_H300_PAD) | ||
57 | #define STOPWATCH_QUIT BUTTON_OFF | 58 | #define STOPWATCH_QUIT BUTTON_OFF |
58 | #define STOPWATCH_START_STOP BUTTON_SELECT | 59 | #define STOPWATCH_START_STOP BUTTON_SELECT |
59 | #define STOPWATCH_RESET_TIMER BUTTON_DOWN | 60 | #define STOPWATCH_RESET_TIMER BUTTON_DOWN |
diff --git a/apps/plugins/viewer.c b/apps/plugins/viewer.c index b36d025b56..8539cac1eb 100644 --- a/apps/plugins/viewer.c +++ b/apps/plugins/viewer.c | |||
@@ -101,8 +101,9 @@ | |||
101 | #define VIEWER_MODE_LINE (BUTTON_ON | BUTTON_MENU | BUTTON_RIGHT) | 101 | #define VIEWER_MODE_LINE (BUTTON_ON | BUTTON_MENU | BUTTON_RIGHT) |
102 | #define VIEWER_MODE_WIDTH (BUTTON_ON | BUTTON_RIGHT) | 102 | #define VIEWER_MODE_WIDTH (BUTTON_ON | BUTTON_RIGHT) |
103 | 103 | ||
104 | /* iRiver H1x0 keys */ | 104 | /* iRiver H1x0 && H3x0 keys */ |
105 | #elif CONFIG_KEYPAD == IRIVER_H100_PAD | 105 | #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ |
106 | (CONFIG_KEYPAD == IRIVER_H300_PAD) | ||
106 | #define VIEWER_QUIT BUTTON_OFF | 107 | #define VIEWER_QUIT BUTTON_OFF |
107 | #define VIEWER_PAGE_UP BUTTON_UP | 108 | #define VIEWER_PAGE_UP BUTTON_UP |
108 | #define VIEWER_PAGE_DOWN BUTTON_DOWN | 109 | #define VIEWER_PAGE_DOWN BUTTON_DOWN |
diff --git a/apps/recorder/keyboard.c b/apps/recorder/keyboard.c index bbca117bdb..8c4d628ba2 100644 --- a/apps/recorder/keyboard.c +++ b/apps/recorder/keyboard.c | |||
@@ -35,7 +35,8 @@ | |||
35 | #define KEYBOARD_PAGES 3 | 35 | #define KEYBOARD_PAGES 3 |
36 | 36 | ||
37 | 37 | ||
38 | #if CONFIG_KEYPAD == IRIVER_H100_PAD | 38 | #if (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ |
39 | (CONFIG_KEYPAD == IRIVER_H300_PAD) | ||
39 | #define KBD_CURSOR_RIGHT (BUTTON_ON | BUTTON_RIGHT) | 40 | #define KBD_CURSOR_RIGHT (BUTTON_ON | BUTTON_RIGHT) |
40 | #define KBD_CURSOR_LEFT (BUTTON_ON | BUTTON_LEFT) | 41 | #define KBD_CURSOR_LEFT (BUTTON_ON | BUTTON_LEFT) |
41 | #define KBD_SELECT BUTTON_SELECT | 42 | #define KBD_SELECT BUTTON_SELECT |
diff --git a/apps/tree.h b/apps/tree.h index a105004d73..41ef0e527f 100644 --- a/apps/tree.h +++ b/apps/tree.h | |||
@@ -23,7 +23,8 @@ | |||
23 | #include <applimits.h> | 23 | #include <applimits.h> |
24 | #include <file.h> | 24 | #include <file.h> |
25 | 25 | ||
26 | #if CONFIG_KEYPAD == IRIVER_H100_PAD | 26 | #if (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ |
27 | (CONFIG_KEYPAD == IRIVER_H300_PAD) | ||
27 | #define TREE_NEXT BUTTON_DOWN | 28 | #define TREE_NEXT BUTTON_DOWN |
28 | #define TREE_PREV BUTTON_UP | 29 | #define TREE_PREV BUTTON_UP |
29 | #define TREE_EXIT BUTTON_LEFT | 30 | #define TREE_EXIT BUTTON_LEFT |
diff --git a/apps/wps.h b/apps/wps.h index c9c872d35e..1779ce425d 100644 --- a/apps/wps.h +++ b/apps/wps.h | |||
@@ -22,7 +22,8 @@ | |||
22 | #include "playlist.h" | 22 | #include "playlist.h" |
23 | 23 | ||
24 | /* button definitions */ | 24 | /* button definitions */ |
25 | #if CONFIG_KEYPAD == IRIVER_H100_PAD | 25 | #if (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ |
26 | (CONFIG_KEYPAD == IRIVER_H300_PAD) | ||
26 | #define WPS_NEXT (BUTTON_RIGHT | BUTTON_REL) | 27 | #define WPS_NEXT (BUTTON_RIGHT | BUTTON_REL) |
27 | #define WPS_NEXT_PRE BUTTON_RIGHT | 28 | #define WPS_NEXT_PRE BUTTON_RIGHT |
28 | #define WPS_PREV (BUTTON_LEFT | BUTTON_REL) | 29 | #define WPS_PREV (BUTTON_LEFT | BUTTON_REL) |
diff --git a/docs/CREDITS b/docs/CREDITS index 6e04addf01..f785066414 100644 --- a/docs/CREDITS +++ b/docs/CREDITS | |||
@@ -122,3 +122,4 @@ Dave Wiard | |||
122 | Pieter Bos | 122 | Pieter Bos |
123 | Konstantin Isakov | 123 | Konstantin Isakov |
124 | Bryan Vandyke | 124 | Bryan Vandyke |
125 | Hristo Kovachev | ||
diff --git a/firmware/export/button.h b/firmware/export/button.h index ddacb5a49d..e1caa52b54 100644 --- a/firmware/export/button.h +++ b/firmware/export/button.h | |||
@@ -93,7 +93,7 @@ bool remote_button_hold(void); | |||
93 | 93 | ||
94 | #define BUTTON_RC_ON (BUTTON_REMOTE | 0x00010000) | 94 | #define BUTTON_RC_ON (BUTTON_REMOTE | 0x00010000) |
95 | #define BUTTON_RC_STOP (BUTTON_REMOTE | 0x00020000) | 95 | #define BUTTON_RC_STOP (BUTTON_REMOTE | 0x00020000) |
96 | #define BUTTON_RC_VOL (BUTTON_REMOTE | 0x00040000) | 96 | #define BUTTON_RC_MODE (BUTTON_REMOTE | 0x00040000) |
97 | #define BUTTON_RC_BITRATE (BUTTON_REMOTE | 0x00200000) | 97 | #define BUTTON_RC_BITRATE (BUTTON_REMOTE | 0x00200000) |
98 | #define BUTTON_RC_REC (BUTTON_REMOTE | 0x00400000) | 98 | #define BUTTON_RC_REC (BUTTON_REMOTE | 0x00400000) |
99 | #define BUTTON_RC_SOURCE (BUTTON_REMOTE | 0x00800000) | 99 | #define BUTTON_RC_SOURCE (BUTTON_REMOTE | 0x00800000) |