Message ID | 20220630221452.638591-1-luiz.dentz@gmail.com (mailing list archive) |
---|---|
State | Accepted |
Commit | b031e4dc8c4ef9cdce40b34a8699c6174c850202 |
Headers | show |
Series | [BlueZ,v8,1/8] lib: Add definitions for ISO socket | expand |
Context | Check | Description |
---|---|---|
tedd_an/pre-ci_am | success | Success |
tedd_an/checkpatch | success | Checkpatch PASS |
tedd_an/gitlint | success | Gitlint PASS |
tedd_an/setupell | success | Setup ELL PASS |
tedd_an/buildprep | success | Build Prep PASS |
tedd_an/build | success | Build Configuration PASS |
tedd_an/makecheck | success | Make Check PASS |
tedd_an/makecheckvalgrind | success | Make Check PASS |
tedd_an/makedistcheck | success | Make Distcheck PASS |
tedd_an/build_extell | success | Build External ELL PASS |
tedd_an/build_extell_make | success | Build Make with External ELL PASS |
tedd_an/incremental_build | success | Pass |
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=655564 ---Test result--- Test Summary: CheckPatch FAIL 9.01 seconds GitLint PASS 4.39 seconds Prep - Setup ELL PASS 42.53 seconds Build - Prep PASS 0.52 seconds Build - Configure PASS 8.20 seconds Build - Make PASS 1358.39 seconds Make Check PASS 10.99 seconds Make Check w/Valgrind PASS 421.57 seconds Make Distcheck PASS 224.30 seconds Build w/ext ELL - Configure PASS 7.92 seconds Build w/ext ELL - Make PASS 1321.74 seconds Incremental Build with patchesPASS 11076.32 seconds Details ############################## Test: CheckPatch - FAIL Desc: Run checkpatch.pl script with rule in .checkpatch.conf Output: [BlueZ,v8,7/8] tools: Add isotest tool WARNING:PREFER_FALLTHROUGH: Prefer 'fallthrough;' over fallthrough comment #1235: FILE: tools/isotest.c:1118: + /* fall through */ /github/workspace/src/12902316.patch total: 0 errors, 1 warnings, 1233 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/12902316.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
Hello: This series was applied to bluetooth/bluez.git (master) by Luiz Augusto von Dentz <luiz.von.dentz@intel.com>: On Thu, 30 Jun 2022 15:14:45 -0700 you wrote: > From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com> > > --- > v2: Fix CI findings. > v3: Add patch fixing mgmt-tester Read EXP Features tests. > v4: Rebase and add flag EXP_FEAT_ISO_SOCKET > v5: Add BT_DEFER_SETUP tests to iso-tester > v6: Make iso-tester disable ISO Socket experimental UUID after each test > v7: Fix scan-build findings > v8: Add tests Defer and Defer send which use DEFER_SETUP when connecting which > emulates the QoS state of BAP where a SetCIGParameter shall be used without > CreateCIS which is left to just Enabling state. > > [...] Here is the summary with links: - [BlueZ,v8,1/8] lib: Add definitions for ISO socket https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=b031e4dc8c4e - [BlueZ,v8,2/8] shared/util: Decode BlueZ Experimental ISO Socket UUID https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=cc482ad3780b - [BlueZ,v8,3/8] mgmt-tester: Fix Read Exp Feature tests https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=9c65bad7a878 - [BlueZ,v8,4/8] adapter: Add support for setting ISO Socket experimental feature https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=8dc5b5e1ba6b - [BlueZ,v8,5/8] btio: Add support for ISO sockets https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=b1b575cf1720 - [BlueZ,v8,6/8] tools: Add iso-tester https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=26ee34d7be40 - [BlueZ,v8,7/8] tools: Add isotest tool https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=037ed8c5b12a - [BlueZ,v8,8/8] isotest: Add documentation https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=4314f7066721 You are awesome, thank you!
diff --git a/Makefile.am b/Makefile.am index 0074ea3ac..cead4b8c6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -69,7 +69,7 @@ lib_headers = lib/bluetooth.h lib/hci.h lib/hci_lib.h \ lib/sco.h lib/l2cap.h lib/sdp.h lib/sdp_lib.h \ lib/rfcomm.h lib/bnep.h lib/cmtp.h lib/hidp.h -extra_headers = lib/mgmt.h lib/uuid.h lib/a2mp.h lib/amp.h +extra_headers = lib/mgmt.h lib/uuid.h lib/a2mp.h lib/amp.h lib/iso.h extra_sources = lib/uuid.c local_headers = $(foreach file,$(lib_headers), lib/bluetooth/$(notdir $(file))) diff --git a/lib/bluetooth.h b/lib/bluetooth.h index e6171cef0..af5fbcfbc 100644 --- a/lib/bluetooth.h +++ b/lib/bluetooth.h @@ -37,6 +37,7 @@ extern "C" { #define BTPROTO_CMTP 5 #define BTPROTO_HIDP 6 #define BTPROTO_AVDTP 7 +#define BTPROTO_ISO 8 #define SOL_HCI 0 #define SOL_L2CAP 6 @@ -140,7 +141,39 @@ struct bt_voice { #define BT_SCM_PKT_STATUS 0x03 -#define BT_CODEC 19 +#define BT_ISO_QOS 17 + +#define BT_ISO_QOS_CIG_UNSET 0xff +#define BT_ISO_QOS_CIS_UNSET 0xff + +struct bt_iso_io_qos { + uint32_t interval; + uint16_t latency; + uint16_t sdu; + uint8_t phy; + uint8_t rtn; +}; + +struct bt_iso_qos { + union { + uint8_t cig; + uint8_t big; + }; + union { + uint8_t cis; + uint8_t bis; + }; + union { + uint8_t sca; + uint8_t sync_interval; + }; + uint8_t packing; + uint8_t framing; + struct bt_iso_io_qos in; + struct bt_iso_io_qos out; +}; + +#define BT_CODEC 19 struct bt_codec { uint8_t id; uint16_t cid; @@ -158,6 +191,7 @@ struct bt_codecs { struct bt_codec codecs[]; } __attribute__((packed)); + /* Connection and socket states */ enum { BT_CONNECTED = 1, /* Equal to TCP_ESTABLISHED to make net code happy */ @@ -171,6 +205,8 @@ enum { BT_CLOSED }; +#define BT_ISO_BASE 20 + /* Byte order conversions */ #if __BYTE_ORDER == __LITTLE_ENDIAN #define htobs(d) (d) diff --git a/lib/iso.h b/lib/iso.h new file mode 100644 index 000000000..1e9f79ce5 --- /dev/null +++ b/lib/iso.h @@ -0,0 +1,42 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * + * BlueZ - Bluetooth protocol stack for Linux + * + * Copyright (C) 2022 Intel Corporation. + * + */ + +#ifndef __ISO_H +#define __ISO_H + +#ifdef __cplusplus +extern "C" { +#endif + +/* ISO defaults */ +#define ISO_DEFAULT_MTU 251 +#define ISO_MAX_NUM_BIS 0x1f + +/* ISO socket broadcast address */ +struct sockaddr_iso_bc { + bdaddr_t bc_bdaddr; + uint8_t bc_bdaddr_type; + uint8_t bc_sid; + uint8_t bc_num_bis; + uint8_t bc_bis[ISO_MAX_NUM_BIS]; +}; + +/* ISO socket address */ +struct sockaddr_iso { + sa_family_t iso_family; + bdaddr_t iso_bdaddr; + uint8_t iso_bdaddr_type; + struct sockaddr_iso_bc iso_bc[]; +}; + +#ifdef __cplusplus +} +#endif + +#endif /* __ISO_H */
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com> --- v2: Fix CI findings. v3: Add patch fixing mgmt-tester Read EXP Features tests. v4: Rebase and add flag EXP_FEAT_ISO_SOCKET v5: Add BT_DEFER_SETUP tests to iso-tester v6: Make iso-tester disable ISO Socket experimental UUID after each test v7: Fix scan-build findings v8: Add tests Defer and Defer send which use DEFER_SETUP when connecting which emulates the QoS state of BAP where a SetCIGParameter shall be used without CreateCIS which is left to just Enabling state. Makefile.am | 2 +- lib/bluetooth.h | 38 +++++++++++++++++++++++++++++++++++++- lib/iso.h | 42 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 80 insertions(+), 2 deletions(-) create mode 100644 lib/iso.h