diff options
-rw-r--r-- | apps/gui/gwps.c | 3 | ||||
-rw-r--r-- | apps/screens.c | 5 | ||||
-rw-r--r-- | apps/screens.h | 3 |
3 files changed, 7 insertions, 4 deletions
diff --git a/apps/gui/gwps.c b/apps/gui/gwps.c index aeaaebd5c2..888cdf9103 100644 --- a/apps/gui/gwps.c +++ b/apps/gui/gwps.c | |||
@@ -531,7 +531,8 @@ long gui_wps_show(void) | |||
531 | #endif | 531 | #endif |
532 | 532 | ||
533 | /* pitch screen */ | 533 | /* pitch screen */ |
534 | #if CONFIG_KEYPAD == RECORDER_PAD || CONFIG_KEYPAD == IRIVER_H100_PAD | 534 | #if CONFIG_KEYPAD == RECORDER_PAD || CONFIG_KEYPAD == IRIVER_H100_PAD \ |
535 | || CONFIG_KEYPAD == IRIVER_H300_PAD | ||
535 | case BUTTON_ON | BUTTON_UP: | 536 | case BUTTON_ON | BUTTON_UP: |
536 | case BUTTON_ON | BUTTON_DOWN: | 537 | case BUTTON_ON | BUTTON_DOWN: |
537 | if (2 == pitch_screen()) | 538 | if (2 == pitch_screen()) |
diff --git a/apps/screens.c b/apps/screens.c index d8bfb56500..41b51cc0ac 100644 --- a/apps/screens.c +++ b/apps/screens.c | |||
@@ -342,14 +342,15 @@ int charging_screen(void) | |||
342 | #endif /* HAVE_CHARGING && !HAVE_POWEROFF_WHILE_CHARGING */ | 342 | #endif /* HAVE_CHARGING && !HAVE_POWEROFF_WHILE_CHARGING */ |
343 | 343 | ||
344 | 344 | ||
345 | #if CONFIG_KEYPAD == RECORDER_PAD || CONFIG_KEYPAD == IRIVER_H100_PAD | 345 | #if CONFIG_KEYPAD == RECORDER_PAD || CONFIG_KEYPAD == IRIVER_H100_PAD \ |
346 | || CONFIG_KEYPAD == IRIVER_H300_PAD | ||
346 | /* returns: | 347 | /* returns: |
347 | 0 if no key was pressed | 348 | 0 if no key was pressed |
348 | 1 if a key was pressed (or if ON was held down long enough to repeat) | 349 | 1 if a key was pressed (or if ON was held down long enough to repeat) |
349 | 2 if USB was connected */ | 350 | 2 if USB was connected */ |
350 | #if CONFIG_KEYPAD == RECORDER_PAD | 351 | #if CONFIG_KEYPAD == RECORDER_PAD |
351 | #define PITCH_PAUSE BUTTON_PLAY | 352 | #define PITCH_PAUSE BUTTON_PLAY |
352 | #elif CONFIG_KEYPAD == IRIVER_H100_PAD | 353 | #elif CONFIG_KEYPAD == IRIVER_H100_PAD || CONFIG_KEYPAD == IRIVER_H300_PAD |
353 | #define PITCH_PAUSE BUTTON_SELECT | 354 | #define PITCH_PAUSE BUTTON_SELECT |
354 | #endif | 355 | #endif |
355 | int pitch_screen(void) | 356 | int pitch_screen(void) |
diff --git a/apps/screens.h b/apps/screens.h index c8e5c320f5..d9b6ba47be 100644 --- a/apps/screens.h +++ b/apps/screens.h | |||
@@ -33,7 +33,8 @@ void charging_splash(void); | |||
33 | int mmc_remove_request(void); | 33 | int mmc_remove_request(void); |
34 | #endif | 34 | #endif |
35 | 35 | ||
36 | #if CONFIG_KEYPAD == RECORDER_PAD || defined(IRIVER_H100_SERIES) | 36 | #if CONFIG_KEYPAD == RECORDER_PAD || CONFIG_KEYPAD == IRIVER_H100_PAD \ |
37 | || CONFIG_KEYPAD == IRIVER_H300_PAD | ||
37 | int pitch_screen(void); | 38 | int pitch_screen(void); |
38 | #endif | 39 | #endif |
39 | #if CONFIG_KEYPAD == RECORDER_PAD | 40 | #if CONFIG_KEYPAD == RECORDER_PAD |