diff options
| author | Nick Brassel <nick@tzarc.org> | 2022-11-28 07:54:00 +1100 |
|---|---|---|
| committer | Nick Brassel <nick@tzarc.org> | 2022-11-28 07:54:00 +1100 |
| commit | 4020674163fc80914059c4c9c3be5c0ae00bd150 (patch) | |
| tree | 6f4187d72b04d03572adf507502afbda9726d696 /tmk_core/protocol/usb_descriptor.h | |
| parent | 8f9b49dc5b05fd3421e47aa76822a5b2199dfca6 (diff) | |
| parent | 9e78e65a566487b2f4fe7b663971a01deb6ddad2 (diff) | |
Merge remote-tracking branch 'upstream/develop'
Diffstat (limited to 'tmk_core/protocol/usb_descriptor.h')
| -rw-r--r-- | tmk_core/protocol/usb_descriptor.h | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/tmk_core/protocol/usb_descriptor.h b/tmk_core/protocol/usb_descriptor.h index f8b7a863aa..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 @@ -240,7 +240,7 @@ enum usb_endpoints { # ifdef USB_ENDPOINTS_ARE_REORDERABLE # define CONSOLE_OUT_EPNUM CONSOLE_IN_EPNUM # else - CONSOLE_OUT_EPNUM = NEXT_EPNUM, + CONSOLE_OUT_EPNUM = NEXT_EPNUM, # endif # else # define CONSOLE_OUT_EPNUM CONSOLE_IN_EPNUM @@ -265,23 +265,18 @@ enum usb_endpoints { CDC_OUT_EPNUM = NEXT_EPNUM, # endif #endif + #ifdef JOYSTICK_ENABLE +# if !defined(JOYSTICK_SHARED_EP) JOYSTICK_IN_EPNUM = NEXT_EPNUM, -# ifdef USB_ENDPOINTS_ARE_REORDERABLE - JOYSTICK_OUT_EPNUM = JOYSTICK_IN_EPNUM, # else - JOYSTICK_OUT_EPNUM = NEXT_EPNUM, +# define JOYSTICK_IN_EPNUM SHARED_IN_EPNUM # endif #endif #ifdef DIGITIZER_ENABLE # if !defined(DIGITIZER_SHARED_EP) DIGITIZER_IN_EPNUM = NEXT_EPNUM, -# ifdef USB_ENDPOINTS_ARE_REORDERABLE - DIGITIZER_OUT_EPNUM = DIGITIZER_IN_EPNUM, -# else - DIGITIZER_OUT_EPNUM = NEXT_EPNUM, -# endif # else # define DIGITIZER_IN_EPNUM SHARED_IN_EPNUM # endif |