diff options
| author | Robert Menes <rmenes@rockbox.org> | 2010-10-21 02:45:06 +0000 |
|---|---|---|
| committer | Robert Menes <rmenes@rockbox.org> | 2010-10-21 02:45:06 +0000 |
| commit | 0c8b5594ae5d653abd2fac453aaea3fbeb97c15f (patch) | |
| tree | 23fb45575f5d0b7fede040acac1ac344545e77de /apps | |
| parent | 03f6c7a4e7914ed7843ef39cf2f275b9da3b430a (diff) | |
| download | rockbox-0c8b5594ae5d653abd2fac453aaea3fbeb97c15f.zip rockbox-0c8b5594ae5d653abd2fac453aaea3fbeb97c15f.tar.gz rockbox-0c8b5594ae5d653abd2fac453aaea3fbeb97c15f.tar.bz2 rockbox-0c8b5594ae5d653abd2fac453aaea3fbeb97c15f.tar.xz | |
Add plugin keymaps to fft for the GoGear SA9200.
Also fix some errors in pluginlib_actions.c which
were causing the SA9200 build to crap out when
building plugins, and also disable plugins for the
SA9200 in the configure script (no idea why they
were enabled in the first place!)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28316 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/plugins/fft/fft.c | 9 | ||||
| -rw-r--r-- | apps/plugins/lib/pluginlib_actions.c | 5 |
2 files changed, 11 insertions, 3 deletions
diff --git a/apps/plugins/fft/fft.c b/apps/plugins/fft/fft.c index a972419..70bea52 100644 --- a/apps/plugins/fft/fft.c +++ b/apps/plugins/fft/fft.c @@ -181,6 +181,15 @@ GREY_INFO_STRUCT # define FFT_FREQ_SCALE BUTTON_DOWN # define FFT_QUIT BUTTON_POWER +#elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD +# define FFT_PREV_GRAPH BUTTON_PREV +# define FFT_NEXT_GRAPH BUTTON_NEXT +# define FFT_ORIENTATION BUTTON_PLAY +# define FFT_WINDOW BUTTON_MENU +# define FFT_AMP_SCALE BUTTON_UP +# define FFT_FREQ_SCALE BUTTON_DOWN +# define FFT_QUIT BUTTON_POWER + #elif (CONFIG_KEYPAD == SAMSUNG_YH_PAD) # define FFT_PREV_GRAPH BUTTON_LEFT # define FFT_NEXT_GRAPH BUTTON_RIGHT diff --git a/apps/plugins/lib/pluginlib_actions.c b/apps/plugins/lib/pluginlib_actions.c index 1eafe87..59756f5 100644 --- a/apps/plugins/lib/pluginlib_actions.c +++ b/apps/plugins/lib/pluginlib_actions.c @@ -250,7 +250,6 @@ const struct button_mapping pla_main_ctx[] = || CONFIG_KEYPAD == SANSA_CLIP_PAD \ || CONFIG_KEYPAD == SANSA_M200_PAD \ || CONFIG_KEYPAD == MROBE100_PAD \ - || CONFIG_KEYPAD == PHILIPS_SA9200_PAD \ || CONFIG_KEYPAD == PHILIPS_HDD1630_PAD) {PLA_CANCEL, BUTTON_POWER|BUTTON_REL, BUTTON_POWER}, {PLA_EXIT, BUTTON_POWER|BUTTON_REPEAT, BUTTON_NONE}, @@ -323,9 +322,9 @@ const struct button_mapping pla_main_ctx[] = {PLA_SELECT, BUTTON_RC_MODE, BUTTON_NONE}, {PLA_SELECT_REL, BUTTON_RC_MODE|BUTTON_REL, BUTTON_RC_MODE}, {PLA_SELECT_REPEAT, BUTTON_RC_MODE|BUTTON_REPEAT, BUTTON_NONE}, -#elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD +#elif (CONFIG_KEYPAD == PHILIPS_SA9200_PAD) {PLA_EXIT, BUTTON_POWER, BUTTON_NONE}, - {PLA_CANCE BUTTON_MENU, BUTTON_NONE}, + {PLA_CANCEL, BUTTON_MENU, BUTTON_NONE}, {PLA_SELECT, BUTTON_PLAY, BUTTON_NONE}, {PLA_SELECT_REL, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY}, {PLA_SELECT_REPEAT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE}, |