diff options
| author | QMK Bot <hello@qmk.fm> | 2021-01-11 08:47:07 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-01-11 08:47:07 +0000 |
| commit | 3bc436988d0a58fdd735495f07aa741660ab8e71 (patch) | |
| tree | cc29932c27f363ee13e1fa36da7d5695979b8dc8 /tmk_core/protocol/vusb/vusb.h | |
| parent | 5193a8d569ef96d5e675a210abc1c4a2e980fdaa (diff) | |
| parent | d8b9825a8bb9d249ead4194accf47b13014e5346 (diff) | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'tmk_core/protocol/vusb/vusb.h')
| -rw-r--r-- | tmk_core/protocol/vusb/vusb.h | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/tmk_core/protocol/vusb/vusb.h b/tmk_core/protocol/vusb/vusb.h index 828960fc35..b4c73aabae 100644 --- a/tmk_core/protocol/vusb/vusb.h +++ b/tmk_core/protocol/vusb/vusb.h @@ -85,9 +85,16 @@ typedef struct usbHIDDescriptor { typedef struct usbConfigurationDescriptor { usbConfigurationDescriptorHeader_t header; - usbInterfaceDescriptor_t keyboardInterface; - usbHIDDescriptor_t keyboardHID; - usbEndpointDescriptor_t keyboardINEndpoint; + +#ifndef KEYBOARD_SHARED_EP + usbInterfaceDescriptor_t keyboardInterface; + usbHIDDescriptor_t keyboardHID; + usbEndpointDescriptor_t keyboardINEndpoint; +#else + usbInterfaceDescriptor_t sharedInterface; + usbHIDDescriptor_t sharedHID; + usbEndpointDescriptor_t sharedINEndpoint; +#endif #if defined(RAW_ENABLE) usbInterfaceDescriptor_t rawInterface; @@ -96,10 +103,10 @@ typedef struct usbConfigurationDescriptor { usbEndpointDescriptor_t rawOUTEndpoint; #endif -#if defined(MOUSE_ENABLE) || defined(EXTRAKEY_ENABLE) - usbInterfaceDescriptor_t mouseExtraInterface; - usbHIDDescriptor_t mouseExtraHID; - usbEndpointDescriptor_t mouseExtraINEndpoint; +#if defined(SHARED_EP_ENABLE) && !defined(KEYBOARD_SHARED_EP) + usbInterfaceDescriptor_t sharedInterface; + usbHIDDescriptor_t sharedHID; + usbEndpointDescriptor_t sharedINEndpoint; #endif #if defined(CONSOLE_ENABLE) |