diff options
author | Joel Challis <git@zvecr.com> | 2021-07-24 12:13:06 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-24 12:13:06 +0100 |
commit | 567da49ed027a936a6f56aa069aad0db4605a198 (patch) | |
tree | 88253ae18b8cfd9e8699ab67e6c8d77da73c6539 /tmk_core/protocol | |
parent | 7907a725846720b96833057e94b548c38fcd0116 (diff) |
Avoid LTO conficts on arm_atsam (#13676)
Diffstat (limited to 'tmk_core/protocol')
-rw-r--r-- | tmk_core/protocol/chibios/usb_util.c | 2 | ||||
-rw-r--r-- | tmk_core/protocol/lufa/usb_util.c | 2 | ||||
-rw-r--r-- | tmk_core/protocol/vusb/usb_util.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/tmk_core/protocol/chibios/usb_util.c b/tmk_core/protocol/chibios/usb_util.c index 5945e8a8de..e32d6ebfa4 100644 --- a/tmk_core/protocol/chibios/usb_util.c +++ b/tmk_core/protocol/chibios/usb_util.c @@ -16,6 +16,6 @@ #include <hal.h> #include "usb_util.h" -void usb_disable(void) { usbStop(&USBD1); } +void usb_disconnect(void) { usbStop(&USBD1); } bool usb_connected_state(void) { return usbGetDriverStateI(&USBD1) == USB_ACTIVE; } diff --git a/tmk_core/protocol/lufa/usb_util.c b/tmk_core/protocol/lufa/usb_util.c index 9e943a21b9..9691eff1e4 100644 --- a/tmk_core/protocol/lufa/usb_util.c +++ b/tmk_core/protocol/lufa/usb_util.c @@ -17,7 +17,7 @@ #include "usb_util.h" #include "wait.h" -void usb_disable(void) { +void usb_disconnect(void) { USB_Disable(); USB_DeviceState = DEVICE_STATE_Unattached; } diff --git a/tmk_core/protocol/vusb/usb_util.c b/tmk_core/protocol/vusb/usb_util.c index 602854dbe6..4ee2d3188b 100644 --- a/tmk_core/protocol/vusb/usb_util.c +++ b/tmk_core/protocol/vusb/usb_util.c @@ -16,7 +16,7 @@ #include <usbdrv/usbdrv.h> #include "usb_util.h" -void usb_disable(void) { usbDeviceDisconnect(); } +void usb_disconnect(void) { usbDeviceDisconnect(); } bool usb_connected_state(void) { usbPoll(); |