Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp3140614pxk; Tue, 15 Sep 2020 11:03:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyp8Ssxx7i/LYkvBDKfZtIHT4MKA4ATiP15oyrukG/lgGkymudj1SmVtVY4ktauVx00YvlZ X-Received: by 2002:a05:6402:184d:: with SMTP id v13mr24283143edy.240.1600193002924; Tue, 15 Sep 2020 11:03:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1600193002; cv=none; d=google.com; s=arc-20160816; b=HWHgMvxsh73gH8vsc9HkYICXZssGvg9iOcExYSn9K5nafDjQf9+QztjF7BqE5I0JFH GPvAPcQyvdabxsEQ86OUT2ExdLmBpKtqNcz8j57hey516FuTXOEnbtAmaUHfvR0g/Ttn RfITb0UuPaMufGoBhfyjygP2vY7L/5RweCcaC7hxPVsWnxCDVxiaAF7HfUL6VdC5K8Ol kJjiqKXQQ8y+WKO6jMUW3NEUKM2vOc1EqtNlF+6iQ98/5lt6beuP+gmL2FtO7LDpgbYe I2s9GIlqwbeDQVmI+W6XxBxqtx/ymiA62iPU5+RIdkuvQQtFd8tdLlUJgP0XynTzKgIq YKVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=K68OMwlpExv+H2CPFTDq3E7u55gF4Q0V8948rZscVcY=; b=l/SBmWI5Dnn1c6wU5Que5rIKPcN8G3bKvwIwqS8jtaaVK6LL1bSxAgzBl6EscO1seb 55F7E7hHQv4cCUMWl7Q2XhnbgTcBL2LJtKAIiE5l6EFZXprHdtFewyBFwAQWZhEPpMNI 9FF8WNa9g3plugFU0SgDjdnBTGwxOwHewSbSBHz+W3PtKl/EVQj8MeElB9334TeuZkBh /am1mNxX7D6nLJjdK/CKMOcRJU0N1tssEdVYQUFRcy5mW+L75QTizmpe5JHWQReGe/+T kEZq4BuQ/OtWZ0w0uzbaRZnIDgq4qZ1VlfP7iQlsNkn4WXWyx3tCyB6XX0LfInqsPpGm 6SfA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=K4iPadvg; spf=pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-bluetooth-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id f23si9369251eja.564.2020.09.15.11.02.49; Tue, 15 Sep 2020 11:03:22 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=K4iPadvg; spf=pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-bluetooth-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727683AbgIORoG (ORCPT + 99 others); Tue, 15 Sep 2020 13:44:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36178 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727803AbgIORl6 (ORCPT ); Tue, 15 Sep 2020 13:41:58 -0400 Received: from mail-pj1-x1044.google.com (mail-pj1-x1044.google.com [IPv6:2607:f8b0:4864:20::1044]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DB9B0C061788 for ; Tue, 15 Sep 2020 10:41:57 -0700 (PDT) Received: by mail-pj1-x1044.google.com with SMTP id jw11so166250pjb.0 for ; Tue, 15 Sep 2020 10:41:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=K68OMwlpExv+H2CPFTDq3E7u55gF4Q0V8948rZscVcY=; b=K4iPadvg0nNgSbx6It9gMhlMf8f3iAUys9Jl6j7LYXIlIvdjbXFt2Gsla5ytYqS0Z2 KwWR1KmWId7wMR44ZW0EghB1L8nFOskYcaUFgkkv/RUmCCzC/4zICqtFgbvVx2q/7zDE TTTdmrVU5Umn6U1ix4G3Azv+gJ/05M9AmZBnU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=K68OMwlpExv+H2CPFTDq3E7u55gF4Q0V8948rZscVcY=; b=AgwuxRsFP5RfDUt+cFkc0+NyZqqweAw+mdBR9ldFuGewpwiHcm2OWTeAi/H1ZpVoum 1ZBwjYujR1u5X2qp8dLHdxgoKWPHIxK4dpicogBbptPmqgrTgPowUBX3T4U8CVB3sq+z gxnJapGxodhrhKABa+OOpI58nQOls+nVOrhwhEKDh0p1mEBiOuKuFwV0Syn3aVkPdYwl W5UEKbh9bTLaPQXWIZKQymMRICjdWuHtALAnZqrwv0SBK4otIrYVmI8d0WdHZ/CjfYIR Sjcsv4q9npZ41Hi7MVnt9/WmZD3jToCAEtti2uO7bNDK0q6OvcUcanRXYm0k8p2a6sOx J3gA== X-Gm-Message-State: AOAM5337vKhGBtB6So2Cl54G20Lgdlh3MuScOKpUomUne4UORxmCAGgW vXvssg8e3lGlg6Is9wNz+PFUkQ== X-Received: by 2002:a17:90a:1548:: with SMTP id y8mr423325pja.113.1600191717370; Tue, 15 Sep 2020 10:41:57 -0700 (PDT) Received: from apsdesk.mtv.corp.google.com ([2620:15c:202:1:7220:84ff:fe09:2b94]) by smtp.gmail.com with ESMTPSA id y29sm15490232pfq.207.2020.09.15.10.41.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Sep 2020 10:41:56 -0700 (PDT) From: Abhishek Pandit-Subedi To: luiz.dentz@gmail.com, marcel@holtmann.org Cc: chromeos-bluetooth-upstreaming@chromium.org, linux-bluetooth@vger.kernel.org, Abhishek Pandit-Subedi Subject: [Bluez PATCH v5 1/4] adapter: Refactor kernel feature globals Date: Tue, 15 Sep 2020 10:41:43 -0700 Message-Id: <20200915104127.Bluez.v5.1.Ib9712d2bf5d4b3f90c5bc835742aea8c7cd239e4@changeid> X-Mailer: git-send-email 2.28.0.618.gf4bc123cb7-goog In-Reply-To: <20200915174146.1693687-1-abhishekpandit@chromium.org> References: <20200915174146.1693687-1-abhishekpandit@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-bluetooth-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org Move all the kernel specific feature globals into a single kernel_features bitfield and replace all uses with the bitfield instead. --- Changes in v5: - Remove use of !! in has_kernel_features Changes in v4: None Changes in v3: None Changes in v2: None src/adapter.c | 59 ++++++++++++++++++++++++++------------------------- src/adapter.h | 9 ++++++++ 2 files changed, 39 insertions(+), 29 deletions(-) diff --git a/src/adapter.c b/src/adapter.c index 1435e2bd7..88b5202d9 100644 --- a/src/adapter.c +++ b/src/adapter.c @@ -116,13 +116,7 @@ static const struct mgmt_blocked_key_info blocked_keys[] = { static DBusConnection *dbus_conn = NULL; -static bool kernel_conn_control = false; - -static bool kernel_blocked_keys_supported = false; - -static bool kernel_set_system_config = false; - -static bool kernel_exp_features = false; +static uint32_t kernel_features = 0; static GList *adapter_list = NULL; static unsigned int adapter_remaining = 0; @@ -678,7 +672,7 @@ static bool set_discoverable(struct btd_adapter *adapter, uint8_t mode, DBG("sending set mode command for index %u", adapter->dev_id); - if (kernel_conn_control) { + if (has_kernel_features(KERNEL_CONN_CONTROL)) { if (mode) set_mode(adapter, MGMT_OP_SET_CONNECTABLE, mode); else @@ -1334,7 +1328,7 @@ static void trigger_passive_scanning(struct btd_adapter *adapter) * no need to start any discovery. The kernel will keep scanning * as long as devices are in its auto-connection list. */ - if (kernel_conn_control) + if (has_kernel_features(KERNEL_CONN_CONTROL)) return; /* @@ -1385,7 +1379,7 @@ static void stop_passive_scanning_complete(uint8_t status, uint16_t length, * no need to stop any discovery. The kernel will handle the * auto-connection by itself. */ - if (kernel_conn_control) + if (has_kernel_features(KERNEL_CONN_CONTROL)) return; /* @@ -2816,7 +2810,7 @@ static void property_set_mode_complete(uint8_t status, uint16_t length, static void clear_discoverable(struct btd_adapter *adapter) { - if (!kernel_conn_control) + if (!has_kernel_features(KERNEL_CONN_CONTROL)) return; if (!(adapter->current_settings & MGMT_SETTING_DISCOVERABLE)) @@ -2876,7 +2870,7 @@ static void property_set_mode(struct btd_adapter *adapter, uint32_t setting, break; case MGMT_SETTING_DISCOVERABLE: - if (kernel_conn_control) { + if (has_kernel_features(KERNEL_CONN_CONTROL)) { if (mode) { set_mode(adapter, MGMT_OP_SET_CONNECTABLE, mode); @@ -4193,7 +4187,8 @@ static void load_default_system_params(struct btd_adapter *adapter) size_t len = 0; unsigned int err; - if (!main_opts.default_params.num_entries || !kernel_set_system_config) + if (!main_opts.default_params.num_entries || + !has_kernel_features(KERNEL_SET_SYSTEM_CONFIG)) return; params = malloc0(sizeof(*params) * @@ -4878,7 +4873,7 @@ int adapter_connect_list_add(struct btd_adapter *adapter, * adapter_auto_connect_add() function is used to maintain what to * connect. */ - if (kernel_conn_control) + if (has_kernel_features(KERNEL_CONN_CONTROL)) return 0; if (g_slist_find(adapter->connect_list, device)) { @@ -4918,7 +4913,7 @@ void adapter_connect_list_remove(struct btd_adapter *adapter, if (device == adapter->connect_le) adapter->connect_le = NULL; - if (kernel_conn_control) + if (has_kernel_features(KERNEL_CONN_CONTROL)) return; if (!g_slist_find(adapter->connect_list, device)) { @@ -4980,7 +4975,7 @@ void adapter_whitelist_add(struct btd_adapter *adapter, struct btd_device *dev) { struct mgmt_cp_add_device cp; - if (!kernel_conn_control) + if (!has_kernel_features(KERNEL_CONN_CONTROL)) return; memset(&cp, 0, sizeof(cp)); @@ -5019,7 +5014,7 @@ void adapter_whitelist_remove(struct btd_adapter *adapter, struct btd_device *de { struct mgmt_cp_remove_device cp; - if (!kernel_conn_control) + if (!has_kernel_features(KERNEL_CONN_CONTROL)) return; memset(&cp, 0, sizeof(cp)); @@ -5075,7 +5070,7 @@ void adapter_auto_connect_add(struct btd_adapter *adapter, uint8_t bdaddr_type; unsigned int id; - if (!kernel_conn_control) + if (!has_kernel_features(KERNEL_CONN_CONTROL)) return; if (g_slist_find(adapter->connect_list, device)) { @@ -5147,7 +5142,7 @@ void adapter_set_device_wakeable(struct btd_adapter *adapter, const bdaddr_t *bdaddr; uint8_t bdaddr_type; - if (!kernel_conn_control) + if (!has_kernel_features(KERNEL_CONN_CONTROL)) return; bdaddr = device_get_address(device); @@ -5224,7 +5219,7 @@ void adapter_auto_connect_remove(struct btd_adapter *adapter, uint8_t bdaddr_type; unsigned int id; - if (!kernel_conn_control) + if (!has_kernel_features(KERNEL_CONN_CONTROL)) return; if (!g_slist_find(adapter->connect_list, device)) { @@ -6764,7 +6759,7 @@ connect_le: * If kernel background scan is used then the kernel is * responsible for connecting. */ - if (kernel_conn_control) + if (has_kernel_features(KERNEL_CONN_CONTROL)) return; /* @@ -8964,7 +8959,7 @@ static int clear_devices(struct btd_adapter *adapter) { struct mgmt_cp_remove_device cp; - if (!kernel_conn_control) + if (!has_kernel_features(KERNEL_CONN_CONTROL)) return 0; memset(&cp, 0, sizeof(cp)); @@ -9282,7 +9277,7 @@ static void read_info_complete(uint8_t status, uint16_t length, (missing_settings & MGMT_SETTING_FAST_CONNECTABLE)) set_mode(adapter, MGMT_OP_SET_FAST_CONNECTABLE, 0x01); - if (kernel_exp_features) + if (has_kernel_features(KERNEL_EXP_FEATURES)) read_exp_features(adapter); err = adapter_register(adapter); @@ -9403,7 +9398,8 @@ static void read_info_complete(uint8_t status, uint16_t length, set_name(adapter, btd_adapter_get_name(adapter)); - if (kernel_blocked_keys_supported && !set_blocked_keys(adapter)) { + if (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->dev_id); @@ -9414,7 +9410,7 @@ static void read_info_complete(uint8_t status, uint16_t length, !(adapter->current_settings & MGMT_SETTING_BONDABLE)) set_mode(adapter, MGMT_OP_SET_BONDABLE, 0x01); - if (!kernel_conn_control) + if (!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); @@ -9590,19 +9586,19 @@ static void read_commands_complete(uint8_t status, uint16_t length, switch (op) { case MGMT_OP_ADD_DEVICE: DBG("enabling kernel-side connection control"); - kernel_conn_control = true; + kernel_features |= KERNEL_CONN_CONTROL; break; case MGMT_OP_SET_BLOCKED_KEYS: DBG("kernel supports the set_blocked_keys op"); - kernel_blocked_keys_supported = true; + kernel_features |= KERNEL_BLOCKED_KEYS_SUPPORTED; break; case MGMT_OP_SET_DEF_SYSTEM_CONFIG: DBG("kernel supports set system confic"); - kernel_set_system_config = true; + kernel_features |= KERNEL_SET_SYSTEM_CONFIG; break; case MGMT_OP_READ_EXP_FEATURES_INFO: DBG("kernel supports exp features"); - kernel_exp_features = true; + kernel_features |= KERNEL_EXP_FEATURES; break; default: break; @@ -9768,3 +9764,8 @@ bool btd_le_connect_before_pairing(void) return false; } + +bool has_kernel_features(uint32_t features) +{ + return (kernel_features & features); +} diff --git a/src/adapter.h b/src/adapter.h index f8ac20261..b0ed4915f 100644 --- a/src/adapter.h +++ b/src/adapter.h @@ -233,3 +233,12 @@ void btd_adapter_for_each_device(struct btd_adapter *adapter, void *data); bool btd_le_connect_before_pairing(void); + +enum kernel_features { + KERNEL_CONN_CONTROL = 1 << 0, + KERNEL_BLOCKED_KEYS_SUPPORTED = 1 << 1, + KERNEL_SET_SYSTEM_CONFIG = 1 << 2, + KERNEL_EXP_FEATURES = 1 << 3, +}; + +bool has_kernel_features(uint32_t feature); -- 2.28.0.618.gf4bc123cb7-goog