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/exent | |
| 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/exent')
| -rw-r--r-- | keyboards/exent/usbconfig.h | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/keyboards/exent/usbconfig.h b/keyboards/exent/usbconfig.h index 4acb6b281..6e910a703 100644 --- a/keyboards/exent/usbconfig.h +++ b/keyboards/exent/usbconfig.h | |||
| @@ -197,7 +197,7 @@ section at the end of this file). | |||
| 197 | 197 | ||
| 198 | /* -------------------------- Device Description --------------------------- */ | 198 | /* -------------------------- Device Description --------------------------- */ |
| 199 | 199 | ||
| 200 | #define USB_CFG_VENDOR_ID (VENDOR_ID & 0xFF), ((VENDOR_ID >> 8) & 0xFF) | 200 | #define USB_CFG_VENDOR_ID |
| 201 | /* USB vendor ID for the device, low byte first. If you have registered your | 201 | /* USB vendor ID for the device, low byte first. If you have registered your |
| 202 | * own Vendor ID, define it here. Otherwise you may use one of obdev's free | 202 | * own Vendor ID, define it here. Otherwise you may use one of obdev's free |
| 203 | * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules! | 203 | * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules! |
| @@ -206,7 +206,7 @@ section at the end of this file). | |||
| 206 | * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand | 206 | * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand |
| 207 | * the implications! | 207 | * the implications! |
| 208 | */ | 208 | */ |
| 209 | #define USB_CFG_DEVICE_ID (PRODUCT_ID & 0xFF), ((PRODUCT_ID >> 8) & 0xFF) | 209 | #define USB_CFG_DEVICE_ID |
| 210 | /* This is the ID of the product, low byte first. It is interpreted in the | 210 | /* This is the ID of the product, low byte first. It is interpreted in the |
| 211 | * scope of the vendor ID. If you have registered your own VID with usb.org | 211 | * scope of the vendor ID. If you have registered your own VID with usb.org |
| 212 | * or if you have licensed a PID from somebody else, define it here. Otherwise | 212 | * or if you have licensed a PID from somebody else, define it here. Otherwise |
| @@ -217,9 +217,6 @@ 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_VERSION (DEVICE_VER & 0xFF), ((DEVICE_VER >> 8) & 0xFF) | ||
| 221 | /* Version number of the device: Minor number first, then major number. | ||
| 222 | */ | ||
| 223 | #define USB_CFG_DEVICE_CLASS 0 | 220 | #define USB_CFG_DEVICE_CLASS 0 |
| 224 | #define USB_CFG_DEVICE_SUBCLASS 0 | 221 | #define USB_CFG_DEVICE_SUBCLASS 0 |
| 225 | /* See USB specification if you want to conform to an existing device class. | 222 | /* See USB specification if you want to conform to an existing device class. |
| @@ -298,18 +295,15 @@ section at the end of this file). | |||
| 298 | * }; | 295 | * }; |
| 299 | */ | 296 | */ |
| 300 | 297 | ||
| 301 | #define USB_CFG_DESCR_PROPS_DEVICE 0 | 298 | #define USB_CFG_DESCR_PROPS_DEVICE USB_PROP_IS_DYNAMIC |
| 302 | #define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC | 299 | #define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC |
| 303 | //#define USB_CFG_DESCR_PROPS_CONFIGURATION 0 | ||
| 304 | #define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC | 300 | #define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC |
| 305 | #define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC | 301 | #define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC |
| 306 | #define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC | 302 | #define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC |
| 307 | #define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC | 303 | #define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC |
| 308 | #define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC | 304 | #define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC |
| 309 | #define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC | 305 | #define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC |
| 310 | //#define USB_CFG_DESCR_PROPS_HID 0 | ||
| 311 | #define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC | 306 | #define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC |
| 312 | //#define USB_CFG_DESCR_PROPS_HID_REPORT 0 | ||
| 313 | #define USB_CFG_DESCR_PROPS_UNKNOWN 0 | 307 | #define USB_CFG_DESCR_PROPS_UNKNOWN 0 |
| 314 | 308 | ||
| 315 | #define usbMsgPtr_t unsigned short | 309 | #define usbMsgPtr_t unsigned short |
