From patchwork Wed Jan 8 11:47:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Szymon Czapracki X-Patchwork-Id: 197506 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6CD5DC33C9E for ; Wed, 8 Jan 2020 11:47:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 282852077B for ; Wed, 8 Jan 2020 11:47:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=codecoup-pl.20150623.gappssmtp.com header.i=@codecoup-pl.20150623.gappssmtp.com header.b="CmPUv51e" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727291AbgAHLr6 (ORCPT ); Wed, 8 Jan 2020 06:47:58 -0500 Received: from mail-lj1-f173.google.com ([209.85.208.173]:35618 "EHLO mail-lj1-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726290AbgAHLr6 (ORCPT ); Wed, 8 Jan 2020 06:47:58 -0500 Received: by mail-lj1-f173.google.com with SMTP id j1so3021610lja.2 for ; Wed, 08 Jan 2020 03:47:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=codecoup-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=OesDWmOQJ38npHVfEaQjvlnmqE7rx0r4/u93ts61DkQ=; b=CmPUv51en9VMacNdSvl39d3ALrc9Zm8QCXPSFWB0U13OjHEiF8CVBRv7JrvY/DtrkG /HEE3fIxR+zO5YuKHbTG8c285uABFYelxvCtnqMErgWypagYY4xarqH5akOZaHDj5Qbp 23tWGklUFpvDZJYNLloiIlpG3QI+4WPo1i8jxoXdAEEuOLUA4cD/1t4eR8kQHZkpIsdu CjobtGovUo+e05IXMj94gbE7O4Rn07jXQJoD1Ow6lowQtP0ggRyeTMPiELOTIvwTn1fc p1w7v178acIMadSe9+gJNlwKLKcg4NFTyym7bWmpETI9hKwqlXM9n34aI88J/JGlyFYf AY7A== 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:mime-version :content-transfer-encoding; bh=OesDWmOQJ38npHVfEaQjvlnmqE7rx0r4/u93ts61DkQ=; b=mXAPm5Lf+EkSZ3wgX+3uFaKHwyOMeErjXFaYtcURnfaLqHlRayMsCPtr3ncXK4JhDI +Zsvo07TfOVi/QG9zpTGxEEzXpsq83AYPAL3+H1gKTIEOiCHplXIi0aJXy87cXCZ2saL bmWcUITASVqLchhJhRa+8Q4VfpBp/SGKLexsg618QnGIjaw59ks5cQHpWTcOLIU3WXEN GdSWtWYlmIp/5ITPWb0xWOsN4Re+Ca0IXS95025GrDg9bYhjljOpTgvpV+DJpMWyBCEQ ULRs18OWheBNcqx1StsxdQ0ociuXgnzdVfnD9K/10eOIyN3PqTC+ci2OfBjDPjbhQ+14 0CyA== X-Gm-Message-State: APjAAAXLpWFcVBG3HSeNvxUw1h6zDQ9SWDSh0HBiT7t6PEPdmwt1LmpU tJ4aNkxNz7oY+7I/wH2OF119ygNyj2Q= X-Google-Smtp-Source: APXvYqysn1yWXC2u2uc2OMF5pQ6ZmHnh/8I4d4d4MmJZbQAVa63tktRBohdvGFeCxKoht0hKfS3eQw== X-Received: by 2002:a2e:9d0f:: with SMTP id t15mr2545187lji.171.1578484075852; Wed, 08 Jan 2020 03:47:55 -0800 (PST) Received: from tp480.int.codecoup.pl ([95.143.243.62]) by smtp.gmail.com with ESMTPSA id e17sm1130645ljg.101.2020.01.08.03.47.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jan 2020 03:47:55 -0800 (PST) From: Szymon Czapracki To: linux-bluetooth@vger.kernel.org Cc: Szymon Czapracki Subject: [PATCH v2 1/8] monitor: Update periodic sync commands. Date: Wed, 8 Jan 2020 12:47:45 +0100 Message-Id: <20200108114752.133076-1-szymon.czapracki@codecoup.pl> X-Mailer: git-send-email 2.24.1 MIME-Version: 1.0 Sender: linux-bluetooth-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org Change fields in periodic_adv_(create/term)_sync_cmd, according to their description with 5.1 specification. < HCI Command: LE Periodic Advertising Create Sync (0x08|0x0044) plen 14 Options: 0x0001 Use Periodic Advertiser List Reporting initially enabled SID: 0x00 Adv address type: Public (0x00) Adv address: 00:00:00:00:00:00 (OUI 00-00-00) Skip: 0x0000 Sync timeout: 0 msec (0x0000) Sync CTE type: 0x0000 > HCI Event: Command Status (0x0f) plen 4 LE Periodic Advertising Create Sync (0x08|0x0044) ncmd 1 Status: Unknown HCI Command (0x01) --- monitor/bt.h | 6 +-- monitor/packet.c | 96 ++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 83 insertions(+), 19 deletions(-) diff --git a/monitor/bt.h b/monitor/bt.h index 8edc895e8..ecf3782c9 100644 --- a/monitor/bt.h +++ b/monitor/bt.h @@ -2371,13 +2371,13 @@ struct bt_hci_le_ext_create_conn { #define BT_HCI_CMD_LE_PERIODIC_ADV_CREATE_SYNC 0x2044 struct bt_hci_cmd_le_periodic_adv_create_sync { - uint8_t filter_policy; + uint8_t options; uint8_t sid; uint8_t addr_type; uint8_t addr[6]; uint16_t skip; uint16_t sync_timeout; - uint8_t unused; + uint8_t sync_cte_type; } __attribute__ ((packed)); #define BT_HCI_CMD_LE_PERIODIC_ADV_CREATE_SYNC_CANCEL 0x2045 @@ -3108,7 +3108,7 @@ struct bt_hci_le_per_adv_report { uint16_t handle; uint8_t tx_power; int8_t rssi; - uint8_t unused; + uint8_t cte_type; uint8_t data_status; uint8_t data_len; uint8_t data[0]; diff --git a/monitor/packet.c b/monitor/packet.c index ab8bbdee5..64f75cf8e 100644 --- a/monitor/packet.c +++ b/monitor/packet.c @@ -7321,24 +7321,70 @@ static void le_ext_create_conn_cmd(const void *data, uint8_t size) print_ext_conn_phys(cmd->data, cmd->phys); } -static void le_periodic_adv_create_sync_cmd(const void *data, uint8_t size) +static const struct bitfield_data create_sync_cte_type[] = { + { 0, "Do not sync to packets with AoA CTE" }, + { 1, "Do not sync to packets with AoD CTE 1us" }, + { 2, "Do not sync to packets with AoD CTE 2us" }, + { 3, "Do not sync to packets with type 3 AoD" }, + { 4, "Do not sync to packets without CTE" }, + { }, +}; + +static const struct bitfield_data create_sync_options[] = { + { 0, "Use Periodic Advertiser List" }, + { 1, "Reporting initially disabled" }, + { }, +}; + +static const struct bitfield_data create_sync_options_alt[] = { + { 0, "Use advertising SID, Advertiser Address Type and address"}, + { 1, "Reporting initially enabled" }, + { }, +}; + +static void print_create_sync_cte_type(uint8_t flags) { - const struct bt_hci_cmd_le_periodic_adv_create_sync *cmd = data; - const char *str; + uint8_t mask = flags; - switch (cmd->filter_policy) { - case 0x00: - str = "Use specified advertising parameters"; - break; - case 0x01: - str = "Use Periodic Advertiser List"; - break; - default: - str = "Reserved"; - break; + print_field("Sync CTE type: 0x%4.4x", flags); + + mask = print_bitfield(2, flags, create_sync_cte_type); + + if (mask) { + print_text(COLOR_UNKNOWN_ADV_FLAG, + "Unknown sync CTE type properties (0x%4.4x)", + mask); } +} - print_field("Filter policy: %s (0x%2.2x)", str, cmd->filter_policy); +static void print_create_sync_options(uint8_t flags) +{ + uint8_t mask = flags; + int i; + + print_field("Options: 0x%4.4x", flags); + + for (i = 0; create_sync_options[i].str; i++) { + if (flags & (1 << create_sync_options[i].bit)) { + print_field("%s", create_sync_options[i].str); + mask &= ~(1 << create_sync_options[i].bit); + } else { + print_field("%s", create_sync_options_alt[i].str); + mask &= ~(1 << create_sync_options_alt[i].bit); + } + } + + if (mask) { + print_text(COLOR_UNKNOWN_ADV_FLAG, + " Unknown options (0x%4.4x)", mask); + } +} + +static void le_periodic_adv_create_sync_cmd(const void *data, uint8_t size) +{ + const struct bt_hci_cmd_le_periodic_adv_create_sync *cmd = data; + + print_create_sync_options(cmd->options); print_field("SID: 0x%2.2x", cmd->sid); print_addr_type("Adv address type", cmd->addr_type); print_addr("Adv address", cmd->addr, cmd->addr_type); @@ -7346,7 +7392,7 @@ static void le_periodic_adv_create_sync_cmd(const void *data, uint8_t size) print_field("Sync timeout: %d msec (0x%4.4x)", le16_to_cpu(cmd->sync_timeout) * 10, le16_to_cpu(cmd->sync_timeout)); - print_field("Unused: 0x%2.2x", cmd->unused); + print_create_sync_cte_type(cmd->sync_cte_type); } static void le_periodic_adv_term_sync_cmd(const void *data, uint8_t size) @@ -9648,7 +9694,25 @@ static void le_per_adv_report_evt(const void *data, uint8_t size) else print_field("RSSI: reserved (0x%2.2x)", (uint8_t) evt->rssi); - print_field("Unused: (0x%2.2x)", evt->unused); + + switch (evt->cte_type) { + case 0x00: + str = "AoA Constant Tone Extension"; + break; + case 0x01: + str = "AoA Constant Tone Extension with 1us slots"; + break; + case 0x02: + str = "AoD Constant Tone Extension with 2us slots"; + break; + case 0xff: + str = "No Constant Tone Extension"; + break; + default: + str = "Reserved"; + color_on = COLOR_RED; + break; + } switch (evt->data_status) { case 0x00: From patchwork Wed Jan 8 11:47:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Szymon Czapracki X-Patchwork-Id: 197505 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 30760C3F68F for ; Wed, 8 Jan 2020 11:48:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 058552077B for ; Wed, 8 Jan 2020 11:48:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=codecoup-pl.20150623.gappssmtp.com header.i=@codecoup-pl.20150623.gappssmtp.com header.b="zQjc+9PX" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727370AbgAHLsB (ORCPT ); Wed, 8 Jan 2020 06:48:01 -0500 Received: from mail-lf1-f47.google.com ([209.85.167.47]:35779 "EHLO mail-lf1-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727319AbgAHLsB (ORCPT ); Wed, 8 Jan 2020 06:48:01 -0500 Received: by mail-lf1-f47.google.com with SMTP id 15so2227488lfr.2 for ; Wed, 08 Jan 2020 03:47:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=codecoup-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=eHTrZ0QELKPawLm9od83NxjHR6BBZ+SXNdRLMQ7KZHQ=; b=zQjc+9PXWza/zCEThwk9gbouYpY3BKI7+XgUs0aUWb7/TgHqar/wTkNoPHLVeb+DiO pXc+GvpT4l8Wq2unstzm+p5+LKoBSJzDWMnTbypCWkFpngmJb23T1GgPWeY4gmq7qVSI Ly8ubPnoVbB04PjHc+6636fre3pWbz117M3Z21BDA462vz8iMXOo5BXFcY4TaUEYYgnK YKEOzbUYq4St9O7w8DwDnxU0ik/yDXluptPa/P6bQB0LmDWDEHiiOZSFPg6w0YO92lfs xy/bCyllK8IwhgdkE5bFb4BG0luW3Wj03p5mZKQplhYiqSgqQkansw5EJqXQnC3HRntP cNhA== 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=eHTrZ0QELKPawLm9od83NxjHR6BBZ+SXNdRLMQ7KZHQ=; b=bcjmJXe48KP0U9hUdLZAQsyLiVDxqWsLmf0fpzyhzPwlgB4HDFSyzIjhMR3wGhNX10 Ny6OA1mMUNqV1uUNL3tkYL+XaIdaQsh9pXfNZiZj5ClsXDNoEDm1FGOJ3eYKJrF1ZFCq hI/7wOI1RBXZHdEtxlsSOiPJXXav7wR2S9pqxockO/EbOuLdrfMFEo44t1IeA58EON8/ Y7xotaKkxxgDlohkXIwmmJYAJtlQKh1vgFWT9cNVcRg3Quy1mJB2OHMVlIIQ/QX4MOo5 G9X2ZvY3tQXq+V+ENcUZzu4zCo93aO2xJNWmor80d180hdqo4HZ2zBC6pL7QCZUznLL7 MyYQ== X-Gm-Message-State: APjAAAU8nL8h3A0kAYZHHhav7o+hZDGd62hTfQPVJFL86eaECs4HeYlP BURPzVIa9apb59p06ULE86jQWrwwEFc= X-Google-Smtp-Source: APXvYqyb7Zgrcwd3ncpYUmrPD5sp5ETd3iZK6iATCy2vRQw7Kx2W9u4COY7aUqp8xC6LWHGXNcxzfw== X-Received: by 2002:a19:2213:: with SMTP id i19mr2573656lfi.83.1578484078857; Wed, 08 Jan 2020 03:47:58 -0800 (PST) Received: from tp480.int.codecoup.pl ([95.143.243.62]) by smtp.gmail.com with ESMTPSA id e17sm1130645ljg.101.2020.01.08.03.47.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jan 2020 03:47:58 -0800 (PST) From: Szymon Czapracki To: linux-bluetooth@vger.kernel.org Cc: Szymon Czapracki Subject: [PATCH v2 3/8] monitor: Decode LE Set Periodic Advertising Receive Enable command Date: Wed, 8 Jan 2020 12:47:47 +0100 Message-Id: <20200108114752.133076-3-szymon.czapracki@codecoup.pl> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200108114752.133076-1-szymon.czapracki@codecoup.pl> References: <20200108114752.133076-1-szymon.czapracki@codecoup.pl> MIME-Version: 1.0 Sender: linux-bluetooth-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org < HCI Command: LE Periodic Advertising Receive Enable (0x08|0x0059) plen 3 Sync handle: 0 Reporting: Enabled (0x01) > HCI Event: Command Status (0x0f) plen 4 LE Periodic Advertising Receive Enable (0x08|0x0059) ncmd 1 Status: Unknown HCI Command (0x01) --- monitor/bt.h | 6 ++++++ monitor/packet.c | 11 +++++++++++ 2 files changed, 17 insertions(+) diff --git a/monitor/bt.h b/monitor/bt.h index e14c1771f..bb373b528 100644 --- a/monitor/bt.h +++ b/monitor/bt.h @@ -2461,6 +2461,12 @@ struct bt_hci_cmd_le_tx_test_v3 { uint8_t antenna_ids[0]; } __attribute__ ((packed)); +#define BT_HCI_CMD_SET_PERIODIC_ADV_REC_ENABLE 0x2059 +struct bt_hci_cmd_set_periodic_adv_rec_enable { + uint16_t sync_handle; + uint8_t enable; +} __attribute__ ((packed)); + #define BT_HCI_EVT_INQUIRY_COMPLETE 0x01 struct bt_hci_evt_inquiry_complete { uint8_t status; diff --git a/monitor/packet.c b/monitor/packet.c index 8e5219bef..e5681b5ff 100644 --- a/monitor/packet.c +++ b/monitor/packet.c @@ -7584,6 +7584,14 @@ static void le_tx_test_cmd_v3(const void *data, uint8_t size) print_field(" Antenna ID: %u", cmd->antenna_ids[i]); } +static void le_periodic_adv_rec_enable(const void *data, uint8_t size) +{ + const struct bt_hci_cmd_le_set_periodic_adv_enable *cmd = data; + + print_field("Sync handle: %d", cmd->handle); + print_enable("Reporting", cmd->enable); +} + struct opcode_data { uint16_t opcode; int bit; @@ -8377,6 +8385,9 @@ static const struct opcode_data opcode_table[] = { { 0x2050, 316, "LE Transmitter Test command [v3]", le_tx_test_cmd_v3, 9, false, status_rsp, 1, true }, + { 0x2059, 325, "LE Periodic Advertising Receive Enable", + le_periodic_adv_rec_enable, 3, true, + status_rsp, 1, true }, { } }; From patchwork Wed Jan 8 11:47:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Szymon Czapracki X-Patchwork-Id: 197504 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4114FC33C9E for ; Wed, 8 Jan 2020 11:48:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 17B272077B for ; Wed, 8 Jan 2020 11:48:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=codecoup-pl.20150623.gappssmtp.com header.i=@codecoup-pl.20150623.gappssmtp.com header.b="xjK8LfAp" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727435AbgAHLsF (ORCPT ); Wed, 8 Jan 2020 06:48:05 -0500 Received: from mail-lf1-f51.google.com ([209.85.167.51]:44090 "EHLO mail-lf1-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727380AbgAHLsE (ORCPT ); Wed, 8 Jan 2020 06:48:04 -0500 Received: by mail-lf1-f51.google.com with SMTP id v201so2186023lfa.11 for ; Wed, 08 Jan 2020 03:48:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=codecoup-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UdqyouaOjE7Zju3IK+QZuvXswBq3t65LtLPxvilN7ak=; b=xjK8LfApqn0XIO1BFce0pumgu7QAzp4m9W5clxMrGM9SsBXUhdpJ/cqeiO7GTt80S2 7qHUZvWuRYug4tlbySogs2Pftr/ZYqVV95Zm5SK1HtKp08UVc8ImGEWtHPsHU6vW4Ced RWBkUQ5kB0Cx1QIyX7CdSEfkjzEc3/VWl+7tX8vOu1xUtSqIficlW7aEVgKQN7XPbE/+ TDZVLMb4uOOlTMevp33Vfg8QHHv8uFiIXdZrmCxIJA6VbF54nQoOERWOoLnk4UbFQFxA 4quCIgrhPDh84WsJohvzJVq9JbXMTap1XFf/CO7Rfssyw/s814te0Y/envYLa2eAOKlK PhWA== 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=UdqyouaOjE7Zju3IK+QZuvXswBq3t65LtLPxvilN7ak=; b=AIyxRPpEnLja1yjzZ1IYcoVpuu8CVGLjkkrNUU/0ojKBeMkLS5LzpM0P+WYtXl7FsF OSCU09Hbeu6PPBN9KHBtRHH6We9Wfwkz/nt9GHA3e4KJqaHphBbUG2cnDLjth8pWsxJQ 5xyDYKqrssYfAXEeXDQP4cm+bFJSG184Ed1AZJHqoRgPxf3IWLINhoU2EXyiV4kV+J5k 7s34YMiZpHhMs7F0OtQrszHwJAXXIZkXXVujkWx9vVunlw3pXVUMYJSkWr7juC/608Y6 LilgxCFpX99kwWuoLIe3qGnn5aqATIHcuZFKsrVFpQUa4HpLxo8BePr7iim4VSXJ6kOJ wF2w== X-Gm-Message-State: APjAAAWtvnrlFOYHowcpRaUNfeRUk0IntbmuUOXuhTyDN5SQsc/DUD33 cZlP8/LC6gKwbYCRpgNsL7bIAAenHZw= X-Google-Smtp-Source: APXvYqwaUe6xJjvk1xC2mRtA0AAzOVRW3YQO7x2eHFhaBU5zCsnrRppPoFVcd3dqA1jqcrLP8C73Bw== X-Received: by 2002:a19:ae18:: with SMTP id f24mr2660095lfc.155.1578484081602; Wed, 08 Jan 2020 03:48:01 -0800 (PST) Received: from tp480.int.codecoup.pl ([95.143.243.62]) by smtp.gmail.com with ESMTPSA id e17sm1130645ljg.101.2020.01.08.03.48.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jan 2020 03:48:01 -0800 (PST) From: Szymon Czapracki To: linux-bluetooth@vger.kernel.org Cc: Szymon Czapracki Subject: [PATCH v2 5/8] monitor: Decode LE Periodic Advertising Set Info Transfer command Date: Wed, 8 Jan 2020 12:47:49 +0100 Message-Id: <20200108114752.133076-5-szymon.czapracki@codecoup.pl> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200108114752.133076-1-szymon.czapracki@codecoup.pl> References: <20200108114752.133076-1-szymon.czapracki@codecoup.pl> MIME-Version: 1.0 Sender: linux-bluetooth-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org < HCI Command: LE Periodic Advertising Set Info Transfer (0x08|0x005b) plen 5 Connection handle: 1 Service data: 0x0000 Advertising handle: 0 > HCI Event: Command Status (0x0f) plen 4 LE Periodic Advertising Set Info Transfer (0x08|0x005b) ncmd 1 Status: Unknown HCI Command (0x01) --- monitor/bt.h | 7 +++++++ monitor/packet.c | 12 ++++++++++++ 2 files changed, 19 insertions(+) diff --git a/monitor/bt.h b/monitor/bt.h index efaf80f55..f8422ccc9 100644 --- a/monitor/bt.h +++ b/monitor/bt.h @@ -2474,6 +2474,13 @@ struct bt_hci_cmd_periodic_sync_trans { uint16_t sync_handle; } __attribute__ ((packed)); +#define BT_HCI_CMD_PERIODIC_ADV_SET_INFO_TRANS 0x205b +struct bt_hci_cmd_periodic_adv_set_info_trans { + uint16_t handle; + uint16_t service_data; + uint16_t adv_handle; +} __attribute__ ((packed)); + #define BT_HCI_EVT_INQUIRY_COMPLETE 0x01 struct bt_hci_evt_inquiry_complete { uint8_t status; diff --git a/monitor/packet.c b/monitor/packet.c index 23eb48374..34b3d1895 100644 --- a/monitor/packet.c +++ b/monitor/packet.c @@ -7609,6 +7609,15 @@ static void le_periodic_adv_sync_trans(const void *data, uint8_t size) print_field("Sync handle: %d", cmd->sync_handle); } +static void le_periodic_adv_set_info_trans(const void *data, uint8_t size) +{ + const struct bt_hci_cmd_periodic_adv_set_info_trans *cmd = data; + + print_field("Connection handle: %d", cmd->handle); + print_field("Service data: 0x%4.4x", cmd->service_data); + print_field("Advertising handle: %d", cmd->adv_handle); +} + struct opcode_data { uint16_t opcode; int bit; @@ -8408,6 +8417,9 @@ static const struct opcode_data opcode_table[] = { { 0x205a, 326, "LE Periodic Advertising Sync Transfer", le_periodic_adv_sync_trans, 6, true, status_handle_rsp, 3, true }, + { 0x205b, 327, "LE Periodic Advertising Set Info Transfer", + le_periodic_adv_set_info_trans, 5, true, + status_handle_rsp, 3, true }, { } }; From patchwork Wed Jan 8 11:47:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Szymon Czapracki X-Patchwork-Id: 197503 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS,UNWANTED_LANGUAGE_BODY,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 18088C33C9E for ; Wed, 8 Jan 2020 11:48:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DD6942077B for ; Wed, 8 Jan 2020 11:48:08 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=codecoup-pl.20150623.gappssmtp.com header.i=@codecoup-pl.20150623.gappssmtp.com header.b="YMl0G26/" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727444AbgAHLsI (ORCPT ); Wed, 8 Jan 2020 06:48:08 -0500 Received: from mail-lf1-f51.google.com ([209.85.167.51]:33009 "EHLO mail-lf1-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727212AbgAHLsI (ORCPT ); Wed, 8 Jan 2020 06:48:08 -0500 Received: by mail-lf1-f51.google.com with SMTP id n25so2236237lfl.0 for ; Wed, 08 Jan 2020 03:48:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=codecoup-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=FLrSyRALA+rrBdzmNTayeiwTN7tLarui48qkxMKE5EE=; b=YMl0G26/8WwZOsKv1hCc7FZeipcAWYMKIiBIStU/wnho8aXwgbpmzF/dYFcrNUKh8J YheU4SAFi2zHi4eD9Me9QCvMxAI98F4vILXcWc4doD2nP1mQ/NM1sjweyuedd1iVRZoF +HIZ4B/ZWHfIgQn8mF65HTQGDstZojWzrVOf/Y1RApqOzCsHo3ofvF+w/m2uG3EypZPp 9C0XB7Cor3kMdQDSkWtmd/4kUG/Fu34gYXyFTWJf5RwNOUbL/MILTqO66V6TPvuELP4o hTZrplirhS6zfvqHMeEPqMXlDGn+c6PT/NDWnHUAB6q7ck0qQZU3qc8Y+RNqU+3KFs09 j/Hw== 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=FLrSyRALA+rrBdzmNTayeiwTN7tLarui48qkxMKE5EE=; b=ccZLhWKKW310RjFHSa2hnI4WCYXMrOiINLVvNVuFfHDF+1F36jIiPBK8GpnQt9kTZp 2WiHbi6/igvQIDsvUqFppJ5yxXl+jLsp2NwimjW+lkZHHzTWGceOlr9oBIBvH856Lq4g g/AtVb4POxMqw6vvX7Vmk75pCZtLUDTChcGno6EG3vCVgV+7+2odZnRAJHMw8izuaEo/ wILxXiHbhpIc+baD1bGcMWcSpghn3UBOE0A/vaSdqLTAuN03s9IctNw8WvaGw8E6fztl BK5XuGykef+m8YxLBzi0Qj4n97iYCN7v6Kp0xDGWhQokTWcOBSYvEB44MWHL4f7TG0SZ y3yg== X-Gm-Message-State: APjAAAVm3X73ujSV5yMqXX09xNi+VDlUk9ds2AdUayktimhqNF6GGth4 8LwvZu2IutAfbfYTEe2OQu+HypZCH4I= X-Google-Smtp-Source: APXvYqzxQDdYpow7XQVkccyuhD9AqzXFHcGt/cO7l8io2z28QdMRdNyE29iF1UIssZ5QGbcYpARr8g== X-Received: by 2002:a19:4b55:: with SMTP id y82mr2590196lfa.171.1578484084353; Wed, 08 Jan 2020 03:48:04 -0800 (PST) Received: from tp480.int.codecoup.pl ([95.143.243.62]) by smtp.gmail.com with ESMTPSA id e17sm1130645ljg.101.2020.01.08.03.48.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jan 2020 03:48:03 -0800 (PST) From: Szymon Czapracki To: linux-bluetooth@vger.kernel.org Cc: Szymon Czapracki Subject: [PATCH v2 7/8] monitor: Decode LE Set Default Periodic Adv Sync Transfer Params. command Date: Wed, 8 Jan 2020 12:47:51 +0100 Message-Id: <20200108114752.133076-7-szymon.czapracki@codecoup.pl> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200108114752.133076-1-szymon.czapracki@codecoup.pl> References: <20200108114752.133076-1-szymon.czapracki@codecoup.pl> MIME-Version: 1.0 Sender: linux-bluetooth-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org < HCI Command: LE Set Default Periodic Advertisng Sync Transfer Parameters (0x08|0x005d) plen 6 Mode: Enabled with report events disabled (0x01) Skip: 0x00 Sync timeout: 0 msec (0x0000) Sync CTE type: 0x0000 > HCI Event: Command Status (0x0f) plen 4 LE Set Default Periodic Advertisng Sync Transfer Parameters (0x08|0x005d) ncmd 1 Status: Unknown HCI Command (0x01) --- monitor/bt.h | 8 ++++++++ monitor/packet.c | 17 +++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/monitor/bt.h b/monitor/bt.h index 2ec2ea0a7..1859dfb21 100644 --- a/monitor/bt.h +++ b/monitor/bt.h @@ -2490,6 +2490,14 @@ struct bt_hci_cmd_periodic_adv_sync_trans_params { uint8_t cte_type; } __attribute__ ((packed)); +#define BT_HCI_CMD_DEFAULT_PERIODIC_ADV_SYNC_TRANS_PARAMS 0x205d +struct bt_hci_cmd_default_periodic_adv_sync_trans_params { + uint8_t mode; + uint16_t skip; + uint16_t sync_timeout; + uint8_t cte_type; +} __attribute__ ((packed)); + #define BT_HCI_EVT_INQUIRY_COMPLETE 0x01 struct bt_hci_evt_inquiry_complete { uint8_t status; diff --git a/monitor/packet.c b/monitor/packet.c index 74c73f145..9d22dfc15 100644 --- a/monitor/packet.c +++ b/monitor/packet.c @@ -7653,6 +7653,19 @@ static void le_periodic_adv_sync_trans_params(const void *data, uint8_t size) print_create_sync_cte_type(cmd->cte_type); } +static void le_set_default_periodic_adv_sync_trans_params(const void *data, + uint8_t size) +{ + const struct bt_hci_cmd_default_periodic_adv_sync_trans_params *cmd = data; + + print_sync_mode(cmd->mode); + print_field("Skip: 0x%2.2x", cmd->skip); + print_field("Sync timeout: %d msec (0x%4.4x)", + le16_to_cpu(cmd->sync_timeout) * 10, + le16_to_cpu(cmd->sync_timeout)); + print_create_sync_cte_type(cmd->cte_type); +} + struct opcode_data { uint16_t opcode; int bit; @@ -8458,6 +8471,10 @@ static const struct opcode_data opcode_table[] = { { 0x205c, 328, "LE Periodic Advertising Sync Transfer Parameters", le_periodic_adv_sync_trans_params, 8, true, status_handle_rsp, 3, true}, + { 0x205d, 329, "LE Set Default Periodic Advertisng Sync Transfer " + "Parameters", + le_set_default_periodic_adv_sync_trans_params, + 6, true, status_rsp, 1, true}, { } };