diff options
| author | Ryan <fauxpark@gmail.com> | 2020-04-06 08:25:07 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-05 23:25:07 +0100 |
| commit | ca91dc594bb011f06f2e13018e74b6fd91c07c84 (patch) | |
| tree | 732a967fd58c648e0552439f835ab8a594ccf028 /tmk_core/protocol/vusb/vusb.h | |
| parent | 26cb83b8c04029f8882f5d3f537c520dde17126e (diff) | |
| download | qmk_firmware-ca91dc594bb011f06f2e13018e74b6fd91c07c84.tar.gz qmk_firmware-ca91dc594bb011f06f2e13018e74b6fd91c07c84.zip | |
V-USB: Remove some stuff from usbconfig.h that should not be configurable (#8656)
* V-USB: Remove some stuff from usbconfig.h that should not be configurable
* Clean up some ifdefs
* And some more
* Even more
Diffstat (limited to 'tmk_core/protocol/vusb/vusb.h')
| -rw-r--r-- | tmk_core/protocol/vusb/vusb.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/tmk_core/protocol/vusb/vusb.h b/tmk_core/protocol/vusb/vusb.h index 6d491266d..bb2a1726e 100644 --- a/tmk_core/protocol/vusb/vusb.h +++ b/tmk_core/protocol/vusb/vusb.h | |||
| @@ -87,23 +87,17 @@ typedef struct usbConfigurationDescriptor { | |||
| 87 | usbConfigurationDescriptorHeader_t header; | 87 | usbConfigurationDescriptorHeader_t header; |
| 88 | usbInterfaceDescriptor_t keyboardInterface; | 88 | usbInterfaceDescriptor_t keyboardInterface; |
| 89 | usbHIDDescriptor_t keyboardHID; | 89 | usbHIDDescriptor_t keyboardHID; |
| 90 | #ifdef USB_CFG_HAVE_INTRIN_ENDPOINT | ||
| 91 | usbEndpointDescriptor_t keyboardINEndpoint; | 90 | usbEndpointDescriptor_t keyboardINEndpoint; |
| 92 | #endif | ||
| 93 | 91 | ||
| 94 | #if defined(MOUSE_ENABLE) || defined(EXTRAKEY_ENABLE) | 92 | #if defined(MOUSE_ENABLE) || defined(EXTRAKEY_ENABLE) |
| 95 | usbInterfaceDescriptor_t mouseExtraInterface; | 93 | usbInterfaceDescriptor_t mouseExtraInterface; |
| 96 | usbHIDDescriptor_t mouseExtraHID; | 94 | usbHIDDescriptor_t mouseExtraHID; |
| 97 | # ifdef USB_CFG_HAVE_INTRIN_ENDPOINT3 | ||
| 98 | usbEndpointDescriptor_t mouseExtraINEndpoint; | 95 | usbEndpointDescriptor_t mouseExtraINEndpoint; |
| 99 | # endif | ||
| 100 | #elif defined(RAW_ENABLE) | 96 | #elif defined(RAW_ENABLE) |
| 101 | usbInterfaceDescriptor_t rawInterface; | 97 | usbInterfaceDescriptor_t rawInterface; |
| 102 | usbHIDDescriptor_t rawHID; | 98 | usbHIDDescriptor_t rawHID; |
| 103 | # ifdef USB_CFG_HAVE_INTRIN_ENDPOINT3 | ||
| 104 | usbEndpointDescriptor_t rawINEndpoint; | 99 | usbEndpointDescriptor_t rawINEndpoint; |
| 105 | usbEndpointDescriptor_t rawOUTEndpoint; | 100 | usbEndpointDescriptor_t rawOUTEndpoint; |
| 106 | # endif | ||
| 107 | #endif | 101 | #endif |
| 108 | } __attribute__((packed)) usbConfigurationDescriptor_t; | 102 | } __attribute__((packed)) usbConfigurationDescriptor_t; |
| 109 | 103 | ||
| @@ -112,6 +106,6 @@ typedef struct usbConfigurationDescriptor { | |||
| 112 | host_driver_t *vusb_driver(void); | 106 | host_driver_t *vusb_driver(void); |
| 113 | void vusb_transfer_keyboard(void); | 107 | void vusb_transfer_keyboard(void); |
| 114 | 108 | ||
| 115 | #if defined(RAW_ENABLE) | 109 | #ifdef RAW_ENABLE |
| 116 | void raw_hid_task(void); | 110 | void raw_hid_task(void); |
| 117 | #endif | 111 | #endif |
