summaryrefslogtreecommitdiff
path: root/firmware/export
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2006-10-30 09:29:01 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2006-10-30 09:29:01 +0000
commitd497bad69ab0e5b89cf4eb0184c020ad10c01705 (patch)
tree86104bf9462088bc2d768194ee966aed9eb04074 /firmware/export
parent139f9f28e9179a881c0bdd5c6bed6790591a07cb (diff)
downloadrockbox-d497bad69ab0e5b89cf4eb0184c020ad10c01705.tar.gz
rockbox-d497bad69ab0e5b89cf4eb0184c020ad10c01705.zip
remove some uneeded #ifdefs
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11393 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/export')
-rw-r--r--firmware/export/button.h31
1 files changed, 1 insertions, 30 deletions
diff --git a/firmware/export/button.h b/firmware/export/button.h
index 18da59e13a..baba07fc1f 100644
--- a/firmware/export/button.h
+++ b/firmware/export/button.h
@@ -72,10 +72,7 @@ void wheel_send_events(bool send);
72#else 72#else
73 73
74 /* Target specific button codes */ 74 /* Target specific button codes */
75#if (CONFIG_KEYPAD == IRIVER_H100_PAD) \ 75#if CONFIG_KEYPAD == RECORDER_PAD
76 || (CONFIG_KEYPAD == IRIVER_H300_PAD)
77#include "button-target.h"
78#elif CONFIG_KEYPAD == RECORDER_PAD
79 76
80 /* Recorder specific button codes */ 77 /* Recorder specific button codes */
81 78
@@ -113,32 +110,6 @@ void wheel_send_events(bool send);
113 110
114#elif CONFIG_KEYPAD == PLAYER_PAD 111#elif CONFIG_KEYPAD == PLAYER_PAD
115 112
116/* Jukebox 6000 and Studio specific button codes */
117
118 /* Main unit's buttons */
119#define BUTTON_ON 0x00000001
120#define BUTTON_STOP 0x00000002
121
122#define BUTTON_LEFT 0x00000004
123#define BUTTON_RIGHT 0x00000008
124#define BUTTON_PLAY 0x00000010
125#define BUTTON_MENU 0x00000020
126
127#define BUTTON_MAIN (BUTTON_ON|BUTTON_STOP|BUTTON_LEFT|BUTTON_RIGHT\
128 |BUTTON_PLAY|BUTTON_MENU)
129
130 /* Remote control's buttons */
131#define BUTTON_RC_PLAY 0x00100000
132#define BUTTON_RC_STOP 0x00080000
133
134#define BUTTON_RC_LEFT 0x00040000
135#define BUTTON_RC_RIGHT 0x00020000
136#define BUTTON_RC_VOL_UP 0x00010000
137#define BUTTON_RC_VOL_DOWN 0x00008000
138
139#define BUTTON_REMOTE (BUTTON_RC_PLAY|BUTTON_RC_STOP\
140 |BUTTON_RC_LEFT|BUTTON_RC_RIGHT\
141 |BUTTON_RC_VOL_UP|BUTTON_RC_VOL_DOWN)
142 113
143 114
144#elif CONFIG_KEYPAD == ONDIO_PAD 115#elif CONFIG_KEYPAD == ONDIO_PAD