diff options
author | Christi Scarborough <christi@coraline.org> | 2005-06-24 13:19:16 +0000 |
---|---|---|
committer | Christi Scarborough <christi@coraline.org> | 2005-06-24 13:19:16 +0000 |
commit | 7600708a7a11a525e4c1212c5c081ff0bf4e7e37 (patch) | |
tree | 52de1024e8c77ca72eeb620fa396fbfd2a9fa291 | |
parent | bd2bfe9993375d90b5cf040aae7987591a0012b8 (diff) | |
download | rockbox-7600708a7a11a525e4c1212c5c081ff0bf4e7e37.tar.gz rockbox-7600708a7a11a525e4c1212c5c081ff0bf4e7e37.zip |
BUTTON_RC_VOL relabeled as BUTTON_RC_MODE for consistency with main unit. RC keymappings changed to be consistent with main unit.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6853 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/tree.h | 10 | ||||
-rw-r--r-- | apps/wps.h | 4 | ||||
-rw-r--r-- | firmware/drivers/button.c | 2 | ||||
-rw-r--r-- | firmware/export/button.h | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/apps/tree.h b/apps/tree.h index ca6fd468e4..cf578fd0bb 100644 --- a/apps/tree.h +++ b/apps/tree.h | |||
@@ -43,11 +43,11 @@ | |||
43 | #define TREE_RC_NEXT BUTTON_RC_FF | 43 | #define TREE_RC_NEXT BUTTON_RC_FF |
44 | #define TREE_RC_PREV BUTTON_RC_REW | 44 | #define TREE_RC_PREV BUTTON_RC_REW |
45 | #define TREE_RC_EXIT BUTTON_RC_STOP | 45 | #define TREE_RC_EXIT BUTTON_RC_STOP |
46 | #define TREE_RC_RUN (BUTTON_RC_ON | BUTTON_REL) | 46 | #define TREE_RC_RUN (BUTTON_RC_MENU | BUTTON_REL) |
47 | #define TREE_RC_RUN_PRE BUTTON_RC_ON | 47 | #define TREE_RC_RUN_PRE BUTTON_RC_MENU |
48 | #define TREE_RC_MENU BUTTON_RC_MENU | 48 | #define TREE_RC_MENU BUTTON_RC_MODE |
49 | #define TREE_RC_WPS (BUTTON_RC_VOL | BUTTON_REL) | 49 | #define TREE_RC_WPS (BUTTON_RC_ON | BUTTON_REL) |
50 | #define TREE_RC_WPS_PRE BUTTON_RC_VOL | 50 | #define TREE_RC_WPS_PRE BUTTON_RC_ON |
51 | #define TREE_RC_CONTEXT (BUTTON_RC_ON | BUTTON_REPEAT) | 51 | #define TREE_RC_CONTEXT (BUTTON_RC_ON | BUTTON_REPEAT) |
52 | 52 | ||
53 | #elif CONFIG_KEYPAD == RECORDER_PAD | 53 | #elif CONFIG_KEYPAD == RECORDER_PAD |
diff --git a/apps/wps.h b/apps/wps.h index 4f22ed9e45..4f869794b2 100644 --- a/apps/wps.h +++ b/apps/wps.h | |||
@@ -48,8 +48,8 @@ | |||
48 | #define WPS_RC_EXIT BUTTON_RC_STOP | 48 | #define WPS_RC_EXIT BUTTON_RC_STOP |
49 | #define WPS_RC_MENU (BUTTON_RC_MENU | BUTTON_REL) | 49 | #define WPS_RC_MENU (BUTTON_RC_MENU | BUTTON_REL) |
50 | #define WPS_RC_MENU_PRE BUTTON_RC_MENU | 50 | #define WPS_RC_MENU_PRE BUTTON_RC_MENU |
51 | #define WPS_RC_BROWSE (BUTTON_RC_VOL | BUTTON_REL) | 51 | #define WPS_RC_BROWSE (BUTTON_RC_MODE | BUTTON_REL) |
52 | #define WPS_RC_BROWSE_PRE BUTTON_RC_VOL | 52 | #define WPS_RC_BROWSE_PRE BUTTON_RC_MODE |
53 | 53 | ||
54 | #elif CONFIG_KEYPAD == RECORDER_PAD | 54 | #elif CONFIG_KEYPAD == RECORDER_PAD |
55 | #define WPS_NEXT (BUTTON_RIGHT | BUTTON_REL) | 55 | #define WPS_NEXT (BUTTON_RIGHT | BUTTON_REL) |
diff --git a/firmware/drivers/button.c b/firmware/drivers/button.c index d0f9b026b6..e644267b19 100644 --- a/firmware/drivers/button.c +++ b/firmware/drivers/button.c | |||
@@ -418,7 +418,7 @@ static int button_read(void) | |||
418 | else | 418 | else |
419 | btn = BUTTON_RC_VOL_DOWN; | 419 | btn = BUTTON_RC_VOL_DOWN; |
420 | else | 420 | else |
421 | btn = BUTTON_RC_VOL; | 421 | btn = BUTTON_RC_MODE; |
422 | else | 422 | else |
423 | if (data < 0x58) | 423 | if (data < 0x58) |
424 | btn = BUTTON_RC_VOL_UP; | 424 | btn = BUTTON_RC_VOL_UP; |
diff --git a/firmware/export/button.h b/firmware/export/button.h index 40c374880b..14cd195d3c 100644 --- a/firmware/export/button.h +++ b/firmware/export/button.h | |||
@@ -70,7 +70,7 @@ bool remote_button_hold(void); | |||
70 | 70 | ||
71 | #define BUTTON_RC_ON (BUTTON_REMOTE | 0x00010000) | 71 | #define BUTTON_RC_ON (BUTTON_REMOTE | 0x00010000) |
72 | #define BUTTON_RC_STOP (BUTTON_REMOTE | 0x00020000) | 72 | #define BUTTON_RC_STOP (BUTTON_REMOTE | 0x00020000) |
73 | #define BUTTON_RC_VOL (BUTTON_REMOTE | 0x00040000) | 73 | #define BUTTON_RC_MODE (BUTTON_REMOTE | 0x00040000) |
74 | #define BUTTON_RC_BITRATE (BUTTON_REMOTE | 0x00200000) | 74 | #define BUTTON_RC_BITRATE (BUTTON_REMOTE | 0x00200000) |
75 | #define BUTTON_RC_REC (BUTTON_REMOTE | 0x00400000) | 75 | #define BUTTON_RC_REC (BUTTON_REMOTE | 0x00400000) |
76 | #define BUTTON_RC_SOURCE (BUTTON_REMOTE | 0x00800000) | 76 | #define BUTTON_RC_SOURCE (BUTTON_REMOTE | 0x00800000) |