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/common | |
| 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/common')
| -rw-r--r-- | tmk_core/common/usb_util.c | 2 | ||||
| -rw-r--r-- | tmk_core/common/usb_util.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tmk_core/common/usb_util.c b/tmk_core/common/usb_util.c index d4134a044..dd1deeaa1 100644 --- a/tmk_core/common/usb_util.c +++ b/tmk_core/common/usb_util.c | |||
| @@ -16,7 +16,7 @@ | |||
| 16 | #include "quantum.h" | 16 | #include "quantum.h" |
| 17 | #include "usb_util.h" | 17 | #include "usb_util.h" |
| 18 | 18 | ||
| 19 | __attribute__((weak)) void usb_disable(void) {} | 19 | __attribute__((weak)) void usb_disconnect(void) {} |
| 20 | __attribute__((weak)) bool usb_connected_state(void) { return true; } | 20 | __attribute__((weak)) bool usb_connected_state(void) { return true; } |
| 21 | __attribute__((weak)) bool usb_vbus_state(void) { | 21 | __attribute__((weak)) bool usb_vbus_state(void) { |
| 22 | #ifdef USB_VBUS_PIN | 22 | #ifdef USB_VBUS_PIN |
diff --git a/tmk_core/common/usb_util.h b/tmk_core/common/usb_util.h index 4ebedb1e7..13db9fbfb 100644 --- a/tmk_core/common/usb_util.h +++ b/tmk_core/common/usb_util.h | |||
| @@ -17,6 +17,6 @@ | |||
| 17 | 17 | ||
| 18 | #include <stdbool.h> | 18 | #include <stdbool.h> |
| 19 | 19 | ||
| 20 | void usb_disable(void); | 20 | void usb_disconnect(void); |
| 21 | bool usb_connected_state(void); | 21 | bool usb_connected_state(void); |
| 22 | bool usb_vbus_state(void); | 22 | bool usb_vbus_state(void); |