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/ymd75 | |
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/ymd75')
-rw-r--r-- | keyboards/ymd75/usbconfig.h | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/keyboards/ymd75/usbconfig.h b/keyboards/ymd75/usbconfig.h index ad9c95c5d..fd5640a08 100644 --- a/keyboards/ymd75/usbconfig.h +++ b/keyboards/ymd75/usbconfig.h | |||
@@ -208,7 +208,7 @@ section at the end of this file). | |||
208 | 208 | ||
209 | /* -------------------------- Device Description --------------------------- */ | 209 | /* -------------------------- Device Description --------------------------- */ |
210 | 210 | ||
211 | #define USB_CFG_VENDOR_ID (VENDOR_ID & 0xFF), ((VENDOR_ID >> 8) & 0xFF) | 211 | #define USB_CFG_VENDOR_ID |
212 | /* USB vendor ID for the device, low byte first. If you have registered your | 212 | /* USB vendor ID for the device, low byte first. If you have registered your |
213 | * own Vendor ID, define it here. Otherwise you may use one of obdev's free | 213 | * own Vendor ID, define it here. Otherwise you may use one of obdev's free |
214 | * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules! | 214 | * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules! |
@@ -217,7 +217,7 @@ section at the end of this file). | |||
217 | * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand | 217 | * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand |
218 | * the implications! | 218 | * the implications! |
219 | */ | 219 | */ |
220 | #define USB_CFG_DEVICE_ID (PRODUCT_ID & 0xFF), ((PRODUCT_ID >> 8) & 0xFF) | 220 | #define USB_CFG_DEVICE_ID |
221 | /* This is the ID of the product, low byte first. It is interpreted in the | 221 | /* This is the ID of the product, low byte first. It is interpreted in the |
222 | * scope of the vendor ID. If you have registered your own VID with usb.org | 222 | * scope of the vendor ID. If you have registered your own VID with usb.org |
223 | * or if you have licensed a PID from somebody else, define it here. Otherwise | 223 | * or if you have licensed a PID from somebody else, define it here. Otherwise |
@@ -228,9 +228,6 @@ section at the end of this file). | |||
228 | * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand | 228 | * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand |
229 | * the implications! | 229 | * the implications! |
230 | */ | 230 | */ |
231 | #define USB_CFG_DEVICE_VERSION (DEVICE_VER & 0xFF), ((DEVICE_VER >> 8) & 0xFF) | ||
232 | /* Version number of the device: Minor number first, then major number. | ||
233 | */ | ||
234 | #define USB_CFG_DEVICE_CLASS 0 | 231 | #define USB_CFG_DEVICE_CLASS 0 |
235 | #define USB_CFG_DEVICE_SUBCLASS 0 | 232 | #define USB_CFG_DEVICE_SUBCLASS 0 |
236 | /* See USB specification if you want to conform to an existing device class. | 233 | /* See USB specification if you want to conform to an existing device class. |
@@ -309,18 +306,15 @@ section at the end of this file). | |||
309 | * }; | 306 | * }; |
310 | */ | 307 | */ |
311 | 308 | ||
312 | #define USB_CFG_DESCR_PROPS_DEVICE 0 | 309 | #define USB_CFG_DESCR_PROPS_DEVICE USB_PROP_IS_DYNAMIC |
313 | #define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC | 310 | #define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC |
314 | //#define USB_CFG_DESCR_PROPS_CONFIGURATION 0 | ||
315 | #define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC | 311 | #define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC |
316 | #define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC | 312 | #define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC |
317 | #define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC | 313 | #define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC |
318 | #define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC | 314 | #define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC |
319 | #define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC | 315 | #define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC |
320 | #define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC | 316 | #define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC |
321 | //#define USB_CFG_DESCR_PROPS_HID 0 | ||
322 | #define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC | 317 | #define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC |
323 | //#define USB_CFG_DESCR_PROPS_HID_REPORT 0 | ||
324 | #define USB_CFG_DESCR_PROPS_UNKNOWN 0 | 318 | #define USB_CFG_DESCR_PROPS_UNKNOWN 0 |
325 | 319 | ||
326 | #define usbMsgPtr_t unsigned short | 320 | #define usbMsgPtr_t unsigned short |