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

1 files changed, 6 insertions, 121 deletions

diff --git a/firmware/export/button.h b/firmware/export/button.h
index 9c0fe639a6..102d542d27 100644
--- a/firmware/export/button.h
+++ b/firmware/export/button.h
@@ -22,11 +22,8 @@
 
 #include <stdbool.h>
 #include "config.h"
-#if (CONFIG_KEYPAD == IRIVER_H100_PAD) || \
-    (CONFIG_KEYPAD == IRIVER_H300_PAD)
-#define HAS_BUTTON_HOLD
-#define HAS_REMOTE_BUTTON_HOLD
-#endif
+#include "button-target.h"
+
 extern struct event_queue button_queue;
 
 void button_init (void);
@@ -44,12 +41,6 @@ void set_remote_backlight_filter_keypress(bool value);
 #endif
 #endif
 
-#ifdef HAS_BUTTON_HOLD
-bool button_hold(void);
-#endif
-#ifdef HAS_REMOTE_BUTTON_HOLD
-bool remote_button_hold(void);
-#endif
 #ifdef HAVE_HEADPHONE_DETECTION
 bool headphones_inserted(void);
 #endif
@@ -58,116 +49,10 @@ int wheel_status(void);
 void wheel_send_events(bool send);
 #endif
 
-#define  BUTTON_NONE        0x00000000
-
-        /* Button modifiers */
-#define BUTTON_REL          0x02000000
-#define BUTTON_REPEAT       0x04000000
-
-
-#ifdef TARGET_TREE
-#include "button-target.h"
-#else
-
-  /* Target specific button codes */
-#if CONFIG_KEYPAD == RECORDER_PAD
-
- /* Recorder specific button codes */
-
-      /* Main unit's buttons */
-#define BUTTON_ON           0x00000001
-#define BUTTON_OFF          0x00000002
-
-#define BUTTON_LEFT         0x00000004
-#define BUTTON_RIGHT        0x00000008
-#define BUTTON_UP           0x00000010
-#define BUTTON_DOWN         0x00000020
-
-#define BUTTON_PLAY         0x00000040
-
-#define BUTTON_F1           0x00000080
-#define BUTTON_F2           0x00000100
-#define BUTTON_F3           0x00000200
-
-#define BUTTON_MAIN (BUTTON_ON|BUTTON_OFF|BUTTON_LEFT|BUTTON_RIGHT\
-                |BUTTON_UP|BUTTON_DOWN|BUTTON_PLAY\
-                |BUTTON_F1|BUTTON_F2|BUTTON_F3)
-                
-    /* Remote control's buttons */
-#define BUTTON_RC_PLAY      0x00100000
-#define BUTTON_RC_STOP      0x00080000
-
-#define BUTTON_RC_LEFT      0x00040000
-#define BUTTON_RC_RIGHT     0x00020000
-#define BUTTON_RC_VOL_UP    0x00010000
-#define BUTTON_RC_VOL_DOWN  0x00008000
-
-#define BUTTON_REMOTE (BUTTON_RC_PLAY|BUTTON_RC_STOP\
-                |BUTTON_RC_LEFT|BUTTON_RC_RIGHT\
-                |BUTTON_RC_VOL_UP|BUTTON_RC_VOL_DOWN)
-
-#elif CONFIG_KEYPAD == PLAYER_PAD
+#define BUTTON_NONE    0x00000000
 
-        /* Main unit's buttons */
-#define BUTTON_ON           0x00000001
-#define BUTTON_STOP         0x00000002
-
-#define BUTTON_LEFT         0x00000004
-#define BUTTON_RIGHT        0x00000008
-#define BUTTON_PLAY         0x00000010
-#define BUTTON_MENU         0x00000020
-
-#define BUTTON_MAIN (BUTTON_ON|BUTTON_STOP|BUTTON_LEFT|BUTTON_RIGHT\
-                |BUTTON_PLAY|BUTTON_MENU)
-
-    /* Remote control's buttons */
-#define BUTTON_RC_PLAY      0x00100000
-#define BUTTON_RC_STOP      0x00080000
-
-#define BUTTON_RC_LEFT      0x00040000
-#define BUTTON_RC_RIGHT     0x00020000
-#define BUTTON_RC_VOL_UP    0x00010000
-#define BUTTON_RC_VOL_DOWN  0x00008000
-
-#define BUTTON_REMOTE (BUTTON_RC_PLAY|BUTTON_RC_STOP\
-                |BUTTON_RC_LEFT|BUTTON_RC_RIGHT\
-                |BUTTON_RC_VOL_UP|BUTTON_RC_VOL_DOWN)
-
-
-#elif CONFIG_KEYPAD == ONDIO_PAD
-
-    /* Ondio specific button codes */
-
-#define BUTTON_OFF          0x00000001
-#define BUTTON_MENU         0x00000002
-
-#define BUTTON_LEFT         0x00000004
-#define BUTTON_RIGHT        0x00000008
-#define BUTTON_UP           0x00000010
-#define BUTTON_DOWN         0x00000020
-
-#define BUTTON_MAIN (BUTTON_OFF|BUTTON_MENU|BUTTON_LEFT|BUTTON_RIGHT\
-                |BUTTON_UP|BUTTON_DOWN)
-
-#define BUTTON_REMOTE 0
-
-#elif 0
-
-/* 
- * Please, add the next Rockbox target's button defines here,
- * using: 
- *  - bits 0 and up:  for main unit's buttons
- *  - bits 20 (0x00100000) and downwards for the remote buttons (if applicable)
- * Don't forget to add BUTTON_MAIN and BUTTON_REMOTE masks
- * Currently, main buttons on all targets are up to bit 9 (0x00000200),
- * and remote buttons are down to bit 10 (0x00000400)
- */ 
-
-
-
-#endif /* RECORDER/PLAYER/ONDIO KEYPAD */
-
-#endif /* TARGET_TREE */
+/* Button modifiers */
+#define BUTTON_REL     0x02000000
+#define BUTTON_REPEAT  0x04000000
 
 #endif /* _BUTTON_H_ */
-