From patchwork Wed Jun 17 06:26:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Sun X-Patchwork-Id: 11609111 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 33F2490 for ; Wed, 17 Jun 2020 06:26:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1B474208E4 for ; Wed, 17 Jun 2020 06:26:53 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="LBZBHrTK" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726845AbgFQG0w (ORCPT ); Wed, 17 Jun 2020 02:26:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40880 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726497AbgFQG0w (ORCPT ); Wed, 17 Jun 2020 02:26:52 -0400 Received: from mail-qk1-x749.google.com (mail-qk1-x749.google.com [IPv6:2607:f8b0:4864:20::749]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2D917C061573 for ; Tue, 16 Jun 2020 23:26:52 -0700 (PDT) Received: by mail-qk1-x749.google.com with SMTP id p7so1037712qkf.21 for ; Tue, 16 Jun 2020 23:26:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc:content-transfer-encoding; bh=GcwHGX7RGWUKJO3An6LOhwQ6jtAqhn84pbCpNrhGuIw=; b=LBZBHrTK66Dm+WO7c869NlobEzRClR0CQr56XuhSNl3Fi3gqNfBGyg8jA2HyL2ehIX yhX9fAcfy8eSpN9fvTU5s8z7Ia2zgqxuim8VXus+ot3MFkGctlZGZ1UxFH80FgLu4ZIF c9eKERI/nmSPoFTEd/nqeDfAnquMUz5eAmH+gdlPp9HDC1kcwDRRaws9rwOiBU3RkMWY QIn0IJTrxKRDdpOyp/6bEJspi2anXFkAhh3lfcM41O0UAtm+8k/Q/A45QWXwQ0vTHBoG C99yh618i6znSZq4vm59tni0b6pbDLL/3+Y8wgc5u+z+Sv6Izlm4/Lu9IZ7oZMCIPXbc pQxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc:content-transfer-encoding; bh=GcwHGX7RGWUKJO3An6LOhwQ6jtAqhn84pbCpNrhGuIw=; b=TsY7RMmxgTmrSEQ/Pd+5918NzlyCIAnZ7uciozYr/vDZsso3jo6YvDrB8dgLQatf0m E9v/eW+WQr5jXpFMcDy7fPkyvbsvCSlMRjWx1krXfm9tmyZQhkwdlFz08XDpE/xRw/Cz sRgW4MckosoMNQHoioFdGtC4xlRDqpTWMtBBhw39g+mvclMGwa3ezkhgjdIHr7IbfPbP ro6m+lUAZAO9TgjZz0FMiKv9sjZX5BF8Ir+BVEsFtHa1C7DWHPWtkVVc4MNREzOn91bK yfg1qRgwhs7fX+Pqd/s17ep+wI4/5Mr8LdZ8wU6co0lO21yvKg93qviahhji4BA1m6tj NNTw== X-Gm-Message-State: AOAM5328TIrjTCH8IqBtiMFBK2/CJ8+I2XJgVHKUZurwxgSG9nciHwVe g6qKLPiaPM6gJfNzXRhrevK78q4/oP8aDH/nWxcpn/QVMgmdAkjY832uNuAdQRA9Tc6GyLJCe+i bZd/S4RYxE/VcLtyyqbSB53GRkYyqg6Xf3+bpVLKj7b/9fS9l+RWgnQuBwo1hWFlaC02jjrCd0g Rc/JKfOUoAVG8= X-Google-Smtp-Source: ABdhPJytL4NA3gwdJh/kPJqAQItz7sQYO3UTF44JXLX26mEo8zoWt2TYmGBDRyYRuo5ufe01yWxSSN0fg7P3imuN/Q== X-Received: by 2002:a0c:f84c:: with SMTP id g12mr5955486qvo.31.1592375211270; Tue, 16 Jun 2020 23:26:51 -0700 (PDT) Date: Tue, 16 Jun 2020 23:26:44 -0700 In-Reply-To: <20200617062646.165307-1-michaelfsun@google.com> Message-Id: <20200616232642.bluez.v2.1.Id1b811687f1245eca676a6c5fae4fd13a70c7732@changeid> Mime-Version: 1.0 References: <20200617062646.165307-1-michaelfsun@google.com> X-Mailer: git-send-email 2.27.0.290.gba653c62da-goog Subject: [bluez PATCH v2 1/3] btmgmt: Add "monitor" btmgmt submenu and command "features" From: Michael Sun To: linux-bluetooth@vger.kernel.org Cc: alainm@chromium.org, mcchou@chromium.org, chromeos-bluetooth-upstreaming@chromium.org, luiz.von.dentz@intel.com, Michael Sun Sender: linux-bluetooth-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org This patch introduces a new submenu "monitor" along with command ‘features’ to help user query for supported advertisement features. The command will work with the new MGMT opcode MGMT_OP_READ_ADV_MONITOR_FEATURES. Reviewed-by: Alain Michaud Reviewed-by: Miao-chen Chou Signed-off-by: Michael Sun --- Changes in v2: - Move advertisement monitor commands into monitor submenu. - Fixing build warnings. tools/btmgmt.c | 88 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) diff --git a/tools/btmgmt.c b/tools/btmgmt.c index 46e7465b31c9..a0487d4de178 100644 --- a/tools/btmgmt.c +++ b/tools/btmgmt.c @@ -4567,6 +4567,83 @@ static void cmd_wbs(int argc, char **argv) cmd_setting(MGMT_OP_SET_WIDEBAND_SPEECH, argc, argv); } +static const char * const advmon_features_str[] = { + "Pattern monitor with logic OR.", +}; + +static const char *advmon_features2str(uint32_t features) +{ + static char str[512]; + int off, i; + + off = 0; + snprintf(str, sizeof(str), "\n\tNone"); + + for (i = 0; i < NELEM(advmon_features_str); i++) { + if ((features & (1 << i)) != 0 && off < sizeof(str)) + off += snprintf(str + off, sizeof(str) - off, "\n\t%s", + advmon_features_str[i]); + } + + return str; +} + +static void advmon_features_rsp(uint8_t status, uint16_t len, const void *param, + void *user_data) +{ + const struct mgmt_rp_read_adv_monitor_features *rp = param; + uint32_t supported_features, enabled_features; + uint16_t num_handles; + int i; + + if (status != MGMT_STATUS_SUCCESS) { + error("Reading adv monitor features failed with status 0x%02x " + "(%s)", status, mgmt_errstr(status)); + return bt_shell_noninteractive_quit(EXIT_FAILURE); + } + + if (len < sizeof(*rp)) { + error("Too small adv monitor features reply (%u bytes)", len); + return bt_shell_noninteractive_quit(EXIT_FAILURE); + } + + if (len < sizeof(*rp) + rp->num_handles * sizeof(uint16_t)) { + error("Handles count (%u) doesn't match reply length (%u)", + rp->num_handles, len); + return bt_shell_noninteractive_quit(EXIT_FAILURE); + } + + supported_features = le32_to_cpu(rp->supported_features); + enabled_features = le32_to_cpu(rp->enabled_features); + num_handles = le16_to_cpu(rp->num_handles); + + print("Supported features:%s", advmon_features2str(supported_features)); + print("Enabled features:%s", advmon_features2str(enabled_features)); + print("Max number of handles: %u", le16_to_cpu(rp->max_num_handles)); + print("Max number of patterns: %u", rp->max_num_patterns); + print("Handles list with %u item%s", num_handles, + num_handles == 0 ? "" : num_handles == 1 ? ":" : "s:"); + for (i = 0; i < num_handles; i++) + print("\t0x%04x ", le16_to_cpu(rp->handles[i])); + + return bt_shell_noninteractive_quit(EXIT_SUCCESS); +} + +static void cmd_advmon_features(int argc, char **argv) +{ + uint16_t index; + + index = mgmt_index; + if (index == MGMT_INDEX_NONE) + index = 0; + + if (!mgmt_send(mgmt, MGMT_OP_READ_ADV_MONITOR_FEATURES, index, 0, NULL, + advmon_features_rsp, NULL, NULL)) { + error("Unable to send advertising monitor features command"); + return bt_shell_noninteractive_quit(EXIT_FAILURE); + } +} + static void register_mgmt_callbacks(struct mgmt *mgmt, uint16_t index) { mgmt_register(mgmt, MGMT_EV_CONTROLLER_ERROR, index, controller_error, @@ -4635,6 +4712,16 @@ static void cmd_select(int argc, char **argv) update_prompt(mgmt_index); } +static const struct bt_shell_menu monitor_menu = { + .name = "monitor", + .desc = "Advertisement Monitor Submenu", + .entries = { + { "features", NULL, + cmd_advmon_features, "Show advertisement monitor " + "features" }, + { } }, +}; + static const struct bt_shell_menu main_menu = { .name = "main", .entries = { @@ -4815,6 +4902,7 @@ int main(int argc, char *argv[]) bt_shell_init(argc, argv, &opt); bt_shell_set_menu(&main_menu); + bt_shell_add_submenu(&monitor_menu); mgmt = mgmt_new_default(); if (!mgmt) {