diff options
author | Sebastian Leonhardt <sebastian.leonhardt@web.de> | 2014-05-22 23:34:52 +0200 |
---|---|---|
committer | Szymon Dziok <b0hoon@o2.pl> | 2014-05-24 00:50:11 +0200 |
commit | 7f7aee3f2457818547ec065ddd65bea0b3a68983 (patch) | |
tree | 84cfadca3187bf65d569cb5456c8d78245823b23 | |
parent | 4b181b4517fad106ab1ffbdab01adac9cf8e4bee (diff) | |
download | rockbox-7f7aee3f2457818547ec065ddd65bea0b3a68983.tar.gz rockbox-7f7aee3f2457818547ec065ddd65bea0b3a68983.zip |
Separate keymaps for YH-820 and YH-920/925
Although both players basically have the same keys, the
differences in the layout is rather big, so I think both
deserve their own keymaps.
(On the yh820 the FFWD/PLAY/REW buttons are located above the
direction keys, on the yh920 at the side of the player.
Furthermore the yh920/925 has a REC switch, whereas
yh820 has a push button.)
Change-Id: I0e62a1b101c387646c0bdb07ea142d9d2430ca15
Reviewed-on: http://gerrit.rockbox.org/814
Reviewed-by: Szymon Dziok <b0hoon@o2.pl>
62 files changed, 123 insertions, 63 deletions
diff --git a/apps/SOURCES b/apps/SOURCES index f0c9462faf..1aa4955205 100644 --- a/apps/SOURCES +++ b/apps/SOURCES | |||
@@ -266,7 +266,8 @@ keymaps/keymap-ondavx747.c | |||
266 | keymaps/keymap-ondavx777.c | 266 | keymaps/keymap-ondavx777.c |
267 | #elif CONFIG_KEYPAD == ONDAVX767_PAD | 267 | #elif CONFIG_KEYPAD == ONDAVX767_PAD |
268 | keymaps/keymap-ondavx767.c | 268 | keymaps/keymap-ondavx767.c |
269 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | 269 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) \ |
270 | || (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | ||
270 | keymaps/keymap-yh8xx_yh9xx.c | 271 | keymaps/keymap-yh8xx_yh9xx.c |
271 | #elif CONFIG_KEYPAD == MINI2440_PAD | 272 | #elif CONFIG_KEYPAD == MINI2440_PAD |
272 | keymaps/keymap-mini2440.c | 273 | keymaps/keymap-mini2440.c |
diff --git a/apps/plugins/battery_bench.c b/apps/plugins/battery_bench.c index 174a589d8f..7ab094df7e 100644 --- a/apps/plugins/battery_bench.c +++ b/apps/plugins/battery_bench.c | |||
@@ -202,7 +202,8 @@ | |||
202 | #define BATTERY_OFF BUTTON_POWER | 202 | #define BATTERY_OFF BUTTON_POWER |
203 | #define BATTERY_OFF_TXT "POWER" | 203 | #define BATTERY_OFF_TXT "POWER" |
204 | 204 | ||
205 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | 205 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ |
206 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | ||
206 | 207 | ||
207 | #define BATTERY_ON BUTTON_LEFT | 208 | #define BATTERY_ON BUTTON_LEFT |
208 | #define BATTERY_OFF BUTTON_RIGHT | 209 | #define BATTERY_OFF BUTTON_RIGHT |
diff --git a/apps/plugins/beatbox/beatbox.c b/apps/plugins/beatbox/beatbox.c index bbe02de6fe..4001e51e23 100644 --- a/apps/plugins/beatbox/beatbox.c +++ b/apps/plugins/beatbox/beatbox.c | |||
@@ -99,7 +99,8 @@ | |||
99 | #define BTN_UP BUTTON_UP | 99 | #define BTN_UP BUTTON_UP |
100 | #define BTN_DOWN BUTTON_DOWN | 100 | #define BTN_DOWN BUTTON_DOWN |
101 | 101 | ||
102 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | 102 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ |
103 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | ||
103 | #define BTN_QUIT BUTTON_PLAY | 104 | #define BTN_QUIT BUTTON_PLAY |
104 | #define BTN_RIGHT BUTTON_RIGHT | 105 | #define BTN_RIGHT BUTTON_RIGHT |
105 | #define BTN_UP BUTTON_UP | 106 | #define BTN_UP BUTTON_UP |
diff --git a/apps/plugins/blackjack.c b/apps/plugins/blackjack.c index adb92e1986..b54d40a717 100644 --- a/apps/plugins/blackjack.c +++ b/apps/plugins/blackjack.c | |||
@@ -393,7 +393,8 @@ enum { | |||
393 | #define BJACK_QUIT_NAME "POWER" | 393 | #define BJACK_QUIT_NAME "POWER" |
394 | #define BJACK_QUIT BUTTON_POWER | 394 | #define BJACK_QUIT BUTTON_POWER |
395 | 395 | ||
396 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | 396 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ |
397 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | ||
397 | #define BJACK_SELECT_NAME "PLAY" | 398 | #define BJACK_SELECT_NAME "PLAY" |
398 | #define BJACK_STAY_NAME "RECORD" | 399 | #define BJACK_STAY_NAME "RECORD" |
399 | #define BJACK_QUIT_NAME "REW" | 400 | #define BJACK_QUIT_NAME "REW" |
diff --git a/apps/plugins/brickmania.c b/apps/plugins/brickmania.c index 369af78910..1574fe7119 100644 --- a/apps/plugins/brickmania.c +++ b/apps/plugins/brickmania.c | |||
@@ -243,7 +243,8 @@ CONFIG_KEYPAD == SANSA_CONNECT_PAD | |||
243 | #elif CONFIG_KEYPAD == MROBE500_PAD | 243 | #elif CONFIG_KEYPAD == MROBE500_PAD |
244 | #define QUIT BUTTON_POWER | 244 | #define QUIT BUTTON_POWER |
245 | 245 | ||
246 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | 246 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ |
247 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | ||
247 | #define QUIT BUTTON_FFWD | 248 | #define QUIT BUTTON_FFWD |
248 | #define SELECT BUTTON_PLAY | 249 | #define SELECT BUTTON_PLAY |
249 | #define LEFT BUTTON_LEFT | 250 | #define LEFT BUTTON_LEFT |
diff --git a/apps/plugins/bubbles.c b/apps/plugins/bubbles.c index e796afd672..539380859e 100644 --- a/apps/plugins/bubbles.c +++ b/apps/plugins/bubbles.c | |||
@@ -82,7 +82,8 @@ enum { | |||
82 | #define BUBBLES_QUIT2 PLA_CANCEL | 82 | #define BUBBLES_QUIT2 PLA_CANCEL |
83 | 83 | ||
84 | /* these are better off shooting with up */ | 84 | /* these are better off shooting with up */ |
85 | #if (CONFIG_KEYPAD == SAMSUNG_YH_PAD) \ | 85 | #if (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) \ |
86 | || (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) \ | ||
86 | || (CONFIG_KEYPAD == ONDIO_PAD) \ | 87 | || (CONFIG_KEYPAD == ONDIO_PAD) \ |
87 | || (CONFIG_KEYPAD == IRIVER_H10_PAD) | 88 | || (CONFIG_KEYPAD == IRIVER_H10_PAD) |
88 | #define SHOOT_WITH_UP | 89 | #define SHOOT_WITH_UP |
diff --git a/apps/plugins/calculator.c b/apps/plugins/calculator.c index 77b00921e1..327ef69b45 100644 --- a/apps/plugins/calculator.c +++ b/apps/plugins/calculator.c | |||
@@ -380,7 +380,8 @@ F3: equal to "=" | |||
380 | #elif CONFIG_KEYPAD == MROBE500_PAD | 380 | #elif CONFIG_KEYPAD == MROBE500_PAD |
381 | #define CALCULATOR_QUIT BUTTON_POWER | 381 | #define CALCULATOR_QUIT BUTTON_POWER |
382 | 382 | ||
383 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | 383 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ |
384 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | ||
384 | 385 | ||
385 | #define CALCULATOR_LEFT BUTTON_LEFT | 386 | #define CALCULATOR_LEFT BUTTON_LEFT |
386 | #define CALCULATOR_RIGHT BUTTON_RIGHT | 387 | #define CALCULATOR_RIGHT BUTTON_RIGHT |
diff --git a/apps/plugins/calendar.c b/apps/plugins/calendar.c index 8e178c06c3..8e43823bb6 100644 --- a/apps/plugins/calendar.c +++ b/apps/plugins/calendar.c | |||
@@ -258,7 +258,8 @@ | |||
258 | #elif CONFIG_KEYPAD == MROBE500_PAD | 258 | #elif CONFIG_KEYPAD == MROBE500_PAD |
259 | #define CALENDAR_QUIT BUTTON_POWER | 259 | #define CALENDAR_QUIT BUTTON_POWER |
260 | 260 | ||
261 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | 261 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ |
262 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | ||
262 | #define CALENDAR_QUIT BUTTON_REC | 263 | #define CALENDAR_QUIT BUTTON_REC |
263 | #define CALENDAR_SELECT BUTTON_PLAY | 264 | #define CALENDAR_SELECT BUTTON_PLAY |
264 | #define CALENDAR_NEXT_WEEK BUTTON_DOWN | 265 | #define CALENDAR_NEXT_WEEK BUTTON_DOWN |
diff --git a/apps/plugins/chessbox/chessbox_pgn.h b/apps/plugins/chessbox/chessbox_pgn.h index 56289025d7..3cc136e566 100644 --- a/apps/plugins/chessbox/chessbox_pgn.h +++ b/apps/plugins/chessbox/chessbox_pgn.h | |||
@@ -366,7 +366,8 @@ | |||
366 | #elif CONFIG_KEYPAD == ONDAVX777_PAD | 366 | #elif CONFIG_KEYPAD == ONDAVX777_PAD |
367 | #define CB_MENU BUTTON_POWER | 367 | #define CB_MENU BUTTON_POWER |
368 | 368 | ||
369 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | 369 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ |
370 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | ||
370 | #define CB_SELECT (BUTTON_FFWD|BUTTON_RIGHT) | 371 | #define CB_SELECT (BUTTON_FFWD|BUTTON_RIGHT) |
371 | #define CB_UP BUTTON_UP | 372 | #define CB_UP BUTTON_UP |
372 | #define CB_DOWN BUTTON_DOWN | 373 | #define CB_DOWN BUTTON_DOWN |
diff --git a/apps/plugins/chessclock.c b/apps/plugins/chessclock.c index 7323a70705..a58dc6bbce 100644 --- a/apps/plugins/chessclock.c +++ b/apps/plugins/chessclock.c | |||
@@ -276,7 +276,8 @@ | |||
276 | #define CHC_QUIT BUTTON_POWER | 276 | #define CHC_QUIT BUTTON_POWER |
277 | #define CHC_SETTINGS_CANCEL BUTTON_POWER | 277 | #define CHC_SETTINGS_CANCEL BUTTON_POWER |
278 | 278 | ||
279 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | 279 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ |
280 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | ||
280 | #define CHC_QUIT BUTTON_REC | 281 | #define CHC_QUIT BUTTON_REC |
281 | #define CHC_STARTSTOP BUTTON_PLAY | 282 | #define CHC_STARTSTOP BUTTON_PLAY |
282 | #define CHC_RESET BUTTON_FFWD | 283 | #define CHC_RESET BUTTON_FFWD |
diff --git a/apps/plugins/chip8.c b/apps/plugins/chip8.c index 6b42078817..63c9b7fa06 100644 --- a/apps/plugins/chip8.c +++ b/apps/plugins/chip8.c | |||
@@ -1143,7 +1143,8 @@ CONFIG_KEYPAD == ONDAVX777_PAD || \ | |||
1143 | CONFIG_KEYPAD == MROBE500_PAD | 1143 | CONFIG_KEYPAD == MROBE500_PAD |
1144 | #define CHIP8_OFF BUTTON_POWER | 1144 | #define CHIP8_OFF BUTTON_POWER |
1145 | 1145 | ||
1146 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | 1146 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ |
1147 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | ||
1147 | #define CHIP8_OFF BUTTON_REC | 1148 | #define CHIP8_OFF BUTTON_REC |
1148 | #define CHIP8_KEY2 BUTTON_UP | 1149 | #define CHIP8_KEY2 BUTTON_UP |
1149 | #define CHIP8_KEY4 BUTTON_LEFT | 1150 | #define CHIP8_KEY4 BUTTON_LEFT |
diff --git a/apps/plugins/chopper.c b/apps/plugins/chopper.c index 92491d859b..db836e5393 100644 --- a/apps/plugins/chopper.c +++ b/apps/plugins/chopper.c | |||
@@ -160,7 +160,8 @@ CONFIG_KEYPAD == ONDAVX777_PAD || \ | |||
160 | CONFIG_KEYPAD == MROBE500_PAD | 160 | CONFIG_KEYPAD == MROBE500_PAD |
161 | #define QUIT BUTTON_POWER | 161 | #define QUIT BUTTON_POWER |
162 | 162 | ||
163 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | 163 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ |
164 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | ||
164 | #define QUIT BUTTON_LEFT | 165 | #define QUIT BUTTON_LEFT |
165 | #define ACTION BUTTON_RIGHT | 166 | #define ACTION BUTTON_RIGHT |
166 | #define ACTIONTEXT "RIGHT" | 167 | #define ACTIONTEXT "RIGHT" |
diff --git a/apps/plugins/clix.c b/apps/plugins/clix.c index f7006b94ce..31951def28 100644 --- a/apps/plugins/clix.c +++ b/apps/plugins/clix.c | |||
@@ -181,7 +181,8 @@ | |||
181 | #elif (CONFIG_KEYPAD == MROBE500_PAD) | 181 | #elif (CONFIG_KEYPAD == MROBE500_PAD) |
182 | #define CLIX_BUTTON_QUIT BUTTON_POWER | 182 | #define CLIX_BUTTON_QUIT BUTTON_POWER |
183 | 183 | ||
184 | #elif (CONFIG_KEYPAD == SAMSUNG_YH_PAD) | 184 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ |
185 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | ||
185 | #define CLIX_BUTTON_QUIT BUTTON_REC | 186 | #define CLIX_BUTTON_QUIT BUTTON_REC |
186 | #define CLIX_BUTTON_LEFT BUTTON_LEFT | 187 | #define CLIX_BUTTON_LEFT BUTTON_LEFT |
187 | #define CLIX_BUTTON_RIGHT BUTTON_RIGHT | 188 | #define CLIX_BUTTON_RIGHT BUTTON_RIGHT |
diff --git a/apps/plugins/cube.c b/apps/plugins/cube.c index 6aaa6fa37b..b75c1f21c8 100644 --- a/apps/plugins/cube.c +++ b/apps/plugins/cube.c | |||
@@ -279,7 +279,8 @@ | |||
279 | #elif CONFIG_KEYPAD == ONDAVX777_PAD | 279 | #elif CONFIG_KEYPAD == ONDAVX777_PAD |
280 | #define CUBE_QUIT BUTTON_POWER | 280 | #define CUBE_QUIT BUTTON_POWER |
281 | 281 | ||
282 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | 282 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ |
283 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | ||
283 | #define CUBE_QUIT BUTTON_REC | 284 | #define CUBE_QUIT BUTTON_REC |
284 | #define CUBE_NEXT BUTTON_RIGHT | 285 | #define CUBE_NEXT BUTTON_RIGHT |
285 | #define CUBE_PREV BUTTON_LEFT | 286 | #define CUBE_PREV BUTTON_LEFT |
diff --git a/apps/plugins/doom/i_video.c b/apps/plugins/doom/i_video.c index 51e2d72723..57803fb57d 100644 --- a/apps/plugins/doom/i_video.c +++ b/apps/plugins/doom/i_video.c | |||
@@ -395,7 +395,8 @@ void I_ShutdownGraphics(void) | |||
395 | #elif CONFIG_KEYPAD == ONDAVX777_PAD | 395 | #elif CONFIG_KEYPAD == ONDAVX777_PAD |
396 | #define DOOMBUTTON_ESC BUTTON_POWER | 396 | #define DOOMBUTTON_ESC BUTTON_POWER |
397 | 397 | ||
398 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | 398 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ |
399 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | ||
399 | #define DOOMBUTTON_UP BUTTON_UP | 400 | #define DOOMBUTTON_UP BUTTON_UP |
400 | #define DOOMBUTTON_DOWN BUTTON_DOWN | 401 | #define DOOMBUTTON_DOWN BUTTON_DOWN |
401 | #define DOOMBUTTON_LEFT BUTTON_LEFT | 402 | #define DOOMBUTTON_LEFT BUTTON_LEFT |
diff --git a/apps/plugins/fft/fft.c b/apps/plugins/fft/fft.c index 466322e34c..e591954664 100644 --- a/apps/plugins/fft/fft.c +++ b/apps/plugins/fft/fft.c | |||
@@ -215,7 +215,8 @@ GREY_INFO_STRUCT | |||
215 | # define FFT_FREQ_SCALE BUTTON_DOWN | 215 | # define FFT_FREQ_SCALE BUTTON_DOWN |
216 | # define FFT_QUIT BUTTON_POWER | 216 | # define FFT_QUIT BUTTON_POWER |
217 | 217 | ||
218 | #elif (CONFIG_KEYPAD == SAMSUNG_YH_PAD) | 218 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ |
219 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | ||
219 | # define FFT_PREV_GRAPH BUTTON_LEFT | 220 | # define FFT_PREV_GRAPH BUTTON_LEFT |
220 | # define FFT_NEXT_GRAPH BUTTON_RIGHT | 221 | # define FFT_NEXT_GRAPH BUTTON_RIGHT |
221 | # define FFT_ORIENTATION BUTTON_UP | 222 | # define FFT_ORIENTATION BUTTON_UP |
diff --git a/apps/plugins/flipit.c b/apps/plugins/flipit.c index 15b887ae7f..056878e7e4 100644 --- a/apps/plugins/flipit.c +++ b/apps/plugins/flipit.c | |||
@@ -322,7 +322,8 @@ | |||
322 | 322 | ||
323 | #define FLIPIT_QUIT BUTTON_POWER | 323 | #define FLIPIT_QUIT BUTTON_POWER |
324 | 324 | ||
325 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | 325 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ |
326 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | ||
326 | 327 | ||
327 | #define FLIPIT_LEFT BUTTON_LEFT | 328 | #define FLIPIT_LEFT BUTTON_LEFT |
328 | #define FLIPIT_RIGHT BUTTON_RIGHT | 329 | #define FLIPIT_RIGHT BUTTON_RIGHT |
diff --git a/apps/plugins/fractals/fractal.h b/apps/plugins/fractals/fractal.h index 4e538d234d..bb47282298 100644 --- a/apps/plugins/fractals/fractal.h +++ b/apps/plugins/fractals/fractal.h | |||
@@ -318,7 +318,8 @@ | |||
318 | #elif CONFIG_KEYPAD == ONDAVX777_PAD | 318 | #elif CONFIG_KEYPAD == ONDAVX777_PAD |
319 | #define FRACTAL_QUIT BUTTON_POWER | 319 | #define FRACTAL_QUIT BUTTON_POWER |
320 | 320 | ||
321 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | 321 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ |
322 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | ||
322 | #define FRACTAL_QUIT BUTTON_REC | 323 | #define FRACTAL_QUIT BUTTON_REC |
323 | #define FRACTAL_UP BUTTON_UP | 324 | #define FRACTAL_UP BUTTON_UP |
324 | #define FRACTAL_DOWN BUTTON_DOWN | 325 | #define FRACTAL_DOWN BUTTON_DOWN |
diff --git a/apps/plugins/goban/goban.h b/apps/plugins/goban/goban.h index 1fc04c9389..d53c6bb5c4 100644 --- a/apps/plugins/goban/goban.h +++ b/apps/plugins/goban/goban.h | |||
@@ -318,7 +318,8 @@ | |||
318 | #define GBN_BUTTON_PLAY BUTTON_MENU | BUTTON_REL | 318 | #define GBN_BUTTON_PLAY BUTTON_MENU | BUTTON_REL |
319 | #define GBN_BUTTON_NAV_MODE BUTTON_OFF | 319 | #define GBN_BUTTON_NAV_MODE BUTTON_OFF |
320 | 320 | ||
321 | #elif (CONFIG_KEYPAD == SAMSUNG_YH_PAD) | 321 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ |
322 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | ||
322 | #define GBN_BUTTON_UP BUTTON_UP | 323 | #define GBN_BUTTON_UP BUTTON_UP |
323 | #define GBN_BUTTON_DOWN BUTTON_DOWN | 324 | #define GBN_BUTTON_DOWN BUTTON_DOWN |
324 | #define GBN_BUTTON_LEFT BUTTON_LEFT | 325 | #define GBN_BUTTON_LEFT BUTTON_LEFT |
diff --git a/apps/plugins/greyscale.c b/apps/plugins/greyscale.c index 42ebbef73b..31cd030f5b 100644 --- a/apps/plugins/greyscale.c +++ b/apps/plugins/greyscale.c | |||
@@ -99,7 +99,8 @@ | |||
99 | #define GREYSCALE_RIGHT BUTTON_RIGHT | 99 | #define GREYSCALE_RIGHT BUTTON_RIGHT |
100 | #define GREYSCALE_OFF BUTTON_POWER | 100 | #define GREYSCALE_OFF BUTTON_POWER |
101 | 101 | ||
102 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | 102 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ |
103 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | ||
103 | #define GREYSCALE_SHIFT BUTTON_FFWD | 104 | #define GREYSCALE_SHIFT BUTTON_FFWD |
104 | #define GREYSCALE_UP BUTTON_UP | 105 | #define GREYSCALE_UP BUTTON_UP |
105 | #define GREYSCALE_DOWN BUTTON_DOWN | 106 | #define GREYSCALE_DOWN BUTTON_DOWN |
diff --git a/apps/plugins/imageviewer/imageviewer_button.h b/apps/plugins/imageviewer/imageviewer_button.h index 03bde20a12..4827ffa038 100644 --- a/apps/plugins/imageviewer/imageviewer_button.h +++ b/apps/plugins/imageviewer/imageviewer_button.h | |||
@@ -314,7 +314,8 @@ | |||
314 | #elif CONFIG_KEYPAD == ONDAVX747_PAD | 314 | #elif CONFIG_KEYPAD == ONDAVX747_PAD |
315 | #elif CONFIG_KEYPAD == ONDAVX777_PAD | 315 | #elif CONFIG_KEYPAD == ONDAVX777_PAD |
316 | 316 | ||
317 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | 317 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ |
318 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | ||
318 | #define IMGVIEW_ZOOM_IN (BUTTON_PLAY|BUTTON_UP) | 319 | #define IMGVIEW_ZOOM_IN (BUTTON_PLAY|BUTTON_UP) |
319 | #define IMGVIEW_ZOOM_OUT (BUTTON_PLAY|BUTTON_DOWN) | 320 | #define IMGVIEW_ZOOM_OUT (BUTTON_PLAY|BUTTON_DOWN) |
320 | #define IMGVIEW_UP BUTTON_UP | 321 | #define IMGVIEW_UP BUTTON_UP |
diff --git a/apps/plugins/invadrox.c b/apps/plugins/invadrox.c index 43f614aa9a..ef53715753 100644 --- a/apps/plugins/invadrox.c +++ b/apps/plugins/invadrox.c | |||
@@ -208,7 +208,8 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
208 | 208 | ||
209 | #define QUIT BUTTON_POWER | 209 | #define QUIT BUTTON_POWER |
210 | 210 | ||
211 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | 211 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ |
212 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | ||
212 | 213 | ||
213 | #define QUIT BUTTON_REC | 214 | #define QUIT BUTTON_REC |
214 | #define LEFT BUTTON_LEFT | 215 | #define LEFT BUTTON_LEFT |
diff --git a/apps/plugins/jewels.c b/apps/plugins/jewels.c index b7de8e4470..3270bd1a3d 100644 --- a/apps/plugins/jewels.c +++ b/apps/plugins/jewels.c | |||
@@ -275,7 +275,8 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
275 | #define JEWELS_CANCEL BUTTON_POWER | 275 | #define JEWELS_CANCEL BUTTON_POWER |
276 | #define HK_CANCEL "POWER" | 276 | #define HK_CANCEL "POWER" |
277 | 277 | ||
278 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | 278 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ |
279 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | ||
279 | #define JEWELS_UP BUTTON_UP | 280 | #define JEWELS_UP BUTTON_UP |
280 | #define JEWELS_DOWN BUTTON_DOWN | 281 | #define JEWELS_DOWN BUTTON_DOWN |
281 | #define JEWELS_LEFT BUTTON_LEFT | 282 | #define JEWELS_LEFT BUTTON_LEFT |
diff --git a/apps/plugins/lib/pluginlib_actions.c b/apps/plugins/lib/pluginlib_actions.c index b1389ede3f..fb54dce1c8 100644 --- a/apps/plugins/lib/pluginlib_actions.c +++ b/apps/plugins/lib/pluginlib_actions.c | |||
@@ -114,7 +114,8 @@ const struct button_mapping pla_main_ctx[] = | |||
114 | || (CONFIG_KEYPAD == SANSA_M200_PAD)\ | 114 | || (CONFIG_KEYPAD == SANSA_M200_PAD)\ |
115 | || (CONFIG_KEYPAD == SANSA_E200_PAD) \ | 115 | || (CONFIG_KEYPAD == SANSA_E200_PAD) \ |
116 | || (CONFIG_KEYPAD == SANSA_FUZE_PAD) \ | 116 | || (CONFIG_KEYPAD == SANSA_FUZE_PAD) \ |
117 | || (CONFIG_KEYPAD == SAMSUNG_YH_PAD) \ | 117 | || (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) \ |
118 | || (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) \ | ||
118 | || (CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD) \ | 119 | || (CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD) \ |
119 | || (CONFIG_KEYPAD == SANSA_CONNECT_PAD) \ | 120 | || (CONFIG_KEYPAD == SANSA_CONNECT_PAD) \ |
120 | || (CONFIG_KEYPAD == SAMSUNG_YPR0_PAD) \ | 121 | || (CONFIG_KEYPAD == SAMSUNG_YPR0_PAD) \ |
@@ -383,7 +384,8 @@ const struct button_mapping pla_main_ctx[] = | |||
383 | {PLA_SELECT, BUTTON_VOL_UP, BUTTON_NONE}, | 384 | {PLA_SELECT, BUTTON_VOL_UP, BUTTON_NONE}, |
384 | {PLA_SELECT_REL, BUTTON_VOL_UP|BUTTON_REL, BUTTON_VOL_UP}, | 385 | {PLA_SELECT_REL, BUTTON_VOL_UP|BUTTON_REL, BUTTON_VOL_UP}, |
385 | {PLA_SELECT_REPEAT, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE}, | 386 | {PLA_SELECT_REPEAT, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE}, |
386 | #elif (CONFIG_KEYPAD == SAMSUNG_YH_PAD) | 387 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) \ |
388 | || (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | ||
387 | {PLA_CANCEL, BUTTON_REW, BUTTON_NONE}, | 389 | {PLA_CANCEL, BUTTON_REW, BUTTON_NONE}, |
388 | {PLA_EXIT, BUTTON_FFWD, BUTTON_NONE}, | 390 | {PLA_EXIT, BUTTON_FFWD, BUTTON_NONE}, |
389 | {PLA_SELECT, BUTTON_PLAY, BUTTON_NONE}, | 391 | {PLA_SELECT, BUTTON_PLAY, BUTTON_NONE}, |
diff --git a/apps/plugins/metronome.c b/apps/plugins/metronome.c index 54af82fa76..c519608372 100644 --- a/apps/plugins/metronome.c +++ b/apps/plugins/metronome.c | |||
@@ -610,7 +610,8 @@ static signed short sound[] = { | |||
610 | #endif | 610 | #endif |
611 | 611 | ||
612 | #if (CONFIG_KEYPAD == IRIVER_H100_PAD) || (CONFIG_KEYPAD == IRIVER_H300_PAD) \ | 612 | #if (CONFIG_KEYPAD == IRIVER_H100_PAD) || (CONFIG_KEYPAD == IRIVER_H300_PAD) \ |
613 | || (CONFIG_KEYPAD == SANSA_E200_PAD) || (CONFIG_KEYPAD == SAMSUNG_YH_PAD) | 613 | || (CONFIG_KEYPAD == SANSA_E200_PAD) || (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) \ |
614 | || (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | ||
614 | #define MET_SYNC | 615 | #define MET_SYNC |
615 | #endif | 616 | #endif |
616 | 617 | ||
diff --git a/apps/plugins/midi/midiplay.c b/apps/plugins/midi/midiplay.c index d042eb6d1d..af76dcb13a 100644 --- a/apps/plugins/midi/midiplay.c +++ b/apps/plugins/midi/midiplay.c | |||
@@ -193,7 +193,8 @@ | |||
193 | #elif CONFIG_KEYPAD == ONDAVX777_PAD | 193 | #elif CONFIG_KEYPAD == ONDAVX777_PAD |
194 | #define BTN_QUIT BUTTON_POWER | 194 | #define BTN_QUIT BUTTON_POWER |
195 | 195 | ||
196 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | 196 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ |
197 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | ||
197 | #define BTN_QUIT BUTTON_REW | 198 | #define BTN_QUIT BUTTON_REW |
198 | #define BTN_RIGHT BUTTON_RIGHT | 199 | #define BTN_RIGHT BUTTON_RIGHT |
199 | #define BTN_LEFT BUTTON_LEFT | 200 | #define BTN_LEFT BUTTON_LEFT |
diff --git a/apps/plugins/minesweeper.c b/apps/plugins/minesweeper.c index 07e2b557bd..c1e6b4a84d 100644 --- a/apps/plugins/minesweeper.c +++ b/apps/plugins/minesweeper.c | |||
@@ -247,7 +247,8 @@ CONFIG_KEYPAD == ONDAVX777_PAD || \ | |||
247 | CONFIG_KEYPAD == MROBE500_PAD | 247 | CONFIG_KEYPAD == MROBE500_PAD |
248 | # define MINESWP_QUIT BUTTON_POWER | 248 | # define MINESWP_QUIT BUTTON_POWER |
249 | 249 | ||
250 | #elif (CONFIG_KEYPAD == SAMSUNG_YH_PAD) | 250 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ |
251 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | ||
251 | # define MINESWP_LEFT BUTTON_LEFT | 252 | # define MINESWP_LEFT BUTTON_LEFT |
252 | # define MINESWP_RIGHT BUTTON_RIGHT | 253 | # define MINESWP_RIGHT BUTTON_RIGHT |
253 | # define MINESWP_UP BUTTON_UP | 254 | # define MINESWP_UP BUTTON_UP |
diff --git a/apps/plugins/mp3_encoder.c b/apps/plugins/mp3_encoder.c index 3b425463bf..642194b983 100644 --- a/apps/plugins/mp3_encoder.c +++ b/apps/plugins/mp3_encoder.c | |||
@@ -2484,7 +2484,8 @@ CONFIG_KEYPAD == ONDAVX777_PAD || \ | |||
2484 | CONFIG_KEYPAD == MROBE500_PAD | 2484 | CONFIG_KEYPAD == MROBE500_PAD |
2485 | #define MP3ENC_DONE BUTTON_POWER | 2485 | #define MP3ENC_DONE BUTTON_POWER |
2486 | 2486 | ||
2487 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | 2487 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ |
2488 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | ||
2488 | #define MP3ENC_PREV BUTTON_UP | 2489 | #define MP3ENC_PREV BUTTON_UP |
2489 | #define MP3ENC_NEXT BUTTON_DOWN | 2490 | #define MP3ENC_NEXT BUTTON_DOWN |
2490 | #define MP3ENC_DONE BUTTON_PLAY | 2491 | #define MP3ENC_DONE BUTTON_PLAY |
diff --git a/apps/plugins/mpegplayer/mpeg_settings.c b/apps/plugins/mpegplayer/mpeg_settings.c index 57872bd70b..26dd24113c 100644 --- a/apps/plugins/mpegplayer/mpeg_settings.c +++ b/apps/plugins/mpegplayer/mpeg_settings.c | |||
@@ -204,7 +204,8 @@ struct mpeg_settings settings; | |||
204 | #elif CONFIG_KEYPAD == ONDAVX777_PAD | 204 | #elif CONFIG_KEYPAD == ONDAVX777_PAD |
205 | #define MPEG_START_TIME_EXIT BUTTON_POWER | 205 | #define MPEG_START_TIME_EXIT BUTTON_POWER |
206 | 206 | ||
207 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | 207 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ |
208 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | ||
208 | #define MPEG_START_TIME_SELECT BUTTON_PLAY | 209 | #define MPEG_START_TIME_SELECT BUTTON_PLAY |
209 | #define MPEG_START_TIME_LEFT BUTTON_LEFT | 210 | #define MPEG_START_TIME_LEFT BUTTON_LEFT |
210 | #define MPEG_START_TIME_RIGHT BUTTON_RIGHT | 211 | #define MPEG_START_TIME_RIGHT BUTTON_RIGHT |
diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c index 706d1546da..2e84a870a9 100644 --- a/apps/plugins/mpegplayer/mpegplayer.c +++ b/apps/plugins/mpegplayer/mpegplayer.c | |||
@@ -317,7 +317,8 @@ CONFIG_KEYPAD == SANSA_M200_PAD | |||
317 | #elif CONFIG_KEYPAD == ONDAVX777_PAD | 317 | #elif CONFIG_KEYPAD == ONDAVX777_PAD |
318 | #define MPEG_MENU BUTTON_POWER | 318 | #define MPEG_MENU BUTTON_POWER |
319 | 319 | ||
320 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | 320 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ |
321 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | ||
321 | #define MPEG_MENU BUTTON_LEFT | 322 | #define MPEG_MENU BUTTON_LEFT |
322 | #define MPEG_STOP BUTTON_RIGHT | 323 | #define MPEG_STOP BUTTON_RIGHT |
323 | #define MPEG_PAUSE BUTTON_PLAY | 324 | #define MPEG_PAUSE BUTTON_PLAY |
diff --git a/apps/plugins/oscilloscope.c b/apps/plugins/oscilloscope.c index bd3e5ae923..e23baf01d9 100644 --- a/apps/plugins/oscilloscope.c +++ b/apps/plugins/oscilloscope.c | |||
@@ -349,7 +349,8 @@ | |||
349 | #elif CONFIG_KEYPAD == MROBE500_PAD | 349 | #elif CONFIG_KEYPAD == MROBE500_PAD |
350 | #define OSCILLOSCOPE_QUIT BUTTON_POWER | 350 | #define OSCILLOSCOPE_QUIT BUTTON_POWER |
351 | 351 | ||
352 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | 352 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ |
353 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | ||
353 | #define OSCILLOSCOPE_QUIT BUTTON_REC | 354 | #define OSCILLOSCOPE_QUIT BUTTON_REC |
354 | #define OSCILLOSCOPE_DRAWMODE (BUTTON_PLAY|BUTTON_LEFT) | 355 | #define OSCILLOSCOPE_DRAWMODE (BUTTON_PLAY|BUTTON_LEFT) |
355 | #define OSCILLOSCOPE_ADVMODE (BUTTON_PLAY|BUTTON_RIGHT) | 356 | #define OSCILLOSCOPE_ADVMODE (BUTTON_PLAY|BUTTON_RIGHT) |
diff --git a/apps/plugins/pacbox/pacbox.h b/apps/plugins/pacbox/pacbox.h index 267dd67e93..1270e9c064 100644 --- a/apps/plugins/pacbox/pacbox.h +++ b/apps/plugins/pacbox/pacbox.h | |||
@@ -232,7 +232,8 @@ | |||
232 | #elif CONFIG_KEYPAD == ONDAVX777_PAD | 232 | #elif CONFIG_KEYPAD == ONDAVX777_PAD |
233 | #define PACMAN_MENU BUTTON_POWER | 233 | #define PACMAN_MENU BUTTON_POWER |
234 | 234 | ||
235 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | 235 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ |
236 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | ||
236 | 237 | ||
237 | #define PACMAN_UP BUTTON_UP | 238 | #define PACMAN_UP BUTTON_UP |
238 | #define PACMAN_DOWN BUTTON_DOWN | 239 | #define PACMAN_DOWN BUTTON_DOWN |
diff --git a/apps/plugins/pegbox.c b/apps/plugins/pegbox.c index db6870fa4b..19f3d529e6 100644 --- a/apps/plugins/pegbox.c +++ b/apps/plugins/pegbox.c | |||
@@ -414,7 +414,8 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
414 | 414 | ||
415 | #define QUIT_TEXT "POWER" | 415 | #define QUIT_TEXT "POWER" |
416 | 416 | ||
417 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | 417 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ |
418 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | ||
418 | #define PEGBOX_SAVE (BUTTON_REC|BUTTON_FFWD) | 419 | #define PEGBOX_SAVE (BUTTON_REC|BUTTON_FFWD) |
419 | #define PEGBOX_QUIT (BUTTON_REC|BUTTON_PLAY) | 420 | #define PEGBOX_QUIT (BUTTON_REC|BUTTON_PLAY) |
420 | #define PEGBOX_RESTART (BUTTON_REC|BUTTON_REW) | 421 | #define PEGBOX_RESTART (BUTTON_REC|BUTTON_REW) |
diff --git a/apps/plugins/pictureflow/pictureflow.c b/apps/plugins/pictureflow/pictureflow.c index 933b134b8a..796b66a48d 100644 --- a/apps/plugins/pictureflow/pictureflow.c +++ b/apps/plugins/pictureflow/pictureflow.c | |||
@@ -61,7 +61,8 @@ | |||
61 | #define PF_TRACKLIST (LAST_ACTION_PLACEHOLDER + 2) | 61 | #define PF_TRACKLIST (LAST_ACTION_PLACEHOLDER + 2) |
62 | 62 | ||
63 | #if defined(HAVE_SCROLLWHEEL) || CONFIG_KEYPAD == IRIVER_H10_PAD || \ | 63 | #if defined(HAVE_SCROLLWHEEL) || CONFIG_KEYPAD == IRIVER_H10_PAD || \ |
64 | CONFIG_KEYPAD == SAMSUNG_YH_PAD || CONFIG_KEYPAD == MPIO_HD300_PAD | 64 | CONFIG_KEYPAD == SAMSUNG_YH820_PAD || CONFIG_KEYPAD == SAMSUNG_YH920_PAD || \ |
65 | CONFIG_KEYPAD == MPIO_HD300_PAD | ||
65 | #define USE_CORE_PREVNEXT | 66 | #define USE_CORE_PREVNEXT |
66 | #endif | 67 | #endif |
67 | 68 | ||
diff --git a/apps/plugins/pong.c b/apps/plugins/pong.c index 4df91b65f3..ccf07544f2 100644 --- a/apps/plugins/pong.c +++ b/apps/plugins/pong.c | |||
@@ -215,7 +215,8 @@ CONFIG_KEYPAD == ONDAVX777_PAD || \ | |||
215 | CONFIG_KEYPAD == MROBE500_PAD | 215 | CONFIG_KEYPAD == MROBE500_PAD |
216 | #define PONG_QUIT BUTTON_POWER | 216 | #define PONG_QUIT BUTTON_POWER |
217 | 217 | ||
218 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | 218 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ |
219 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | ||
219 | #define PONG_QUIT BUTTON_REC | 220 | #define PONG_QUIT BUTTON_REC |
220 | #define PONG_PAUSE BUTTON_PLAY | 221 | #define PONG_PAUSE BUTTON_PLAY |
221 | #define PONG_LEFT_UP BUTTON_UP | 222 | #define PONG_LEFT_UP BUTTON_UP |
diff --git a/apps/plugins/reversi/reversi-gui.h b/apps/plugins/reversi/reversi-gui.h index 9cd6622918..131a3df32a 100644 --- a/apps/plugins/reversi/reversi-gui.h +++ b/apps/plugins/reversi/reversi-gui.h | |||
@@ -230,7 +230,8 @@ | |||
230 | #define REVERSI_BUTTON_MAKE_MOVE BUTTON_SELECT | 230 | #define REVERSI_BUTTON_MAKE_MOVE BUTTON_SELECT |
231 | #define REVERSI_BUTTON_MENU BUTTON_MENU | 231 | #define REVERSI_BUTTON_MENU BUTTON_MENU |
232 | 232 | ||
233 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | 233 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ |
234 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | ||
234 | #define REVERSI_BUTTON_QUIT BUTTON_REC | 235 | #define REVERSI_BUTTON_QUIT BUTTON_REC |
235 | #define REVERSI_BUTTON_UP BUTTON_UP | 236 | #define REVERSI_BUTTON_UP BUTTON_UP |
236 | #define REVERSI_BUTTON_DOWN BUTTON_DOWN | 237 | #define REVERSI_BUTTON_DOWN BUTTON_DOWN |
diff --git a/apps/plugins/rockblox.c b/apps/plugins/rockblox.c index adfeb60670..77e834e52b 100644 --- a/apps/plugins/rockblox.c +++ b/apps/plugins/rockblox.c | |||
@@ -328,7 +328,8 @@ | |||
328 | #elif CONFIG_KEYPAD == ONDAVX777_PAD | 328 | #elif CONFIG_KEYPAD == ONDAVX777_PAD |
329 | #define ROCKBLOX_OFF BUTTON_POWER | 329 | #define ROCKBLOX_OFF BUTTON_POWER |
330 | 330 | ||
331 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | 331 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ |
332 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | ||
332 | 333 | ||
333 | #define ROCKBLOX_OFF (BUTTON_REC|BUTTON_PLAY) | 334 | #define ROCKBLOX_OFF (BUTTON_REC|BUTTON_PLAY) |
334 | #define ROCKBLOX_ROTATE_CCW BUTTON_UP | 335 | #define ROCKBLOX_ROTATE_CCW BUTTON_UP |
diff --git a/apps/plugins/rockboy/rockboy.c b/apps/plugins/rockboy/rockboy.c index d5f2a24b51..ba70d77627 100644 --- a/apps/plugins/rockboy/rockboy.c +++ b/apps/plugins/rockboy/rockboy.c | |||
@@ -295,7 +295,8 @@ static void setoptions (void) | |||
295 | options.SELECT = BUTTON_RIGHT; | 295 | options.SELECT = BUTTON_RIGHT; |
296 | options.MENU = BUTTON_LEFT; | 296 | options.MENU = BUTTON_LEFT; |
297 | 297 | ||
298 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | 298 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ |
299 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | ||
299 | options.UP = BUTTON_UP; | 300 | options.UP = BUTTON_UP; |
300 | options.DOWN = BUTTON_DOWN; | 301 | options.DOWN = BUTTON_DOWN; |
301 | 302 | ||
diff --git a/apps/plugins/rockpaint.c b/apps/plugins/rockpaint.c index 5de27d9947..ce1b911e43 100644 --- a/apps/plugins/rockpaint.c +++ b/apps/plugins/rockpaint.c | |||
@@ -199,7 +199,8 @@ | |||
199 | #elif CONFIG_KEYPAD == MROBE500_PAD | 199 | #elif CONFIG_KEYPAD == MROBE500_PAD |
200 | #define ROCKPAINT_QUIT BUTTON_POWER | 200 | #define ROCKPAINT_QUIT BUTTON_POWER |
201 | 201 | ||
202 | #elif ( CONFIG_KEYPAD == SAMSUNG_YH_PAD ) | 202 | #elif ( CONFIG_KEYPAD == SAMSUNG_YH820_PAD ) || \ |
203 | ( CONFIG_KEYPAD == SAMSUNG_YH920_PAD ) | ||
203 | #define ROCKPAINT_QUIT BUTTON_REC | 204 | #define ROCKPAINT_QUIT BUTTON_REC |
204 | #define ROCKPAINT_DRAW BUTTON_PLAY | 205 | #define ROCKPAINT_DRAW BUTTON_PLAY |
205 | #define ROCKPAINT_MENU BUTTON_FFWD | 206 | #define ROCKPAINT_MENU BUTTON_FFWD |
diff --git a/apps/plugins/sliding_puzzle.c b/apps/plugins/sliding_puzzle.c index 55ee46415f..53c64525ba 100644 --- a/apps/plugins/sliding_puzzle.c +++ b/apps/plugins/sliding_puzzle.c | |||
@@ -219,7 +219,8 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
219 | #define PUZZLE_QUIT BUTTON_POWER | 219 | #define PUZZLE_QUIT BUTTON_POWER |
220 | #define PUZZLE_QUIT_TEXT "[POWER]" | 220 | #define PUZZLE_QUIT_TEXT "[POWER]" |
221 | 221 | ||
222 | #elif (CONFIG_KEYPAD == SAMSUNG_YH_PAD) | 222 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ |
223 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | ||
223 | #define PUZZLE_QUIT BUTTON_REC | 224 | #define PUZZLE_QUIT BUTTON_REC |
224 | #define PUZZLE_LEFT BUTTON_LEFT | 225 | #define PUZZLE_LEFT BUTTON_LEFT |
225 | #define PUZZLE_RIGHT BUTTON_RIGHT | 226 | #define PUZZLE_RIGHT BUTTON_RIGHT |
diff --git a/apps/plugins/snake.c b/apps/plugins/snake.c index d5168f79ba..e662a3b2e7 100644 --- a/apps/plugins/snake.c +++ b/apps/plugins/snake.c | |||
@@ -190,7 +190,8 @@ dir is the current direction of the snake - 0=up, 1=right, 2=down, 3=left; | |||
190 | #define SNAKE_DOWN BUTTON_DOWN | 190 | #define SNAKE_DOWN BUTTON_DOWN |
191 | #define SNAKE_PLAYPAUSE BUTTON_MENU | 191 | #define SNAKE_PLAYPAUSE BUTTON_MENU |
192 | 192 | ||
193 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | 193 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ |
194 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | ||
194 | #define SNAKE_QUIT BUTTON_REC | 195 | #define SNAKE_QUIT BUTTON_REC |
195 | #define SNAKE_LEFT BUTTON_LEFT | 196 | #define SNAKE_LEFT BUTTON_LEFT |
196 | #define SNAKE_RIGHT BUTTON_RIGHT | 197 | #define SNAKE_RIGHT BUTTON_RIGHT |
diff --git a/apps/plugins/snake2.c b/apps/plugins/snake2.c index 779b8cf16c..54a2bc8709 100644 --- a/apps/plugins/snake2.c +++ b/apps/plugins/snake2.c | |||
@@ -309,7 +309,8 @@ Head and Tail are stored | |||
309 | CONFIG_KEYPAD == MROBE500_PAD | 309 | CONFIG_KEYPAD == MROBE500_PAD |
310 | #define SNAKE2_QUIT BUTTON_POWER | 310 | #define SNAKE2_QUIT BUTTON_POWER |
311 | 311 | ||
312 | #elif (CONFIG_KEYPAD == SAMSUNG_YH_PAD) | 312 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ |
313 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | ||
313 | #define SNAKE2_LEFT BUTTON_LEFT | 314 | #define SNAKE2_LEFT BUTTON_LEFT |
314 | #define SNAKE2_RIGHT BUTTON_RIGHT | 315 | #define SNAKE2_RIGHT BUTTON_RIGHT |
315 | #define SNAKE2_UP BUTTON_UP | 316 | #define SNAKE2_UP BUTTON_UP |
diff --git a/apps/plugins/sokoban.c b/apps/plugins/sokoban.c index a962d34842..a3d760d5cd 100644 --- a/apps/plugins/sokoban.c +++ b/apps/plugins/sokoban.c | |||
@@ -450,7 +450,8 @@ | |||
450 | #define SOKOBAN_MENU BUTTON_POWER | 450 | #define SOKOBAN_MENU BUTTON_POWER |
451 | #define SOKOBAN_MENU_NAME "[POWER]" | 451 | #define SOKOBAN_MENU_NAME "[POWER]" |
452 | 452 | ||
453 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | 453 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ |
454 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | ||
454 | #define SOKOBAN_LEFT BUTTON_LEFT | 455 | #define SOKOBAN_LEFT BUTTON_LEFT |
455 | #define SOKOBAN_RIGHT BUTTON_RIGHT | 456 | #define SOKOBAN_RIGHT BUTTON_RIGHT |
456 | #define SOKOBAN_UP BUTTON_UP | 457 | #define SOKOBAN_UP BUTTON_UP |
diff --git a/apps/plugins/solitaire.c b/apps/plugins/solitaire.c index fbfe6776b5..0a1dc36cf5 100644 --- a/apps/plugins/solitaire.c +++ b/apps/plugins/solitaire.c | |||
@@ -452,7 +452,8 @@ | |||
452 | CONFIG_KEYPAD == MROBE500_PAD | 452 | CONFIG_KEYPAD == MROBE500_PAD |
453 | # define SOL_QUIT BUTTON_POWER | 453 | # define SOL_QUIT BUTTON_POWER |
454 | 454 | ||
455 | #elif (CONFIG_KEYPAD == SAMSUNG_YH_PAD) | 455 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ |
456 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | ||
456 | # define SOL_QUIT BUTTON_REC | 457 | # define SOL_QUIT BUTTON_REC |
457 | # define SOL_UP BUTTON_UP | 458 | # define SOL_UP BUTTON_UP |
458 | # define SOL_DOWN BUTTON_DOWN | 459 | # define SOL_DOWN BUTTON_DOWN |
diff --git a/apps/plugins/spacerocks.c b/apps/plugins/spacerocks.c index 9d906516ae..bc67e4d6d6 100644 --- a/apps/plugins/spacerocks.c +++ b/apps/plugins/spacerocks.c | |||
@@ -229,7 +229,8 @@ | |||
229 | (CONFIG_KEYPAD == MROBE500_PAD) | 229 | (CONFIG_KEYPAD == MROBE500_PAD) |
230 | #define AST_QUIT BUTTON_POWER | 230 | #define AST_QUIT BUTTON_POWER |
231 | 231 | ||
232 | #elif (CONFIG_KEYPAD == SAMSUNG_YH_PAD) | 232 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ |
233 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | ||
233 | #define AST_PAUSE BUTTON_FFWD | 234 | #define AST_PAUSE BUTTON_FFWD |
234 | #define AST_QUIT BUTTON_REC | 235 | #define AST_QUIT BUTTON_REC |
235 | #define AST_THRUST BUTTON_UP | 236 | #define AST_THRUST BUTTON_UP |
diff --git a/apps/plugins/splitedit.c b/apps/plugins/splitedit.c index a17ce30f5a..955eb90bab 100644 --- a/apps/plugins/splitedit.c +++ b/apps/plugins/splitedit.c | |||
@@ -55,7 +55,8 @@ | |||
55 | #define SPLITEDIT_SPEED150 (BUTTON_REC | BUTTON_RIGHT) | 55 | #define SPLITEDIT_SPEED150 (BUTTON_REC | BUTTON_RIGHT) |
56 | #define SPLITEDIT_MENU_RUN BUTTON_RIGHT | 56 | #define SPLITEDIT_MENU_RUN BUTTON_RIGHT |
57 | 57 | ||
58 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | 58 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ |
59 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | ||
59 | #define SPLITEDIT_QUIT (BUTTON_REC | BUTTON_REW) | 60 | #define SPLITEDIT_QUIT (BUTTON_REC | BUTTON_REW) |
60 | #define SPLITEDIT_PLAY (BUTTON_REC | BUTTON_FFWD) | 61 | #define SPLITEDIT_PLAY (BUTTON_REC | BUTTON_FFWD) |
61 | #define SPLITEDIT_SAVE BUTTON_FFWD | 62 | #define SPLITEDIT_SAVE BUTTON_FFWD |
diff --git a/apps/plugins/star.c b/apps/plugins/star.c index 5335e7665b..d74fc45e89 100644 --- a/apps/plugins/star.c +++ b/apps/plugins/star.c | |||
@@ -391,7 +391,8 @@ | |||
391 | #define STAR_QUIT BUTTON_POWER | 391 | #define STAR_QUIT BUTTON_POWER |
392 | #define STAR_QUIT_NAME "POWER" | 392 | #define STAR_QUIT_NAME "POWER" |
393 | 393 | ||
394 | #elif (CONFIG_KEYPAD == SAMSUNG_YH_PAD) | 394 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ |
395 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | ||
395 | 396 | ||
396 | #define STAR_QUIT BUTTON_REC | 397 | #define STAR_QUIT BUTTON_REC |
397 | #define STAR_LEFT BUTTON_LEFT | 398 | #define STAR_LEFT BUTTON_LEFT |
diff --git a/apps/plugins/stopwatch.c b/apps/plugins/stopwatch.c index f11266ce1b..e83fd5d42d 100644 --- a/apps/plugins/stopwatch.c +++ b/apps/plugins/stopwatch.c | |||
@@ -223,7 +223,8 @@ | |||
223 | #elif CONFIG_KEYPAD == ONDAVX777_PAD | 223 | #elif CONFIG_KEYPAD == ONDAVX777_PAD |
224 | #define STOPWATCH_QUIT BUTTON_POWER | 224 | #define STOPWATCH_QUIT BUTTON_POWER |
225 | 225 | ||
226 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | 226 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ |
227 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | ||
227 | #define STOPWATCH_QUIT BUTTON_REC | 228 | #define STOPWATCH_QUIT BUTTON_REC |
228 | #define STOPWATCH_START_STOP BUTTON_PLAY | 229 | #define STOPWATCH_START_STOP BUTTON_PLAY |
229 | #define STOPWATCH_RESET_TIMER BUTTON_LEFT | 230 | #define STOPWATCH_RESET_TIMER BUTTON_LEFT |
diff --git a/apps/plugins/sudoku/sudoku.h b/apps/plugins/sudoku/sudoku.h index 5ffdc344f9..dc29594223 100644 --- a/apps/plugins/sudoku/sudoku.h +++ b/apps/plugins/sudoku/sudoku.h | |||
@@ -282,7 +282,8 @@ | |||
282 | #elif (CONFIG_KEYPAD == ONDAVX777_PAD) | 282 | #elif (CONFIG_KEYPAD == ONDAVX777_PAD) |
283 | #define SUDOKU_BUTTON_QUIT BUTTON_POWER | 283 | #define SUDOKU_BUTTON_QUIT BUTTON_POWER |
284 | 284 | ||
285 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | 285 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ |
286 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | ||
286 | #define SUDOKU_BUTTON_QUIT BUTTON_REC | 287 | #define SUDOKU_BUTTON_QUIT BUTTON_REC |
287 | #define SUDOKU_BUTTON_UP BUTTON_UP | 288 | #define SUDOKU_BUTTON_UP BUTTON_UP |
288 | #define SUDOKU_BUTTON_DOWN BUTTON_DOWN | 289 | #define SUDOKU_BUTTON_DOWN BUTTON_DOWN |
diff --git a/apps/plugins/superdom.c b/apps/plugins/superdom.c index 04c606d05d..be480bcbb1 100644 --- a/apps/plugins/superdom.c +++ b/apps/plugins/superdom.c | |||
@@ -167,7 +167,8 @@ char buf[255]; | |||
167 | #elif (CONFIG_KEYPAD == ONDAVX747_PAD) || (CONFIG_KEYPAD == MROBE500_PAD) | 167 | #elif (CONFIG_KEYPAD == ONDAVX747_PAD) || (CONFIG_KEYPAD == MROBE500_PAD) |
168 | #define SUPERDOM_CANCEL BUTTON_POWER | 168 | #define SUPERDOM_CANCEL BUTTON_POWER |
169 | 169 | ||
170 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | 170 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ |
171 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | ||
171 | #define SUPERDOM_OK BUTTON_PLAY | 172 | #define SUPERDOM_OK BUTTON_PLAY |
172 | #define SUPERDOM_UP BUTTON_UP | 173 | #define SUPERDOM_UP BUTTON_UP |
173 | #define SUPERDOM_DOWN BUTTON_DOWN | 174 | #define SUPERDOM_DOWN BUTTON_DOWN |
diff --git a/apps/plugins/text_viewer/tv_button.h b/apps/plugins/text_viewer/tv_button.h index ac88e9b5d4..b63f8780ea 100644 --- a/apps/plugins/text_viewer/tv_button.h +++ b/apps/plugins/text_viewer/tv_button.h | |||
@@ -381,7 +381,8 @@ | |||
381 | #define TV_BOOKMARK (BUTTON_RIGHT|BUTTON_POWER) | 381 | #define TV_BOOKMARK (BUTTON_RIGHT|BUTTON_POWER) |
382 | 382 | ||
383 | /* SAMSUNG YH-820 / YH-920 / YH-925 keys */ | 383 | /* SAMSUNG YH-820 / YH-920 / YH-925 keys */ |
384 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | 384 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ |
385 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | ||
385 | #define TV_QUIT BUTTON_REC | 386 | #define TV_QUIT BUTTON_REC |
386 | #define TV_SCROLL_UP BUTTON_UP | 387 | #define TV_SCROLL_UP BUTTON_UP |
387 | #define TV_SCROLL_DOWN BUTTON_DOWN | 388 | #define TV_SCROLL_DOWN BUTTON_DOWN |
diff --git a/apps/plugins/vu_meter.c b/apps/plugins/vu_meter.c index f424a7099f..06fc137754 100644 --- a/apps/plugins/vu_meter.c +++ b/apps/plugins/vu_meter.c | |||
@@ -283,7 +283,8 @@ | |||
283 | #define VUMETER_QUIT BUTTON_POWER | 283 | #define VUMETER_QUIT BUTTON_POWER |
284 | #define LABEL_QUIT "POWER" | 284 | #define LABEL_QUIT "POWER" |
285 | 285 | ||
286 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | 286 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ |
287 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | ||
287 | #define VUMETER_QUIT BUTTON_REC | 288 | #define VUMETER_QUIT BUTTON_REC |
288 | #define VUMETER_HELP BUTTON_PLAY | 289 | #define VUMETER_HELP BUTTON_PLAY |
289 | #define VUMETER_MENU BUTTON_LEFT | 290 | #define VUMETER_MENU BUTTON_LEFT |
diff --git a/apps/plugins/wormlet.c b/apps/plugins/wormlet.c index a53a849963..8f4c7ab5ac 100644 --- a/apps/plugins/wormlet.c +++ b/apps/plugins/wormlet.c | |||
@@ -271,7 +271,8 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
271 | 271 | ||
272 | #define BTN_QUIT BUTTON_POWER | 272 | #define BTN_QUIT BUTTON_POWER |
273 | 273 | ||
274 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | 274 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ |
275 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | ||
275 | 276 | ||
276 | #define BTN_DIR_UP BUTTON_UP | 277 | #define BTN_DIR_UP BUTTON_UP |
277 | #define BTN_DIR_DOWN BUTTON_DOWN | 278 | #define BTN_DIR_DOWN BUTTON_DOWN |
diff --git a/apps/plugins/xobox.c b/apps/plugins/xobox.c index 37bb32d2eb..7b2189762e 100644 --- a/apps/plugins/xobox.c +++ b/apps/plugins/xobox.c | |||
@@ -232,7 +232,8 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
232 | 232 | ||
233 | #define QUIT BUTTON_POWER | 233 | #define QUIT BUTTON_POWER |
234 | 234 | ||
235 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | 235 | #elif CONFIG_KEYPAD == SAMSUNG_YH820_PAD || \ |
236 | CONFIG_KEYPAD == SAMSUNG_YH920_PAD | ||
236 | 237 | ||
237 | #define QUIT BUTTON_PLAY | 238 | #define QUIT BUTTON_PLAY |
238 | #define LEFT BUTTON_LEFT | 239 | #define LEFT BUTTON_LEFT |
diff --git a/apps/plugins/zxbox/keymaps.h b/apps/plugins/zxbox/keymaps.h index 28073ac8d4..659bcca40a 100644 --- a/apps/plugins/zxbox/keymaps.h +++ b/apps/plugins/zxbox/keymaps.h | |||
@@ -190,7 +190,8 @@ | |||
190 | #elif CONFIG_KEYPAD == ONDAVX777_PAD | 190 | #elif CONFIG_KEYPAD == ONDAVX777_PAD |
191 | #define ZX_MENU BUTTON_POWER | 191 | #define ZX_MENU BUTTON_POWER |
192 | 192 | ||
193 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | 193 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ |
194 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | ||
194 | 195 | ||
195 | #define ZX_UP BUTTON_UP | 196 | #define ZX_UP BUTTON_UP |
196 | #define ZX_DOWN BUTTON_DOWN | 197 | #define ZX_DOWN BUTTON_DOWN |
diff --git a/apps/plugins/zxbox/zxbox_keyb.c b/apps/plugins/zxbox/zxbox_keyb.c index e09fe9a7d8..62f593df37 100644 --- a/apps/plugins/zxbox/zxbox_keyb.c +++ b/apps/plugins/zxbox/zxbox_keyb.c | |||
@@ -197,7 +197,8 @@ | |||
197 | #define KBD_UP BUTTON_UP | 197 | #define KBD_UP BUTTON_UP |
198 | #define KBD_DOWN BUTTON_DOWN | 198 | #define KBD_DOWN BUTTON_DOWN |
199 | 199 | ||
200 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | 200 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ |
201 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | ||
201 | 202 | ||
202 | #define KBD_SELECT BUTTON_PLAY | 203 | #define KBD_SELECT BUTTON_PLAY |
203 | #define KBD_ABORT BUTTON_REW | 204 | #define KBD_ABORT BUTTON_REW |
diff --git a/bootloader/main-pp.c b/bootloader/main-pp.c index b03a5a75c6..7caf397f9f 100644 --- a/bootloader/main-pp.c +++ b/bootloader/main-pp.c | |||
@@ -81,7 +81,8 @@ extern void show_logo(void); | |||
81 | #elif CONFIG_KEYPAD == PHILIPS_HDD6330_PAD | 81 | #elif CONFIG_KEYPAD == PHILIPS_HDD6330_PAD |
82 | #define BOOTLOADER_BOOT_OF BUTTON_VOL_UP | 82 | #define BOOTLOADER_BOOT_OF BUTTON_VOL_UP |
83 | 83 | ||
84 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | 84 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ |
85 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | ||
85 | #define BOOTLOADER_BOOT_OF BUTTON_LEFT | 86 | #define BOOTLOADER_BOOT_OF BUTTON_LEFT |
86 | 87 | ||
87 | #elif CONFIG_KEYPAD == SANSA_FUZE_PAD | 88 | #elif CONFIG_KEYPAD == SANSA_FUZE_PAD |
diff --git a/firmware/export/config.h b/firmware/export/config.h index 1998720f87..9c1a8dbf57 100644 --- a/firmware/export/config.h +++ b/firmware/export/config.h | |||
@@ -130,7 +130,7 @@ | |||
130 | #define SANSA_CLIP_PAD 35 | 130 | #define SANSA_CLIP_PAD 35 |
131 | #define SANSA_FUZE_PAD 36 | 131 | #define SANSA_FUZE_PAD 36 |
132 | #define LYRE_PROTO1_PAD 37 | 132 | #define LYRE_PROTO1_PAD 37 |
133 | #define SAMSUNG_YH_PAD 38 | 133 | #define SAMSUNG_YH820_PAD 38 |
134 | #define ONDAVX777_PAD 39 | 134 | #define ONDAVX777_PAD 39 |
135 | #define SAMSUNG_YPS3_PAD 40 | 135 | #define SAMSUNG_YPS3_PAD 40 |
136 | #define MINI2440_PAD 41 | 136 | #define MINI2440_PAD 41 |
@@ -154,6 +154,7 @@ | |||
154 | #define SAMSUNG_YPZ5_PAD 59 | 154 | #define SAMSUNG_YPZ5_PAD 59 |
155 | #define IHIFI_PAD 60 | 155 | #define IHIFI_PAD 60 |
156 | #define SAMSUNG_YPR1_PAD 61 | 156 | #define SAMSUNG_YPR1_PAD 61 |
157 | #define SAMSUNG_YH920_PAD 62 | ||
157 | 158 | ||
158 | /* CONFIG_REMOTE_KEYPAD */ | 159 | /* CONFIG_REMOTE_KEYPAD */ |
159 | #define H100_REMOTE 1 | 160 | #define H100_REMOTE 1 |
diff --git a/firmware/export/config/samsungyh820.h b/firmware/export/config/samsungyh820.h index e7a4c9d307..0b9c603850 100644 --- a/firmware/export/config/samsungyh820.h +++ b/firmware/export/config/samsungyh820.h | |||
@@ -90,7 +90,7 @@ | |||
90 | /* define this if you would like tagcache to build on this target */ | 90 | /* define this if you would like tagcache to build on this target */ |
91 | #define HAVE_TAGCACHE | 91 | #define HAVE_TAGCACHE |
92 | 92 | ||
93 | #define CONFIG_KEYPAD SAMSUNG_YH_PAD | 93 | #define CONFIG_KEYPAD SAMSUNG_YH820_PAD |
94 | 94 | ||
95 | /* Define this if you do software codec */ | 95 | /* Define this if you do software codec */ |
96 | #define CONFIG_CODEC SWCODEC | 96 | #define CONFIG_CODEC SWCODEC |
diff --git a/firmware/export/config/samsungyh920.h b/firmware/export/config/samsungyh920.h index a5cb75ef43..04487bc2db 100644 --- a/firmware/export/config/samsungyh920.h +++ b/firmware/export/config/samsungyh920.h | |||
@@ -90,7 +90,7 @@ | |||
90 | /* define this if you would like tagcache to build on this target */ | 90 | /* define this if you would like tagcache to build on this target */ |
91 | #define HAVE_TAGCACHE | 91 | #define HAVE_TAGCACHE |
92 | 92 | ||
93 | #define CONFIG_KEYPAD SAMSUNG_YH_PAD | 93 | #define CONFIG_KEYPAD SAMSUNG_YH920_PAD |
94 | 94 | ||
95 | /* Define this if you do software codec */ | 95 | /* Define this if you do software codec */ |
96 | #define CONFIG_CODEC SWCODEC | 96 | #define CONFIG_CODEC SWCODEC |
diff --git a/firmware/export/config/samsungyh925.h b/firmware/export/config/samsungyh925.h index 92604af135..aeb9cb6829 100644 --- a/firmware/export/config/samsungyh925.h +++ b/firmware/export/config/samsungyh925.h | |||
@@ -87,7 +87,7 @@ | |||
87 | /* define this if you would like tagcache to build on this target */ | 87 | /* define this if you would like tagcache to build on this target */ |
88 | #define HAVE_TAGCACHE | 88 | #define HAVE_TAGCACHE |
89 | 89 | ||
90 | #define CONFIG_KEYPAD SAMSUNG_YH_PAD | 90 | #define CONFIG_KEYPAD SAMSUNG_YH920_PAD |
91 | 91 | ||
92 | /* Define this if you do software codec */ | 92 | /* Define this if you do software codec */ |
93 | #define CONFIG_CODEC SWCODEC | 93 | #define CONFIG_CODEC SWCODEC |
diff --git a/firmware/target/arm/pp/debug-pp.c b/firmware/target/arm/pp/debug-pp.c index 9e0dcad5f9..a77101eef4 100644 --- a/firmware/target/arm/pp/debug-pp.c +++ b/firmware/target/arm/pp/debug-pp.c | |||
@@ -51,7 +51,8 @@ | |||
51 | (CONFIG_KEYPAD == PHILIPS_HDD1630_PAD) | 51 | (CONFIG_KEYPAD == PHILIPS_HDD1630_PAD) |
52 | # define DEBUG_CANCEL BUTTON_POWER | 52 | # define DEBUG_CANCEL BUTTON_POWER |
53 | 53 | ||
54 | #elif (CONFIG_KEYPAD == SAMSUNG_YH_PAD) | 54 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ |
55 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | ||
55 | # define DEBUG_CANCEL BUTTON_PLAY | 56 | # define DEBUG_CANCEL BUTTON_PLAY |
56 | 57 | ||
57 | #elif (CONFIG_KEYPAD == PBELL_VIBE500_PAD) | 58 | #elif (CONFIG_KEYPAD == PBELL_VIBE500_PAD) |