diff options
author | Tomer Shalev <shalev.tomer@gmail.com> | 2009-09-30 12:04:06 +0000 |
---|---|---|
committer | Tomer Shalev <shalev.tomer@gmail.com> | 2009-09-30 12:04:06 +0000 |
commit | 363c116fc7f4b5189f863004d4ac0d2f1a48ec89 (patch) | |
tree | f73376029e2a768d3108d258aa988ab01623b4f0 /apps | |
parent | 0a41a7963909956711a493b38e746f7d3441737a (diff) | |
download | rockbox-363c116fc7f4b5189f863004d4ac0d2f1a48ec89.tar.gz rockbox-363c116fc7f4b5189f863004d4ac0d2f1a48ec89.zip |
- Added USB HID documentation to the mr100 manual
- Fixed mr100 keymap
- Fixed wrong entry for mr100's pad in blackjack's manual entry
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22855 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/keymaps/keymap-mr100.c | 4 | ||||
-rw-r--r-- | apps/usb_keymaps.c | 27 |
2 files changed, 16 insertions, 15 deletions
diff --git a/apps/keymaps/keymap-mr100.c b/apps/keymaps/keymap-mr100.c index 5c0fd5065b..dc8c765a01 100644 --- a/apps/keymaps/keymap-mr100.c +++ b/apps/keymaps/keymap-mr100.c | |||
@@ -331,8 +331,8 @@ static const struct button_mapping button_context_usb_hid[] = { | |||
331 | { ACTION_USB_HID_RIGHT_LONG, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT }, | 331 | { ACTION_USB_HID_RIGHT_LONG, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT }, |
332 | { ACTION_USB_HID_SELECT, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, | 332 | { ACTION_USB_HID_SELECT, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, |
333 | { ACTION_USB_HID_SELECT_LONG, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, | 333 | { ACTION_USB_HID_SELECT_LONG, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, |
334 | { ACTION_USB_HID_MENU, BUTTON_DOWN|BUTTON_REL, BUTTON_DOWN }, | 334 | { ACTION_USB_HID_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, |
335 | { ACTION_USB_HID_MENU_LONG, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_DOWN }, | 335 | { ACTION_USB_HID_MENU_LONG, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, |
336 | { ACTION_USB_HID_MODE, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, | 336 | { ACTION_USB_HID_MODE, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, |
337 | { ACTION_USB_HID_MODE_LONG, BUTTON_POWER|BUTTON_REPEAT, BUTTON_POWER }, | 337 | { ACTION_USB_HID_MODE_LONG, BUTTON_POWER|BUTTON_REPEAT, BUTTON_POWER }, |
338 | 338 | ||
diff --git a/apps/usb_keymaps.c b/apps/usb_keymaps.c index c791b11b25..466cf6f9e8 100644 --- a/apps/usb_keymaps.c +++ b/apps/usb_keymaps.c | |||
@@ -59,9 +59,9 @@ static const hid_key_mapping_t hid_key_mapping_multimedia = { | |||
59 | { ACTION_USB_HID_INC, HID_CONSUMER_USAGE_VOLUME_INCREMENT }, | 59 | { ACTION_USB_HID_INC, HID_CONSUMER_USAGE_VOLUME_INCREMENT }, |
60 | /* Volume mute */ | 60 | /* Volume mute */ |
61 | { ACTION_USB_HID_SELECT, HID_CONSUMER_USAGE_MUTE }, | 61 | { ACTION_USB_HID_SELECT, HID_CONSUMER_USAGE_MUTE }, |
62 | /* Play / pause */ | 62 | /* Playback play / pause */ |
63 | { ACTION_USB_HID_START, HID_CONSUMER_USAGE_PLAY_PAUSE }, | 63 | { ACTION_USB_HID_START, HID_CONSUMER_USAGE_PLAY_PAUSE }, |
64 | /* Stop */ | 64 | /* Playback stop */ |
65 | { ACTION_USB_HID_QUIT, HID_CONSUMER_USAGE_STOP }, | 65 | { ACTION_USB_HID_QUIT, HID_CONSUMER_USAGE_STOP }, |
66 | /* Scan previous track */ | 66 | /* Scan previous track */ |
67 | { ACTION_USB_HID_LEFT, HID_CONSUMER_USAGE_SCAN_PREVIOUS_TRACK }, | 67 | { ACTION_USB_HID_LEFT, HID_CONSUMER_USAGE_SCAN_PREVIOUS_TRACK }, |
@@ -85,19 +85,19 @@ static const hid_key_mapping_t hid_key_mapping_presentation = { | |||
85 | { ACTION_USB_HID_RIGHT, HID_KEYBOARD_N }, | 85 | { ACTION_USB_HID_RIGHT, HID_KEYBOARD_N }, |
86 | /* Slide first */ | 86 | /* Slide first */ |
87 | { ACTION_USB_HID_LEFT_LONG, HID_KEYBOARD_HOME }, | 87 | { ACTION_USB_HID_LEFT_LONG, HID_KEYBOARD_HOME }, |
88 | /* Slide Last */ | 88 | /* Slide last */ |
89 | { ACTION_USB_HID_RIGHT_LONG, HID_KEYBOARD_END }, | 89 | { ACTION_USB_HID_RIGHT_LONG, HID_KEYBOARD_END }, |
90 | /* Black screen */ | 90 | /* Screen black */ |
91 | { ACTION_USB_HID_MENU, HID_KEYBOARD_DOT }, | 91 | { ACTION_USB_HID_MENU, HID_KEYBOARD_DOT }, |
92 | /* White screen */ | 92 | /* Screen white*/ |
93 | { ACTION_USB_HID_MENU_LONG, HID_KEYBOARD_COMMA }, | 93 | { ACTION_USB_HID_MENU_LONG, HID_KEYBOARD_COMMA }, |
94 | /* Link previous */ | 94 | /* Link previous */ |
95 | { ACTION_USB_HID_DEC, SHIFT(HID_KEYBOARD_TAB) }, | 95 | { ACTION_USB_HID_DEC, SHIFT(HID_KEYBOARD_TAB) }, |
96 | /* Link next */ | 96 | /* Link next */ |
97 | { ACTION_USB_HID_INC, HID_KEYBOARD_TAB }, | 97 | { ACTION_USB_HID_INC, HID_KEYBOARD_TAB }, |
98 | /* 'Mouse click' */ | 98 | /* Mouse click */ |
99 | { ACTION_USB_HID_SELECT, HID_KEYBOARD_RETURN }, | 99 | { ACTION_USB_HID_SELECT, HID_KEYBOARD_RETURN }, |
100 | /* 'Mouse over' */ | 100 | /* Mouse over */ |
101 | { ACTION_USB_HID_SELECT_LONG, SHIFT(HID_KEYBOARD_RETURN) }, | 101 | { ACTION_USB_HID_SELECT_LONG, SHIFT(HID_KEYBOARD_RETURN) }, |
102 | { 0, 0 }, | 102 | { 0, 0 }, |
103 | } | 103 | } |
@@ -131,7 +131,7 @@ static const hid_key_mapping_t hid_key_mapping_browser = { | |||
131 | { ACTION_USB_HID_LEFT_LONG, ALT(HID_KEYBOARD_LEFT_ARROW) }, | 131 | { ACTION_USB_HID_LEFT_LONG, ALT(HID_KEYBOARD_LEFT_ARROW) }, |
132 | /* History forward */ | 132 | /* History forward */ |
133 | { ACTION_USB_HID_RIGHT_LONG, ALT(HID_KEYBOARD_RIGHT_ARROW) }, | 133 | { ACTION_USB_HID_RIGHT_LONG, ALT(HID_KEYBOARD_RIGHT_ARROW) }, |
134 | /* Full-Screen */ | 134 | /* View full-screen */ |
135 | { ACTION_USB_HID_SELECT, HID_KEYBOARD_F11 }, | 135 | { ACTION_USB_HID_SELECT, HID_KEYBOARD_F11 }, |
136 | { 0, 0 }, | 136 | { 0, 0 }, |
137 | } | 137 | } |
@@ -142,37 +142,38 @@ static const hid_key_mapping_t hid_key_mapping_mouse = { | |||
142 | LANG_MOUSE, | 142 | LANG_MOUSE, |
143 | HID_USAGE_PAGE_GENERIC_DESKTOP_CONTROLS, | 143 | HID_USAGE_PAGE_GENERIC_DESKTOP_CONTROLS, |
144 | { | 144 | { |
145 | /* Mouse up */ | 145 | /* Cursor move up */ |
146 | { ACTION_USB_HID_MOUSE_UP, HID_MOUSE_UP }, | 146 | { ACTION_USB_HID_MOUSE_UP, HID_MOUSE_UP }, |
147 | { ACTION_USB_HID_MOUSE_UP_REP, HID_MOUSE_UP_REP }, | 147 | { ACTION_USB_HID_MOUSE_UP_REP, HID_MOUSE_UP_REP }, |
148 | { ACTION_USB_HID_MOUSE_LDRAG_UP, HID_MOUSE_LDRAG_UP }, | 148 | { ACTION_USB_HID_MOUSE_LDRAG_UP, HID_MOUSE_LDRAG_UP }, |
149 | { ACTION_USB_HID_MOUSE_LDRAG_UP_REP, HID_MOUSE_LDRAG_UP_REP }, | 149 | { ACTION_USB_HID_MOUSE_LDRAG_UP_REP, HID_MOUSE_LDRAG_UP_REP }, |
150 | { ACTION_USB_HID_MOUSE_RDRAG_UP, HID_MOUSE_RDRAG_UP }, | 150 | { ACTION_USB_HID_MOUSE_RDRAG_UP, HID_MOUSE_RDRAG_UP }, |
151 | { ACTION_USB_HID_MOUSE_RDRAG_UP_REP, HID_MOUSE_RDRAG_UP_REP }, | 151 | { ACTION_USB_HID_MOUSE_RDRAG_UP_REP, HID_MOUSE_RDRAG_UP_REP }, |
152 | /* Mouse down */ | 152 | /* Cursor move down */ |
153 | { ACTION_USB_HID_MOUSE_DOWN, HID_MOUSE_DOWN }, | 153 | { ACTION_USB_HID_MOUSE_DOWN, HID_MOUSE_DOWN }, |
154 | { ACTION_USB_HID_MOUSE_DOWN_REP, HID_MOUSE_DOWN_REP }, | 154 | { ACTION_USB_HID_MOUSE_DOWN_REP, HID_MOUSE_DOWN_REP }, |
155 | { ACTION_USB_HID_MOUSE_LDRAG_DOWN, HID_MOUSE_LDRAG_DOWN }, | 155 | { ACTION_USB_HID_MOUSE_LDRAG_DOWN, HID_MOUSE_LDRAG_DOWN }, |
156 | { ACTION_USB_HID_MOUSE_LDRAG_DOWN_REP, HID_MOUSE_LDRAG_DOWN_REP }, | 156 | { ACTION_USB_HID_MOUSE_LDRAG_DOWN_REP, HID_MOUSE_LDRAG_DOWN_REP }, |
157 | { ACTION_USB_HID_MOUSE_RDRAG_DOWN, HID_MOUSE_RDRAG_DOWN }, | 157 | { ACTION_USB_HID_MOUSE_RDRAG_DOWN, HID_MOUSE_RDRAG_DOWN }, |
158 | { ACTION_USB_HID_MOUSE_RDRAG_DOWN_REP, HID_MOUSE_RDRAG_DOWN_REP }, | 158 | { ACTION_USB_HID_MOUSE_RDRAG_DOWN_REP, HID_MOUSE_RDRAG_DOWN_REP }, |
159 | /* Mouse left */ | 159 | /* Cursor move left */ |
160 | { ACTION_USB_HID_MOUSE_LEFT, HID_MOUSE_LEFT }, | 160 | { ACTION_USB_HID_MOUSE_LEFT, HID_MOUSE_LEFT }, |
161 | { ACTION_USB_HID_MOUSE_LEFT_REP, HID_MOUSE_LEFT_REP }, | 161 | { ACTION_USB_HID_MOUSE_LEFT_REP, HID_MOUSE_LEFT_REP }, |
162 | { ACTION_USB_HID_MOUSE_LDRAG_LEFT, HID_MOUSE_LDRAG_LEFT }, | 162 | { ACTION_USB_HID_MOUSE_LDRAG_LEFT, HID_MOUSE_LDRAG_LEFT }, |
163 | { ACTION_USB_HID_MOUSE_LDRAG_LEFT_REP, HID_MOUSE_LDRAG_LEFT_REP }, | 163 | { ACTION_USB_HID_MOUSE_LDRAG_LEFT_REP, HID_MOUSE_LDRAG_LEFT_REP }, |
164 | { ACTION_USB_HID_MOUSE_RDRAG_LEFT, HID_MOUSE_RDRAG_LEFT }, | 164 | { ACTION_USB_HID_MOUSE_RDRAG_LEFT, HID_MOUSE_RDRAG_LEFT }, |
165 | { ACTION_USB_HID_MOUSE_RDRAG_LEFT_REP, HID_MOUSE_RDRAG_LEFT_REP }, | 165 | { ACTION_USB_HID_MOUSE_RDRAG_LEFT_REP, HID_MOUSE_RDRAG_LEFT_REP }, |
166 | /* Mouse right */ | 166 | /* Cursor move right */ |
167 | { ACTION_USB_HID_MOUSE_RIGHT, HID_MOUSE_RIGHT }, | 167 | { ACTION_USB_HID_MOUSE_RIGHT, HID_MOUSE_RIGHT }, |
168 | { ACTION_USB_HID_MOUSE_RIGHT_REP, HID_MOUSE_RIGHT_REP }, | 168 | { ACTION_USB_HID_MOUSE_RIGHT_REP, HID_MOUSE_RIGHT_REP }, |
169 | { ACTION_USB_HID_MOUSE_LDRAG_RIGHT, HID_MOUSE_LDRAG_RIGHT }, | 169 | { ACTION_USB_HID_MOUSE_LDRAG_RIGHT, HID_MOUSE_LDRAG_RIGHT }, |
170 | { ACTION_USB_HID_MOUSE_LDRAG_RIGHT_REP, HID_MOUSE_LDRAG_RIGHT_REP }, | 170 | { ACTION_USB_HID_MOUSE_LDRAG_RIGHT_REP, HID_MOUSE_LDRAG_RIGHT_REP }, |
171 | { ACTION_USB_HID_MOUSE_RDRAG_RIGHT, HID_MOUSE_RDRAG_RIGHT }, | 171 | { ACTION_USB_HID_MOUSE_RDRAG_RIGHT, HID_MOUSE_RDRAG_RIGHT }, |
172 | { ACTION_USB_HID_MOUSE_RDRAG_RIGHT_REP, HID_MOUSE_RDRAG_RIGHT_REP }, | 172 | { ACTION_USB_HID_MOUSE_RDRAG_RIGHT_REP, HID_MOUSE_RDRAG_RIGHT_REP }, |
173 | /* Mouse buttons */ | 173 | /* Mouse button left-click */ |
174 | { ACTION_USB_HID_MOUSE_BUTTON_LEFT, HID_MOUSE_BUTTON_LEFT }, | 174 | { ACTION_USB_HID_MOUSE_BUTTON_LEFT, HID_MOUSE_BUTTON_LEFT }, |
175 | { ACTION_USB_HID_MOUSE_BUTTON_LEFT_REL, HID_MOUSE_BUTTON_LEFT_REL }, | 175 | { ACTION_USB_HID_MOUSE_BUTTON_LEFT_REL, HID_MOUSE_BUTTON_LEFT_REL }, |
176 | /* Mouse button right-click */ | ||
176 | { ACTION_USB_HID_MOUSE_BUTTON_RIGHT, HID_MOUSE_BUTTON_RIGHT }, | 177 | { ACTION_USB_HID_MOUSE_BUTTON_RIGHT, HID_MOUSE_BUTTON_RIGHT }, |
177 | { ACTION_USB_HID_MOUSE_BUTTON_RIGHT_REL, HID_MOUSE_BUTTON_RIGHT_REL }, | 178 | { ACTION_USB_HID_MOUSE_BUTTON_RIGHT_REL, HID_MOUSE_BUTTON_RIGHT_REL }, |
178 | /* Mouse wheel scroll up */ | 179 | /* Mouse wheel scroll up */ |