diff options
| author | Dave Chapman <dave@dchapman.com> | 2005-12-19 00:11:28 +0000 |
|---|---|---|
| committer | Dave Chapman <dave@dchapman.com> | 2005-12-19 00:11:28 +0000 |
| commit | 0dc63c1b7145b0b37476bdd701b8d5c15ad038b3 (patch) | |
| tree | 5b83cc73ca892f4faf669036da32abaff0d6b2fc /apps/gui | |
| parent | 2a7bd9fb7b9698b949ae85e24b17921c807c323c (diff) | |
| download | rockbox-0dc63c1b7145b0b37476bdd701b8d5c15ad038b3.tar.gz rockbox-0dc63c1b7145b0b37476bdd701b8d5c15ad038b3.zip | |
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
Diffstat (limited to 'apps/gui')
| -rw-r--r-- | apps/gui/gwps.h | 3 | ||||
| -rw-r--r-- | apps/gui/list.h | 3 | ||||
| -rw-r--r-- | apps/gui/select.h | 3 | ||||
| -rw-r--r-- | apps/gui/yesno.h | 2 |
4 files changed, 4 insertions, 7 deletions
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 |