diff options
author | Jens Arnold <amiconn@rockbox.org> | 2006-11-27 02:16:32 +0000 |
---|---|---|
committer | Jens Arnold <amiconn@rockbox.org> | 2006-11-27 02:16:32 +0000 |
commit | 0e6dd7efcd21d48665b5a799fe081a75cdcb960f (patch) | |
tree | 9c0db844416a114adebb725f6172e38009b317f8 /apps | |
parent | e43f56b58d8540492d83b44abfdf4c758b0e74bf (diff) | |
download | rockbox-0e6dd7efcd21d48665b5a799fe081a75cdcb960f.tar.gz rockbox-0e6dd7efcd21d48665b5a799fe081a75cdcb960f.zip |
Moved archos button reading to target tree. * Cleanup of button.[ch]. * Deactivated serial remote code for recorder FM/V2 as there is no remote pin, saving ~500 bytes of code.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11612 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/keymaps/keymap-recorder.c | 4 | ||||
-rw-r--r-- | apps/main.c | 3 | ||||
-rw-r--r-- | apps/plugins/battery_bench.c | 8 | ||||
-rw-r--r-- | apps/plugins/wormlet.c | 6 |
4 files changed, 14 insertions, 7 deletions
diff --git a/apps/keymaps/keymap-recorder.c b/apps/keymaps/keymap-recorder.c index cc09b90bfd..c51bde9a4b 100644 --- a/apps/keymaps/keymap-recorder.c +++ b/apps/keymaps/keymap-recorder.c | |||
@@ -215,6 +215,7 @@ const struct button_mapping button_context_radio[] = { | |||
215 | 215 | ||
216 | }; | 216 | }; |
217 | 217 | ||
218 | #if BUTTON_REMOTE != 0 | ||
218 | /***************************************************************************** | 219 | /***************************************************************************** |
219 | * Remote control mappings | 220 | * Remote control mappings |
220 | *****************************************************************************/ | 221 | *****************************************************************************/ |
@@ -254,11 +255,14 @@ static const struct button_mapping* get_context_mapping_remote( int context ) | |||
254 | return remote_button_context_standard; | 255 | return remote_button_context_standard; |
255 | } | 256 | } |
256 | } | 257 | } |
258 | #endif /* BUTTON_REMOTE != 0 */ | ||
257 | 259 | ||
258 | const struct button_mapping* get_context_mapping( int context ) | 260 | const struct button_mapping* get_context_mapping( int context ) |
259 | { | 261 | { |
262 | #if BUTTON_REMOTE != 0 | ||
260 | if (context&CONTEXT_REMOTE) | 263 | if (context&CONTEXT_REMOTE) |
261 | return get_context_mapping_remote(context); | 264 | return get_context_mapping_remote(context); |
265 | #endif | ||
262 | 266 | ||
263 | switch( context ) | 267 | switch( context ) |
264 | { | 268 | { |
diff --git a/apps/main.c b/apps/main.c index abe73414c1..7a100eb5a8 100644 --- a/apps/main.c +++ b/apps/main.c | |||
@@ -309,8 +309,7 @@ void init(void) | |||
309 | #ifdef DEBUG | 309 | #ifdef DEBUG |
310 | debug_init(); | 310 | debug_init(); |
311 | #else | 311 | #else |
312 | #ifndef HAVE_MMC /* FIXME: This is also necessary for debug builds | 312 | #if !defined(HAVE_FMADC) && !defined(HAVE_MMC) |
313 | * (do debug builds on the Ondio make sense?) */ | ||
314 | serial_setup(); | 313 | serial_setup(); |
315 | #endif | 314 | #endif |
316 | #endif | 315 | #endif |
diff --git a/apps/plugins/battery_bench.c b/apps/plugins/battery_bench.c index c9c289acb7..9b8871eb41 100644 --- a/apps/plugins/battery_bench.c +++ b/apps/plugins/battery_bench.c | |||
@@ -29,15 +29,17 @@ PLUGIN_HEADER | |||
29 | #define EV_EXIT 1337 | 29 | #define EV_EXIT 1337 |
30 | 30 | ||
31 | /* seems to work with 1300, but who knows... */ | 31 | /* seems to work with 1300, but who knows... */ |
32 | #define THREAD_STACK_SIZE DEFAULT_STACK_SIZE + 0x200 | 32 | #define THREAD_STACK_SIZE DEFAULT_STACK_SIZE + 0x200 |
33 | 33 | ||
34 | #if CONFIG_KEYPAD == RECORDER_PAD | 34 | #if CONFIG_KEYPAD == RECORDER_PAD |
35 | 35 | ||
36 | #define BATTERY_ON BUTTON_PLAY | 36 | #define BATTERY_ON BUTTON_PLAY |
37 | #define BATTERY_RC_ON BUTTON_RC_PLAY | ||
38 | |||
39 | #define BATTERY_OFF BUTTON_OFF | 37 | #define BATTERY_OFF BUTTON_OFF |
38 | |||
39 | #if BUTTON_REMOTE != 0 | ||
40 | #define BATTERY_RC_ON BUTTON_RC_PLAY | ||
40 | #define BATTERY_RC_OFF BUTTON_RC_STOP | 41 | #define BATTERY_RC_OFF BUTTON_RC_STOP |
42 | #endif | ||
41 | 43 | ||
42 | #elif CONFIG_KEYPAD == ONDIO_PAD | 44 | #elif CONFIG_KEYPAD == ONDIO_PAD |
43 | 45 | ||
diff --git a/apps/plugins/wormlet.c b/apps/plugins/wormlet.c index 1ca570d24a..6a10fac984 100644 --- a/apps/plugins/wormlet.c +++ b/apps/plugins/wormlet.c | |||
@@ -47,15 +47,17 @@ PLUGIN_HEADER | |||
47 | #define BTN_DIR_RIGHT BUTTON_RIGHT | 47 | #define BTN_DIR_RIGHT BUTTON_RIGHT |
48 | #define BTN_PLAYER2_DIR1 BUTTON_F2 | 48 | #define BTN_PLAYER2_DIR1 BUTTON_F2 |
49 | #define BTN_PLAYER2_DIR2 BUTTON_F3 | 49 | #define BTN_PLAYER2_DIR2 BUTTON_F3 |
50 | #define BTN_RC_UP BUTTON_RC_VOL_UP | ||
51 | #define BTN_RC_DOWN BUTTON_RC_VOL_DOWN | ||
52 | #define BTN_STARTPAUSE BUTTON_PLAY | 50 | #define BTN_STARTPAUSE BUTTON_PLAY |
53 | #define BTN_QUIT BUTTON_OFF | 51 | #define BTN_QUIT BUTTON_OFF |
54 | #define BTN_STOPRESET BUTTON_ON | 52 | #define BTN_STOPRESET BUTTON_ON |
55 | #define BTN_TOGGLE_KEYS BUTTON_F1 | 53 | #define BTN_TOGGLE_KEYS BUTTON_F1 |
56 | 54 | ||
55 | #if BUTTON_REMOTE != 0 | ||
56 | #define BTN_RC_UP BUTTON_RC_VOL_UP | ||
57 | #define BTN_RC_DOWN BUTTON_RC_VOL_DOWN | ||
57 | #define REMOTE | 58 | #define REMOTE |
58 | #define MULTIPLAYER | 59 | #define MULTIPLAYER |
60 | #endif | ||
59 | 61 | ||
60 | #define PLAYERS_TEXT "UP/DN" | 62 | #define PLAYERS_TEXT "UP/DN" |
61 | #define WORMS_TEXT "L/R" | 63 | #define WORMS_TEXT "L/R" |