diff options
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/drivers/button.c | 3 | ||||
-rw-r--r-- | firmware/export/button.h | 31 |
2 files changed, 1 insertions, 33 deletions
diff --git a/firmware/drivers/button.c b/firmware/drivers/button.c index c4e013afdc..3ae4893290 100644 --- a/firmware/drivers/button.c +++ b/firmware/drivers/button.c | |||
@@ -308,9 +308,6 @@ void button_init(void) | |||
308 | #ifdef TARGET_TREE | 308 | #ifdef TARGET_TREE |
309 | button_init_device(); | 309 | button_init_device(); |
310 | 310 | ||
311 | #elif CONFIG_KEYPAD == IRIVER_H100_PAD \ | ||
312 | || CONFIG_KEYPAD == IRIVER_H300_PAD | ||
313 | button_init_device(); /* temp untill TARGET_TREE is defined */ | ||
314 | #elif CONFIG_KEYPAD == RECORDER_PAD | 311 | #elif CONFIG_KEYPAD == RECORDER_PAD |
315 | /* Set PB4 and PB8 as input pins */ | 312 | /* Set PB4 and PB8 as input pins */ |
316 | PBCR1 &= 0xfffc; /* PB8MD = 00 */ | 313 | PBCR1 &= 0xfffc; /* PB8MD = 00 */ |
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 |