diff options
| author | tmk <nobody@nowhere> | 2013-04-22 13:04:00 +0900 |
|---|---|---|
| committer | tmk <nobody@nowhere> | 2013-04-22 13:04:00 +0900 |
| commit | f4760c822a34c338250dc47ff6d195935986bdae (patch) | |
| tree | 613d38c81cb95be754450a4ccf7d16a7d4da22de /protocol | |
| parent | c7b180e3d7181791f2382632267d10f1a499366a (diff) | |
| download | qmk_firmware-f4760c822a34c338250dc47ff6d195935986bdae.tar.gz qmk_firmware-f4760c822a34c338250dc47ff6d195935986bdae.zip | |
Fix doc and descriptor of iwrap
Diffstat (limited to 'protocol')
| -rw-r--r-- | protocol/iwrap/combo.desc | 1 | ||||
| -rw-r--r-- | protocol/iwrap/consumer.desc | 1 | ||||
| -rw-r--r-- | protocol/iwrap/iWRAP5.txt | 174 | ||||
| -rw-r--r-- | protocol/iwrap/keyboard.desc | 1 | ||||
| -rw-r--r-- | protocol/iwrap/mouse.desc | 40 |
5 files changed, 89 insertions, 128 deletions
diff --git a/protocol/iwrap/combo.desc b/protocol/iwrap/combo.desc deleted file mode 100644 index 572f99906..000000000 --- a/protocol/iwrap/combo.desc +++ /dev/null | |||
| @@ -1 +0,0 @@ | |||
| 1 | 05010906a1010507850119e029e715002501750195088102950175088101950575010508850119012905910295017503910395067508150025650507190029658100c005010902a1010901a1008502050919012903150025019503750181020501093815f1250f9501750581060501093009311581257f750895028106c0c0050c0901a1018503050c1500250109e909ea09e209cd19b529b87501950881020a8a010a21020a2a021a23022a27027501950881020a83010a96010a92010a9e010a94010a060209b209b4750195088102c0 | ||
diff --git a/protocol/iwrap/consumer.desc b/protocol/iwrap/consumer.desc deleted file mode 100644 index d7f2217e8..000000000 --- a/protocol/iwrap/consumer.desc +++ /dev/null | |||
| @@ -1 +0,0 @@ | |||
| 1 | 050c0901a1018503050c1500250109e909ea09e209cd19b529b87501950881020a8a010a21020a2a021a23022a27027501950881020a83010a96010a92010a9e010a94010a060209b209b4750195088102c0 | ||
diff --git a/protocol/iwrap/iWRAP5.txt b/protocol/iwrap/iWRAP5.txt index 65bbe0421..ce3310f1b 100644 --- a/protocol/iwrap/iWRAP5.txt +++ b/protocol/iwrap/iWRAP5.txt | |||
| @@ -7,42 +7,44 @@ MTU Maximum Transmission Unit | |||
| 7 | 7 | ||
| 8 | 8 | ||
| 9 | 9 | ||
| 10 | HID Protocol Messages | 10 | HID Protocol |
| 11 | ===================== | 11 | ============ |
| 12 | 3 of HID_SPEC_V11.pdf | 12 | 3 of HID_SPEC_V11.pdf |
| 13 | 13 | ||
| 14 | Channel | ||
| 15 | ------- | ||
| 14 | Control channel PSM=0x0011 | 16 | Control channel PSM=0x0011 |
| 15 | Interrupt channel PSM=0x0013 | 17 | Interrupt channel PSM=0x0013 |
| 16 | 18 | ||
| 19 | Message | ||
| 20 | ------- | ||
| 17 | HANDSHAKE(0) | 21 | HANDSHAKE(0) |
| 18 | HID_CONTROL(1) | 22 | HID_CONTROL(1) |
| 23 | |||
| 19 | GET_REPORT(4) | 24 | GET_REPORT(4) |
| 20 | ------------- | 25 | Host requests report(DATA payload on Control channel) from Device |
| 21 | Host requests report(DATA payload on Control channel) from Device | 26 | Size Desc |
| 22 | 27 | ------------------------------------------------------------------------------ | |
| 23 | Size Desc | 28 | HIDP-Hdr 1 7..4: HIDP Message TYpe(4: GET_REPORT) |
| 24 | ------------------------------------------------------------------------------ | 29 | 3: Size(1:2-octed buffer size, 0:size of the report) |
| 25 | HIDP-Hdr 1 7..4: HIDP Message TYpe(4: GET_REPORT) | 30 | 2: 0 |
| 26 | 3: Size(1:2-octed buffer size, 0:size of the report) | 31 | 1..0: Report Type(1:input, 2:output, 3: feature) |
| 27 | 2: 0 | 32 | ReportID 1 Optional |
| 28 | 1..0: Report Type(1:input, 2:output, 3: feature) | 33 | BufferSize 2 Optional(specified when Size=1) |
| 29 | ReportID 1 Optional | ||
| 30 | BufferSize 2 Optional(specified when Size=1) | ||
| 31 | 34 | ||
| 32 | SET_REPORT(5) | 35 | SET_REPORT(5) |
| 33 | GET_PROTOCOL(6) | 36 | GET_PROTOCOL(6) |
| 34 | SET_PROTOCOL(7) | 37 | SET_PROTOCOL(7) |
| 35 | DATA(A) | ||
| 36 | ------- | ||
| 37 | Input/Output Report: All DATA payloads flow on Interrupt channel. | ||
| 38 | Other: flows on Control channel. | ||
| 39 | 38 | ||
| 40 | Size Desc | 39 | DATA(A) |
| 41 | ------------------------------------------------------------------------------ | 40 | Input/Output Report: All DATA payloads flow on Interrupt channel. |
| 42 | HIDP-Hdr 1 7..4 0xA | 41 | Other: flows on Control channel. |
| 43 | 3..2 Reserved(0) | 42 | Size Desc |
| 44 | 1..0 Report Type(0:Other, 1:Input, 2:Output, 3:Feature) | 43 | ------------------------------------------------------------------------------ |
| 45 | Payload N Data | 44 | HIDP-Hdr 1 7..4 0xA |
| 45 | 3..2 Reserved(0) | ||
| 46 | 1..0 Report Type(0:Other, 1:Input, 2:Output, 3:Feature) | ||
| 47 | Payload N Data | ||
| 46 | 48 | ||
| 47 | 49 | ||
| 48 | 50 | ||
| @@ -84,11 +86,11 @@ attributes(3.3.2) | |||
| 84 | ---------- | 86 | ---------- |
| 85 | HIDDeviceSubclass | 87 | HIDDeviceSubclass |
| 86 | which type is supported in Boot Protocol Mode | 88 | which type is supported in Boot Protocol Mode |
| 87 | 7 6 | 89 | 7 6 |
| 88 | --- | 90 | --- |
| 89 | 0 1 Keyboard | 91 | 0 1 Keyboard |
| 90 | 1 0 Pointing device | 92 | 1 0 Pointing device |
| 91 | 1 1 Combo keyboard/pointing device | 93 | 1 1 Combo keyboard/pointing device |
| 92 | 94 | ||
| 93 | HIDBootDevice | 95 | HIDBootDevice |
| 94 | TRUE | 96 | TRUE |
| @@ -103,70 +105,52 @@ http://phys.sci.hokudai.ac.jp/LABS/yts/pic/GB002/Bluetooth_assigned_numbers_base | |||
| 103 | 0x0005C0 Keyboard and Pointing deivce(combo) | 105 | 0x0005C0 Keyboard and Pointing deivce(combo) |
| 104 | 106 | ||
| 105 | 107 | ||
| 106 | 23 16 15 8 7 0 | 108 | 23 16 15 8 7 0 |
| 107 | --------------------------------- | 109 | --------------------------------- |
| 108 | Service |Major |Minor |Format | 110 | Service |Major |Minor |Format |
| 109 | |||
| 110 | Format type | ||
| 111 | 1 0 | ||
| 112 | --- | ||
| 113 | 0 0 | ||
| 114 | |||
| 115 | Minor Device Class of Peripheral Major | ||
| 116 | 7 6 | ||
| 117 | --- | ||
| 118 | 0 1 Keyboard | ||
| 119 | 1 0 Pointing device | ||
| 120 | 1 1 Combo keyboard/pointing device | ||
| 121 | |||
| 122 | 111 | ||
| 123 | Major device classes | 112 | Format type |
| 124 | 12 11 10 9 8 | 113 | 1 0 |
| 125 | -------------- | 114 | --- |
| 126 | 0 0 0 0 0 Miscellaneous | 115 | 0 0 |
| 127 | 0 0 0 0 1 Computer | ||
| 128 | 0 0 0 1 0 Phone | ||
| 129 | 0 0 0 1 1 LAN /Network Access point | ||
| 130 | 0 0 1 0 0 Audio/Video (headset,speaker,stereo, video display, vcr..... | ||
| 131 | 0 0 1 0 1 *Peripheral (mouse, joystick, keyboards, ..... ) | ||
| 132 | 0 0 1 1 0 Imaging (printing, scanner, camera, display, ...) | ||
| 133 | 1 1 1 1 1 Uncategorized, specific device code not specified | ||
| 134 | X X X X X All other values reserved | ||
| 135 | 116 | ||
| 117 | Minor Device Class of Peripheral Major | ||
| 118 | 7 6 | ||
| 119 | --- | ||
| 120 | 0 1 Keyboard | ||
| 121 | 1 0 Pointing device | ||
| 122 | 1 1 Combo keyboard/pointing device | ||
| 136 | 123 | ||
| 137 | Major service classes | ||
| 138 | bit | ||
| 139 | -------------------------------------- | ||
| 140 | 13 Limited Discoverable Mode [Ref #1] | ||
| 141 | 14 (reserved) | ||
| 142 | 15 (reserved) | ||
| 143 | 16 Positioning (Location identification) | ||
| 144 | 17 Networking (LAN, Ad hoc, ...) | ||
| 145 | 18 Rendering (Printing, Speaker, ...) | ||
| 146 | 19 Capturing (Scanner, Microphone, ...) | ||
| 147 | 20 Object Transfer (v-Inbox, v-Folder, ...) | ||
| 148 | 21 Audio (Speaker, Microphone, Headset service, ...) | ||
| 149 | 22 Telephony (Cordless telephony, Modem, Headset service, ...) | ||
| 150 | 23 Information (WEB-server, WAP-server, ...) | ||
| 151 | 124 | ||
| 125 | Major device classes | ||
| 126 | 12 11 10 9 8 | ||
| 127 | -------------- | ||
| 128 | 0 0 0 0 0 Miscellaneous | ||
| 129 | 0 0 0 0 1 Computer | ||
| 130 | 0 0 0 1 0 Phone | ||
| 131 | 0 0 0 1 1 LAN /Network Access point | ||
| 132 | 0 0 1 0 0 Audio/Video (headset,speaker,stereo, video display, vcr..... | ||
| 133 | 0 0 1 0 1 *Peripheral (mouse, joystick, keyboards, ..... ) | ||
| 134 | 0 0 1 1 0 Imaging (printing, scanner, camera, display, ...) | ||
| 135 | 1 1 1 1 1 Uncategorized, specific device code not specified | ||
| 136 | X X X X X All other values reserved | ||
| 152 | 137 | ||
| 153 | 138 | ||
| 139 | Major service classes | ||
| 140 | bit | ||
| 141 | -------------------------------------- | ||
| 142 | 13 Limited Discoverable Mode [Ref #1] | ||
| 143 | 14 (reserved) | ||
| 144 | 15 (reserved) | ||
| 145 | 16 Positioning (Location identification) | ||
| 146 | 17 Networking (LAN, Ad hoc, ...) | ||
| 147 | 18 Rendering (Printing, Speaker, ...) | ||
| 148 | 19 Capturing (Scanner, Microphone, ...) | ||
| 149 | 20 Object Transfer (v-Inbox, v-Folder, ...) | ||
| 150 | 21 Audio (Speaker, Microphone, Headset service, ...) | ||
| 151 | 22 Telephony (Cordless telephony, Modem, Headset service, ...) | ||
| 152 | 23 Information (WEB-server, WAP-server, ...) | ||
| 154 | 153 | ||
| 155 | SET PROFILE HID 0d c0 100 0 en 0409 HHKB pro Bluetooth keyboard | ||
| 156 | |||
| 157 | {function bit} uint8 | ||
| 158 | {subclass} uint8 | ||
| 159 | {version} uint16 | ||
| 160 | {country} uint8 | ||
| 161 | {BTlang} char[2] | ||
| 162 | {USBlang} uint16 | ||
| 163 | {name} string | ||
| 164 | |||
| 165 | |||
| 166 | SET PROFILE HID 0f c0 100 0 en 0409 TMK Bluetooth keyboard | ||
| 167 | |||
| 168 | // composite device: keyboard and mouse | ||
| 169 | SET BT CLASS 005c0 | ||
| 170 | 154 | ||
| 171 | 155 | ||
| 172 | 156 | ||
| @@ -233,6 +217,26 @@ HID SET d2 05010906a1010507850119e029e715002501750195088102950175088101950575010 | |||
| 233 | 217 | ||
| 234 | 218 | ||
| 235 | 219 | ||
| 220 | SET PROFILE HID | ||
| 221 | --------------- | ||
| 222 | SET PROFILE HID 0d c0 100 0 en 0409 HHKB pro Bluetooth keyboard | ||
| 223 | {function bit} uint8 | ||
| 224 | {subclass} uint8 | ||
| 225 | {version} uint16 | ||
| 226 | {country} uint8 | ||
| 227 | {BTlang} char[2] | ||
| 228 | {USBlang} uint16 | ||
| 229 | {name} string | ||
| 230 | |||
| 231 | |||
| 232 | SET BT CLASS | ||
| 233 | ------------ | ||
| 234 | See Class of Device | ||
| 235 | composite device: keyboard and mouse | ||
| 236 | SET BT CLASS 005c0 | ||
| 237 | |||
| 238 | |||
| 239 | |||
| 236 | 240 | ||
| 237 | 241 | ||
| 238 | 242 | ||
diff --git a/protocol/iwrap/keyboard.desc b/protocol/iwrap/keyboard.desc deleted file mode 100644 index d9e7a4c5a..000000000 --- a/protocol/iwrap/keyboard.desc +++ /dev/null | |||
| @@ -1 +0,0 @@ | |||
| 1 | 05010906a1010507850119e029e715002501750195088102950175088101950575010508850119012905910295017503910395067508150025650507190029658100c0 | ||
diff --git a/protocol/iwrap/mouse.desc b/protocol/iwrap/mouse.desc deleted file mode 100644 index 11898f2b1..000000000 --- a/protocol/iwrap/mouse.desc +++ /dev/null | |||
| @@ -1,40 +0,0 @@ | |||
| 1 | 05010902a1010901a1008502050919012908150025017501950881020501093009311581257f750895028106093895018106050c0a380295018106c0c0 | ||
| 2 | |||
| 3 | Length: 67(0x43) | ||
| 4 | virtical/horizontal wheel support | ||
| 5 | |||
| 6 | 0x05, 0x01, // USAGE_PAGE (Generic Desktop) | ||
| 7 | 0x09, 0x02, // USAGE (Mouse) | ||
| 8 | 0xa1, 0x01, // COLLECTION (Application) | ||
| 9 | 0x09, 0x01, // USAGE (Pointer) | ||
| 10 | 0xa1, 0x00, // COLLECTION (Physical) | ||
| 11 | 0x85, 0x02, // REPORT_ID (2) | ||
| 12 | // ---------------------------- Buttons | ||
| 13 | 0x05, 0x09, // USAGE_PAGE (Button) | ||
| 14 | 0x19, 0x01, // USAGE_MINIMUM (Button 1) | ||
| 15 | 0x29, 0x08, // USAGE_MAXIMUM (Button 8) | ||
| 16 | 0x15, 0x00, // LOGICAL_MINIMUM (0) | ||
| 17 | 0x25, 0x01, // LOGICAL_MAXIMUM (1) | ||
| 18 | 0x75, 0x01, // REPORT_SIZE (1) | ||
| 19 | 0x95, 0x08, // REPORT_COUNT (8) | ||
| 20 | 0x81, 0x02, // INPUT (Data,Var,Abs) | ||
| 21 | // ---------------------------- X,Y position | ||
| 22 | 0x05, 0x01, // USAGE_PAGE (Generic Desktop) | ||
| 23 | 0x09, 0x30, // USAGE (X) | ||
| 24 | 0x09, 0x31, // USAGE (Y) | ||
| 25 | 0x15, 0x81, // LOGICAL_MINIMUM (-127) | ||
| 26 | 0x25, 0x7f, // LOGICAL_MAXIMUM (127) | ||
| 27 | 0x75, 0x08, // REPORT_SIZE (8) | ||
| 28 | 0x95, 0x02, // REPORT_COUNT (2) | ||
| 29 | 0x81, 0x06, // INPUT (Data,Var,Rel) | ||
| 30 | // ---------------------------- Vertical wheel | ||
| 31 | 0x09, 0x38, // USAGE (Wheel) | ||
| 32 | 0x95, 0x01, // REPORT_COUNT (1) | ||
| 33 | 0x81, 0x06, // INPUT (Data,Var,Rel) | ||
| 34 | // ---------------------------- Horizontal wheel | ||
| 35 | 0x05, 0x0c, // USAGE_PAGE (Consumer Devices) | ||
| 36 | 0x0a, 0x38, 0x02, // USAGE (AC Pan) | ||
| 37 | 0x95, 0x01, // REPORT_COUNT (1) | ||
| 38 | 0x81, 0x06, // INPUT (Data,Var,Rel) | ||
| 39 | 0xc0, // END_COLLECTION | ||
| 40 | 0xc0, // END_COLLECTION | ||
