diff options
author | Ryan <fauxpark@gmail.com> | 2020-04-21 08:38:34 +1000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-20 15:38:34 -0700 |
commit | 99f7fe6bd4ab7bc332fcbe35ef741a4142a73b1f (patch) | |
tree | 53b41f59ccaef201012b619ca49393e4429ee3f5 /tmk_core/protocol/arm_atsam/usb/udi_hid_kbd_desc.c | |
parent | d0c3a4c8d58c1b8c60426ea2f1572fe1fe3bcd01 (diff) |
Clean up ATSAM ifdefs (#8808)
Diffstat (limited to 'tmk_core/protocol/arm_atsam/usb/udi_hid_kbd_desc.c')
-rw-r--r-- | tmk_core/protocol/arm_atsam/usb/udi_hid_kbd_desc.c | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/tmk_core/protocol/arm_atsam/usb/udi_hid_kbd_desc.c b/tmk_core/protocol/arm_atsam/usb/udi_hid_kbd_desc.c index 4e7deaaa38..a3fb46a3d4 100644 --- a/tmk_core/protocol/arm_atsam/usb/udi_hid_kbd_desc.c +++ b/tmk_core/protocol/arm_atsam/usb/udi_hid_kbd_desc.c @@ -120,49 +120,45 @@ UDC_DESC_STORAGE udc_desc_t udc_desc = { .conf.iConfiguration = 0, .conf.bmAttributes = /* USB_CONFIG_ATTR_MUST_SET | */ USB_DEVICE_ATTR, .conf.bMaxPower = USB_CONFIG_MAX_POWER(USB_DEVICE_POWER), -#ifdef KBD .hid_kbd = UDI_HID_KBD_DESC, -#endif -#ifdef RAW +#ifdef RAW_ENABLE .hid_raw = UDI_HID_RAW_DESC, #endif -#ifdef MOU +#ifdef MOUSE_ENABLE .hid_mou = UDI_HID_MOU_DESC, #endif -#ifdef EXK +#ifdef EXTRAKEY_ENABLE .hid_exk = UDI_HID_EXK_DESC, #endif -#ifdef CON +#ifdef CONSOLE_ENABLE .hid_con = UDI_HID_CON_DESC, #endif -#ifdef NKRO +#ifdef NKRO_ENABLE .hid_nkro = UDI_HID_NKRO_DESC, #endif -#ifdef CDC +#ifdef VIRTSER_ENABLE .cdc_serial = CDC_DESCRIPTOR, #endif }; UDC_DESC_STORAGE udi_api_t *udi_apis[USB_DEVICE_NB_INTERFACE] = { -#ifdef KBD &udi_api_hid_kbd, -#endif -#ifdef RAW +#ifdef RAW_ENABLE &udi_api_hid_raw, #endif -#ifdef MOU +#ifdef MOUSE_ENABLE &udi_api_hid_mou, #endif -#ifdef EXK +#ifdef EXTRAKEY_ENABLE &udi_api_hid_exk, #endif -#ifdef CON +#ifdef CONSOLE_ENABLE &udi_api_hid_con, #endif -#ifdef NKRO +#ifdef NKRO_ENABLE &udi_api_hid_nkro, #endif -#ifdef CDC +#ifdef VIRTSER_ENABLE &udi_api_cdc_comm, &udi_api_cdc_data, #endif }; |