diff options
| author | fauxpark <fauxpark@gmail.com> | 2020-12-18 02:15:28 +1100 |
|---|---|---|
| committer | fauxpark <fauxpark@gmail.com> | 2020-12-18 02:15:28 +1100 |
| commit | 7797070b376ff18a5d540ccc2a95033fc548c611 (patch) | |
| tree | e3092fed02c154ed104c5fa541a604c9ed8643cb /tmk_core/protocol/arm_atsam/usb/udi_device_conf.h | |
| parent | 973057cfe4ac0ddc23b7ed1016245e6fc939c456 (diff) | |
| parent | 6ea4b06f9fc19825605477cdc27f5bec0f3dc0a9 (diff) | |
Merge remote-tracking branch 'upstream/master' into develop
Diffstat (limited to 'tmk_core/protocol/arm_atsam/usb/udi_device_conf.h')
| -rw-r--r-- | tmk_core/protocol/arm_atsam/usb/udi_device_conf.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tmk_core/protocol/arm_atsam/usb/udi_device_conf.h b/tmk_core/protocol/arm_atsam/usb/udi_device_conf.h index 505db47b06..9c9d94789d 100644 --- a/tmk_core/protocol/arm_atsam/usb/udi_device_conf.h +++ b/tmk_core/protocol/arm_atsam/usb/udi_device_conf.h @@ -291,7 +291,7 @@ typedef struct { extern uint8_t udi_hid_kbd_report_set; // report buffer (to host) -# define UDI_HID_KBD_REPORT_SIZE 8 +#define UDI_HID_KBD_REPORT_SIZE 8 extern uint8_t udi_hid_kbd_report[UDI_HID_KBD_REPORT_SIZE]; COMPILER_PACK_RESET() @@ -784,7 +784,7 @@ COMPILER_PACK_RESET() COMPILER_PACK_SET(1) typedef struct { - usb_conf_desc_t conf; + usb_conf_desc_t conf; udi_hid_kbd_desc_t hid_kbd; #ifdef MOUSE_ENABLE udi_hid_mou_desc_t hid_mou; |