qmk/qmk_firmware
1
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2026-10-23 09:21:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove assumption on XAP interface number

Browse Source
This commit is contained in:
zvecr
2023-01-16 02:03:41 +00:00
parent 93585b37f7
commit 2f7be506de
6 changed files with 229 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tmk_core/protocol/chibios/usb_main.c
+11 -11
View File
@@ -368,14 +368,14 @@ typedef struct {
#ifdef RAW_ENABLE
usb_driver_config_t raw_driver;
#endif
#ifdef XAP_ENABLE
usb_driver_config_t xap_driver;
#endif
#ifdef MIDI_ENABLE
usb_driver_config_t midi_driver;
#endif
#ifdef VIRTSER_ENABLE
usb_driver_config_t serial_driver;
#endif
#ifdef XAP_ENABLE
usb_driver_config_t xap_driver;
#endif
};
usb_driver_config_t array[0];
@@ -402,14 +402,6 @@ static usb_driver_configs_t drivers = {
.raw_driver = QMK_USB_DRIVER_CONFIG(RAW, 0, false),
#endif
#ifdef XAP_ENABLE
# define XAP_IN_CAPACITY 4
# define XAP_OUT_CAPACITY 4
# define XAP_IN_MODE USB_EP_MODE_TYPE_INTR
# define XAP_OUT_MODE USB_EP_MODE_TYPE_INTR
.xap_driver = QMK_USB_DRIVER_CONFIG(XAP, 0, false),
#endif
#ifdef MIDI_ENABLE
# define MIDI_STREAM_IN_CAPACITY 4
# define MIDI_STREAM_OUT_CAPACITY 4
@@ -425,6 +417,14 @@ static usb_driver_configs_t drivers = {
# define CDC_OUT_MODE USB_EP_MODE_TYPE_BULK
.serial_driver = QMK_USB_DRIVER_CONFIG(CDC, CDC_NOTIFICATION_EPNUM, false),
#endif
#ifdef XAP_ENABLE
# define XAP_IN_CAPACITY 4
# define XAP_OUT_CAPACITY 4
# define XAP_IN_MODE USB_EP_MODE_TYPE_INTR
# define XAP_OUT_MODE USB_EP_MODE_TYPE_INTR
.xap_driver = QMK_USB_DRIVER_CONFIG(XAP, 0, false),
#endif
};
#define NUM_USB_DRIVERS (sizeof(drivers) / sizeof(usb_driver_config_t))