diff options
author | Michael Sevakis <jethead71@rockbox.org> | 2008-05-09 21:19:58 +0000 |
---|---|---|
committer | Michael Sevakis <jethead71@rockbox.org> | 2008-05-09 21:19:58 +0000 |
commit | 6df1a86e9959cdae26dc2850fa749ad18fc2a94c (patch) | |
tree | 901710269963bd5914bbfb3d2cdc65c5b6aa5a27 /firmware/target/arm/imx31/gigabeat-s/button-target.h | |
parent | c85faed1ee3205d99c1ec053fc5af28d59ac0ab3 (diff) | |
download | rockbox-6df1a86e9959cdae26dc2850fa749ad18fc2a94c.tar.gz rockbox-6df1a86e9959cdae26dc2850fa749ad18fc2a94c.zip |
Remove inner loop from button scanning on Gigabeat S. Requires changing the button codes but it's not a "functional port" so no plugin API version increase is done though a full update will be needed since any using the values will be incompatible.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17432 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/arm/imx31/gigabeat-s/button-target.h')
-rw-r--r-- | firmware/target/arm/imx31/gigabeat-s/button-target.h | 44 |
1 files changed, 19 insertions, 25 deletions
diff --git a/firmware/target/arm/imx31/gigabeat-s/button-target.h b/firmware/target/arm/imx31/gigabeat-s/button-target.h index 836a4c02cd..e2f68162f7 100644 --- a/firmware/target/arm/imx31/gigabeat-s/button-target.h +++ b/firmware/target/arm/imx31/gigabeat-s/button-target.h | |||
@@ -31,32 +31,26 @@ void button_power_set_state(bool pressed); | |||
31 | void set_headphones_inserted(bool inserted); | 31 | void set_headphones_inserted(bool inserted); |
32 | bool headphones_inserted(void); | 32 | bool headphones_inserted(void); |
33 | 33 | ||
34 | /* Toshiba Gigabeat specific button codes */ | 34 | /* Toshiba Gigabeat S-specific button codes */ |
35 | 35 | ||
36 | #define BUTTON_BACK (1 << 0) | 36 | /* These shifts are selected to optimize scanning of the keypad port */ |
37 | #define BUTTON_MENU (1 << 1) | 37 | #define BUTTON_LEFT (1 << 0) |
38 | 38 | #define BUTTON_UP (1 << 1) | |
39 | #define BUTTON_LEFT (1 << 2) | 39 | #define BUTTON_DOWN (1 << 2) |
40 | #define BUTTON_RIGHT (1 << 3) | 40 | #define BUTTON_RIGHT (1 << 3) |
41 | #define BUTTON_UP (1 << 4) | 41 | #define BUTTON_SELECT (1 << 4) |
42 | #define BUTTON_DOWN (1 << 5) | 42 | #define BUTTON_BACK (1 << 5) |
43 | #define BUTTON_SELECT (1 << 6) | 43 | #define BUTTON_MENU (1 << 6) |
44 | 44 | #define BUTTON_VOL_UP (1 << 7) | |
45 | #define BUTTON_POWER (1 << 7) | 45 | #define BUTTON_VOL_DOWN (1 << 8) |
46 | #define BUTTON_VOL_UP (1 << 8) | 46 | #define BUTTON_PREV (1 << 9) |
47 | #define BUTTON_VOL_DOWN (1 << 9) | 47 | #define BUTTON_PLAY (1 << 10) |
48 | #define BUTTON_NEXT (1 << 10) | 48 | #define BUTTON_NEXT (1 << 11) |
49 | #define BUTTON_PREV (1 << 11) | 49 | #define BUTTON_POWER (1 << 12) /* Read from PMIC */ |
50 | #define BUTTON_PLAY (1 << 12) | 50 | |
51 | 51 | #define BUTTON_REMOTE 0 | |
52 | #define BUTTON_MAIN (BUTTON_BACK|BUTTON_MENU|BUTTON_LEFT|BUTTON_RIGHT \ | 52 | |
53 | |BUTTON_UP|BUTTON_DOWN|BUTTON_SELECT|BUTTON_POWER \ | 53 | #define POWEROFF_BUTTON BUTTON_POWER |
54 | |BUTTON_VOL_UP|BUTTON_VOL_DOWN|BUTTON_NEXT|BUTTON_PREV \ | 54 | #define POWEROFF_COUNT 10 |
55 | |BUTTON_PLAY) | ||
56 | |||
57 | #define BUTTON_REMOTE 0 | ||
58 | |||
59 | #define POWEROFF_BUTTON BUTTON_POWER | ||
60 | #define POWEROFF_COUNT 10 | ||
61 | 55 | ||
62 | #endif /* _BUTTON_TARGET_H_ */ | 56 | #endif /* _BUTTON_TARGET_H_ */ |