diff options
Diffstat (limited to 'apps/keymaps/keymap-ipod.c')
-rw-r--r-- | apps/keymaps/keymap-ipod.c | 81 |
1 files changed, 63 insertions, 18 deletions
diff --git a/apps/keymaps/keymap-ipod.c b/apps/keymaps/keymap-ipod.c index 2b34fbc157..199524e6af 100644 --- a/apps/keymaps/keymap-ipod.c +++ b/apps/keymaps/keymap-ipod.c | |||
@@ -213,29 +213,35 @@ static const struct button_mapping button_context_usb_hid[] = { | |||
213 | LAST_ITEM_IN_LIST | 213 | LAST_ITEM_IN_LIST |
214 | }; /* button_context_usb_hid */ | 214 | }; /* button_context_usb_hid */ |
215 | 215 | ||
216 | #ifdef HAVE_USB_HID_MOUSE | ||
216 | static const struct button_mapping button_context_usb_hid_mouse[] = { | 217 | static const struct button_mapping button_context_usb_hid_mouse[] = { |
217 | { ACTION_USB_HID_MOUSE_UP, BUTTON_MENU, BUTTON_NONE }, | 218 | { ACTION_USB_HID_MOUSE_UP, BUTTON_MENU, BUTTON_NONE }, |
218 | { ACTION_USB_HID_MOUSE_UP_REP, BUTTON_MENU|BUTTON_REPEAT, BUTTON_NONE }, | 219 | { ACTION_USB_HID_MOUSE_UP_REP, BUTTON_MENU|BUTTON_REPEAT, BUTTON_NONE }, |
219 | { ACTION_USB_HID_MOUSE_DOWN, BUTTON_PLAY, BUTTON_NONE }, | 220 | { ACTION_USB_HID_MOUSE_DOWN, BUTTON_PLAY, BUTTON_NONE }, |
220 | { ACTION_USB_HID_MOUSE_DOWN_REP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE }, | 221 | { ACTION_USB_HID_MOUSE_DOWN_REP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE }, |
221 | { ACTION_USB_HID_MOUSE_LEFT, BUTTON_LEFT, BUTTON_NONE }, | 222 | { ACTION_USB_HID_MOUSE_LEFT, BUTTON_LEFT, BUTTON_NONE }, |
222 | { ACTION_USB_HID_MOUSE_LEFT_REP, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | 223 | { ACTION_USB_HID_MOUSE_LEFT_REP, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
223 | { ACTION_USB_HID_MOUSE_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, | 224 | { ACTION_USB_HID_MOUSE_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, |
224 | { ACTION_USB_HID_MOUSE_RIGHT_REP, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | 225 | { ACTION_USB_HID_MOUSE_RIGHT_REP, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, |
225 | { ACTION_USB_HID_MOUSE_LDRAG_UP, BUTTON_SELECT|BUTTON_MENU, BUTTON_NONE }, | 226 | { ACTION_USB_HID_MOUSE_BUTTON_LEFT, BUTTON_SELECT, BUTTON_NONE }, |
226 | { ACTION_USB_HID_MOUSE_LDRAG_UP_REP, BUTTON_SELECT|BUTTON_MENU|BUTTON_REPEAT, BUTTON_NONE }, | 227 | { ACTION_USB_HID_MOUSE_BUTTON_LEFT_REL, BUTTON_SELECT|BUTTON_REL, BUTTON_NONE }, |
227 | { ACTION_USB_HID_MOUSE_LDRAG_DOWN, BUTTON_SELECT|BUTTON_PLAY, BUTTON_NONE }, | 228 | { ACTION_USB_HID_MOUSE_LDRAG_UP, BUTTON_SELECT|BUTTON_MENU, BUTTON_NONE }, |
228 | { ACTION_USB_HID_MOUSE_LDRAG_DOWN_REP, BUTTON_SELECT|BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE }, | 229 | { ACTION_USB_HID_MOUSE_LDRAG_UP_REP, BUTTON_SELECT|BUTTON_MENU|BUTTON_REPEAT, BUTTON_NONE }, |
229 | { ACTION_USB_HID_MOUSE_LDRAG_LEFT, BUTTON_SELECT|BUTTON_LEFT, BUTTON_NONE }, | 230 | { ACTION_USB_HID_MOUSE_LDRAG_DOWN, BUTTON_SELECT|BUTTON_PLAY, BUTTON_NONE }, |
230 | { ACTION_USB_HID_MOUSE_LDRAG_LEFT_REP, BUTTON_SELECT|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | 231 | { ACTION_USB_HID_MOUSE_LDRAG_DOWN_REP, BUTTON_SELECT|BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE }, |
231 | { ACTION_USB_HID_MOUSE_LDRAG_RIGHT, BUTTON_SELECT|BUTTON_RIGHT, BUTTON_NONE }, | 232 | { ACTION_USB_HID_MOUSE_LDRAG_LEFT, BUTTON_SELECT|BUTTON_LEFT, BUTTON_NONE }, |
232 | { ACTION_USB_HID_MOUSE_LDRAG_RIGHT_REP, BUTTON_SELECT|BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | 233 | { ACTION_USB_HID_MOUSE_LDRAG_LEFT_REP, BUTTON_SELECT|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
233 | { ACTION_USB_HID_MOUSE_BUTTON_LEFT, BUTTON_SELECT, BUTTON_NONE }, | 234 | { ACTION_USB_HID_MOUSE_LDRAG_RIGHT, BUTTON_SELECT|BUTTON_RIGHT, BUTTON_NONE }, |
234 | { ACTION_USB_HID_MOUSE_BUTTON_LEFT_REL, BUTTON_SELECT|BUTTON_REL, BUTTON_NONE }, | 235 | { ACTION_USB_HID_MOUSE_LDRAG_RIGHT_REP, BUTTON_SELECT|BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, |
236 | { ACTION_USB_HID_MOUSE_WHEEL_SCROLL_UP, BUTTON_SCROLL_BACK, BUTTON_NONE }, | ||
237 | { ACTION_USB_HID_MOUSE_WHEEL_SCROLL_UP, BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE }, | ||
238 | { ACTION_USB_HID_MOUSE_WHEEL_SCROLL_DOWN, BUTTON_SCROLL_FWD, BUTTON_NONE }, | ||
239 | { ACTION_USB_HID_MOUSE_WHEEL_SCROLL_DOWN, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE }, | ||
235 | 240 | ||
236 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_USB_HID) | 241 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_USB_HID) |
237 | }; /* button_context_usb_hid_mouse */ | 242 | }; /* button_context_usb_hid_mouse */ |
238 | #endif | 243 | #endif |
244 | #endif | ||
239 | 245 | ||
240 | #if BUTTON_REMOTE != 0 | 246 | #if BUTTON_REMOTE != 0 |
241 | /***************************************************************************** | 247 | /***************************************************************************** |
@@ -284,6 +290,37 @@ static const struct button_mapping remote_button_context_usb_hid[] = { | |||
284 | 290 | ||
285 | LAST_ITEM_IN_LIST | 291 | LAST_ITEM_IN_LIST |
286 | }; /* remote_button_context_usb_hid */ | 292 | }; /* remote_button_context_usb_hid */ |
293 | |||
294 | #if 0 /* Pending P#10623: Improved accessory support and detection for Ipod */ | ||
295 | #ifdef HAVE_USB_HID_MOUSE | ||
296 | static const struct button_mapping remote_button_context_usb_hid_mouse[] = { | ||
297 | { ACTION_USB_HID_MOUSE_UP, BUTTON_RC_MENU, BUTTON_NONE }, | ||
298 | { ACTION_USB_HID_MOUSE_UP_REP, BUTTON_RC_MENU|BUTTON_REPEAT, BUTTON_NONE }, | ||
299 | { ACTION_USB_HID_MOUSE_DOWN, BUTTON_RC_PLAY, BUTTON_NONE }, | ||
300 | { ACTION_USB_HID_MOUSE_DOWN_REP, BUTTON_RC_PLAY|BUTTON_REPEAT, BUTTON_NONE }, | ||
301 | { ACTION_USB_HID_MOUSE_LEFT, BUTTON_RC_LEFT, BUTTON_NONE }, | ||
302 | { ACTION_USB_HID_MOUSE_LEFT_REP, BUTTON_RC_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | ||
303 | { ACTION_USB_HID_MOUSE_RIGHT, BUTTON_RC_RIGHT, BUTTON_NONE }, | ||
304 | { ACTION_USB_HID_MOUSE_RIGHT_REP, BUTTON_RC_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | ||
305 | { ACTION_USB_HID_MOUSE_BUTTON_LEFT, BUTTON_RC_SELECT, BUTTON_NONE }, | ||
306 | { ACTION_USB_HID_MOUSE_BUTTON_LEFT_REL, BUTTON_RC_SELECT|BUTTON_REL, BUTTON_NONE }, | ||
307 | { ACTION_USB_HID_MOUSE_LDRAG_UP, BUTTON_RC_SELECT|BUTTON_RC_MENU, BUTTON_NONE }, | ||
308 | { ACTION_USB_HID_MOUSE_LDRAG_UP_REP, BUTTON_RC_SELECT|BUTTON_RC_MENU|BUTTON_REPEAT, BUTTON_NONE }, | ||
309 | { ACTION_USB_HID_MOUSE_LDRAG_DOWN, BUTTON_RC_SELECT|BUTTON_RC_PLAY, BUTTON_NONE }, | ||
310 | { ACTION_USB_HID_MOUSE_LDRAG_DOWN_REP, BUTTON_RC_SELECT|BUTTON_RC_PLAY|BUTTON_REPEAT, BUTTON_NONE }, | ||
311 | { ACTION_USB_HID_MOUSE_LDRAG_LEFT, BUTTON_RC_SELECT|BUTTON_RC_LEFT, BUTTON_NONE }, | ||
312 | { ACTION_USB_HID_MOUSE_LDRAG_LEFT_REP, BUTTON_RC_SELECT|BUTTON_RC_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | ||
313 | { ACTION_USB_HID_MOUSE_LDRAG_RIGHT, BUTTON_RC_SELECT|BUTTON_RC_RIGHT, BUTTON_NONE }, | ||
314 | { ACTION_USB_HID_MOUSE_LDRAG_RIGHT_REP, BUTTON_RC_SELECT|BUTTON_RC_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | ||
315 | { ACTION_USB_HID_MOUSE_WHEEL_SCROLL_UP, BUTTON_RC_VOL_UP, BUTTON_NONE }, | ||
316 | { ACTION_USB_HID_MOUSE_WHEEL_SCROLL_UP, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, | ||
317 | { ACTION_USB_HID_MOUSE_WHEEL_SCROLL_DOWN, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, | ||
318 | { ACTION_USB_HID_MOUSE_WHEEL_SCROLL_DOWN, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
319 | |||
320 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_USB_HID) | ||
321 | }; /* remote_button_context_usb_hid_mouse */ | ||
322 | #endif | ||
323 | #endif /* if 0 */ | ||
287 | #endif | 324 | #endif |
288 | 325 | ||
289 | static const struct button_mapping* get_context_mapping_remote( int context ) | 326 | static const struct button_mapping* get_context_mapping_remote( int context ) |
@@ -297,6 +334,12 @@ static const struct button_mapping* get_context_mapping_remote( int context ) | |||
297 | #ifdef USB_ENABLE_HID | 334 | #ifdef USB_ENABLE_HID |
298 | case CONTEXT_USB_HID: | 335 | case CONTEXT_USB_HID: |
299 | return remote_button_context_usb_hid; | 336 | return remote_button_context_usb_hid; |
337 | #if 0 /* Pending P#10623: Improved accessory support and detection for Ipod */ | ||
338 | #ifdef HAVE_USB_HID_MOUSE | ||
339 | case CONTEXT_USB_HID_MOUSE: | ||
340 | return remote_button_context_usb_hid_mouse; | ||
341 | #endif | ||
342 | #endif /* If 0 */ | ||
300 | #endif | 343 | #endif |
301 | default: | 344 | default: |
302 | return remote_button_context_standard; | 345 | return remote_button_context_standard; |
@@ -353,9 +396,11 @@ const struct button_mapping* get_context_mapping(int context) | |||
353 | #ifdef USB_ENABLE_HID | 396 | #ifdef USB_ENABLE_HID |
354 | case CONTEXT_USB_HID: | 397 | case CONTEXT_USB_HID: |
355 | return button_context_usb_hid; | 398 | return button_context_usb_hid; |
399 | #ifdef HAVE_USB_HID_MOUSE | ||
356 | case CONTEXT_USB_HID_MOUSE: | 400 | case CONTEXT_USB_HID_MOUSE: |
357 | return button_context_usb_hid_mouse; | 401 | return button_context_usb_hid_mouse; |
358 | #endif | 402 | #endif |
403 | #endif | ||
359 | default: | 404 | default: |
360 | return button_context_standard; | 405 | return button_context_standard; |
361 | } | 406 | } |