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) | |
| download | qmk_firmware-567da49ed027a936a6f56aa069aad0db4605a198.tar.gz qmk_firmware-567da49ed027a936a6f56aa069aad0db4605a198.zip | |
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 5945e8a8d..e32d6ebfa 100644 --- a/tmk_core/protocol/chibios/usb_util.c +++ b/tmk_core/protocol/chibios/usb_util.c | |||
| @@ -16,6 +16,6 @@ | |||
| 16 | #include <hal.h> | 16 | #include <hal.h> |
| 17 | #include "usb_util.h" | 17 | #include "usb_util.h" |
| 18 | 18 | ||
| 19 | void usb_disable(void) { usbStop(&USBD1); } | 19 | void usb_disconnect(void) { usbStop(&USBD1); } |
| 20 | 20 | ||
| 21 | bool usb_connected_state(void) { return usbGetDriverStateI(&USBD1) == USB_ACTIVE; } | 21 | 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 9e943a21b..9691eff1e 100644 --- a/tmk_core/protocol/lufa/usb_util.c +++ b/tmk_core/protocol/lufa/usb_util.c | |||
| @@ -17,7 +17,7 @@ | |||
| 17 | #include "usb_util.h" | 17 | #include "usb_util.h" |
| 18 | #include "wait.h" | 18 | #include "wait.h" |
| 19 | 19 | ||
| 20 | void usb_disable(void) { | 20 | void usb_disconnect(void) { |
| 21 | USB_Disable(); | 21 | USB_Disable(); |
| 22 | USB_DeviceState = DEVICE_STATE_Unattached; | 22 | USB_DeviceState = DEVICE_STATE_Unattached; |
| 23 | } | 23 | } |
diff --git a/tmk_core/protocol/vusb/usb_util.c b/tmk_core/protocol/vusb/usb_util.c index 602854dbe..4ee2d3188 100644 --- a/tmk_core/protocol/vusb/usb_util.c +++ b/tmk_core/protocol/vusb/usb_util.c | |||
| @@ -16,7 +16,7 @@ | |||
| 16 | #include <usbdrv/usbdrv.h> | 16 | #include <usbdrv/usbdrv.h> |
| 17 | #include "usb_util.h" | 17 | #include "usb_util.h" |
| 18 | 18 | ||
| 19 | void usb_disable(void) { usbDeviceDisconnect(); } | 19 | void usb_disconnect(void) { usbDeviceDisconnect(); } |
| 20 | 20 | ||
| 21 | bool usb_connected_state(void) { | 21 | bool usb_connected_state(void) { |
| 22 | usbPoll(); | 22 | usbPoll(); |
