diff options
Diffstat (limited to 'quantum/connection')
-rw-r--r-- | quantum/connection/connection.c | 14 | ||||
-rw-r--r-- | quantum/connection/connection.h | 4 |
2 files changed, 7 insertions, 11 deletions
diff --git a/quantum/connection/connection.c b/quantum/connection/connection.c index c7f3c4b424..1ff8876876 100644 --- a/quantum/connection/connection.c +++ b/quantum/connection/connection.c @@ -5,6 +5,10 @@ #include "usb_util.h" #include "util.h" +#ifdef BLUETOOTH_ENABLE +# include "bluetooth.h" +#endif + // ======== DEPRECATED DEFINES - DO NOT USE ======== #ifdef OUTPUT_DEFAULT # undef CONNECTION_HOST_DEFAULT @@ -14,16 +18,6 @@ __attribute__((weak)) void set_output_user(uint8_t output) {} // ======== -#ifdef BLUETOOTH_ENABLE -# ifdef BLUETOOTH_BLUEFRUIT_LE -# include "bluefruit_le.h" -# define bluetooth_is_connected() bluefruit_le_is_connected() -# else -// TODO: drivers should check if BT is connected here -# define bluetooth_is_connected() true -# endif -#endif - #define CONNECTION_HOST_INVALID 0xFF #ifndef CONNECTION_HOST_DEFAULT diff --git a/quantum/connection/connection.h b/quantum/connection/connection.h index e403141fae..b25160c759 100644 --- a/quantum/connection/connection.h +++ b/quantum/connection/connection.h @@ -3,6 +3,8 @@ #pragma once #include <stdint.h> + +#include "compiler_support.h" #include "util.h" /** @@ -29,7 +31,7 @@ typedef union connection_config_t { connection_host_t desired_host : 8; } PACKED connection_config_t; -_Static_assert(sizeof(connection_config_t) == sizeof(uint8_t), "Connection EECONFIG out of spec."); +STATIC_ASSERT(sizeof(connection_config_t) == sizeof(uint8_t), "Connection EECONFIG out of spec."); /** * \brief Initialize the subsystem. |