Align func name

qmk · Feb 25, 2021 · 55bfb3c · 55bfb3c
1 parent 2f345e9
commit 55bfb3c
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/quantum/split_common/split_util.c b/quantum/split_common/split_util.c
@@ -45,7 +45,7 @@ volatile bool isLeftHand = true;
 static bool usbIsActive(void) {
     for (uint8_t i = 0; i < (SPLIT_USB_TIMEOUT / SPLIT_USB_TIMEOUT_POLL); i++) {
         // This will return true if a USB connection has been established
-        if (usb_active_connection()) {
+        if (usb_connected_state()) {
             return true;
         }
         wait_ms(SPLIT_USB_TIMEOUT_POLL);

diff --git a/tmk_core/common/usb_util.c b/tmk_core/common/usb_util.c
@@ -16,8 +16,8 @@
 #include "usb_util.h"
 #include "wait.h"
 
-__attribute__((weak)) bool usb_active_connection(void) { return true; }
 __attribute__((weak)) void usb_disable(void) {}
+__attribute__((weak)) bool usb_connected_state(void) { return true; }
 __attribute__((weak)) bool usb_vbus_state(void) {
 #ifdef USB_VBUS_PIN
     setPinInput(USB_VBUS_PIN);

diff --git a/tmk_core/common/usb_util.h b/tmk_core/common/usb_util.h
@@ -17,6 +17,6 @@
 
 #include <stdbool.h>
 
-bool usb_active_connection(void);
 void usb_disable(void);
+bool usb_connected_state(void);
 bool usb_vbus_state(void);
diff --git 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"
 
-bool usb_active_connection(void) { return usbGetDriverStateI(&USBD1) == USB_ACTIVE; }
-
 void usb_disable(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
@@ -17,13 +17,13 @@
 #include "usb_util.h"
 #include "wait.h"
 
-bool usb_active_connection(void) { return USB_Device_IsAddressSet(); }
-
 void usb_disable(void) {
     USB_Disable();
     USB_DeviceState = DEVICE_STATE_Unattached;
 }
 
+bool usb_connected_state(void) { return USB_Device_IsAddressSet(); }
+
 #if defined(OTGPADE)
 bool usb_vbus_state(void) {
     USB_OTGPAD_On();  // enables VBUS pad

diff --git a/tmk_core/protocol/vusb/usb_util.c b/tmk_core/protocol/vusb/usb_util.c
@@ -16,9 +16,9 @@
 #include <usbdrv/usbdrv.h>
 #include "usb_util.h"
 
-bool usb_active_connection(void) {
+void usb_disable(void) { usbDeviceDisconnect(); }
+
+bool usb_connected_state(void) {
     usbPoll();
     return usbConfiguration;
 }
-
-void usb_disable(void) { usbDeviceDisconnect(); }