diff options
Diffstat (limited to 'apps/keymaps/keymap-ipod.c')
-rw-r--r-- | apps/keymaps/keymap-ipod.c | 75 |
1 files changed, 53 insertions, 22 deletions
diff --git a/apps/keymaps/keymap-ipod.c b/apps/keymaps/keymap-ipod.c index 774597a3c0..99c7f93511 100644 --- a/apps/keymaps/keymap-ipod.c +++ b/apps/keymaps/keymap-ipod.c | |||
@@ -193,21 +193,48 @@ const struct button_mapping button_context_recscreen[] = { | |||
193 | }; /* button_context_recscreen */ | 193 | }; /* button_context_recscreen */ |
194 | #endif | 194 | #endif |
195 | 195 | ||
196 | #ifdef HAVE_USBSTACK | 196 | #ifdef USB_ENABLE_HID |
197 | static const struct button_mapping button_context_usb_hid[] = { | 197 | static const struct button_mapping button_context_usb_hid[] = { |
198 | { ACTION_USB_HID_PLAY, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, | 198 | { ACTION_USB_HID_INC, BUTTON_SCROLL_FWD, BUTTON_NONE }, |
199 | { ACTION_USB_HID_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, | 199 | { ACTION_USB_HID_INC, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE }, |
200 | { ACTION_USB_HID_SKIPPREV, BUTTON_LEFT, BUTTON_NONE }, | 200 | { ACTION_USB_HID_DEC, BUTTON_SCROLL_BACK, BUTTON_NONE }, |
201 | { ACTION_USB_HID_SKIPNEXT, BUTTON_RIGHT, BUTTON_NONE }, | 201 | { ACTION_USB_HID_DEC, BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE }, |
202 | { ACTION_USB_HID_VOLUP, BUTTON_SCROLL_FWD, BUTTON_NONE }, | 202 | { ACTION_USB_HID_START, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, |
203 | { ACTION_USB_HID_VOLUP, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE }, | 203 | { ACTION_USB_HID_QUIT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, |
204 | { ACTION_USB_HID_VOLDOWN, BUTTON_SCROLL_BACK, BUTTON_NONE }, | 204 | { ACTION_USB_HID_LEFT, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, |
205 | { ACTION_USB_HID_VOLDOWN, BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE }, | 205 | { ACTION_USB_HID_LEFT_LONG, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, |
206 | { ACTION_USB_HID_MUTE, BUTTON_SELECT, BUTTON_NONE }, | 206 | { ACTION_USB_HID_RIGHT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, |
207 | { ACTION_USB_HID_MENU, BUTTON_MENU, BUTTON_NONE }, | 207 | { ACTION_USB_HID_RIGHT_LONG, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT }, |
208 | { ACTION_USB_HID_SELECT, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, | ||
209 | { ACTION_USB_HID_SELECT_LONG, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, | ||
210 | { ACTION_USB_HID_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, | ||
211 | { ACTION_USB_HID_MODE, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, | ||
208 | 212 | ||
209 | LAST_ITEM_IN_LIST | 213 | LAST_ITEM_IN_LIST |
210 | }; /* button_context_usb_hid */ | 214 | }; /* button_context_usb_hid */ |
215 | |||
216 | 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_REP, BUTTON_MENU|BUTTON_REPEAT, BUTTON_NONE }, | ||
219 | { 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_LEFT, BUTTON_LEFT, BUTTON_NONE }, | ||
222 | { 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_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_LDRAG_UP_REP, BUTTON_SELECT|BUTTON_MENU|BUTTON_REPEAT, BUTTON_NONE }, | ||
227 | { ACTION_USB_HID_MOUSE_LDRAG_DOWN, BUTTON_SELECT|BUTTON_PLAY, BUTTON_NONE }, | ||
228 | { ACTION_USB_HID_MOUSE_LDRAG_DOWN_REP, BUTTON_SELECT|BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE }, | ||
229 | { ACTION_USB_HID_MOUSE_LDRAG_LEFT, BUTTON_SELECT|BUTTON_LEFT, BUTTON_NONE }, | ||
230 | { ACTION_USB_HID_MOUSE_LDRAG_LEFT_REP, BUTTON_SELECT|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | ||
231 | { ACTION_USB_HID_MOUSE_LDRAG_RIGHT, BUTTON_SELECT|BUTTON_RIGHT, BUTTON_NONE }, | ||
232 | { ACTION_USB_HID_MOUSE_LDRAG_RIGHT_REP, BUTTON_SELECT|BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | ||
233 | { ACTION_USB_HID_MOUSE_BUTTON_LEFT, BUTTON_SELECT, BUTTON_NONE }, | ||
234 | { ACTION_USB_HID_MOUSE_BUTTON_LEFT_REL, BUTTON_SELECT|BUTTON_REL, BUTTON_NONE }, | ||
235 | |||
236 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_USB_HID) | ||
237 | }; /* button_context_usb_hid_mouse */ | ||
211 | #endif | 238 | #endif |
212 | 239 | ||
213 | #if BUTTON_REMOTE != 0 | 240 | #if BUTTON_REMOTE != 0 |
@@ -242,16 +269,18 @@ static const struct button_mapping remote_button_context_wps[] = { | |||
242 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 269 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
243 | }; | 270 | }; |
244 | 271 | ||
245 | #ifdef HAVE_USBSTACK | 272 | #ifdef USB_ENABLE_HID |
246 | static const struct button_mapping remote_button_context_usb_hid[] = { | 273 | static const struct button_mapping remote_button_context_usb_hid[] = { |
247 | { ACTION_USB_HID_PLAY, BUTTON_RC_PLAY, BUTTON_NONE }, | 274 | { ACTION_USB_HID_INC, BUTTON_RC_VOL_UP, BUTTON_NONE }, |
248 | { ACTION_USB_HID_STOP, BUTTON_RC_PLAY|BUTTON_REPEAT, BUTTON_NONE }, | 275 | { ACTION_USB_HID_INC, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, |
249 | { ACTION_USB_HID_SKIPPREV, BUTTON_RC_LEFT, BUTTON_NONE }, | 276 | { ACTION_USB_HID_DEC, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, |
250 | { ACTION_USB_HID_SKIPNEXT, BUTTON_RC_RIGHT, BUTTON_NONE }, | 277 | { ACTION_USB_HID_DEC, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
251 | { ACTION_USB_HID_VOLUP, BUTTON_RC_VOL_UP, BUTTON_NONE }, | 278 | { ACTION_USB_HID_START, BUTTON_RC_PLAY|BUTTON_REL, BUTTON_RC_PLAY }, |
252 | { ACTION_USB_HID_VOLUP, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, | 279 | { ACTION_USB_HID_QUIT, BUTTON_RC_PLAY|BUTTON_REPEAT, BUTTON_RC_PLAY }, |
253 | { ACTION_USB_HID_VOLDOWN, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, | 280 | { ACTION_USB_HID_LEFT, BUTTON_RC_LEFT|BUTTON_REL, BUTTON_RC_LEFT }, |
254 | { ACTION_USB_HID_VOLDOWN, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 281 | { ACTION_USB_HID_LEFT_LONG, BUTTON_RC_LEFT|BUTTON_REPEAT, BUTTON_RC_LEFT }, |
282 | { ACTION_USB_HID_RIGHT, BUTTON_RC_RIGHT|BUTTON_REL, BUTTON_RC_RIGHT }, | ||
283 | { ACTION_USB_HID_RIGHT_LONG, BUTTON_RC_RIGHT|BUTTON_REPEAT, BUTTON_RC_RIGHT }, | ||
255 | 284 | ||
256 | LAST_ITEM_IN_LIST | 285 | LAST_ITEM_IN_LIST |
257 | }; /* remote_button_context_usb_hid */ | 286 | }; /* remote_button_context_usb_hid */ |
@@ -265,7 +294,7 @@ static const struct button_mapping* get_context_mapping_remote( int context ) | |||
265 | { | 294 | { |
266 | case CONTEXT_WPS: | 295 | case CONTEXT_WPS: |
267 | return remote_button_context_wps; | 296 | return remote_button_context_wps; |
268 | #ifdef HAVE_USBSTACK | 297 | #ifdef USB_ENABLE_HID |
269 | case CONTEXT_USB_HID: | 298 | case CONTEXT_USB_HID: |
270 | return remote_button_context_usb_hid; | 299 | return remote_button_context_usb_hid; |
271 | #endif | 300 | #endif |
@@ -321,9 +350,11 @@ const struct button_mapping* get_context_mapping(int context) | |||
321 | case CONTEXT_RECSCREEN: | 350 | case CONTEXT_RECSCREEN: |
322 | return button_context_recscreen; | 351 | return button_context_recscreen; |
323 | #endif | 352 | #endif |
324 | #ifdef HAVE_USBSTACK | 353 | #ifdef USB_ENABLE_HID |
325 | case CONTEXT_USB_HID: | 354 | case CONTEXT_USB_HID: |
326 | return button_context_usb_hid; | 355 | return button_context_usb_hid; |
356 | case CONTEXT_USB_HID_MOUSE: | ||
357 | return button_context_usb_hid_mouse; | ||
327 | #endif | 358 | #endif |
328 | default: | 359 | default: |
329 | return button_context_standard; | 360 | return button_context_standard; |