aboutsummaryrefslogtreecommitdiff
path: root/quantum/split_common/split_util.c
diff options
context:
space:
mode:
authorNick Brassel <nick@tzarc.org>2024-05-28 14:39:23 +1000
committerNick Brassel <nick@tzarc.org>2024-05-28 14:39:23 +1000
commitf76cc320fd9f3365a80cc0d8af2990bc28d76bde (patch)
tree3c5330bbc9ab254424ac57335510de341b4ada11 /quantum/split_common/split_util.c
parent7620c64b99dc5bec480bfaa2708cb3fae709e2b3 (diff)
parent465ab5a20643722c9b712c6b6924472b7345dd64 (diff)
Merge branch 'develop'
Diffstat (limited to 'quantum/split_common/split_util.c')
-rw-r--r--quantum/split_common/split_util.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/quantum/split_common/split_util.c b/quantum/split_common/split_util.c
index 96f19bfd84..9af3c29d75 100644
--- a/quantum/split_common/split_util.c
+++ b/quantum/split_common/split_util.c
@@ -63,7 +63,7 @@ static struct {
#if defined(SPLIT_USB_DETECT)
_Static_assert((SPLIT_USB_TIMEOUT / SPLIT_USB_TIMEOUT_POLL) <= UINT16_MAX, "Please lower SPLIT_USB_TIMEOUT and/or increase SPLIT_USB_TIMEOUT_POLL.");
-static bool usbIsActive(void) {
+static bool usb_bus_detected(void) {
for (uint16_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_connected_state()) {
@@ -74,7 +74,7 @@ static bool usbIsActive(void) {
return false;
}
#else
-static inline bool usbIsActive(void) {
+static inline bool usb_bus_detected(void) {
return usb_vbus_state();
}
#endif
@@ -179,7 +179,7 @@ __attribute__((weak)) bool is_keyboard_left_impl(void) {
}
__attribute__((weak)) bool is_keyboard_master_impl(void) {
- bool is_master = usbIsActive();
+ bool is_master = usb_bus_detected();
// Avoid NO_USB_STARTUP_CHECK - Disable USB as the previous checks seem to enable it somehow
if (!is_master) {