diff options
author | Karl Kurbjun <kkurbjun@gmail.com> | 2008-05-29 22:22:44 +0000 |
---|---|---|
committer | Karl Kurbjun <kkurbjun@gmail.com> | 2008-05-29 22:22:44 +0000 |
commit | 9ba4864d73b647646d3c5c0525b656b2c758f7d8 (patch) | |
tree | e73021198fd52a8e26b967902fb279452fd79072 | |
parent | 3b730a280d0fab13b65d03514a122fc7f8d86686 (diff) | |
download | rockbox-9ba4864d73b647646d3c5c0525b656b2c758f7d8.tar.gz rockbox-9ba4864d73b647646d3c5c0525b656b2c758f7d8.zip |
Simplify the button handling code on the Gigabeat F/X a bit for the side buttons. Plugins should be updated with this revision, or the buttons in plugins will not operate properly.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17659 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | firmware/target/arm/s3c2440/gigabeat-fx/button-meg-fx.c | 15 | ||||
-rw-r--r-- | firmware/target/arm/s3c2440/gigabeat-fx/button-target.h | 17 |
2 files changed, 9 insertions, 23 deletions
diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/button-meg-fx.c b/firmware/target/arm/s3c2440/gigabeat-fx/button-meg-fx.c index c43d1884f4..790d8aa634 100644 --- a/firmware/target/arm/s3c2440/gigabeat-fx/button-meg-fx.c +++ b/firmware/target/arm/s3c2440/gigabeat-fx/button-meg-fx.c | |||
@@ -119,20 +119,7 @@ int button_read_device(void) | |||
119 | buttons = GPGDAT & 0x1F; | 119 | buttons = GPGDAT & 0x1F; |
120 | if (buttons) | 120 | if (buttons) |
121 | { | 121 | { |
122 | if (buttons & (1 << 0)) | 122 | btn |= buttons; |
123 | btn |= BUTTON_POWER; | ||
124 | |||
125 | if (buttons & (1 << 1)) | ||
126 | btn |= BUTTON_MENU; | ||
127 | |||
128 | if (buttons & (1 << 2)) | ||
129 | btn |= BUTTON_VOL_UP; | ||
130 | |||
131 | if (buttons & (1 << 3)) | ||
132 | btn |= BUTTON_VOL_DOWN; | ||
133 | |||
134 | if (buttons & (1 << 4)) | ||
135 | btn |= BUTTON_A; | ||
136 | buttonlight_on(); | 123 | buttonlight_on(); |
137 | } | 124 | } |
138 | 125 | ||
diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/button-target.h b/firmware/target/arm/s3c2440/gigabeat-fx/button-target.h index a5876aadde..6d2d6c084b 100644 --- a/firmware/target/arm/s3c2440/gigabeat-fx/button-target.h +++ b/firmware/target/arm/s3c2440/gigabeat-fx/button-target.h | |||
@@ -33,17 +33,16 @@ void touchpad_set_sensitivity(int level); | |||
33 | 33 | ||
34 | #define BUTTON_POWER 0x00000001 | 34 | #define BUTTON_POWER 0x00000001 |
35 | #define BUTTON_MENU 0x00000002 | 35 | #define BUTTON_MENU 0x00000002 |
36 | #define BUTTON_VOL_UP 0x00000004 | ||
37 | #define BUTTON_VOL_DOWN 0x00000008 | ||
38 | #define BUTTON_A 0x00000010 | ||
36 | 39 | ||
37 | #define BUTTON_LEFT 0x00000004 | 40 | #define BUTTON_LEFT 0x00000020 |
38 | #define BUTTON_RIGHT 0x00000008 | 41 | #define BUTTON_RIGHT 0x00000040 |
39 | #define BUTTON_UP 0x00000010 | 42 | #define BUTTON_UP 0x00000080 |
40 | #define BUTTON_DOWN 0x00000020 | 43 | #define BUTTON_DOWN 0x00000100 |
41 | 44 | ||
42 | #define BUTTON_VOL_UP 0x00000040 | 45 | #define BUTTON_SELECT 0x00000200 |
43 | #define BUTTON_VOL_DOWN 0x00000080 | ||
44 | |||
45 | #define BUTTON_SELECT 0x00000100 | ||
46 | #define BUTTON_A 0x00000200 | ||
47 | 46 | ||
48 | /* Remote control buttons */ | 47 | /* Remote control buttons */ |
49 | 48 | ||