Mercurial > louis > kiibohd-controller
annotate Output/pjrcUSB/arm/usb_desc.c @ 368:06a54d582bf8
FIxing Media Keys and general USB compatibilty
- Media keys tested working on Linux/Windows/Mac (use Consumer control)
- Fixed enumeration delays
- Fixed virtual serial port configuration issues
- Fixed GET_REPORT and SET_REPORT
- Added intial descriptors and endpoints for Mouse and Joystick devices
- Split out the consumer and system control endpoint
- Added more fault debugging messages
- Added interface names to endpoints (visible in Windows Device Manager)
- Added KLL define for keyboard locale
| author | Jacob Alexander <haata@kiibohd.com> |
|---|---|
| date | Wed, 19 Aug 2015 00:01:15 -0700 |
| parents | ab4515606277 |
| children | 47f89f1bfdb7 |
| rev | line source |
|---|---|
|
117
5ffefdf89b37
Adding in USB module updates from Teensyduino 1.18rc2.
Jacob Alexander <haata@kiibohd.com>
parents:
104
diff
changeset
|
1 /* Teensyduino Core Library |
|
5ffefdf89b37
Adding in USB module updates from Teensyduino 1.18rc2.
Jacob Alexander <haata@kiibohd.com>
parents:
104
diff
changeset
|
2 * http://www.pjrc.com/teensy/ |
|
5ffefdf89b37
Adding in USB module updates from Teensyduino 1.18rc2.
Jacob Alexander <haata@kiibohd.com>
parents:
104
diff
changeset
|
3 * Copyright (c) 2013 PJRC.COM, LLC. |
|
368
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
4 * Modified by Jacob Alexander (2013-2015) |
|
117
5ffefdf89b37
Adding in USB module updates from Teensyduino 1.18rc2.
Jacob Alexander <haata@kiibohd.com>
parents:
104
diff
changeset
|
5 * |
|
5ffefdf89b37
Adding in USB module updates from Teensyduino 1.18rc2.
Jacob Alexander <haata@kiibohd.com>
parents:
104
diff
changeset
|
6 * Permission is hereby granted, free of charge, to any person obtaining |
|
5ffefdf89b37
Adding in USB module updates from Teensyduino 1.18rc2.
Jacob Alexander <haata@kiibohd.com>
parents:
104
diff
changeset
|
7 * a copy of this software and associated documentation files (the |
|
5ffefdf89b37
Adding in USB module updates from Teensyduino 1.18rc2.
Jacob Alexander <haata@kiibohd.com>
parents:
104
diff
changeset
|
8 * "Software"), to deal in the Software without restriction, including |
|
5ffefdf89b37
Adding in USB module updates from Teensyduino 1.18rc2.
Jacob Alexander <haata@kiibohd.com>
parents:
104
diff
changeset
|
9 * without limitation the rights to use, copy, modify, merge, publish, |
|
5ffefdf89b37
Adding in USB module updates from Teensyduino 1.18rc2.
Jacob Alexander <haata@kiibohd.com>
parents:
104
diff
changeset
|
10 * distribute, sublicense, and/or sell copies of the Software, and to |
|
5ffefdf89b37
Adding in USB module updates from Teensyduino 1.18rc2.
Jacob Alexander <haata@kiibohd.com>
parents:
104
diff
changeset
|
11 * permit persons to whom the Software is furnished to do so, subject to |
|
5ffefdf89b37
Adding in USB module updates from Teensyduino 1.18rc2.
Jacob Alexander <haata@kiibohd.com>
parents:
104
diff
changeset
|
12 * the following conditions: |
|
5ffefdf89b37
Adding in USB module updates from Teensyduino 1.18rc2.
Jacob Alexander <haata@kiibohd.com>
parents:
104
diff
changeset
|
13 * |
|
123
0c5d1fe99302
Adding CLI and CDC Serial support for Teensy 2.0 and Teensy 2.0++
Jacob Alexander <haata@kiibohd.com>
parents:
119
diff
changeset
|
14 * 1. The above copyright notice and this permission notice shall be |
|
117
5ffefdf89b37
Adding in USB module updates from Teensyduino 1.18rc2.
Jacob Alexander <haata@kiibohd.com>
parents:
104
diff
changeset
|
15 * included in all copies or substantial portions of the Software. |
|
5ffefdf89b37
Adding in USB module updates from Teensyduino 1.18rc2.
Jacob Alexander <haata@kiibohd.com>
parents:
104
diff
changeset
|
16 * |
|
123
0c5d1fe99302
Adding CLI and CDC Serial support for Teensy 2.0 and Teensy 2.0++
Jacob Alexander <haata@kiibohd.com>
parents:
119
diff
changeset
|
17 * 2. If the Software is incorporated into a build system that allows |
|
117
5ffefdf89b37
Adding in USB module updates from Teensyduino 1.18rc2.
Jacob Alexander <haata@kiibohd.com>
parents:
104
diff
changeset
|
18 * selection among a list of target devices, then similar target |
|
5ffefdf89b37
Adding in USB module updates from Teensyduino 1.18rc2.
Jacob Alexander <haata@kiibohd.com>
parents:
104
diff
changeset
|
19 * devices manufactured by PJRC.COM must be included in the list of |
|
5ffefdf89b37
Adding in USB module updates from Teensyduino 1.18rc2.
Jacob Alexander <haata@kiibohd.com>
parents:
104
diff
changeset
|
20 * target devices and selectable in the same manner. |
|
5ffefdf89b37
Adding in USB module updates from Teensyduino 1.18rc2.
Jacob Alexander <haata@kiibohd.com>
parents:
104
diff
changeset
|
21 * |
|
5ffefdf89b37
Adding in USB module updates from Teensyduino 1.18rc2.
Jacob Alexander <haata@kiibohd.com>
parents:
104
diff
changeset
|
22 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, |
|
5ffefdf89b37
Adding in USB module updates from Teensyduino 1.18rc2.
Jacob Alexander <haata@kiibohd.com>
parents:
104
diff
changeset
|
23 * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF |
|
5ffefdf89b37
Adding in USB module updates from Teensyduino 1.18rc2.
Jacob Alexander <haata@kiibohd.com>
parents:
104
diff
changeset
|
24 * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND |
|
5ffefdf89b37
Adding in USB module updates from Teensyduino 1.18rc2.
Jacob Alexander <haata@kiibohd.com>
parents:
104
diff
changeset
|
25 * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS |
|
5ffefdf89b37
Adding in USB module updates from Teensyduino 1.18rc2.
Jacob Alexander <haata@kiibohd.com>
parents:
104
diff
changeset
|
26 * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN |
|
5ffefdf89b37
Adding in USB module updates from Teensyduino 1.18rc2.
Jacob Alexander <haata@kiibohd.com>
parents:
104
diff
changeset
|
27 * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN |
|
5ffefdf89b37
Adding in USB module updates from Teensyduino 1.18rc2.
Jacob Alexander <haata@kiibohd.com>
parents:
104
diff
changeset
|
28 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE |
|
5ffefdf89b37
Adding in USB module updates from Teensyduino 1.18rc2.
Jacob Alexander <haata@kiibohd.com>
parents:
104
diff
changeset
|
29 * SOFTWARE. |
|
5ffefdf89b37
Adding in USB module updates from Teensyduino 1.18rc2.
Jacob Alexander <haata@kiibohd.com>
parents:
104
diff
changeset
|
30 */ |
|
5ffefdf89b37
Adding in USB module updates from Teensyduino 1.18rc2.
Jacob Alexander <haata@kiibohd.com>
parents:
104
diff
changeset
|
31 |
|
231
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
32 // ----- Includes ----- |
|
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
33 |
|
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
34 // Local Includes |
|
104
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
35 #include "usb_desc.h" |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
36 |
|
368
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
37 // Generated Includes |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
38 #include <kll_defs.h> |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
39 |
|
104
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
40 |
|
231
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
41 |
|
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
42 // ----- Macros ----- |
|
104
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
43 |
|
231
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
44 #define LSB(n) ((n) & 255) |
|
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
45 #define MSB(n) (((n) >> 8) & 255) |
|
104
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
46 |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
47 |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
48 |
|
231
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
49 // ----- USB Device Descriptor ----- |
|
104
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
50 |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
51 // USB Device Descriptor. The USB host reads this first, to learn |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
52 // what type of device is connected. |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
53 static uint8_t device_descriptor[] = { |
| 308 | 54 18, // bLength |
| 55 1, // bDescriptorType | |
| 56 0x00, 0x02, // bcdUSB | |
| 57 DEVICE_CLASS, // bDeviceClass | |
| 58 DEVICE_SUBCLASS, // bDeviceSubClass | |
| 59 DEVICE_PROTOCOL, // bDeviceProtocol | |
| 60 EP0_SIZE, // bMaxPacketSize0 | |
| 61 LSB(VENDOR_ID), MSB(VENDOR_ID), // idVendor | |
| 62 LSB(PRODUCT_ID), MSB(PRODUCT_ID), // idProduct | |
| 63 0x00, 0x01, // bcdDevice | |
| 64 1, // iManufacturer | |
| 65 2, // iProduct | |
| 66 3, // iSerialNumber | |
| 67 1 // bNumConfigurations | |
|
104
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
68 }; |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
69 |
|
231
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
70 // USB Device Qualifier Descriptor |
|
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
71 static uint8_t device_qualifier_descriptor[] = { |
|
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
72 0 // Indicate only single speed |
|
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
73 /* Device qualifier example (used for specifying multiple USB speeds) |
| 308 | 74 10, // bLength |
| 75 6, // bDescriptorType | |
| 76 0x00, 0x02, // bcdUSB | |
| 77 DEVICE_CLASS, // bDeviceClass | |
| 78 DEVICE_SUBCLASS, // bDeviceSubClass | |
| 79 DEVICE_PROTOCOL, // bDeviceProtocol | |
| 80 EP0_SIZE, // bMaxPacketSize0 | |
|
233
757e06368d0f
Fixing NKRO for Windows.
Jacob Alexander <haata@kiibohd.com>
parents:
231
diff
changeset
|
81 0, // bNumOtherSpeedConfigurations |
|
231
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
82 0 // bReserved |
|
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
83 */ |
|
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
84 }; |
|
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
85 |
|
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
86 // USB Debug Descriptor |
|
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
87 // XXX Not sure of exact use, lsusb requests it |
|
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
88 static uint8_t usb_debug_descriptor[] = { |
|
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
89 0 |
|
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
90 }; |
|
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
91 |
|
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
92 // XXX |
|
104
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
93 // These descriptors must NOT be "const", because the USB DMA |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
94 // has trouble accessing flash memory with enough bandwidth |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
95 // while the processor is executing from flash. |
|
231
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
96 // XXX |
|
104
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
97 |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
98 |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
99 |
|
231
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
100 // ----- USB HID Report Descriptsors ----- |
|
104
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
101 |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
102 // Each HID interface needs a special report descriptor that tells |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
103 // the meaning and format of the data. |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
104 |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
105 // Keyboard Protocol 1, HID 1.11 spec, Appendix B, page 59-60 |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
106 static uint8_t keyboard_report_desc[] = { |
|
231
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
107 // Keyboard Collection |
| 308 | 108 0x05, 0x01, // Usage Page (Generic Desktop), |
| 109 0x09, 0x06, // Usage (Keyboard), | |
| 110 0xA1, 0x01, // Collection (Application) - Keyboard, | |
|
231
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
111 |
|
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
112 // Modifier Byte |
| 308 | 113 0x75, 0x01, // Report Size (1), |
| 114 0x95, 0x08, // Report Count (8), | |
| 115 0x05, 0x07, // Usage Page (Key Codes), | |
| 116 0x19, 0xE0, // Usage Minimum (224), | |
| 117 0x29, 0xE7, // Usage Maximum (231), | |
| 118 0x15, 0x00, // Logical Minimum (0), | |
| 119 0x25, 0x01, // Logical Maximum (1), | |
| 120 0x81, 0x02, // Input (Data, Variable, Absolute), | |
|
231
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
121 |
|
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
122 // Reserved Byte |
| 308 | 123 0x75, 0x08, // Report Size (8), |
| 124 0x95, 0x01, // Report Count (1), | |
| 125 0x81, 0x03, // Output (Constant), | |
|
231
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
126 |
|
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
127 // LED Report |
| 308 | 128 0x75, 0x01, // Report Size (1), |
| 129 0x95, 0x05, // Report Count (5), | |
| 130 0x05, 0x08, // Usage Page (LEDs), | |
| 131 0x19, 0x01, // Usage Minimum (1), | |
| 132 0x29, 0x05, // Usage Maximum (5), | |
| 133 0x91, 0x02, // Output (Data, Variable, Absolute), | |
|
231
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
134 |
|
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
135 // LED Report Padding |
| 308 | 136 0x75, 0x03, // Report Size (3), |
| 137 0x95, 0x01, // Report Count (1), | |
| 138 0x91, 0x03, // Output (Constant), | |
|
231
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
139 |
|
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
140 // Normal Keys |
| 308 | 141 0x75, 0x08, // Report Size (8), |
| 142 0x95, 0x06, // Report Count (6), | |
| 143 0x15, 0x00, // Logical Minimum (0), | |
| 144 0x25, 0x7F, // Logical Maximum(104), | |
| 145 0x05, 0x07, // Usage Page (Key Codes), | |
| 146 0x19, 0x00, // Usage Minimum (0), | |
| 147 0x29, 0x7F, // Usage Maximum (104), | |
| 148 0x81, 0x00, // Input (Data, Array), | |
| 149 0xc0, // End Collection - Keyboard | |
|
104
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
150 }; |
|
231
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
151 |
|
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
152 // Keyboard Protocol 1, HID 1.11 spec, Appendix B, page 59-60 |
|
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
153 static uint8_t nkro_keyboard_report_desc[] = { |
|
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
154 // Keyboard Collection |
| 308 | 155 0x05, 0x01, // Usage Page (Generic Desktop), |
| 156 0x09, 0x06, // Usage (Keyboard), | |
| 157 0xA1, 0x01, // Collection (Application) - Keyboard, | |
|
231
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
158 |
|
251
d3ac199593d6
Fixing NKRO on Windows 8.1
Jacob Alexander <haata@kiibohd.com>
parents:
248
diff
changeset
|
159 // LED Report |
| 308 | 160 0x85, 0x01, // Report ID (1), |
| 161 0x75, 0x01, // Report Size (1), | |
| 162 0x95, 0x05, // Report Count (5), | |
| 163 0x05, 0x08, // Usage Page (LEDs), | |
| 164 0x19, 0x01, // Usage Minimum (1), | |
| 165 0x29, 0x05, // Usage Maximum (5), | |
| 166 0x91, 0x02, // Output (Data, Variable, Absolute), | |
|
231
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
167 |
|
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
168 // LED Report Padding |
| 308 | 169 0x75, 0x03, // Report Size (3), |
| 170 0x95, 0x01, // Report Count (1), | |
| 171 0x91, 0x03, // Output (Constant), | |
|
104
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
172 |
|
231
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
173 // Normal Keys - Using an NKRO Bitmap |
|
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
174 // |
|
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
175 // NOTES: |
|
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
176 // Supports all keys defined by the spec, except 1-3 which define error events |
|
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
177 // and 0 which is "no keys pressed" |
|
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
178 // See http://www.usb.org/developers/hidpage/Hut1_12v2.pdf Chapter 10 |
|
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
179 // Or Macros/PartialMap/usb_hid.h |
|
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
180 // |
|
248
2e098cf8f71d
Fixing Linux NKRO Delete bug
Jacob Alexander <haata@kiibohd.com>
parents:
246
diff
changeset
|
181 // 50 (ISO \ due to \ bug) and 156 (Clear due to Delete bug) must be excluded |
|
2e098cf8f71d
Fixing Linux NKRO Delete bug
Jacob Alexander <haata@kiibohd.com>
parents:
246
diff
changeset
|
182 // due to a Linux bug with bitmaps (not useful anyways) |
|
231
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
183 // 165-175 are reserved/unused as well as 222-223 and 232-65535 |
|
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
184 // |
|
246
f23f6cff7ef8
Fixing Mac OSX USB NKRO
Jacob Alexander <haata@kiibohd.com>
parents:
245
diff
changeset
|
185 // Compatibility Notes: |
|
f23f6cff7ef8
Fixing Mac OSX USB NKRO
Jacob Alexander <haata@kiibohd.com>
parents:
245
diff
changeset
|
186 // - Using a second endpoint for a boot mode device helps with compatibility |
|
f23f6cff7ef8
Fixing Mac OSX USB NKRO
Jacob Alexander <haata@kiibohd.com>
parents:
245
diff
changeset
|
187 // - DO NOT use Padding in the descriptor for bitfields |
|
f23f6cff7ef8
Fixing Mac OSX USB NKRO
Jacob Alexander <haata@kiibohd.com>
parents:
245
diff
changeset
|
188 // (Mac OSX silently fails... Windows/Linux work correctly) |
|
251
d3ac199593d6
Fixing NKRO on Windows 8.1
Jacob Alexander <haata@kiibohd.com>
parents:
248
diff
changeset
|
189 // - DO NOT use Report IDs, Windows 8.1 will not update keyboard correctly (modifiers disappear) |
|
d3ac199593d6
Fixing NKRO on Windows 8.1
Jacob Alexander <haata@kiibohd.com>
parents:
248
diff
changeset
|
190 // (all other OSs, including OSX work fine...) |
|
d3ac199593d6
Fixing NKRO on Windows 8.1
Jacob Alexander <haata@kiibohd.com>
parents:
248
diff
changeset
|
191 // (you can use them *iff* you only have 1 per collection) |
|
d3ac199593d6
Fixing NKRO on Windows 8.1
Jacob Alexander <haata@kiibohd.com>
parents:
248
diff
changeset
|
192 // - Mac OSX and Windows 8.1 are extremely picky about padding |
|
246
f23f6cff7ef8
Fixing Mac OSX USB NKRO
Jacob Alexander <haata@kiibohd.com>
parents:
245
diff
changeset
|
193 // |
|
231
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
194 // Packing of bitmaps are as follows: |
|
251
d3ac199593d6
Fixing NKRO on Windows 8.1
Jacob Alexander <haata@kiibohd.com>
parents:
248
diff
changeset
|
195 // 4-49 : 6 bytes (0x04-0x31) ( 46 bits + 2 padding bits for 6 bytes total) |
|
d3ac199593d6
Fixing NKRO on Windows 8.1
Jacob Alexander <haata@kiibohd.com>
parents:
248
diff
changeset
|
196 // 51-155 : 14 bytes (0x33-0x9B) (105 bits + 6 padding bits for 15 bytes total) |
|
d3ac199593d6
Fixing NKRO on Windows 8.1
Jacob Alexander <haata@kiibohd.com>
parents:
248
diff
changeset
|
197 // 157-164 : 1 byte (0x9D-0xA4) ( 8 bits) |
|
d3ac199593d6
Fixing NKRO on Windows 8.1
Jacob Alexander <haata@kiibohd.com>
parents:
248
diff
changeset
|
198 // 176-221 : 6 bytes (0xB0-0xDD) ( 46 bits + 2 padding bits for 6 bytes total) |
|
d3ac199593d6
Fixing NKRO on Windows 8.1
Jacob Alexander <haata@kiibohd.com>
parents:
248
diff
changeset
|
199 // 224-231 : 1 byte (0xE0-0xE7) ( 8 bits) |
|
d3ac199593d6
Fixing NKRO on Windows 8.1
Jacob Alexander <haata@kiibohd.com>
parents:
248
diff
changeset
|
200 |
|
d3ac199593d6
Fixing NKRO on Windows 8.1
Jacob Alexander <haata@kiibohd.com>
parents:
248
diff
changeset
|
201 // Modifier Byte |
| 308 | 202 0x75, 0x01, // Report Size (1), |
| 203 0x95, 0x08, // Report Count (8), | |
| 204 0x15, 0x00, // Logical Minimum (0), | |
| 205 0x25, 0x01, // Logical Maximum (1), | |
| 206 0x05, 0x07, // Usage Page (Key Codes), | |
| 207 0x19, 0xE0, // Usage Minimum (224), | |
| 208 0x29, 0xE7, // Usage Maximum (231), | |
| 209 0x81, 0x02, // Input (Data, Variable, Absolute), | |
|
251
d3ac199593d6
Fixing NKRO on Windows 8.1
Jacob Alexander <haata@kiibohd.com>
parents:
248
diff
changeset
|
210 |
|
248
2e098cf8f71d
Fixing Linux NKRO Delete bug
Jacob Alexander <haata@kiibohd.com>
parents:
246
diff
changeset
|
211 // 4-49 (6 bytes/46 bits) - MainKeys |
| 308 | 212 0x75, 0x01, // Report Size (1), |
| 213 0x95, 0x2E, // Report Count (46), | |
| 214 0x15, 0x00, // Logical Minimum (0), | |
| 215 0x25, 0x01, // Logical Maximum (1), | |
| 216 0x05, 0x07, // Usage Page (Key Codes), | |
| 217 0x19, 0x04, // Usage Minimum (4), | |
| 218 0x29, 0x31, // Usage Maximum (49), | |
| 219 0x81, 0x02, // Input (Data, Variable, Absolute, Bitfield), | |
|
236
d494b74d5242
Fixed Linux NKRO bitmap bug.
Jacob Alexander <haata@kiibohd.com>
parents:
233
diff
changeset
|
220 |
|
251
d3ac199593d6
Fixing NKRO on Windows 8.1
Jacob Alexander <haata@kiibohd.com>
parents:
248
diff
changeset
|
221 // Padding (2 bits) |
|
d3ac199593d6
Fixing NKRO on Windows 8.1
Jacob Alexander <haata@kiibohd.com>
parents:
248
diff
changeset
|
222 0x75, 0x02, // Report Size (2), |
|
d3ac199593d6
Fixing NKRO on Windows 8.1
Jacob Alexander <haata@kiibohd.com>
parents:
248
diff
changeset
|
223 0x95, 0x01, // Report Count (1), |
|
d3ac199593d6
Fixing NKRO on Windows 8.1
Jacob Alexander <haata@kiibohd.com>
parents:
248
diff
changeset
|
224 0x81, 0x03, // Input (Constant), |
|
236
d494b74d5242
Fixed Linux NKRO bitmap bug.
Jacob Alexander <haata@kiibohd.com>
parents:
233
diff
changeset
|
225 |
|
248
2e098cf8f71d
Fixing Linux NKRO Delete bug
Jacob Alexander <haata@kiibohd.com>
parents:
246
diff
changeset
|
226 // 51-155 (14 bytes/105 bits) - SecondaryKeys |
| 308 | 227 0x75, 0x01, // Report Size (1), |
| 228 0x95, 0x69, // Report Count (105), | |
| 229 0x15, 0x00, // Logical Minimum (0), | |
| 230 0x25, 0x01, // Logical Maximum (1), | |
| 231 0x05, 0x07, // Usage Page (Key Codes), | |
| 232 0x19, 0x33, // Usage Minimum (51), | |
| 233 0x29, 0x9B, // Usage Maximum (155), | |
| 234 0x81, 0x02, // Input (Data, Variable, Absolute, Bitfield), | |
|
231
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
235 |
|
251
d3ac199593d6
Fixing NKRO on Windows 8.1
Jacob Alexander <haata@kiibohd.com>
parents:
248
diff
changeset
|
236 // Padding (7 bits) |
|
d3ac199593d6
Fixing NKRO on Windows 8.1
Jacob Alexander <haata@kiibohd.com>
parents:
248
diff
changeset
|
237 0x75, 0x07, // Report Size (7), |
|
d3ac199593d6
Fixing NKRO on Windows 8.1
Jacob Alexander <haata@kiibohd.com>
parents:
248
diff
changeset
|
238 0x95, 0x01, // Report Count (1), |
|
d3ac199593d6
Fixing NKRO on Windows 8.1
Jacob Alexander <haata@kiibohd.com>
parents:
248
diff
changeset
|
239 0x81, 0x03, // Input (Constant), |
|
236
d494b74d5242
Fixed Linux NKRO bitmap bug.
Jacob Alexander <haata@kiibohd.com>
parents:
233
diff
changeset
|
240 |
|
248
2e098cf8f71d
Fixing Linux NKRO Delete bug
Jacob Alexander <haata@kiibohd.com>
parents:
246
diff
changeset
|
241 // 157-164 (1 byte/8 bits) - TertiaryKeys |
| 308 | 242 0x75, 0x01, // Report Size (1), |
| 243 0x95, 0x08, // Report Count (8), | |
| 244 0x15, 0x00, // Logical Minimum (0), | |
| 245 0x25, 0x01, // Logical Maximum (1), | |
| 246 0x05, 0x07, // Usage Page (Key Codes), | |
| 247 0x19, 0x9D, // Usage Minimum (157), | |
| 248 0x29, 0xA4, // Usage Maximum (164), | |
| 249 0x81, 0x02, // Input (Data, Variable, Absolute, Bitfield), | |
|
248
2e098cf8f71d
Fixing Linux NKRO Delete bug
Jacob Alexander <haata@kiibohd.com>
parents:
246
diff
changeset
|
250 |
|
2e098cf8f71d
Fixing Linux NKRO Delete bug
Jacob Alexander <haata@kiibohd.com>
parents:
246
diff
changeset
|
251 // 176-221 (6 bytes/46 bits) - QuartiaryKeys |
| 308 | 252 0x75, 0x01, // Report Size (1), |
| 253 0x95, 0x2E, // Report Count (46), | |
| 254 0x15, 0x00, // Logical Minimum (0), | |
| 255 0x25, 0x01, // Logical Maximum (1), | |
| 256 0x05, 0x07, // Usage Page (Key Codes), | |
| 257 0x19, 0xB0, // Usage Minimum (176), | |
| 258 0x29, 0xDD, // Usage Maximum (221), | |
| 259 0x81, 0x02, // Input (Data, Variable, Absolute, Bitfield), | |
|
231
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
260 |
|
251
d3ac199593d6
Fixing NKRO on Windows 8.1
Jacob Alexander <haata@kiibohd.com>
parents:
248
diff
changeset
|
261 // Padding (2 bits) |
|
d3ac199593d6
Fixing NKRO on Windows 8.1
Jacob Alexander <haata@kiibohd.com>
parents:
248
diff
changeset
|
262 0x75, 0x02, // Report Size (2), |
|
d3ac199593d6
Fixing NKRO on Windows 8.1
Jacob Alexander <haata@kiibohd.com>
parents:
248
diff
changeset
|
263 0x95, 0x01, // Report Count (1), |
|
d3ac199593d6
Fixing NKRO on Windows 8.1
Jacob Alexander <haata@kiibohd.com>
parents:
248
diff
changeset
|
264 0x81, 0x03, // Input (Constant), |
| 308 | 265 0xc0, // End Collection - Keyboard |
|
368
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
266 }; |
|
231
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
267 |
|
368
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
268 // System Control and Consumer Control |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
269 static uint8_t sys_ctrl_report_desc[] = { |
|
231
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
270 // System Control Collection |
|
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
271 // |
|
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
272 // NOTES: |
|
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
273 // Not bothering with NKRO for this table. If there's need, I can implement it. -HaaTa |
|
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
274 // Using a 1KRO scheme |
| 308 | 275 0x05, 0x01, // Usage Page (Generic Desktop), |
| 276 0x09, 0x80, // Usage (System Control), | |
| 277 0xA1, 0x01, // Collection (Application), | |
| 278 0x85, 0x02, // Report ID (2), | |
| 279 0x75, 0x08, // Report Size (8), | |
| 280 0x95, 0x01, // Report Count (1), | |
| 281 0x16, 0x81, 0x00, // Logical Minimum (129), | |
| 282 0x26, 0xB7, 0x00, // Logical Maximum (183), | |
| 283 0x19, 0x81, // Usage Minimum (129), | |
| 284 0x29, 0xB7, // Usage Maximum (183), | |
| 285 0x81, 0x00, // Input (Data, Array), | |
| 286 0xc0, // End Collection - System Control | |
|
231
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
287 |
|
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
288 // Consumer Control Collection - Media Keys |
|
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
289 // |
|
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
290 // NOTES: |
|
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
291 // Not bothering with NKRO for this table. If there's a need, I can implement it. -HaaTa |
|
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
292 // Using a 1KRO scheme |
| 308 | 293 0x05, 0x0c, // Usage Page (Consumer), |
| 294 0x09, 0x01, // Usage (Consumer Control), | |
| 295 0xA1, 0x01, // Collection (Application), | |
| 296 0x85, 0x03, // Report ID (3), | |
| 297 0x75, 0x10, // Report Size (16), | |
| 298 0x95, 0x01, // Report Count (1), | |
|
368
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
299 0x16, 0x01, 0x00, // Logical Minimum (1), |
| 308 | 300 0x26, 0x9C, 0x02, // Logical Maximum (668), |
| 301 0x05, 0x0C, // Usage Page (Consumer), | |
|
368
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
302 0x19, 0x01, // Usage Minimum (1), |
| 308 | 303 0x2A, 0x9C, 0x02, // Usage Maximum (668), |
| 304 0x81, 0x00, // Input (Data, Array), | |
| 305 0xc0, // End Collection - Consumer Control | |
|
231
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
306 }; |
|
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
307 |
|
104
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
308 // Mouse Protocol 1, HID 1.11 spec, Appendix B, page 59-60, with wheel extension |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
309 static uint8_t mouse_report_desc[] = { |
| 308 | 310 0x05, 0x01, // Usage Page (Generic Desktop) |
| 311 0x09, 0x02, // Usage (Mouse) | |
| 312 0xA1, 0x01, // Collection (Application) | |
| 313 0x05, 0x09, // Usage Page (Button) | |
| 314 0x19, 0x01, // Usage Minimum (Button #1) | |
| 315 0x29, 0x03, // Usage Maximum (Button #3) | |
| 316 0x15, 0x00, // Logical Minimum (0) | |
| 317 0x25, 0x01, // Logical Maximum (1) | |
| 318 0x95, 0x03, // Report Count (3) | |
| 319 0x75, 0x01, // Report Size (1) | |
| 320 0x81, 0x02, // Input (Data, Variable, Absolute) | |
| 321 0x95, 0x01, // Report Count (1) | |
| 322 0x75, 0x05, // Report Size (5) | |
| 323 0x81, 0x03, // Input (Constant) | |
| 324 0x05, 0x01, // Usage Page (Generic Desktop) | |
| 325 0x09, 0x30, // Usage (X) | |
| 326 0x09, 0x31, // Usage (Y) | |
| 327 0x15, 0x00, // Logical Minimum (0) | |
| 328 0x26, 0xFF, 0x7F, // Logical Maximum (32767) | |
| 329 0x75, 0x10, // Report Size (16), | |
| 330 0x95, 0x02, // Report Count (2), | |
| 331 0x81, 0x02, // Input (Data, Variable, Absolute) | |
| 332 0x09, 0x38, // Usage (Wheel) | |
| 333 0x15, 0x81, // Logical Minimum (-127) | |
| 334 0x25, 0x7F, // Logical Maximum (127) | |
| 335 0x75, 0x08, // Report Size (8), | |
| 336 0x95, 0x01, // Report Count (1), | |
| 337 0x81, 0x06, // Input (Data, Variable, Relative) | |
| 338 0xC0 // End Collection | |
|
104
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
339 }; |
|
368
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
340 |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
341 // Joystick Protocol, HID 1.11 spec, Apendix D, page 64-65 |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
342 static uint8_t joystick_report_desc[] = { |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
343 0x05, 0x01, // Usage Page (Generic Desktop) |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
344 0x09, 0x04, // Usage (Joystick) |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
345 0xA1, 0x01, // Collection (Application) |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
346 0x15, 0x00, // Logical Minimum (0) |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
347 0x25, 0x01, // Logical Maximum (1) |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
348 0x75, 0x01, // Report Size (1) |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
349 0x95, 0x20, // Report Count (32) |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
350 0x05, 0x09, // Usage Page (Button) |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
351 0x19, 0x01, // Usage Minimum (Button #1) |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
352 0x29, 0x20, // Usage Maximum (Button #32) |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
353 0x81, 0x02, // Input (variable,absolute) |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
354 0x15, 0x00, // Logical Minimum (0) |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
355 0x25, 0x07, // Logical Maximum (7) |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
356 0x35, 0x00, // Physical Minimum (0) |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
357 0x46, 0x3B, 0x01, // Physical Maximum (315) |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
358 0x75, 0x04, // Report Size (4) |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
359 0x95, 0x01, // Report Count (1) |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
360 0x65, 0x14, // Unit (20) |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
361 0x05, 0x01, // Usage Page (Generic Desktop) |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
362 0x09, 0x39, // Usage (Hat switch) |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
363 0x81, 0x42, // Input (variable,absolute,null_state) |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
364 0x05, 0x01, // Usage Page (Generic Desktop) |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
365 0x09, 0x01, // Usage (Pointer) |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
366 0xA1, 0x00, // Collection () |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
367 0x15, 0x00, // Logical Minimum (0) |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
368 0x26, 0xFF, 0x03, // Logical Maximum (1023) |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
369 0x75, 0x0A, // Report Size (10) |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
370 0x95, 0x04, // Report Count (4) |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
371 0x09, 0x30, // Usage (X) |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
372 0x09, 0x31, // Usage (Y) |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
373 0x09, 0x32, // Usage (Z) |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
374 0x09, 0x35, // Usage (Rz) |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
375 0x81, 0x02, // Input (variable,absolute) |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
376 0xC0, // End Collection |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
377 0x15, 0x00, // Logical Minimum (0) |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
378 0x26, 0xFF, 0x03, // Logical Maximum (1023) |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
379 0x75, 0x0A, // Report Size (10) |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
380 0x95, 0x02, // Report Count (2) |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
381 0x09, 0x36, // Usage (Slider) |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
382 0x09, 0x36, // Usage (Slider) |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
383 0x81, 0x02, // Input (variable,absolute) |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
384 0xC0 // End Collection |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
385 }; |
|
104
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
386 |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
387 |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
388 |
|
231
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
389 // ----- USB Configuration ----- |
|
104
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
390 |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
391 // USB Configuration Descriptor. This huge descriptor tells all |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
392 // of the devices capbilities. |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
393 static uint8_t config_descriptor[CONFIG_DESC_SIZE] = { |
|
231
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
394 // --- Configuration --- |
|
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
395 // - 9 bytes - |
| 308 | 396 // configuration descriptor, USB spec 9.6.3, page 264-266, Table 9-10 |
| 397 9, // bLength; | |
| 398 2, // bDescriptorType; | |
| 399 LSB(CONFIG_DESC_SIZE), // wTotalLength | |
| 400 MSB(CONFIG_DESC_SIZE), | |
| 401 NUM_INTERFACE, // bNumInterfaces | |
| 402 1, // bConfigurationValue | |
| 403 0, // iConfiguration | |
| 404 0xA0, // bmAttributes | |
| 405 250, // bMaxPower | |
|
231
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
406 |
|
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
407 // --- Keyboard HID --- Boot Mode Keyboard Interface |
|
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
408 // - 9 bytes - |
| 308 | 409 // interface descriptor, USB spec 9.6.5, page 267-269, Table 9-12 |
| 410 9, // bLength | |
| 411 4, // bDescriptorType | |
| 412 KEYBOARD_INTERFACE, // bInterfaceNumber | |
| 413 0, // bAlternateSetting | |
| 414 1, // bNumEndpoints | |
| 415 0x03, // bInterfaceClass (0x03 = HID) | |
| 416 0x01, // bInterfaceSubClass (0x00 = Non-Boot, 0x01 = Boot) | |
| 417 0x01, // bInterfaceProtocol (0x01 = Keyboard) | |
|
368
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
418 KEYBOARD_INTERFACE + 4, // iInterface |
|
231
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
419 // - 9 bytes - |
| 308 | 420 // HID interface descriptor, HID 1.11 spec, section 6.2.1 |
| 421 9, // bLength | |
| 422 0x21, // bDescriptorType | |
| 423 0x11, 0x01, // bcdHID | |
|
368
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
424 KeyboardLocale_define, // bCountryCode |
| 308 | 425 1, // bNumDescriptors |
| 426 0x22, // bDescriptorType | |
| 427 LSB(sizeof(keyboard_report_desc)), // wDescriptorLength | |
| 428 MSB(sizeof(keyboard_report_desc)), | |
|
231
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
429 // - 7 bytes - |
| 308 | 430 // endpoint descriptor, USB spec 9.6.6, page 269-271, Table 9-13 |
| 431 7, // bLength | |
| 432 5, // bDescriptorType | |
| 433 KEYBOARD_ENDPOINT | 0x80, // bEndpointAddress | |
| 434 0x03, // bmAttributes (0x03=intr) | |
| 435 KEYBOARD_SIZE, 0, // wMaxPacketSize | |
| 436 KEYBOARD_INTERVAL, // bInterval | |
|
104
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
437 |
|
231
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
438 // --- NKRO Keyboard HID --- OS Mode Keyboard Interface |
|
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
439 // - 9 bytes - |
| 308 | 440 // interface descriptor, USB spec 9.6.5, page 267-269, Table 9-12 |
| 441 9, // bLength | |
| 442 4, // bDescriptorType | |
| 443 NKRO_KEYBOARD_INTERFACE, // bInterfaceNumber | |
| 444 0, // bAlternateSetting | |
| 445 1, // bNumEndpoints | |
| 446 0x03, // bInterfaceClass (0x03 = HID) | |
| 447 0x00, // bInterfaceSubClass (0x00 = Non-Boot, 0x01 = Boot) | |
| 448 0x01, // bInterfaceProtocol (0x01 = Keyboard) | |
|
368
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
449 NKRO_KEYBOARD_INTERFACE + 4, // iInterface |
|
231
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
450 // - 9 bytes - |
| 308 | 451 // HID interface descriptor, HID 1.11 spec, section 6.2.1 |
| 452 9, // bLength | |
| 453 0x21, // bDescriptorType | |
| 454 0x11, 0x01, // bcdHID | |
|
368
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
455 KeyboardLocale_define, // bCountryCode |
| 308 | 456 1, // bNumDescriptors |
| 457 0x22, // bDescriptorType | |
| 458 LSB(sizeof(nkro_keyboard_report_desc)), // wDescriptorLength | |
| 459 MSB(sizeof(nkro_keyboard_report_desc)), | |
|
231
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
460 // - 7 bytes - |
| 308 | 461 // endpoint descriptor, USB spec 9.6.6, page 269-271, Table 9-13 |
| 462 7, // bLength | |
| 463 5, // bDescriptorType | |
| 464 NKRO_KEYBOARD_ENDPOINT | 0x80, // bEndpointAddress | |
| 465 0x03, // bmAttributes (0x03=intr) | |
| 466 NKRO_KEYBOARD_SIZE, 0, // wMaxPacketSize | |
| 467 NKRO_KEYBOARD_INTERVAL, // bInterval | |
|
231
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
468 |
|
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
469 // --- Serial CDC --- CDC IAD Descriptor |
|
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
470 // - 8 bytes - |
| 308 | 471 // interface association descriptor, USB ECN, Table 9-Z |
| 472 8, // bLength | |
| 473 11, // bDescriptorType | |
| 474 CDC_STATUS_INTERFACE, // bFirstInterface | |
| 475 2, // bInterfaceCount | |
| 476 0x02, // bFunctionClass | |
| 477 0x02, // bFunctionSubClass | |
| 478 0x01, // bFunctionProtocol | |
|
368
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
479 CDC_STATUS_INTERFACE + 4, // iFunction |
|
104
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
480 |
|
231
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
481 // --- Serial CDC --- CDC Data Interface |
|
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
482 // - 9 bytes - |
| 308 | 483 // interface descriptor, USB spec 9.6.5, page 267-269, Table 9-12 |
| 484 9, // bLength | |
| 485 4, // bDescriptorType | |
| 486 CDC_STATUS_INTERFACE, // bInterfaceNumber | |
| 487 0, // bAlternateSetting | |
| 488 1, // bNumEndpoints | |
| 489 0x02, // bInterfaceClass | |
| 490 0x02, // bInterfaceSubClass | |
| 491 0x01, // bInterfaceProtocol | |
|
368
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
492 CDC_STATUS_INTERFACE + 4, // iInterface |
|
231
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
493 // - 5 bytes - |
| 308 | 494 // CDC Header Functional Descriptor, CDC Spec 5.2.3.1, Table 26 |
| 495 5, // bFunctionLength | |
| 496 0x24, // bDescriptorType | |
| 497 0x00, // bDescriptorSubtype | |
| 498 0x10, 0x01, // bcdCDC | |
|
231
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
499 // - 5 bytes - |
| 308 | 500 // Call Management Functional Descriptor, CDC Spec 5.2.3.2, Table 27 |
| 501 5, // bFunctionLength | |
| 502 0x24, // bDescriptorType | |
| 503 0x01, // bDescriptorSubtype | |
| 504 0x01, // bmCapabilities | |
| 505 CDC_DATA_INTERFACE, // bDataInterface | |
|
231
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
506 // - 4 bytes - |
| 308 | 507 // Abstract Control Management Functional Descriptor, CDC Spec 5.2.3.3, Table 28 |
| 508 4, // bFunctionLength | |
| 509 0x24, // bDescriptorType | |
| 510 0x02, // bDescriptorSubtype | |
| 511 0x06, // bmCapabilities | |
|
231
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
512 // - 5 bytes - |
| 308 | 513 // Union Functional Descriptor, CDC Spec 5.2.3.8, Table 33 |
| 514 5, // bFunctionLength | |
| 515 0x24, // bDescriptorType | |
| 516 0x06, // bDescriptorSubtype | |
| 517 CDC_STATUS_INTERFACE, // bMasterInterface | |
| 518 CDC_DATA_INTERFACE, // bSlaveInterface0 | |
|
231
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
519 // - 7 bytes - |
| 308 | 520 // endpoint descriptor, USB spec 9.6.6, page 269-271, Table 9-13 |
| 521 7, // bLength | |
| 522 5, // bDescriptorType | |
| 523 CDC_ACM_ENDPOINT | 0x80, // bEndpointAddress | |
| 524 0x03, // bmAttributes (0x03=intr) | |
| 525 CDC_ACM_SIZE, 0, // wMaxPacketSize | |
| 526 64, // bInterval | |
|
231
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
527 // - 9 bytes - |
| 308 | 528 // interface descriptor, USB spec 9.6.5, page 267-269, Table 9-12 |
| 529 9, // bLength | |
| 530 4, // bDescriptorType | |
| 531 CDC_DATA_INTERFACE, // bInterfaceNumber | |
| 532 0, // bAlternateSetting | |
| 533 2, // bNumEndpoints | |
| 534 0x0A, // bInterfaceClass | |
| 535 0x00, // bInterfaceSubClass | |
| 536 0x00, // bInterfaceProtocol | |
|
368
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
537 CDC_DATA_INTERFACE + 4, // iInterface |
|
231
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
538 // - 7 bytes - |
| 308 | 539 // endpoint descriptor, USB spec 9.6.6, page 269-271, Table 9-13 |
| 540 7, // bLength | |
| 541 5, // bDescriptorType | |
| 542 CDC_RX_ENDPOINT, // bEndpointAddress | |
| 543 0x02, // bmAttributes (0x02=bulk) | |
| 544 CDC_RX_SIZE, 0, // wMaxPacketSize | |
| 545 0, // bInterval | |
|
231
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
546 // - 7 bytes - |
| 308 | 547 // endpoint descriptor, USB spec 9.6.6, page 269-271, Table 9-13 |
| 548 7, // bLength | |
| 549 5, // bDescriptorType | |
| 550 CDC_TX_ENDPOINT | 0x80, // bEndpointAddress | |
| 551 0x02, // bmAttributes (0x02=bulk) | |
| 552 CDC_TX_SIZE, 0, // wMaxPacketSize | |
| 553 0, // bInterval | |
|
104
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
554 |
|
368
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
555 // --- Mouse Interface --- |
|
231
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
556 // - 9 bytes - |
| 308 | 557 // interface descriptor, USB spec 9.6.5, page 267-269, Table 9-12 |
| 558 9, // bLength | |
| 559 4, // bDescriptorType | |
| 560 MOUSE_INTERFACE, // bInterfaceNumber | |
| 561 0, // bAlternateSetting | |
| 562 1, // bNumEndpoints | |
| 563 0x03, // bInterfaceClass (0x03 = HID) | |
| 564 0x00, // bInterfaceSubClass (0x01 = Boot) | |
|
368
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
565 0x02, // bInterfaceProtocol (0x02 = Mouse) |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
566 MOUSE_INTERFACE + 4, // iInterface |
|
231
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
567 // - 9 bytes - |
| 308 | 568 // HID interface descriptor, HID 1.11 spec, section 6.2.1 |
| 569 9, // bLength | |
| 570 0x21, // bDescriptorType | |
| 571 0x11, 0x01, // bcdHID | |
| 572 0, // bCountryCode | |
| 573 1, // bNumDescriptors | |
| 574 0x22, // bDescriptorType | |
| 575 LSB(sizeof(mouse_report_desc)), // wDescriptorLength | |
| 576 MSB(sizeof(mouse_report_desc)), | |
|
231
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
577 // - 7 bytes - |
| 308 | 578 // endpoint descriptor, USB spec 9.6.6, page 269-271, Table 9-13 |
| 579 7, // bLength | |
| 580 5, // bDescriptorType | |
| 581 MOUSE_ENDPOINT | 0x80, // bEndpointAddress | |
| 582 0x03, // bmAttributes (0x03=intr) | |
| 583 MOUSE_SIZE, 0, // wMaxPacketSize | |
| 584 MOUSE_INTERVAL, // bInterval | |
|
368
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
585 |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
586 // --- Joystick Interface --- |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
587 // - 9 bytes - |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
588 // interface descriptor, USB spec 9.6.5, page 267-269, Table 9-12 |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
589 9, // bLength |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
590 4, // bDescriptorType |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
591 JOYSTICK_INTERFACE, // bInterfaceNumber |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
592 0, // bAlternateSetting |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
593 1, // bNumEndpoints |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
594 0x03, // bInterfaceClass (0x03 = HID) |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
595 0x00, // bInterfaceSubClass |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
596 0x00, // bInterfaceProtocol |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
597 JOYSTICK_INTERFACE + 4, // iInterface |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
598 // - 9 bytes - |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
599 // HID interface descriptor, HID 1.11 spec, section 6.2.1 |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
600 9, // bLength |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
601 0x21, // bDescriptorType |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
602 0x11, 0x01, // bcdHID |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
603 0, // bCountryCode |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
604 1, // bNumDescriptors |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
605 0x22, // bDescriptorType |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
606 LSB(sizeof(joystick_report_desc)), // wDescriptorLength |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
607 MSB(sizeof(joystick_report_desc)), |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
608 // - 7 bytes - |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
609 // endpoint descriptor, USB spec 9.6.6, page 269-271, Table 9-13 |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
610 7, // bLength |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
611 5, // bDescriptorType |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
612 JOYSTICK_ENDPOINT | 0x80, // bEndpointAddress |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
613 0x03, // bmAttributes (0x03=intr) |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
614 JOYSTICK_SIZE, 0, // wMaxPacketSize |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
615 JOYSTICK_INTERVAL, // bInterval |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
616 |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
617 // --- System/Consumer Control --- |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
618 // - 9 bytes - |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
619 // interface descriptor, USB spec 9.6.5, page 267-269, Table 9-12 |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
620 9, // bLength |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
621 4, // bDescriptorType |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
622 SYS_CTRL_INTERFACE, // bInterfaceNumber |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
623 0, // bAlternateSetting |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
624 1, // bNumEndpoints |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
625 0x03, // bInterfaceClass (0x03 = HID) |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
626 0x01, // bInterfaceSubClass (0x00 = Non-Boot, 0x01 = Boot) |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
627 0x00, // bInterfaceProtocol (0x00 = None) |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
628 SYS_CTRL_INTERFACE + 4, // iInterface |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
629 // - 9 bytes - |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
630 // HID interface descriptor, HID 1.11 spec, section 6.2.1 |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
631 9, // bLength |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
632 0x21, // bDescriptorType |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
633 0x11, 0x01, // bcdHID |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
634 KeyboardLocale_define, // bCountryCode |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
635 1, // bNumDescriptors |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
636 0x22, // bDescriptorType |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
637 LSB(sizeof(sys_ctrl_report_desc)), // wDescriptorLength |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
638 MSB(sizeof(sys_ctrl_report_desc)), |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
639 // - 7 bytes - |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
640 // endpoint descriptor, USB spec 9.6.6, page 269-271, Table 9-13 |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
641 7, // bLength |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
642 5, // bDescriptorType |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
643 SYS_CTRL_ENDPOINT | 0x80, // bEndpointAddress |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
644 0x03, // bmAttributes (0x03=intr) |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
645 SYS_CTRL_SIZE, 0, // wMaxPacketSize |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
646 SYS_CTRL_INTERVAL, // bInterval |
|
104
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
647 }; |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
648 |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
649 |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
650 |
|
231
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
651 // ----- String Descriptors ----- |
|
104
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
652 |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
653 // The descriptors above can provide human readable strings, |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
654 // referenced by index numbers. These descriptors are the |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
655 // actual string data |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
656 |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
657 struct usb_string_descriptor_struct { |
| 308 | 658 uint8_t bLength; |
| 659 uint8_t bDescriptorType; | |
| 660 uint16_t wString[]; | |
|
104
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
661 }; |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
662 |
|
119
814b5d3d7da6
Finished USB for Teensy 3.1 (Now 3.1 compatible!)
Jacob Alexander <haata@kiibohd.com>
parents:
117
diff
changeset
|
663 extern struct usb_string_descriptor_struct usb_string_manufacturer_name |
| 308 | 664 __attribute__ ((weak, alias("usb_string_manufacturer_name_default"))); |
|
119
814b5d3d7da6
Finished USB for Teensy 3.1 (Now 3.1 compatible!)
Jacob Alexander <haata@kiibohd.com>
parents:
117
diff
changeset
|
665 extern struct usb_string_descriptor_struct usb_string_product_name |
| 308 | 666 __attribute__ ((weak, alias("usb_string_product_name_default"))); |
|
119
814b5d3d7da6
Finished USB for Teensy 3.1 (Now 3.1 compatible!)
Jacob Alexander <haata@kiibohd.com>
parents:
117
diff
changeset
|
667 extern struct usb_string_descriptor_struct usb_string_serial_number |
| 308 | 668 __attribute__ ((weak, alias("usb_string_serial_number_default"))); |
|
119
814b5d3d7da6
Finished USB for Teensy 3.1 (Now 3.1 compatible!)
Jacob Alexander <haata@kiibohd.com>
parents:
117
diff
changeset
|
669 |
|
814b5d3d7da6
Finished USB for Teensy 3.1 (Now 3.1 compatible!)
Jacob Alexander <haata@kiibohd.com>
parents:
117
diff
changeset
|
670 struct usb_string_descriptor_struct string0 = { |
| 308 | 671 4, |
| 672 3, | |
| 673 {0x0409} | |
|
104
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
674 }; |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
675 |
|
368
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
676 #define usb_string_descriptor(name, str) \ |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
677 struct usb_string_descriptor_struct name = { \ |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
678 sizeof(str), \ |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
679 3, \ |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
680 {str} \ |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
681 } |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
682 |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
683 usb_string_descriptor( usb_string_manufacturer_name_default, STR_MANUFACTURER ); |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
684 usb_string_descriptor( usb_string_product_name_default, STR_PRODUCT ); |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
685 usb_string_descriptor( usb_string_serial_number_default, STR_SERIAL ); |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
686 usb_string_descriptor( usb_string_keyboard_name, KEYBOARD_NAME ); |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
687 usb_string_descriptor( usb_string_nkro_keyboard_name, NKRO_KEYBOARD_NAME ); |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
688 usb_string_descriptor( usb_string_cdc_status_name, CDC_STATUS_NAME ); |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
689 usb_string_descriptor( usb_string_cdc_data_name, CDC_DATA_NAME ); |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
690 usb_string_descriptor( usb_string_mouse_name, MOUSE_NAME ); |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
691 usb_string_descriptor( usb_string_joystick_name, JOYSTICK_NAME ); |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
692 usb_string_descriptor( usb_string_sys_ctrl_name, SYS_CTRL_NAME ); |
|
104
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
693 |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
694 |
|
231
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
695 |
|
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
696 // ----- Descriptors List ----- |
|
104
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
697 |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
698 // This table provides access to all the descriptor data above. |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
699 |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
700 const usb_descriptor_list_t usb_descriptor_list[] = { |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
701 //wValue, wIndex, address, length |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
702 {0x0100, 0x0000, device_descriptor, sizeof(device_descriptor)}, |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
703 {0x0200, 0x0000, config_descriptor, sizeof(config_descriptor)}, |
|
231
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
704 {0x0600, 0x0000, device_qualifier_descriptor, sizeof(device_qualifier_descriptor)}, |
|
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
705 {0x0A00, 0x0000, usb_debug_descriptor, sizeof(usb_debug_descriptor)}, |
|
368
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
706 |
| 308 | 707 {0x2200, KEYBOARD_INTERFACE, keyboard_report_desc, sizeof(keyboard_report_desc)}, |
| 708 {0x2100, KEYBOARD_INTERFACE, config_descriptor + KEYBOARD_DESC_OFFSET, 9}, | |
|
368
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
709 |
| 308 | 710 {0x2200, NKRO_KEYBOARD_INTERFACE, nkro_keyboard_report_desc, sizeof(nkro_keyboard_report_desc)}, |
| 711 {0x2100, NKRO_KEYBOARD_INTERFACE, config_descriptor + NKRO_KEYBOARD_DESC_OFFSET, 9}, | |
|
368
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
712 |
| 308 | 713 {0x2200, MOUSE_INTERFACE, mouse_report_desc, sizeof(mouse_report_desc)}, |
|
368
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
714 {0x2100, MOUSE_INTERFACE, config_descriptor + MOUSE_DESC_OFFSET, 9}, |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
715 |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
716 {0x2200, JOYSTICK_INTERFACE, joystick_report_desc, sizeof(joystick_report_desc)}, |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
717 {0x2100, JOYSTICK_INTERFACE, config_descriptor + JOYSTICK_DESC_OFFSET, 9}, |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
718 |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
719 {0x2200, SYS_CTRL_INTERFACE, sys_ctrl_report_desc, sizeof(sys_ctrl_report_desc)}, |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
720 {0x2100, SYS_CTRL_INTERFACE, config_descriptor + SYS_CTRL_DESC_OFFSET, 9}, |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
721 |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
722 #define iInterfaceString(num, var) \ |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
723 {0x0300 + 4 + num, 0x409, (const uint8_t *)&var, 0 } |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
724 |
| 308 | 725 {0x0300, 0x0000, (const uint8_t *)&string0, 0}, |
| 726 {0x0301, 0x0409, (const uint8_t *)&usb_string_manufacturer_name, 0}, | |
| 727 {0x0302, 0x0409, (const uint8_t *)&usb_string_product_name, 0}, | |
| 728 {0x0303, 0x0409, (const uint8_t *)&usb_string_serial_number, 0}, | |
|
368
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
729 iInterfaceString( KEYBOARD_INTERFACE, usb_string_keyboard_name ), |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
730 iInterfaceString( NKRO_KEYBOARD_INTERFACE, usb_string_nkro_keyboard_name ), |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
731 iInterfaceString( CDC_STATUS_INTERFACE, usb_string_cdc_status_name ), |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
732 iInterfaceString( CDC_DATA_INTERFACE, usb_string_cdc_data_name ), |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
733 iInterfaceString( MOUSE_INTERFACE, usb_string_mouse_name ), |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
734 iInterfaceString( JOYSTICK_INTERFACE, usb_string_joystick_name ), |
|
06a54d582bf8
FIxing Media Keys and general USB compatibilty
Jacob Alexander <haata@kiibohd.com>
parents:
308
diff
changeset
|
735 iInterfaceString( SYS_CTRL_INTERFACE, usb_string_sys_ctrl_name ), |
|
104
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
736 {0, 0, NULL, 0} |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
737 }; |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
738 |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
739 |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
740 |
|
231
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
741 // ----- Endpoint Configuration ----- |
|
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
742 |
|
4afb170978e9
More preparation for NKRO USB for arm
Jacob Alexander <haata@kiibohd.com>
parents:
170
diff
changeset
|
743 // See usb_desc.h for Endpoint configuration |
|
104
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
744 // 0x00 = not used |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
745 // 0x19 = Recieve only |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
746 // 0x15 = Transmit only |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
747 // 0x1D = Transmit & Recieve |
|
170
85d74e5e1a95
More work on mk20dx128vlf5 port.
Jacob Alexander <haata@kiibohd.com>
parents:
123
diff
changeset
|
748 // |
|
85d74e5e1a95
More work on mk20dx128vlf5 port.
Jacob Alexander <haata@kiibohd.com>
parents:
123
diff
changeset
|
749 const uint8_t usb_endpoint_config_table[NUM_ENDPOINTS] = |
|
104
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
750 { |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
751 #if (defined(ENDPOINT1_CONFIG) && NUM_ENDPOINTS >= 1) |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
752 ENDPOINT1_CONFIG, |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
753 #elif (NUM_ENDPOINTS >= 1) |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
754 ENDPOINT_UNUSED, |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
755 #endif |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
756 #if (defined(ENDPOINT2_CONFIG) && NUM_ENDPOINTS >= 2) |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
757 ENDPOINT2_CONFIG, |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
758 #elif (NUM_ENDPOINTS >= 2) |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
759 ENDPOINT_UNUSED, |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
760 #endif |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
761 #if (defined(ENDPOINT3_CONFIG) && NUM_ENDPOINTS >= 3) |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
762 ENDPOINT3_CONFIG, |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
763 #elif (NUM_ENDPOINTS >= 3) |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
764 ENDPOINT_UNUSED, |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
765 #endif |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
766 #if (defined(ENDPOINT4_CONFIG) && NUM_ENDPOINTS >= 4) |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
767 ENDPOINT4_CONFIG, |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
768 #elif (NUM_ENDPOINTS >= 4) |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
769 ENDPOINT_UNUSED, |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
770 #endif |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
771 #if (defined(ENDPOINT5_CONFIG) && NUM_ENDPOINTS >= 5) |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
772 ENDPOINT5_CONFIG, |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
773 #elif (NUM_ENDPOINTS >= 5) |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
774 ENDPOINT_UNUSED, |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
775 #endif |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
776 #if (defined(ENDPOINT6_CONFIG) && NUM_ENDPOINTS >= 6) |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
777 ENDPOINT6_CONFIG, |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
778 #elif (NUM_ENDPOINTS >= 6) |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
779 ENDPOINT_UNUSED, |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
780 #endif |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
781 #if (defined(ENDPOINT7_CONFIG) && NUM_ENDPOINTS >= 7) |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
782 ENDPOINT7_CONFIG, |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
783 #elif (NUM_ENDPOINTS >= 7) |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
784 ENDPOINT_UNUSED, |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
785 #endif |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
786 #if (defined(ENDPOINT8_CONFIG) && NUM_ENDPOINTS >= 8) |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
787 ENDPOINT8_CONFIG, |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
788 #elif (NUM_ENDPOINTS >= 8) |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
789 ENDPOINT_UNUSED, |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
790 #endif |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
791 #if (defined(ENDPOINT9_CONFIG) && NUM_ENDPOINTS >= 9) |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
792 ENDPOINT9_CONFIG, |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
793 #elif (NUM_ENDPOINTS >= 9) |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
794 ENDPOINT_UNUSED, |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
795 #endif |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
796 #if (defined(ENDPOINT10_CONFIG) && NUM_ENDPOINTS >= 10) |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
797 ENDPOINT10_CONFIG, |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
798 #elif (NUM_ENDPOINTS >= 10) |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
799 ENDPOINT_UNUSED, |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
800 #endif |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
801 #if (defined(ENDPOINT11_CONFIG) && NUM_ENDPOINTS >= 11) |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
802 ENDPOINT11_CONFIG, |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
803 #elif (NUM_ENDPOINTS >= 11) |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
804 ENDPOINT_UNUSED, |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
805 #endif |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
806 #if (defined(ENDPOINT12_CONFIG) && NUM_ENDPOINTS >= 12) |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
807 ENDPOINT12_CONFIG, |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
808 #elif (NUM_ENDPOINTS >= 12) |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
809 ENDPOINT_UNUSED, |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
810 #endif |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
811 #if (defined(ENDPOINT13_CONFIG) && NUM_ENDPOINTS >= 13) |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
812 ENDPOINT13_CONFIG, |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
813 #elif (NUM_ENDPOINTS >= 13) |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
814 ENDPOINT_UNUSED, |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
815 #endif |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
816 #if (defined(ENDPOINT14_CONFIG) && NUM_ENDPOINTS >= 14) |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
817 ENDPOINT14_CONFIG, |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
818 #elif (NUM_ENDPOINTS >= 14) |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
819 ENDPOINT_UNUSED, |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
820 #endif |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
821 #if (defined(ENDPOINT15_CONFIG) && NUM_ENDPOINTS >= 15) |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
822 ENDPOINT15_CONFIG, |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
823 #elif (NUM_ENDPOINTS >= 15) |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
824 ENDPOINT_UNUSED, |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
825 #endif |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
826 }; |
|
e84738d174bc
Moving USB to Output in preparation for additional Output types.
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
827 |
|
246
f23f6cff7ef8
Fixing Mac OSX USB NKRO
Jacob Alexander <haata@kiibohd.com>
parents:
245
diff
changeset
|
828 |