diff options
| author | Linus Nielsen Feltzing <linus@haxx.se> | 2002-07-27 19:38:20 +0000 |
|---|---|---|
| committer | Linus Nielsen Feltzing <linus@haxx.se> | 2002-07-27 19:38:20 +0000 |
| commit | e1a97288fc490558b0e55bb417aa8f8ac7c38c14 (patch) | |
| tree | fae1ee280c69f775f2c2e3600cfaf9e4a6393027 /firmware/drivers/button.h | |
| parent | 42df5849609c726c2c8190ffc61f7474b458c126 (diff) | |
| download | rockbox-e1a97288fc490558b0e55bb417aa8f8ac7c38c14.zip rockbox-e1a97288fc490558b0e55bb417aa8f8ac7c38c14.tar.gz rockbox-e1a97288fc490558b0e55bb417aa8f8ac7c38c14.tar.bz2 rockbox-e1a97288fc490558b0e55bb417aa8f8ac7c38c14.tar.xz | |
Reworked the button code
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1462 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/drivers/button.h')
| -rw-r--r-- | firmware/drivers/button.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/firmware/drivers/button.h b/firmware/drivers/button.h index d5c194c..22d648c 100644 --- a/firmware/drivers/button.h +++ b/firmware/drivers/button.h @@ -28,7 +28,6 @@ void button_init (void); int button_get (bool block); int button_set_repeat(int newmask); int button_set_release(int newmask); -int button_set_locked(int newmask); /* Shared button codes */ #define BUTTON_NONE 0x0000 @@ -39,7 +38,7 @@ int button_set_locked(int newmask); #define BUTTON_RIGHT 0x0080 /* Button modifiers */ -#define BUTTON_HELD 0x4000 +#define BUTTON_REPEAT 0x4000 #define BUTTON_REL 0x8000 /* Special message */ @@ -56,7 +55,11 @@ int button_set_locked(int newmask); #define DEFAULT_REPEAT_MASK (BUTTON_LEFT | BUTTON_RIGHT | \ BUTTON_UP | BUTTON_DOWN) - + +#define ALL_BUTTONS (BUTTON_ON | BUTTON_UP | BUTTON_DOWN | BUTTON_LEFT | \ + BUTTON_RIGHT | BUTTON_OFF | BUTTON_PLAY | BUTTON_F1 | \ + BUTTON_F2 | BUTTON_F3) + #elif HAVE_PLAYER_KEYPAD /* Jukebox 6000 and Studio specific button codes */ @@ -66,9 +69,11 @@ int button_set_locked(int newmask); #define DEFAULT_REPEAT_MASK (BUTTON_LEFT | BUTTON_RIGHT) +#define ALL_BUTTONS (BUTTON_ON | BUTTON_UP | BUTTON_DOWN | BUTTON_LEFT | \ + BUTTON_RIGHT | BUTTON_OFF | BUTTON_MENU) + #endif /* HAVE_PLAYER_KEYPAD */ #define DEFAULT_RELEASE_MASK 0 -#define DEFAULT_LOCKED_MASK 0 #endif |