diff options
Diffstat (limited to 'firmware/target/coldfire/mpio')
-rw-r--r-- | firmware/target/coldfire/mpio/button-target.h | 24 | ||||
-rw-r--r-- | firmware/target/coldfire/mpio/hd200/button-hd200.c | 12 |
2 files changed, 18 insertions, 18 deletions
diff --git a/firmware/target/coldfire/mpio/button-target.h b/firmware/target/coldfire/mpio/button-target.h index 6cfe758458..b7c31f8c59 100644 --- a/firmware/target/coldfire/mpio/button-target.h +++ b/firmware/target/coldfire/mpio/button-target.h | |||
@@ -36,30 +36,30 @@ int button_read_device(void); | |||
36 | /* Main unit's buttons - flags as in original firmware*/ | 36 | /* Main unit's buttons - flags as in original firmware*/ |
37 | #define BUTTON_PLAY 0x00000001 | 37 | #define BUTTON_PLAY 0x00000001 |
38 | 38 | ||
39 | #define BUTTON_PREV 0x00000004 | 39 | #define BUTTON_REW 0x00000004 |
40 | #define BUTTON_NEXT 0x00000002 | 40 | #define BUTTON_FF 0x00000002 |
41 | #define BUTTON_VOL_UP 0x00000008 | 41 | #define BUTTON_VOL_UP 0x00000008 |
42 | #define BUTTON_VOL_DOWN 0x00000010 | 42 | #define BUTTON_VOL_DOWN 0x00000010 |
43 | #define BUTTON_REC 0x00000020 | 43 | #define BUTTON_REC 0x00000020 |
44 | #define BUTTON_SELECT 0x00002000 | 44 | #define BUTTON_FUNC 0x00002000 |
45 | 45 | ||
46 | #define BUTTON_RC_PLAY 0x00010000 | 46 | #define BUTTON_RC_PLAY 0x00010000 |
47 | 47 | ||
48 | #define BUTTON_RC_PREV 0x00040000 | 48 | #define BUTTON_RC_REW 0x00040000 |
49 | #define BUTTON_RC_NEXT 0x00020000 | 49 | #define BUTTON_RC_FF 0x00020000 |
50 | #define BUTTON_RC_VOL_UP 0x00080000 | 50 | #define BUTTON_RC_VOL_UP 0x00080000 |
51 | #define BUTTON_RC_VOL_DOWN 0x00100000 | 51 | #define BUTTON_RC_VOL_DOWN 0x00100000 |
52 | #define BUTTON_RC_SELECT 0x20000000 | 52 | #define BUTTON_RC_FUNC 0x20000000 |
53 | 53 | ||
54 | #define BUTTON_LEFT BUTTON_PREV | 54 | #define BUTTON_LEFT BUTTON_REW |
55 | #define BUTTON_RIGHT BUTTON_NEXT | 55 | #define BUTTON_RIGHT BUTTON_FF |
56 | #define BUTTON_ON BUTTON_PLAY | 56 | #define BUTTON_ON BUTTON_PLAY |
57 | 57 | ||
58 | #define BUTTON_MAIN (BUTTON_PLAY|BUTTON_PREV|BUTTON_NEXT|BUTTON_VOL_UP|\ | 58 | #define BUTTON_MAIN (BUTTON_PLAY|BUTTON_REW|BUTTON_FF|BUTTON_VOL_UP|\ |
59 | BUTTON_VOL_DOWN|BUTTON_REC|BUTTON_SELECT) | 59 | BUTTON_VOL_DOWN|BUTTON_REC|BUTTON_FUNC) |
60 | 60 | ||
61 | #define BUTTON_REMOTE (BUTTON_RC_PLAY|BUTTON_RC_PREV|BUTTON_RC_NEXT|\ | 61 | #define BUTTON_REMOTE (BUTTON_RC_PLAY|BUTTON_RC_REW|BUTTON_RC_FF|\ |
62 | BUTTON_RC_VOL_UP|BUTTON_RC_VOL_DOWN|BUTTON_RC_SELECT) | 62 | BUTTON_RC_VOL_UP|BUTTON_RC_VOL_DOWN|BUTTON_RC_FUNC) |
63 | 63 | ||
64 | #define POWEROFF_BUTTON BUTTON_PLAY | 64 | #define POWEROFF_BUTTON BUTTON_PLAY |
65 | #define RC_POWEROFF_BUTTON BUTTON_RC_PLAY | 65 | #define RC_POWEROFF_BUTTON BUTTON_RC_PLAY |
diff --git a/firmware/target/coldfire/mpio/hd200/button-hd200.c b/firmware/target/coldfire/mpio/hd200/button-hd200.c index 65a996e7a5..93109ab209 100644 --- a/firmware/target/coldfire/mpio/hd200/button-hd200.c +++ b/firmware/target/coldfire/mpio/hd200/button-hd200.c | |||
@@ -113,15 +113,15 @@ int button_read_device(void) | |||
113 | /* 1200 - 900 */ | 113 | /* 1200 - 900 */ |
114 | btn = BUTTON_VOL_UP; | 114 | btn = BUTTON_VOL_UP; |
115 | else /* 1600 - 1200 */ | 115 | else /* 1600 - 1200 */ |
116 | btn = BUTTON_NEXT; | 116 | btn = BUTTON_FF; |
117 | } | 117 | } |
118 | else /* 1600 - 2250 */ | 118 | else /* 1600 - 2250 */ |
119 | { | 119 | { |
120 | if (data < 1900) | 120 | if (data < 1900) |
121 | /* 1900 - 1600 */ | 121 | /* 1900 - 1600 */ |
122 | btn = BUTTON_PREV; | 122 | btn = BUTTON_REW; |
123 | else /* 1900 - 2300 */ | 123 | else /* 1900 - 2300 */ |
124 | btn = BUTTON_SELECT; | 124 | btn = BUTTON_FUNC; |
125 | } | 125 | } |
126 | } | 126 | } |
127 | } | 127 | } |
@@ -148,7 +148,7 @@ int button_read_device(void) | |||
148 | btn = BUTTON_RC_VOL_UP; | 148 | btn = BUTTON_RC_VOL_UP; |
149 | } | 149 | } |
150 | else /* 950 - 650 */ | 150 | else /* 950 - 650 */ |
151 | btn = BUTTON_RC_NEXT; | 151 | btn = BUTTON_RC_FF; |
152 | } | 152 | } |
153 | else /* 2050 - 950 */ | 153 | else /* 2050 - 950 */ |
154 | { | 154 | { |
@@ -156,10 +156,10 @@ int button_read_device(void) | |||
156 | { | 156 | { |
157 | if (data < 1350) | 157 | if (data < 1350) |
158 | /* 1350 - 900 */ | 158 | /* 1350 - 900 */ |
159 | btn = BUTTON_RC_PREV; | 159 | btn = BUTTON_RC_REW; |
160 | } | 160 | } |
161 | else /* 2050 - 1900 */ | 161 | else /* 2050 - 1900 */ |
162 | btn = BUTTON_RC_SELECT; | 162 | btn = BUTTON_RC_FUNC; |
163 | } | 163 | } |
164 | } | 164 | } |
165 | } | 165 | } |