From b12bcecb297ab8408b25bc9e539d78fa92e6589e Mon Sep 17 00:00:00 2001 From: Hristo Kovachev Date: Wed, 22 Feb 2006 11:48:58 +0000 Subject: Remove some unused/deprecated defines git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8777 a1c6a512-1295-4272-9138-f99709370657 --- apps/tree.h | 24 ------------------------ firmware/export/button.h | 2 -- 2 files changed, 26 deletions(-) diff --git a/apps/tree.h b/apps/tree.h index 8fdcc883cf..d1b57d6991 100644 --- a/apps/tree.h +++ b/apps/tree.h @@ -23,12 +23,8 @@ #include #include -/*FIXME: don't forget to remove PGUP, PGDOW, NEXT, PREV - * when everything will be working with gui_list */ #if (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ (CONFIG_KEYPAD == IRIVER_H300_PAD) -#define TREE_NEXT BUTTON_DOWN -#define TREE_PREV BUTTON_UP #define TREE_EXIT BUTTON_LEFT #define TREE_ABORT BUTTON_OFF #define TREE_ENTER BUTTON_RIGHT @@ -39,8 +35,6 @@ #define TREE_OFF BUTTON_OFF #define TREE_WPS (BUTTON_ON | BUTTON_REL) #define TREE_WPS_PRE BUTTON_ON -#define TREE_PGUP (BUTTON_ON | BUTTON_UP) -#define TREE_PGDN (BUTTON_ON | BUTTON_DOWN) #define TREE_CONTEXT (BUTTON_SELECT | BUTTON_REPEAT) #define TREE_CONTEXT2 (BUTTON_ON | BUTTON_SELECT) #define TREE_POWER_BTN BUTTON_ON @@ -62,8 +56,6 @@ #define TREE_RC_QUICK (BUTTON_RC_MODE | BUTTON_REPEAT) #elif CONFIG_KEYPAD == RECORDER_PAD -#define TREE_NEXT BUTTON_DOWN -#define TREE_PREV BUTTON_UP #define TREE_EXIT BUTTON_LEFT #define TREE_ABORT BUTTON_OFF #define TREE_ENTER BUTTON_RIGHT @@ -73,8 +65,6 @@ #define TREE_OFF BUTTON_OFF #define TREE_WPS (BUTTON_ON | BUTTON_REL) #define TREE_WPS_PRE BUTTON_ON -#define TREE_PGUP (BUTTON_ON | BUTTON_UP) -#define TREE_PGDN (BUTTON_ON | BUTTON_DOWN) #define TREE_CONTEXT (BUTTON_PLAY | BUTTON_REPEAT) #define TREE_CONTEXT2 (BUTTON_ON | BUTTON_PLAY) #define TREE_POWER_BTN BUTTON_ON @@ -86,8 +76,6 @@ #define TREE_RC_RUN BUTTON_RC_PLAY #elif CONFIG_KEYPAD == PLAYER_PAD -#define TREE_NEXT BUTTON_RIGHT -#define TREE_PREV BUTTON_LEFT #define TREE_EXIT BUTTON_STOP #define TREE_ABORT BUTTON_STOP #define TREE_RUN (BUTTON_PLAY | BUTTON_REL) @@ -105,8 +93,6 @@ #define TREE_RC_RUN BUTTON_RC_PLAY #elif CONFIG_KEYPAD == ONDIO_PAD -#define TREE_NEXT BUTTON_DOWN -#define TREE_PREV BUTTON_UP #define TREE_EXIT BUTTON_LEFT #define TREE_ABORT BUTTON_OFF #define TREE_RUN (BUTTON_RIGHT | BUTTON_REL) @@ -120,8 +106,6 @@ #define TREE_POWER_BTN BUTTON_OFF #elif CONFIG_KEYPAD == GMINI100_PAD -#define TREE_NEXT BUTTON_DOWN -#define TREE_PREV BUTTON_UP #define TREE_EXIT BUTTON_LEFT #define TREE_ENTER BUTTON_RIGHT #define TREE_RUN (BUTTON_PLAY | BUTTON_REL) @@ -129,16 +113,12 @@ #define TREE_MENU BUTTON_MENU #define TREE_WPS (BUTTON_ON | BUTTON_REL) #define TREE_WPS_PRE BUTTON_ON -#define TREE_PGUP (BUTTON_ON | BUTTON_UP) -#define TREE_PGDN (BUTTON_ON | BUTTON_DOWN) #define TREE_CONTEXT (BUTTON_PLAY | BUTTON_REPEAT) #define TREE_CONTEXT2 (BUTTON_ON | BUTTON_PLAY) #define TREE_POWER_BTN BUTTON_ON #elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) -#define TREE_NEXT BUTTON_SCROLL_FWD -#define TREE_PREV BUTTON_SCROLL_BACK #define TREE_EXIT BUTTON_LEFT #define TREE_ABORT BUTTON_LEFT #define TREE_ENTER BUTTON_RIGHT @@ -152,8 +132,6 @@ #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD -#define TREE_NEXT BUTTON_DOWN -#define TREE_PREV BUTTON_UP #define TREE_EXIT BUTTON_LEFT #define TREE_ABORT BUTTON_PLAY #define TREE_RUN (BUTTON_RIGHT | BUTTON_REL) @@ -167,8 +145,6 @@ #elif CONFIG_KEYPAD == IAUDIO_X5_PAD -#define TREE_NEXT BUTTON_DOWN -#define TREE_PREV BUTTON_UP #define TREE_EXIT BUTTON_LEFT #define TREE_ABORT BUTTON_PLAY #define TREE_RUN (BUTTON_RIGHT | BUTTON_REL) diff --git a/firmware/export/button.h b/firmware/export/button.h index e1a75878c6..1d6acfa275 100644 --- a/firmware/export/button.h +++ b/firmware/export/button.h @@ -78,8 +78,6 @@ bool button_hold(void); #define BUTTON_OFF 0x0002 #define BUTTON_UP 0x0010 #define BUTTON_DOWN 0x0020 -#define BUTTON_QUICK BUTTON_ON -#define BUTTON_QUICK_LONG (BUTTON_ON | BUTTON_REPEAT) #define BUTTON_RC_ON (BUTTON_REMOTE | 0x00010000) #define BUTTON_RC_STOP (BUTTON_REMOTE | 0x00020000) -- cgit v1.2.3