monitor: Add support for LE BIG Info Adverting Report
Luiz Augusto von Dentz
maintainerPATCH 1/3 monitor: Add support for LE BIG Info Adverting Report
From: Luiz Augusto von Dentz <[email protected]>
This adds support for LE BIG Info Advertising Report.
--- monitor/bt.h | 17 +++++++++++++++++ monitor/packet.c | 23 +++++++++++++++++++++++ 2 files changed, 40 insertions(+)
monitor/bt.h +17 -0
@@ -3653,6 +3653,23 @@ struct bt_hci_evt_le_req_peer_sca_complete {uint8_t sca; } __attribute__ ((packed)); +#define BT_HCI_EVT_LE_BIG_INFO_ADV_REPORT 0x22 +struct bt_hci_evt_le_big_info_adv_report { +uint16_t sync_handle; +uint8_t num_bis; +uint8_t nse; +uint16_t iso_interval; +uint8_t bn; +uint8_t pto; +uint8_t irc; +uint16_t max_pdu; +uint8_t sdu_interval[3 ]; +uint16_t max_sdu; +uint8_t phy; +uint8_t framing; +uint8_t encryption; +} __attribute__ ((packed)); +#define BT_HCI_ERR_SUCCESS 0x00#define BT_HCI_ERR_UNKNOWN_COMMAND 0x01#define BT_HCI_ERR_UNKNOWN_CONN_ID 0x02
monitor/packet.c +23 -0
@@ -10886,6 +10886,25 @@ static void le_req_sca_complete_evt(const void *data, uint8_t size)print_sca (evt->sca); } +static void le_big_info_evt (const void *data,uint8_t size) +{ +const struct bt_hci_evt_le_big_info_adv_report *evt = data; + +print_field ("Sync Handle: 0x%4.4x" , evt->sync_handle); +print_field ("Number BIS: %u" , evt->num_bis); +print_field ("NSE: %u" , evt->nse); +print_slot_125 ("ISO Interval" , evt->iso_interval); +print_field ("BN: %u" , evt->bn); +print_field ("PTO: %u" , evt->bn); +print_field ("IRC: %u" , evt->irc); +print_field ("Maximum PDU: %u" , evt->max_pdu); +print_usec_interval ("SDU Interval" , evt->sdu_interval); +print_field ("Maximum SDU: %u" , evt->max_sdu); +print_le_phy ("PHY" , evt->phy); +print_framing (evt->framing); +print_field ("Encryption: 0x%02x" , evt->encryption); +} +struct subevent_data {uint8_t subevent;const char *str;
@@ -11004,6 +11023,10 @@ static const struct subevent_data le_meta_event_table[] = { le_req_sca_complete_evt, sizeof( struct bt_hci_evt_le_req_peer_sca_complete)}, + { BT_HCI_EVT_LE_BIG_INFO_ADV_REPORT, + "LE Broadcast Isochronous Group Info Advertising Report", + le_big_info_evt, + sizeof(struct bt_hci_evt_le_big_info_adv_report) }, { } };
Signature · 1 line
2.35.1
Luiz Augusto von Dentz
maintainerPATCH 2/3 btdev: Add support for sending LE BIG Info Adv Reports
From: Luiz Augusto von Dentz <[email protected]>
This adds support for sending LE BIG Info Adv Reports if LE Create BIG has been called.
--- emulator/btdev.c | 40 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-)
emulator/btdev.c +39 -1
@@ -1139,7 +1139,8 @@ static struct btdev_conn *conn_add_bis(struct btdev *dev, uint16_t handle,return conn; } -static struct btdev_conn *find_bis_index (struct btdev *remote,uint8_t index) +static struct btdev_conn *find_bis_index (const struct btdev *remote, +uint8_t index) {struct btdev_conn *conn;const struct queue_entry *entry;
@@ -5105,6 +5106,40 @@ static int cmd_set_pa_data(struct btdev *dev, const void *data,return 0 ; } +static void send_biginfo (struct btdev *dev,const struct btdev *remote) +{ +struct bt_hci_evt_le_big_info_adv_report ev; +const struct btdev_conn *conn; +struct bt_hci_bis *bis; + + conn =find_bis_index (remote,0 ); +if (!conn) +return ; + + bis = conn->data; + +memset (&ev,0 ,sizeof (ev)); + ev.sync_handle =cpu_to_le16 (dev->le_pa_sync_handle); + ev.num_bis =1 ; + +while (find_bis_index (remote, ev.num_bis)) + ev.num_bis++; + + ev.nse =0x01 ; + ev.iso_interval = bis->latency /1.25 ; + ev.bn =0x01 ; + ev.pto =0x00 ; + ev.irc =0x01 ; + ev.max_pdu = bis->sdu; +memcpy (ev.sdu_interval, bis->sdu_interval,sizeof (ev.sdu_interval)); + ev.max_sdu = bis->sdu; + ev.phy = bis->phy; + ev.framing = bis->framing; + ev.encryption = bis->encryption; + +le_meta_event (dev,BT_HCI_EVT_LE_BIG_INFO_ADV_REPORT , &ev,sizeof (ev)); +} +static void send_pa (struct btdev *dev,const struct btdev *remote,uint8_t offset) {
@@ -5135,7 +5170,10 @@ static void send_pa(struct btdev *dev, const struct btdev *remote,if (pdu.ev.data_status ==0x01 ) { offset += pdu.ev.data_len;send_pa (dev, remote, offset); +return ; } + +send_biginfo (dev, remote); } static void le_pa_sync_estabilished(struct btdev *dev, struct btdev *remote,
Signature · 1 line
2.35.1
Luiz Augusto von Dentz
maintainerPATCH 3/3 btdev: Fix BIG Create Sync
In reply to Luiz Augusto von DentzFrom: Luiz Augusto von Dentz <[email protected]>
This fixes status return to BIG Create Sync command.
--- emulator/btdev.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-)
emulator/btdev.c +10 -7
@@ -6070,15 +6070,19 @@ static int cmd_big_create_sync(struct btdev *dev, const void *data, uint8_t len)/* If the Sync_Handle does not exist, the Controller shall return the * error code Unknown Advertising Identifier (0x42). */ -if (dev->le_pa_sync_handle !=le16_to_cpu (cmd->sync_handle)) +if (dev->le_pa_sync_handle !=le16_to_cpu (cmd->sync_handle)) { status =BT_HCI_ERR_UNKNOWN_ADVERTISING_ID ; + goto done; + }/* If the Host sends this command with a BIG_Handle that is already * allocated, the Controller shall return the error code Command * Disallowed (0x0C). */ -if (dev->big_handle == cmd->handle) +if (dev->big_handle == cmd->handle) { status =BT_HCI_ERR_COMMAND_DISALLOWED ; + goto done; + }/* If the Num_BIS parameter is greater than the total number of BISes * in the BIG, the Controller shall return the error code Unsupported
@@ -6087,12 +6091,10 @@ static int cmd_big_create_sync(struct btdev *dev, const void *data, uint8_t len)if (cmd->num_bis != len -sizeof (*cmd)) status =BT_HCI_ERR_UNSUPPORTED_FEATURE ; -if (status) -return status; - +done:cmd_status (dev, status,BT_HCI_CMD_LE_BIG_CREATE_SYNC ); -return status; +return 0 ; } static int cmd_big_create_sync_complete(struct btdev *dev, const void *data,
@@ -6140,7 +6142,7 @@ static int cmd_big_create_sync_complete(struct btdev *dev, const void *data, pdu.ev.pto =0x00 ; pdu.ev.irc =0x01 ; pdu.ev.max_pdu = bis->sdu; - pdu.ev.interval = bis->latency; + pdu.ev.interval = bis->latency /1.25 ; pdu.ev.num_bis = cmd->num_bis; le_meta_event(dev, BT_HCI_EVT_LE_BIG_SYNC_ESTABILISHED, &pdu,
@@ -6873,6 +6875,7 @@ struct btdev *btdev_create(enum btdev_type type, uint16_t id) btdev->iso_mtu =251 ; btdev->iso_max_pkt =1 ; btdev->le_cig.params.cig_id =0xff ; + btdev->big_handle =0xff ; btdev->country_code =0x00 ;
Signature · 1 line
2.35.1
This series was applied to bluetooth/bluez.git (master) by Luiz Augusto von Dentz <[email protected]>:
Hello:
This series was applied to bluetooth/bluez.git (master) by Luiz Augusto von Dentz <[email protected]>:
Quoted 7 lines · On Wed, 6 Apr 2022 14:33:53 -0700 you wrote:
From: Luiz Augusto von Dentz <[email protected]>
This adds support for LE BIG Info Advertising Report.
--- monitor/bt.h | 17 +++++++++++++++++ monitor/packet.c | 23 +++++++++++++++++++++++ 2 files changed, 40 insertions(+)
Here is the summary with links:
- [BlueZ,1/3] monitor: Add support for LE BIG Info Adverting Report
https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=0533085d22ba - [BlueZ,2/3] btdev: Add support for sending LE BIG Info Adv Reports https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=10948891336d - [BlueZ,3/3] btdev: Fix BIG Create Sync https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=d1871fc93522
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
This is automated email and please do not reply to this email!
Dear submitter,
Thank you for submitting the patches to the linux bluetooth mailing list. This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=629731
---Test result---
Test Summary:
CheckPatch FAIL 4.33 seconds GitLint PASS 2.89 seconds Prep - Setup ELL PASS 42.45 seconds Build - Prep PASS 0.68 seconds Build - Configure PASS 8.47 seconds Build - Make PASS 1384.46 seconds Make Check PASS 11.53 seconds Make Check w/Valgrind PASS 440.77 seconds Make Distcheck PASS 228.57 seconds Build w/ext ELL - Configure PASS 8.77 seconds Build w/ext ELL - Make PASS 1367.66 seconds Incremental Build with patchesPASS 4171.28 seconds
Details
##############################
Test: CheckPatch - FAIL
Desc: Run checkpatch.pl script with rule in .checkpatch.conf
Output:
[BlueZ,1/3] monitor: Add support for LE BIG Info Adverting Report WARNING:PREFER_DEFINED_ATTRIBUTE_MACRO: Prefer __packed over __attribute__((packed)) #110: FILE: monitor/bt.h:3671:
+} __attribute__ ((packed));
/github/workspace/src/12804115.patch total: 0 errors, 1 warnings, 58 lines checked
NOTE: For some of the reported defects, checkpatch may be able to
mechanically convert to the typical style using --fix or --fix-inplace.
/github/workspace/src/12804115.patch has style problems, please review.
NOTE: Ignored message types: COMMIT_MESSAGE COMPLEX_MACRO CONST_STRUCT FILE_PATH_CHANGES MISSING_SIGN_OFF PREFER_PACKED SPDX_LICENSE_TAG SPLIT_STRING SSCANF_TO_KSTRTO
NOTE: If any of the errors are false positives, please report
them to the maintainer, see CHECKPATCH in MAINTAINERS.
---
Regards,
Linux Bluetooth