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

2 files changed, 9 insertions, 5 deletions

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
 #define EV_EXIT 1337
 
 /* seems to work with 1300, but who knows... */ 
-#define THREAD_STACK_SIZE DEFAULT_STACK_SIZE + 0x200 
+#define THREAD_STACK_SIZE DEFAULT_STACK_SIZE + 0x200
 
 #if CONFIG_KEYPAD == RECORDER_PAD
 
 #define BATTERY_ON BUTTON_PLAY
-#define BATTERY_RC_ON BUTTON_RC_PLAY
-
 #define BATTERY_OFF BUTTON_OFF
+
+#if BUTTON_REMOTE != 0
+#define BATTERY_RC_ON BUTTON_RC_PLAY
 #define BATTERY_RC_OFF BUTTON_RC_STOP
+#endif
 
 #elif CONFIG_KEYPAD == ONDIO_PAD
 
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
 #define BTN_DIR_RIGHT BUTTON_RIGHT
 #define BTN_PLAYER2_DIR1 BUTTON_F2
 #define BTN_PLAYER2_DIR2 BUTTON_F3
-#define BTN_RC_UP BUTTON_RC_VOL_UP
-#define BTN_RC_DOWN BUTTON_RC_VOL_DOWN
 #define BTN_STARTPAUSE BUTTON_PLAY
 #define BTN_QUIT BUTTON_OFF
 #define BTN_STOPRESET BUTTON_ON
 #define BTN_TOGGLE_KEYS BUTTON_F1
 
+#if BUTTON_REMOTE != 0
+#define BTN_RC_UP BUTTON_RC_VOL_UP
+#define BTN_RC_DOWN BUTTON_RC_VOL_DOWN
 #define REMOTE
 #define MULTIPLAYER
+#endif
 
 #define PLAYERS_TEXT "UP/DN"
 #define WORMS_TEXT "L/R"