diff options
| author | Stefan Kerkmann <karlk90@pm.me> | 2024-06-03 14:35:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-03 22:35:46 +1000 |
| commit | 8253697a6389aaec73f85a29dd25247b32389502 (patch) | |
| tree | 9a78f6e42fe53c81ca6c310ec88b8e5ee90ba02c | |
| parent | 282253a7e0c51717234bd64159a37ee527d16dc2 (diff) | |
[FIX] ChibiOS: USB Digitizer and Joystick IN endpoint compilation (#23854)
Co-authored-by: Ryan <fauxpark@gmail.com>
| -rw-r--r-- | tmk_core/protocol/chibios/usb_endpoints.c | 4 | ||||
| -rw-r--r-- | tmk_core/protocol/usb_descriptor.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tmk_core/protocol/chibios/usb_endpoints.c b/tmk_core/protocol/chibios/usb_endpoints.c index 37ec3c722f..856df62426 100644 --- a/tmk_core/protocol/chibios/usb_endpoints.c +++ b/tmk_core/protocol/chibios/usb_endpoints.c | |||
| @@ -57,11 +57,11 @@ usb_endpoint_in_t usb_endpoints_in[USB_ENDPOINT_IN_COUNT] = { | |||
| 57 | #endif | 57 | #endif |
| 58 | 58 | ||
| 59 | #if defined(JOYSTICK_ENABLE) && !defined(JOYSTICK_SHARED_EP) | 59 | #if defined(JOYSTICK_ENABLE) && !defined(JOYSTICK_SHARED_EP) |
| 60 | [USB_ENDPOINT_IN_JOYSTICK] = QMK_USB_ENDPOINT_IN(USB_EP_MODE_TYPE_INTR, JOYSTICK_EPSIZE, JOYSTICK_IN_EPNUM, JOYSTICK_IN_CAPACITY, QMK_USB_REPORT_STORAGE_DEFAULT(sizeof(report_joystick_t))), | 60 | [USB_ENDPOINT_IN_JOYSTICK] = QMK_USB_ENDPOINT_IN(USB_EP_MODE_TYPE_INTR, JOYSTICK_EPSIZE, JOYSTICK_IN_EPNUM, JOYSTICK_IN_CAPACITY, NULL, QMK_USB_REPORT_STORAGE_DEFAULT(sizeof(report_joystick_t))), |
| 61 | #endif | 61 | #endif |
| 62 | 62 | ||
| 63 | #if defined(DIGITIZER_ENABLE) && !defined(DIGITIZER_SHARED_EP) | 63 | #if defined(DIGITIZER_ENABLE) && !defined(DIGITIZER_SHARED_EP) |
| 64 | [USB_ENDPOINT_IN_JOYSTICK] = QMK_USB_ENDPOINT_IN(USB_EP_MODE_TYPE_INTR, DIGITIZER_EPSIZE, DIGITIZER_IN_EPNUM, DIGITIZER_IN_CAPACITY, QMK_USB_REPORT_STORAGE_DEFAULT(sizeof(report_digitizer_t))), | 64 | [USB_ENDPOINT_IN_DIGITIZER] = QMK_USB_ENDPOINT_IN(USB_EP_MODE_TYPE_INTR, DIGITIZER_EPSIZE, DIGITIZER_IN_EPNUM, DIGITIZER_IN_CAPACITY, NULL, QMK_USB_REPORT_STORAGE_DEFAULT(sizeof(report_digitizer_t))), |
| 65 | #endif | 65 | #endif |
| 66 | 66 | ||
| 67 | #if defined(CONSOLE_ENABLE) | 67 | #if defined(CONSOLE_ENABLE) |
diff --git a/tmk_core/protocol/usb_descriptor.c b/tmk_core/protocol/usb_descriptor.c index 0e2e63ad8e..7efd085ea3 100644 --- a/tmk_core/protocol/usb_descriptor.c +++ b/tmk_core/protocol/usb_descriptor.c | |||
| @@ -990,7 +990,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = { | |||
| 990 | .Attributes = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA), | 990 | .Attributes = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA), |
| 991 | .EndpointSize = JOYSTICK_EPSIZE, | 991 | .EndpointSize = JOYSTICK_EPSIZE, |
| 992 | .PollingIntervalMS = USB_POLLING_INTERVAL_MS | 992 | .PollingIntervalMS = USB_POLLING_INTERVAL_MS |
| 993 | } | 993 | }, |
| 994 | #endif | 994 | #endif |
| 995 | 995 | ||
| 996 | #if defined(DIGITIZER_ENABLE) && !defined(DIGITIZER_SHARED_EP) | 996 | #if defined(DIGITIZER_ENABLE) && !defined(DIGITIZER_SHARED_EP) |