diff options
author | Tomer Shalev <shalev.tomer@gmail.com> | 2009-09-30 10:06:04 +0000 |
---|---|---|
committer | Tomer Shalev <shalev.tomer@gmail.com> | 2009-09-30 10:06:04 +0000 |
commit | 8c5141b32ea74a3093073d9bb11205acb7640233 (patch) | |
tree | 486f8e4f94053a389d840b04724567a524b9b4ea /apps/keymaps/keymap-c100.c | |
parent | d7f4f9ff750872a9eb570409966e500099d84d7d (diff) | |
download | rockbox-8c5141b32ea74a3093073d9bb11205acb7640233.tar.gz rockbox-8c5141b32ea74a3093073d9bb11205acb7640233.zip |
Commit "FS#10468 - USB HID: Show keypad mode on screen"
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22852 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/keymaps/keymap-c100.c')
-rw-r--r-- | apps/keymaps/keymap-c100.c | 61 |
1 files changed, 53 insertions, 8 deletions
diff --git a/apps/keymaps/keymap-c100.c b/apps/keymaps/keymap-c100.c index a19549dbd9..fcb747b5fd 100644 --- a/apps/keymaps/keymap-c100.c +++ b/apps/keymaps/keymap-c100.c | |||
@@ -232,17 +232,60 @@ static const struct button_mapping button_context_bmark[] = { | |||
232 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST), | 232 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST), |
233 | }; /* button_context_bmark */ | 233 | }; /* button_context_bmark */ |
234 | 234 | ||
235 | #ifdef HAVE_USBSTACK | 235 | #ifdef USB_ENABLE_HID |
236 | static const struct button_mapping button_context_usb_hid[] = { | 236 | static const struct button_mapping button_context_usb_hid[] = { |
237 | { ACTION_USB_HID_PLAY, BUTTON_UP, BUTTON_NONE }, | 237 | { ACTION_USB_HID_INC, BUTTON_VOLUP, BUTTON_NONE }, |
238 | { ACTION_USB_HID_STOP, BUTTON_POWER, BUTTON_NONE }, | 238 | { ACTION_USB_HID_INC, BUTTON_VOLUP|BUTTON_REPEAT, BUTTON_NONE }, |
239 | { ACTION_USB_HID_SKIPPREV, BUTTON_LEFT, BUTTON_NONE }, | 239 | { ACTION_USB_HID_DEC, BUTTON_VOLDOWN, BUTTON_NONE }, |
240 | { ACTION_USB_HID_SKIPNEXT, BUTTON_RIGHT, BUTTON_NONE }, | 240 | { ACTION_USB_HID_DEC, BUTTON_VOLDOWN|BUTTON_REPEAT, BUTTON_NONE }, |
241 | { ACTION_USB_HID_MUTE, BUTTON_VOLDOWN, BUTTON_NONE }, | 241 | { ACTION_USB_HID_START, BUTTON_UP|BUTTON_REL, BUTTON_UP }, |
242 | { ACTION_USB_HID_MENU, BUTTON_DOWN, BUTTON_NONE }, | 242 | { ACTION_USB_HID_START_LONG, BUTTON_UP|BUTTON_REPEAT, BUTTON_UP }, |
243 | { ACTION_USB_HID_QUIT, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, | ||
244 | { ACTION_USB_HID_QUIT_LONG, BUTTON_POWER|BUTTON_REPEAT, BUTTON_POWER }, | ||
245 | { ACTION_USB_HID_LEFT, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, | ||
246 | { ACTION_USB_HID_LEFT_LONG, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, | ||
247 | { ACTION_USB_HID_RIGHT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, | ||
248 | { ACTION_USB_HID_RIGHT_LONG, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT }, | ||
249 | { ACTION_USB_HID_SELECT, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, | ||
250 | { ACTION_USB_HID_SELECT_LONG, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, | ||
251 | { ACTION_USB_HID_MENU, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_DOWN }, | ||
252 | { ACTION_USB_HID_MODE, BUTTON_DOWN|BUTTON_REL, BUTTON_DOWN }, | ||
243 | 253 | ||
244 | LAST_ITEM_IN_LIST | 254 | LAST_ITEM_IN_LIST |
245 | }; /* button_context_usb_hid */ | 255 | }; /* button_context_usb_hid */ |
256 | |||
257 | static const struct button_mapping button_context_usb_hid_mouse[] = { | ||
258 | { ACTION_USB_HID_MOUSE_UP, BUTTON_UP, BUTTON_NONE }, | ||
259 | { ACTION_USB_HID_MOUSE_UP_REP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | ||
260 | { ACTION_USB_HID_MOUSE_DOWN, BUTTON_DOWN, BUTTON_NONE }, | ||
261 | { ACTION_USB_HID_MOUSE_DOWN_REP, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
262 | { ACTION_USB_HID_MOUSE_LEFT, BUTTON_LEFT, BUTTON_NONE }, | ||
263 | { ACTION_USB_HID_MOUSE_LEFT_REP, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | ||
264 | { ACTION_USB_HID_MOUSE_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, | ||
265 | { ACTION_USB_HID_MOUSE_RIGHT_REP, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | ||
266 | { ACTION_USB_HID_MOUSE_LDRAG_UP, BUTTON_SELECT|BUTTON_UP, BUTTON_NONE }, | ||
267 | { ACTION_USB_HID_MOUSE_LDRAG_UP_REP, BUTTON_SELECT|BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | ||
268 | { ACTION_USB_HID_MOUSE_LDRAG_DOWN, BUTTON_SELECT|BUTTON_DOWN, BUTTON_NONE }, | ||
269 | { ACTION_USB_HID_MOUSE_LDRAG_DOWN_REP, BUTTON_SELECT|BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
270 | { ACTION_USB_HID_MOUSE_LDRAG_LEFT, BUTTON_SELECT|BUTTON_LEFT, BUTTON_NONE }, | ||
271 | { ACTION_USB_HID_MOUSE_LDRAG_LEFT_REP, BUTTON_SELECT|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | ||
272 | { ACTION_USB_HID_MOUSE_LDRAG_RIGHT, BUTTON_SELECT|BUTTON_RIGHT, BUTTON_NONE }, | ||
273 | { ACTION_USB_HID_MOUSE_LDRAG_RIGHT_REP, BUTTON_SELECT|BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | ||
274 | { ACTION_USB_HID_MOUSE_RDRAG_UP, BUTTON_POWER|BUTTON_UP, BUTTON_NONE }, | ||
275 | { ACTION_USB_HID_MOUSE_RDRAG_UP_REP, BUTTON_POWER|BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | ||
276 | { ACTION_USB_HID_MOUSE_RDRAG_DOWN, BUTTON_POWER|BUTTON_DOWN, BUTTON_NONE }, | ||
277 | { ACTION_USB_HID_MOUSE_RDRAG_DOWN_REP, BUTTON_POWER|BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
278 | { ACTION_USB_HID_MOUSE_RDRAG_LEFT, BUTTON_POWER|BUTTON_LEFT, BUTTON_NONE }, | ||
279 | { ACTION_USB_HID_MOUSE_RDRAG_LEFT_REP, BUTTON_POWER|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | ||
280 | { ACTION_USB_HID_MOUSE_RDRAG_RIGHT, BUTTON_POWER|BUTTON_RIGHT, BUTTON_NONE }, | ||
281 | { ACTION_USB_HID_MOUSE_RDRAG_RIGHT_REP, BUTTON_POWER|BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | ||
282 | { ACTION_USB_HID_MOUSE_BUTTON_LEFT, BUTTON_SELECT, BUTTON_NONE }, | ||
283 | { ACTION_USB_HID_MOUSE_BUTTON_LEFT_REL, BUTTON_SELECT|BUTTON_REL, BUTTON_NONE }, | ||
284 | { ACTION_USB_HID_MOUSE_BUTTON_RIGHT, BUTTON_POWER, BUTTON_NONE }, | ||
285 | { ACTION_USB_HID_MOUSE_BUTTON_RIGHT_REL, BUTTON_POWER|BUTTON_REL, BUTTON_NONE }, | ||
286 | |||
287 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_USB_HID) | ||
288 | }; /* button_context_usb_hid_mouse */ | ||
246 | #endif | 289 | #endif |
247 | 290 | ||
248 | /* get_context_mapping returns a pointer to one of the above defined arrays depending on the context */ | 291 | /* get_context_mapping returns a pointer to one of the above defined arrays depending on the context */ |
@@ -293,9 +336,11 @@ const struct button_mapping* get_context_mapping(int context) | |||
293 | #endif | 336 | #endif |
294 | case CONTEXT_KEYBOARD: | 337 | case CONTEXT_KEYBOARD: |
295 | return button_context_keyboard; | 338 | return button_context_keyboard; |
296 | #ifdef HAVE_USBSTACK | 339 | #ifdef USB_ENABLE_HID |
297 | case CONTEXT_USB_HID: | 340 | case CONTEXT_USB_HID: |
298 | return button_context_usb_hid; | 341 | return button_context_usb_hid; |
342 | case CONTEXT_USB_HID_MOUSE: | ||
343 | return button_context_usb_hid_mouse; | ||
299 | #endif | 344 | #endif |
300 | default: | 345 | default: |
301 | return button_context_standard; | 346 | return button_context_standard; |