diff options
author | Ryan <fauxpark@gmail.com> | 2020-03-28 13:02:25 +1100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-28 13:02:25 +1100 |
commit | 14079ce6984b359e080c85d9e9b8f7b8eb01437c (patch) | |
tree | 7da8f69e8611836197a926946204f04df0fc5140 /keyboards/pearl | |
parent | 05d9a0ff036d91b7dc4e6198f4074161c1c7b633 (diff) | |
download | qmk_firmware-14079ce6984b359e080c85d9e9b8f7b8eb01437c.tar.gz qmk_firmware-14079ce6984b359e080c85d9e9b8f7b8eb01437c.zip |
V-USB: Use structs for USB descriptors (#8572)
* V-USB: Use structs for USB descriptors
* Update usbconfigs
* cformat pass
Diffstat (limited to 'keyboards/pearl')
-rw-r--r-- | keyboards/pearl/usbconfig.h | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/keyboards/pearl/usbconfig.h b/keyboards/pearl/usbconfig.h index a3aa0f7c8..9ffec5280 100644 --- a/keyboards/pearl/usbconfig.h +++ b/keyboards/pearl/usbconfig.h | |||
@@ -207,7 +207,7 @@ section at the end of this file). | |||
207 | 207 | ||
208 | /* -------------------------- Device Description --------------------------- */ | 208 | /* -------------------------- Device Description --------------------------- */ |
209 | 209 | ||
210 | #define USB_CFG_VENDOR_ID (VENDOR_ID & 0xFF), ((VENDOR_ID >> 8) & 0xFF) | 210 | #define USB_CFG_VENDOR_ID |
211 | /* USB vendor ID for the device, low byte first. If you have registered your | 211 | /* USB vendor ID for the device, low byte first. If you have registered your |
212 | * own Vendor ID, define it here. Otherwise you may use one of obdev's free | 212 | * own Vendor ID, define it here. Otherwise you may use one of obdev's free |
213 | * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules! | 213 | * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules! |
@@ -216,7 +216,7 @@ section at the end of this file). | |||
216 | * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand | 216 | * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand |
217 | * the implications! | 217 | * the implications! |
218 | */ | 218 | */ |
219 | #define USB_CFG_DEVICE_ID (PRODUCT_ID & 0xFF), ((PRODUCT_ID >> 8) & 0xFF) | 219 | #define USB_CFG_DEVICE_ID |
220 | /* This is the ID of the product, low byte first. It is interpreted in the | 220 | /* This is the ID of the product, low byte first. It is interpreted in the |
221 | * scope of the vendor ID. If you have registered your own VID with usb.org | 221 | * scope of the vendor ID. If you have registered your own VID with usb.org |
222 | * or if you have licensed a PID from somebody else, define it here. Otherwise | 222 | * or if you have licensed a PID from somebody else, define it here. Otherwise |
@@ -227,9 +227,6 @@ section at the end of this file). | |||
227 | * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand | 227 | * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand |
228 | * the implications! | 228 | * the implications! |
229 | */ | 229 | */ |
230 | #define USB_CFG_DEVICE_VERSION (DEVICE_VER & 0xFF), ((DEVICE_VER >> 8) & 0xFF) | ||
231 | /* Version number of the device: Minor number first, then major number. | ||
232 | */ | ||
233 | #define USB_CFG_DEVICE_CLASS 0 | 230 | #define USB_CFG_DEVICE_CLASS 0 |
234 | #define USB_CFG_DEVICE_SUBCLASS 0 | 231 | #define USB_CFG_DEVICE_SUBCLASS 0 |
235 | /* See USB specification if you want to conform to an existing device class. | 232 | /* See USB specification if you want to conform to an existing device class. |
@@ -308,18 +305,15 @@ section at the end of this file). | |||
308 | * }; | 305 | * }; |
309 | */ | 306 | */ |
310 | 307 | ||
311 | #define USB_CFG_DESCR_PROPS_DEVICE 0 | 308 | #define USB_CFG_DESCR_PROPS_DEVICE USB_PROP_IS_DYNAMIC |
312 | #define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC | 309 | #define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC |
313 | //#define USB_CFG_DESCR_PROPS_CONFIGURATION 0 | ||
314 | #define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC | 310 | #define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC |
315 | #define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC | 311 | #define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC |
316 | #define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC | 312 | #define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC |
317 | #define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC | 313 | #define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC |
318 | #define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC | 314 | #define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC |
319 | #define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC | 315 | #define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC |
320 | //#define USB_CFG_DESCR_PROPS_HID 0 | ||
321 | #define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC | 316 | #define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC |
322 | //#define USB_CFG_DESCR_PROPS_HID_REPORT 0 | ||
323 | #define USB_CFG_DESCR_PROPS_UNKNOWN 0 | 317 | #define USB_CFG_DESCR_PROPS_UNKNOWN 0 |
324 | 318 | ||
325 | #define usbMsgPtr_t unsigned short | 319 | #define usbMsgPtr_t unsigned short |