diff options
Diffstat (limited to 'tmk_core')
| -rw-r--r-- | tmk_core/common/usb_util.c | 2 | ||||
| -rw-r--r-- | tmk_core/common/usb_util.h | 2 | ||||
| -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 |
5 files changed, 5 insertions, 5 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); |
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(); |
