diff options
Diffstat (limited to 'tmk_core/protocol/usb_descriptor.h')
| -rw-r--r-- | tmk_core/protocol/usb_descriptor.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/tmk_core/protocol/usb_descriptor.h b/tmk_core/protocol/usb_descriptor.h index 6e842f6984..bc5e84e586 100644 --- a/tmk_core/protocol/usb_descriptor.h +++ b/tmk_core/protocol/usb_descriptor.h @@ -132,7 +132,7 @@ typedef struct { USB_Descriptor_Endpoint_t CDC_DataInEndpoint; #endif -#ifdef JOYSTICK_ENABLE +#if defined(JOYSTICK_ENABLE) && !defined(JOYSTICK_SHARED_EP) // Joystick HID Interface USB_Descriptor_Interface_t Joystick_Interface; USB_HID_Descriptor_HID_t Joystick_HID; @@ -187,7 +187,7 @@ enum usb_interfaces { CDI_INTERFACE, #endif -#if defined(JOYSTICK_ENABLE) +#if defined(JOYSTICK_ENABLE) && !defined(JOYSTICK_SHARED_EP) JOYSTICK_INTERFACE, #endif @@ -267,7 +267,11 @@ enum usb_endpoints { #endif #ifdef JOYSTICK_ENABLE +# if !defined(JOYSTICK_SHARED_EP) JOYSTICK_IN_EPNUM = NEXT_EPNUM, +# else +# define JOYSTICK_IN_EPNUM SHARED_IN_EPNUM +# endif #endif #ifdef DIGITIZER_ENABLE |