From f4760c822a34c338250dc47ff6d195935986bdae Mon Sep 17 00:00:00 2001 From: tmk Date: Mon, 22 Apr 2013 13:04:00 +0900 Subject: [PATCH] Fix doc and descriptor of iwrap --- protocol/iwrap/combo.desc | 1 - protocol/iwrap/consumer.desc | 1 - protocol/iwrap/iWRAP5.txt | 174 ++++++++++++++++++----------------- protocol/iwrap/keyboard.desc | 1 - protocol/iwrap/mouse.desc | 40 -------- 5 files changed, 89 insertions(+), 128 deletions(-) delete mode 100644 protocol/iwrap/combo.desc delete mode 100644 protocol/iwrap/consumer.desc delete mode 100644 protocol/iwrap/keyboard.desc delete mode 100644 protocol/iwrap/mouse.desc diff --git a/protocol/iwrap/combo.desc b/protocol/iwrap/combo.desc deleted file mode 100644 index 572f99906d..0000000000 --- a/protocol/iwrap/combo.desc +++ /dev/null @@ -1 +0,0 @@ -05010906a1010507850119e029e715002501750195088102950175088101950575010508850119012905910295017503910395067508150025650507190029658100c005010902a1010901a1008502050919012903150025019503750181020501093815f1250f9501750581060501093009311581257f750895028106c0c0050c0901a1018503050c1500250109e909ea09e209cd19b529b87501950881020a8a010a21020a2a021a23022a27027501950881020a83010a96010a92010a9e010a94010a060209b209b4750195088102c0 diff --git a/protocol/iwrap/consumer.desc b/protocol/iwrap/consumer.desc deleted file mode 100644 index d7f2217e87..0000000000 --- a/protocol/iwrap/consumer.desc +++ /dev/null @@ -1 +0,0 @@ -050c0901a1018503050c1500250109e909ea09e209cd19b529b87501950881020a8a010a21020a2a021a23022a27027501950881020a83010a96010a92010a9e010a94010a060209b209b4750195088102c0 diff --git a/protocol/iwrap/iWRAP5.txt b/protocol/iwrap/iWRAP5.txt index 65bbe0421b..ce3310f1bf 100644 --- a/protocol/iwrap/iWRAP5.txt +++ b/protocol/iwrap/iWRAP5.txt @@ -7,42 +7,44 @@ MTU Maximum Transmission Unit -HID Protocol Messages -===================== +HID Protocol +============ 3 of HID_SPEC_V11.pdf +Channel +------- Control channel PSM=0x0011 Interrupt channel PSM=0x0013 +Message +------- HANDSHAKE(0) HID_CONTROL(1) -GET_REPORT(4) -------------- -Host requests report(DATA payload on Control channel) from Device - Size Desc ------------------------------------------------------------------------------- -HIDP-Hdr 1 7..4: HIDP Message TYpe(4: GET_REPORT) - 3: Size(1:2-octed buffer size, 0:size of the report) - 2: 0 - 1..0: Report Type(1:input, 2:output, 3: feature) -ReportID 1 Optional -BufferSize 2 Optional(specified when Size=1) +GET_REPORT(4) + Host requests report(DATA payload on Control channel) from Device + Size Desc + ------------------------------------------------------------------------------ + HIDP-Hdr 1 7..4: HIDP Message TYpe(4: GET_REPORT) + 3: Size(1:2-octed buffer size, 0:size of the report) + 2: 0 + 1..0: Report Type(1:input, 2:output, 3: feature) + ReportID 1 Optional + BufferSize 2 Optional(specified when Size=1) SET_REPORT(5) GET_PROTOCOL(6) SET_PROTOCOL(7) -DATA(A) -------- -Input/Output Report: All DATA payloads flow on Interrupt channel. -Other: flows on Control channel. - Size Desc ------------------------------------------------------------------------------- -HIDP-Hdr 1 7..4 0xA - 3..2 Reserved(0) - 1..0 Report Type(0:Other, 1:Input, 2:Output, 3:Feature) -Payload N Data +DATA(A) + Input/Output Report: All DATA payloads flow on Interrupt channel. + Other: flows on Control channel. + Size Desc + ------------------------------------------------------------------------------ + HIDP-Hdr 1 7..4 0xA + 3..2 Reserved(0) + 1..0 Report Type(0:Other, 1:Input, 2:Output, 3:Feature) + Payload N Data @@ -84,11 +86,11 @@ attributes(3.3.2) ---------- HIDDeviceSubclass which type is supported in Boot Protocol Mode -7 6 ---- -0 1 Keyboard -1 0 Pointing device -1 1 Combo keyboard/pointing device + 7 6 + --- + 0 1 Keyboard + 1 0 Pointing device + 1 1 Combo keyboard/pointing device HIDBootDevice TRUE @@ -103,73 +105,55 @@ http://phys.sci.hokudai.ac.jp/LABS/yts/pic/GB002/Bluetooth_assigned_numbers_base 0x0005C0 Keyboard and Pointing deivce(combo) -23 16 15 8 7 0 ---------------------------------- -Service |Major |Minor |Format + 23 16 15 8 7 0 + --------------------------------- + Service |Major |Minor |Format -Format type -1 0 ---- -0 0 + Format type + 1 0 + --- + 0 0 -Minor Device Class of Peripheral Major -7 6 ---- -0 1 Keyboard -1 0 Pointing device -1 1 Combo keyboard/pointing device + Minor Device Class of Peripheral Major + 7 6 + --- + 0 1 Keyboard + 1 0 Pointing device + 1 1 Combo keyboard/pointing device -Major device classes -12 11 10 9 8 --------------- - 0 0 0 0 0 Miscellaneous - 0 0 0 0 1 Computer - 0 0 0 1 0 Phone - 0 0 0 1 1 LAN /Network Access point - 0 0 1 0 0 Audio/Video (headset,speaker,stereo, video display, vcr..... - 0 0 1 0 1 *Peripheral (mouse, joystick, keyboards, ..... ) - 0 0 1 1 0 Imaging (printing, scanner, camera, display, ...) - 1 1 1 1 1 Uncategorized, specific device code not specified - X X X X X All other values reserved + Major device classes + 12 11 10 9 8 + -------------- + 0 0 0 0 0 Miscellaneous + 0 0 0 0 1 Computer + 0 0 0 1 0 Phone + 0 0 0 1 1 LAN /Network Access point + 0 0 1 0 0 Audio/Video (headset,speaker,stereo, video display, vcr..... + 0 0 1 0 1 *Peripheral (mouse, joystick, keyboards, ..... ) + 0 0 1 1 0 Imaging (printing, scanner, camera, display, ...) + 1 1 1 1 1 Uncategorized, specific device code not specified + X X X X X All other values reserved -Major service classes -bit --------------------------------------- -13 Limited Discoverable Mode [Ref #1] -14 (reserved) -15 (reserved) -16 Positioning (Location identification) -17 Networking (LAN, Ad hoc, ...) -18 Rendering (Printing, Speaker, ...) -19 Capturing (Scanner, Microphone, ...) -20 Object Transfer (v-Inbox, v-Folder, ...) -21 Audio (Speaker, Microphone, Headset service, ...) -22 Telephony (Cordless telephony, Modem, Headset service, ...) -23 Information (WEB-server, WAP-server, ...) + Major service classes + bit + -------------------------------------- + 13 Limited Discoverable Mode [Ref #1] + 14 (reserved) + 15 (reserved) + 16 Positioning (Location identification) + 17 Networking (LAN, Ad hoc, ...) + 18 Rendering (Printing, Speaker, ...) + 19 Capturing (Scanner, Microphone, ...) + 20 Object Transfer (v-Inbox, v-Folder, ...) + 21 Audio (Speaker, Microphone, Headset service, ...) + 22 Telephony (Cordless telephony, Modem, Headset service, ...) + 23 Information (WEB-server, WAP-server, ...) -SET PROFILE HID 0d c0 100 0 en 0409 HHKB pro Bluetooth keyboard - -{function bit} uint8 -{subclass} uint8 -{version} uint16 -{country} uint8 -{BTlang} char[2] -{USBlang} uint16 -{name} string - - -SET PROFILE HID 0f c0 100 0 en 0409 TMK Bluetooth keyboard - -// composite device: keyboard and mouse -SET BT CLASS 005c0 - - - Authentication SSP ------------------- SET BT SSP 2 0 PASS KEY entering @@ -233,6 +217,26 @@ HID SET d2 05010906a1010507850119e029e715002501750195088102950175088101950575010 +SET PROFILE HID +--------------- + SET PROFILE HID 0d c0 100 0 en 0409 HHKB pro Bluetooth keyboard + {function bit} uint8 + {subclass} uint8 + {version} uint16 + {country} uint8 + {BTlang} char[2] + {USBlang} uint16 + {name} string + + +SET BT CLASS +------------ + See Class of Device + composite device: keyboard and mouse + SET BT CLASS 005c0 + + + diff --git a/protocol/iwrap/keyboard.desc b/protocol/iwrap/keyboard.desc deleted file mode 100644 index d9e7a4c5a7..0000000000 --- a/protocol/iwrap/keyboard.desc +++ /dev/null @@ -1 +0,0 @@ -05010906a1010507850119e029e715002501750195088102950175088101950575010508850119012905910295017503910395067508150025650507190029658100c0 diff --git a/protocol/iwrap/mouse.desc b/protocol/iwrap/mouse.desc deleted file mode 100644 index 11898f2b1c..0000000000 --- a/protocol/iwrap/mouse.desc +++ /dev/null @@ -1,40 +0,0 @@ -05010902a1010901a1008502050919012908150025017501950881020501093009311581257f750895028106093895018106050c0a380295018106c0c0 - -Length: 67(0x43) -virtical/horizontal wheel support - - 0x05, 0x01, // USAGE_PAGE (Generic Desktop) - 0x09, 0x02, // USAGE (Mouse) - 0xa1, 0x01, // COLLECTION (Application) - 0x09, 0x01, // USAGE (Pointer) - 0xa1, 0x00, // COLLECTION (Physical) - 0x85, 0x02, // REPORT_ID (2) - // ---------------------------- Buttons - 0x05, 0x09, // USAGE_PAGE (Button) - 0x19, 0x01, // USAGE_MINIMUM (Button 1) - 0x29, 0x08, // USAGE_MAXIMUM (Button 8) - 0x15, 0x00, // LOGICAL_MINIMUM (0) - 0x25, 0x01, // LOGICAL_MAXIMUM (1) - 0x75, 0x01, // REPORT_SIZE (1) - 0x95, 0x08, // REPORT_COUNT (8) - 0x81, 0x02, // INPUT (Data,Var,Abs) - // ---------------------------- X,Y position - 0x05, 0x01, // USAGE_PAGE (Generic Desktop) - 0x09, 0x30, // USAGE (X) - 0x09, 0x31, // USAGE (Y) - 0x15, 0x81, // LOGICAL_MINIMUM (-127) - 0x25, 0x7f, // LOGICAL_MAXIMUM (127) - 0x75, 0x08, // REPORT_SIZE (8) - 0x95, 0x02, // REPORT_COUNT (2) - 0x81, 0x06, // INPUT (Data,Var,Rel) - // ---------------------------- Vertical wheel - 0x09, 0x38, // USAGE (Wheel) - 0x95, 0x01, // REPORT_COUNT (1) - 0x81, 0x06, // INPUT (Data,Var,Rel) - // ---------------------------- Horizontal wheel - 0x05, 0x0c, // USAGE_PAGE (Consumer Devices) - 0x0a, 0x38, 0x02, // USAGE (AC Pan) - 0x95, 0x01, // REPORT_COUNT (1) - 0x81, 0x06, // INPUT (Data,Var,Rel) - 0xc0, // END_COLLECTION - 0xc0, // END_COLLECTION