diff --git a/plugins/policy.c b/plugins/policy.c
index 6558429..3ce6f1d 100644
--- a/plugins/policy.c
+++ b/plugins/policy.c
* preferable to set the reconnect timer there as it is
* a more predictable delay.
*/
- if (!has_kernel_features(KERNEL_HAS_RESUME_EVT))
+ if (!btd_has_kernel_features(KERNEL_HAS_RESUME_EVT))
reconnect_set_timer(reconnect, resume_delay);
}
break;
diff --git a/src/adapter.c b/src/adapter.c
index 70b5e46..b2bd8b3 100644
--- a/src/adapter.c
+++ b/src/adapter.c
DBG("sending set mode command for index %u", adapter->dev_id);
- if (has_kernel_features(KERNEL_CONN_CONTROL)) {
+ if (btd_has_kernel_features(KERNEL_CONN_CONTROL)) {
if (mode)
set_mode(adapter, MGMT_OP_SET_CONNECTABLE, mode);
else
* no need to start any discovery. The kernel will keep scanning
* as long as devices are in its auto-connection list.
*/
- if (has_kernel_features(KERNEL_CONN_CONTROL))
+ if (btd_has_kernel_features(KERNEL_CONN_CONTROL))
return;
/*
* no need to stop any discovery. The kernel will handle the
* auto-connection by itself.
*/
- if (has_kernel_features(KERNEL_CONN_CONTROL))
+ if (btd_has_kernel_features(KERNEL_CONN_CONTROL))
return;
/*
static void clear_discoverable(struct btd_adapter *adapter)
{
- if (!has_kernel_features(KERNEL_CONN_CONTROL))
+ if (!btd_has_kernel_features(KERNEL_CONN_CONTROL))
return;
if (!(adapter->current_settings & MGMT_SETTING_DISCOVERABLE))
break;
case MGMT_SETTING_DISCOVERABLE:
- if (has_kernel_features(KERNEL_CONN_CONTROL)) {
+ if (btd_has_kernel_features(KERNEL_CONN_CONTROL)) {
if (mode) {
set_mode(adapter, MGMT_OP_SET_CONNECTABLE,
mode);
unsigned int err;
if (!main_opts.default_params.num_entries ||
- !has_kernel_features(KERNEL_SET_SYSTEM_CONFIG))
+ !btd_has_kernel_features(KERNEL_SET_SYSTEM_CONFIG))
return;
params = malloc0(sizeof(*params) *
* adapter_auto_connect_add() function is used to maintain what to
* connect.
*/
- if (has_kernel_features(KERNEL_CONN_CONTROL))
+ if (btd_has_kernel_features(KERNEL_CONN_CONTROL))
return 0;
if (g_slist_find(adapter->connect_list, device)) {
if (device == adapter->connect_le)
adapter->connect_le = NULL;
- if (has_kernel_features(KERNEL_CONN_CONTROL))
+ if (btd_has_kernel_features(KERNEL_CONN_CONTROL))
return;
if (!g_slist_find(adapter->connect_list, device)) {
{
struct mgmt_cp_add_device cp;
- if (!has_kernel_features(KERNEL_CONN_CONTROL))
+ if (!btd_has_kernel_features(KERNEL_CONN_CONTROL))
return;
memset(&cp, 0, sizeof(cp));
{
struct mgmt_cp_remove_device cp;
- if (!has_kernel_features(KERNEL_CONN_CONTROL))
+ if (!btd_has_kernel_features(KERNEL_CONN_CONTROL))
return;
memset(&cp, 0, sizeof(cp));
uint8_t bdaddr_type;
unsigned int id;
- if (!has_kernel_features(KERNEL_CONN_CONTROL))
+ if (!btd_has_kernel_features(KERNEL_CONN_CONTROL))
return;
if (g_slist_find(adapter->connect_list, device)) {
const bdaddr_t *bdaddr;
uint8_t bdaddr_type;
- if (!has_kernel_features(KERNEL_CONN_CONTROL))
+ if (!btd_has_kernel_features(KERNEL_CONN_CONTROL))
return;
bdaddr = device_get_address(device);
uint8_t bdaddr_type;
unsigned int id;
- if (!has_kernel_features(KERNEL_CONN_CONTROL))
+ if (!btd_has_kernel_features(KERNEL_CONN_CONTROL))
return;
if (!g_slist_find(adapter->connect_list, device)) {
* If kernel background scan is used then the kernel is
* responsible for connecting.
*/
- if (has_kernel_features(KERNEL_CONN_CONTROL))
+ if (btd_has_kernel_features(KERNEL_CONN_CONTROL))
return;
/*
{
struct mgmt_cp_remove_device cp;
- if (!has_kernel_features(KERNEL_CONN_CONTROL))
+ if (!btd_has_kernel_features(KERNEL_CONN_CONTROL))
return 0;
memset(&cp, 0, sizeof(cp));
(missing_settings & MGMT_SETTING_FAST_CONNECTABLE))
set_mode(adapter, MGMT_OP_SET_FAST_CONNECTABLE, 0x01);
- if (has_kernel_features(KERNEL_EXP_FEATURES))
+ if (btd_has_kernel_features(KERNEL_EXP_FEATURES))
read_exp_features(adapter);
err = adapter_register(adapter);
set_name(adapter, btd_adapter_get_name(adapter));
- if (has_kernel_features(KERNEL_BLOCKED_KEYS_SUPPORTED) &&
+ if (btd_has_kernel_features(KERNEL_BLOCKED_KEYS_SUPPORTED) &&
!set_blocked_keys(adapter)) {
btd_error(adapter->dev_id,
"Failed to set blocked keys for index %u",
!(adapter->current_settings & MGMT_SETTING_BONDABLE))
set_mode(adapter, MGMT_OP_SET_BONDABLE, 0x01);
- if (!has_kernel_features(KERNEL_CONN_CONTROL))
+ if (!btd_has_kernel_features(KERNEL_CONN_CONTROL))
set_mode(adapter, MGMT_OP_SET_CONNECTABLE, 0x01);
else if (adapter->current_settings & MGMT_SETTING_CONNECTABLE)
set_mode(adapter, MGMT_OP_SET_CONNECTABLE, 0x00);
return false;
}
-bool has_kernel_features(uint32_t features)
+bool btd_has_kernel_features(uint32_t features)
{
- return !!(kernel_features & features);
+ return (kernel_features & features) ? true : false;
}
diff --git a/src/adapter.h b/src/adapter.h
index 11b93d2..b4d872b 100644
--- a/src/adapter.h
+++ b/src/adapter.h
KERNEL_HAS_RESUME_EVT = 1 << 4,
};
-bool has_kernel_features(uint32_t feature);
+bool btd_has_kernel_features(uint32_t feature);