diff options
-rw-r--r-- | firmware/target/arm/tms320dm320/creative-zvm/pic-creativezvm.c | 33 |
1 files changed, 20 insertions, 13 deletions
diff --git a/firmware/target/arm/tms320dm320/creative-zvm/pic-creativezvm.c b/firmware/target/arm/tms320dm320/creative-zvm/pic-creativezvm.c index 836d46c067..76c8869f50 100644 --- a/firmware/target/arm/tms320dm320/creative-zvm/pic-creativezvm.c +++ b/firmware/target/arm/tms320dm320/creative-zvm/pic-creativezvm.c | |||
@@ -73,6 +73,8 @@ | |||
73 | #define BTN_MENU 0x9F00 | 73 | #define BTN_MENU 0x9F00 |
74 | #define BTN_HOLD 0x9F06 | 74 | #define BTN_HOLD 0x9F06 |
75 | #define BTN_UNHOLD 0xAF06 | 75 | #define BTN_UNHOLD 0xAF06 |
76 | |||
77 | |||
76 | /* TODO: other values | 78 | /* TODO: other values |
77 | 79 | ||
78 | First number is just pressing it, second is when you release it or keep it | 80 | First number is just pressing it, second is when you release it or keep it |
@@ -104,23 +106,22 @@ AV out = 9F06 */ | |||
104 | 106 | ||
105 | #define BTN_REL 1 | 107 | #define BTN_REL 1 |
106 | 108 | ||
107 | #define BTN_TOUCHPAD_PRESS 0x8F00 | 109 | #define BTN_TOUCHPAD_PRESS 0x1F00 |
108 | #define BTN_TOUCHPAD_LONG_PRESS 0x0F00 | 110 | #define BTN_TOUCHPAD_LONG_PRESS 0x1F01 |
109 | #define BTN_TOUCHPAD_CORNER_DOWN 0xD700 | 111 | #define BTN_TOUCHPAD_CORNER_DOWN 0xFF00 |
110 | #define BTN_TOUCHPAD_CORNER_LONG_DOWN 0x5700 | 112 | #define BTN_TOUCHPAD_SCROLL_DOWN 0xFF01 |
111 | #define BTN_TOUCHPAD_CORNER_UP 0x9F00 | 113 | #define BTN_TOUCHPAD_CORNER_UP 0xDF00 |
112 | #define BTN_TOUCHPAD_CORNER_LONG_UP 0x1F00 | 114 | #define BTN_TOUCHPAD_SCROLL_UP 0xDF01 |
113 | 115 | ||
114 | #define HEADPHONE_PLUGIN_A 0xAF06 | 116 | #define HEADPHONE_PLUGIN_A 0xAF06 |
115 | #define HEADPHONE_PLUGIN_B 0xAF06 | 117 | #define HEADPHONE_PLUGIN_B 0x00AF06 //Dummy Value |
116 | #define HEADPHONE_UNPLUG_A 0xBF06 | 118 | #define HEADPHONE_UNPLUG_A 0x00BF06 //Dummy Value |
117 | #define HEADPHONE_UNPLUG_B 0xBF06 | 119 | #define HEADPHONE_UNPLUG_B 0x00BF061 //Dummy Value |
118 | 120 | ||
119 | #define DOCK_INSERT 0x0 | 121 | #define DOCK_INSERT 0x00003 //Dummy Value |
120 | #define DOCK_UNPLUG 0x0 | 122 | #define DOCK_UNPLUG 0x00002 //Dummy Value |
121 | #define DOCK_USB_INSERT 0x2F06 | 123 | #define DOCK_USB_INSERT 0x2F06 |
122 | #define DOCK_USB_UNPLUG_A 0x3F06 | 124 | #define DOCK_USB_UNPLUG 0x3F06 |
123 | #define DOCK_USB_UNPLUG_B 0x3F06 | ||
124 | #define DOCK_POWER_INSERT 0x4F06 | 125 | #define DOCK_POWER_INSERT 0x4F06 |
125 | #define DOCK_POWER_UNPLUG 0x5F06 | 126 | #define DOCK_POWER_UNPLUG 0x5F06 |
126 | #define DOCK_AV_INSERT 0x8F06 | 127 | #define DOCK_AV_INSERT 0x8F06 |
@@ -204,18 +205,23 @@ void GIO0(void) | |||
204 | map_button(BTN_TOUCHPAD_PRESS, BUTTON_SELECT); | 205 | map_button(BTN_TOUCHPAD_PRESS, BUTTON_SELECT); |
205 | map_button(BTN_TOUCHPAD_CORNER_DOWN, BUTTON_DOWN); | 206 | map_button(BTN_TOUCHPAD_CORNER_DOWN, BUTTON_DOWN); |
206 | map_button(BTN_TOUCHPAD_CORNER_UP, BUTTON_UP); | 207 | map_button(BTN_TOUCHPAD_CORNER_UP, BUTTON_UP); |
208 | #ifndef ZEN_VISION | ||
209 | /* These don't seem to work for some reason on the Zen Vision.. */ | ||
207 | case BTN_TOUCHPAD_SCROLL_DOWN: | 210 | case BTN_TOUCHPAD_SCROLL_DOWN: |
208 | btn = BUTTON_DOWN; | 211 | btn = BUTTON_DOWN; |
209 | break; | 212 | break; |
210 | case BTN_TOUCHPAD_SCROLL_UP: | 213 | case BTN_TOUCHPAD_SCROLL_UP: |
211 | btn = BUTTON_UP; | 214 | btn = BUTTON_UP; |
212 | break; | 215 | break; |
216 | #endif | ||
213 | case BTN_HOLD: | 217 | case BTN_HOLD: |
214 | hold_switch = true; | 218 | hold_switch = true; |
215 | break; | 219 | break; |
216 | case BTN_UNHOLD: | 220 | case BTN_UNHOLD: |
217 | hold_switch = false; | 221 | hold_switch = false; |
218 | break; | 222 | break; |
223 | #ifndef ZEN_VISION | ||
224 | /* These don't seem to work for some reason.. */ | ||
219 | case HEADPHONE_PLUGIN_A: | 225 | case HEADPHONE_PLUGIN_A: |
220 | case HEADPHONE_PLUGIN_B: | 226 | case HEADPHONE_PLUGIN_B: |
221 | nonbtn |= NONBUTTON_HEADPHONE; | 227 | nonbtn |= NONBUTTON_HEADPHONE; |
@@ -224,6 +230,7 @@ void GIO0(void) | |||
224 | case HEADPHONE_UNPLUG_B: | 230 | case HEADPHONE_UNPLUG_B: |
225 | nonbtn &= ~NONBUTTON_HEADPHONE; | 231 | nonbtn &= ~NONBUTTON_HEADPHONE; |
226 | break; | 232 | break; |
233 | #endif | ||
227 | case DOCK_INSERT: | 234 | case DOCK_INSERT: |
228 | nonbtn |= NONBUTTON_DOCK; | 235 | nonbtn |= NONBUTTON_DOCK; |
229 | break; | 236 | break; |