lib: Add definitions for ISO socket
Subsystems (3)
Luiz Augusto von Dentz
maintainerPATCH v3 1/8 lib: Add definitions for ISO socket
From: Luiz Augusto von Dentz <[email protected]>
---
v2: Fix CI findings.
v3: Add patch fixing mgmt-tester Read EXP Features tests.
Makefile.am | 2 +- lib/bluetooth.h | 38 +++++++++++++++++++++++++++++++++++++- lib/iso.h | 42 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 80 insertions(+), 2 deletions(-) create mode 100644 lib/iso.h
Makefile.am +1 -1
@@ -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)))
lib/bluetooth.h +37 -1
@@ -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 19struct 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)
lib/iso.h new file +42 -0
42 lines not on this page · raw message
Signature · 1 line
2.35.1
Luiz Augusto von Dentz
maintainerPATCH v3 2/8 shared/util: Decode BlueZ Experimental ISO Socket UUID
From: Luiz Augusto von Dentz <[email protected]>
This adds BlueZ experimental ISO Socket UUID to uuid128_table so it is decoded by the likes of btmon.
--- src/shared/util.c | 2 ++ 1 file changed, 2 insertions(+)
src/shared/util.c +2 -0
@@ -1149,6 +1149,8 @@ static const struct { {"330859bc-7506-492d-9370-9a6f0614037f" , "BlueZ Experimental Bluetooth Quality Report" }, { "a6695ace-ee7f-4fb9-881a-5fac66c629af", "BlueZ Offload Codecs"}, + { "6fbaf188-05e0-496a-9885-d6ddfdb4e03e", + "BlueZ Experimental ISO Socket"}, { } };
Signature · 1 line
2.35.1
Luiz Augusto von Dentz
maintainerPATCH v3 3/8 mgmt-tester: Fix Read Exp Feature tests
In reply to Luiz Augusto von DentzFrom: Luiz Augusto von Dentz <[email protected]>
This adds ISO Socket UUID as response to Read Exp Feature.
--- tools/mgmt-tester.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
tools/mgmt-tester.c +11 -3
@@ -9798,7 +9798,7 @@ static const struct generic_data set_dev_flags_fail_3 = { };static const uint8_t read_exp_feat_param_success[] = { -0x03 ,0x00 ,/* Feature Count */ +0x04 ,0x00 ,/* Feature Count */ 0xd6 ,0x49 ,0xb0 ,0xd1 ,0x28 ,0xeb ,/* UUID - Simultaneous */ 0x27 ,0x92 ,0x96 ,0x46 ,0xc0 ,0x42 ,/* Central Peripheral */ 0xb5 ,0x10 ,0x1b ,0x67 ,
@@ -9810,7 +9810,11 @@ static const uint8_t read_exp_feat_param_success[] = {0xaf ,0x29 ,0xc6 ,0x66 ,0xac ,0x5f ,/* UUID - Codec Offload */ 0x1a ,0x88 ,0xb9 ,0x4f ,0x7f ,0xee ,0xce ,0x5a ,0x69 ,0xa6 , -0x00 ,0x00 ,0x00 ,0x00 /* Flags */ +0x00 ,0x00 ,0x00 ,0x00 ,/* Flags */ +0x3e ,0xe0 ,0xb4 ,0xfd ,0xdd ,0xd6 ,/* UUID - ISO Socket */ +0x85 ,0x98 ,0x6a ,0x49 ,0xe0 ,0x05 , +0x88 ,0xf1 ,0xba ,0x6f , + 0x00, 0x00, 0x00, 0x00, /* Flags */ }; static const struct generic_data read_exp_feat_success = {
@@ -9822,11 +9826,15 @@ static const struct generic_data read_exp_feat_success = {static const uint8_t read_exp_feat_param_success_index_none[] = { -0x01 ,0x00 ,/* Feature Count */ +0x02 ,0x00 ,/* Feature Count */ 0x1c ,0xda ,0x47 ,0x1c ,0x48 ,0x6c ,/* UUID - Debug */ 0x01 ,0xab ,0x9f ,0x46 ,0xec ,0xb9 ,0x30 ,0x25 ,0x99 ,0xd4 ,0x00 ,0x00 ,0x00 ,0x00 ,/* Flags */ +0x3e ,0xe0 ,0xb4 ,0xfd ,0xdd ,0xd6 ,/* UUID - ISO Socket */ +0x85 ,0x98 ,0x6a ,0x49 ,0xe0 ,0x05 , +0x88 ,0xf1 ,0xba ,0x6f , +0x00 ,0x00 ,0x00 ,0x00 ,/* Flags */ };static const struct generic_data read_exp_feat_success_index_none = {
Signature · 1 line
2.35.1
Luiz Augusto von Dentz
maintainerPATCH v3 4/8 adapter: Add support for setting ISO Socket experimental feature
In reply to Luiz Augusto von DentzFrom: Luiz Augusto von Dentz <[email protected]>
This adds support for setting ISO Socket experimental UUID which enables the use of BTPROTO_ISO on the system.
--- src/adapter.c | 42 ++++++++++++++++++++++++++++++++++++++++++ src/main.c | 1 + src/main.conf | 1 + 3 files changed, 44 insertions(+)
src/adapter.c +42 -0
@@ -141,6 +141,13 @@ static const struct mgmt_exp_uuid codec_offload_uuid = { .str = "a6695ace-ee7f-4fb9-881a-5fac66c629af" }; +/* 6fbaf188-05e0-496a-9885-d6ddfdb4e03e */ +static const struct mgmt_exp_uuid iso_socket_uuid = { + .val = {0x3e ,0xe0 ,0xb4 ,0xfd ,0xdd ,0xd6 ,0x85 ,0x98 , +0x6a ,0x49 ,0xe0 ,0x05 ,0x88 ,0xf1 ,0xba ,0x6f }, + .str ="6fbaf188-05e0-496a-9885-d6ddfdb4e03e" +}; +static DBusConnection *dbus_conn =NULL ;static uint32_t kernel_features =0 ;
@@ -9691,6 +9698,40 @@ static void codec_offload_func(struct btd_adapter *adapter, uint8_t action)btd_error (adapter->dev_id,"Failed to set Codec Offload" ); } +static void iso_socket_complete (uint8_t status,uint16_t len, +const void *param,void *user_data) +{ +struct btd_adapter *adapter = user_data; +uint8_t action = btd_opts.experimental ?0x01 :0x00 ; + +if (status !=0 ) { +error ("Set ISO Socket failed with status 0x%02x (%s)" , + status,mgmt_errstr (status)); +return ; + } + +DBG ("ISO Socket successfully set" ); + +if (action) +queue_push_tail (adapter->exps, (void *)iso_socket_uuid.val); +} + +static void iso_socket_func (struct btd_adapter *adapter,uint8_t action) +{ +struct mgmt_cp_set_exp_feature cp; + +memset (&cp,0 ,sizeof (cp)); +memcpy (cp.uuid, iso_socket_uuid.val,16 ); + cp.action = action; + +if (mgmt_send (adapter->mgmt,MGMT_OP_SET_EXP_FEATURE , +MGMT_INDEX_NONE ,sizeof (cp), &cp, + iso_socket_complete, adapter,NULL ) >0 ) +return ; + +btd_error (adapter->dev_id,"Failed to set ISO Socket" ); +} + static const struct exp_feat { const struct mgmt_exp_uuid *uuid; void (*func)(struct btd_adapter *adapter, uint8_t action);
@@ -9701,6 +9742,7 @@ static const struct exp_feat {EXP_FEAT (&quality_report_uuid, quality_report_func),EXP_FEAT (&rpa_resolution_uuid, rpa_resolution_func),EXP_FEAT (&codec_offload_uuid, codec_offload_func), + EXP_FEAT(&iso_socket_uuid, iso_socket_func), }; static void read_exp_features_complete(uint8_t status, uint16_t length,
src/main.c +1 -0
@@ -606,6 +606,7 @@ static const char *valid_uuids[] = {"15c0a148-c273-11ea-b3de-0242ac130004" ,"330859bc-7506-492d-9370-9a6f0614037f" ,"a6695ace-ee7f-4fb9-881a-5fac66c629af" , +"6fbaf188-05e0-496a-9885-d6ddfdb4e03e" , "*" };
src/main.conf +1 -0
@@ -120,6 +120,7 @@ # 15c0a148-c273-11ea-b3de-0242ac130004 (BlueZ Experimental LL privacy) # 330859bc-7506-492d-9370-9a6f0614037f (BlueZ Experimental Bluetooth Quality Report) # a6695ace-ee7f-4fb9-881a-5fac66c629af (BlueZ Experimental Offload Codecs) +# 6fbaf188-05e0-496a-9885-d6ddfdb4e03e (BlueZ Experimental ISO socket) # Defaults to false. #Experimental = false
Signature · 1 line
2.35.1
Luiz Augusto von Dentz
maintainerPATCH v3 5/8 btio: Add support for ISO sockets
In reply to Luiz Augusto von DentzFrom: Luiz Augusto von Dentz <[email protected]>
This adds support to create objects that map to ISO sockets.
--- btio/btio.c | 170 +++++++++++++++++++++++++++++++++++++++++++++++ btio/btio.h | 4 +- tools/btiotest.c | 110 ++++++++++++++++++++++++++++++ 3 files changed, 283 insertions(+), 1 deletion(-)
btio/btio.c +170 -0
@@ -27,6 +27,7 @@#include "lib/l2cap.h" #include "lib/rfcomm.h" #include "lib/sco.h" +#include "lib/iso.h" #include "btio.h"
@@ -44,6 +45,7 @@ typedef enum {BT_IO_L2CAP ,BT_IO_RFCOMM ,BT_IO_SCO , +BT_IO_ISO ,BT_IO_INVALID , } BtIOType;
@@ -66,6 +68,7 @@ struct set_opts {int flushable;uint32_t priority;uint16_t voice; +struct bt_iso_qos qos; };struct connect {
@@ -123,6 +126,8 @@ static BtIOType bt_io_get_type(GIOChannel *io, GError **gerr)return BT_IO_SCO ;case BTPROTO_L2CAP :return BT_IO_L2CAP ; +case BTPROTO_ISO : +return BT_IO_ISO ;default :g_set_error (gerr,BT_IO_ERROR ,EINVAL ,"Unknown BtIO socket type" );
@@ -763,6 +768,24 @@ static int sco_bind(int sock, const bdaddr_t *src, GError **err)return 0 ; } +static int iso_bind (int sock,const bdaddr_t *src,uint8_t src_type, +GError **err) +{ +struct sockaddr_iso addr; + +memset (&addr,0 ,sizeof (addr)); + addr.iso_family =AF_BLUETOOTH ; +bacpy (&addr.iso_bdaddr, src); + addr.iso_bdaddr_type = src_type; + +if (!bind (sock, (struct sockaddr *) &addr,sizeof (addr))) +return 0 ; + +ERROR_FAILED (err,"iso_bind" , errno); + +return -errno; +} +static int sco_connect (int sock,const bdaddr_t *dst) {struct sockaddr_sco addr;
@@ -779,6 +802,23 @@ static int sco_connect(int sock, const bdaddr_t *dst)return 0 ; } +static int iso_connect (int sock,const bdaddr_t *dst,uint8_t dst_type) +{ +struct sockaddr_iso addr; +int err; + +memset (&addr,0 ,sizeof (addr)); + addr.iso_family =AF_BLUETOOTH ; +bacpy (&addr.iso_bdaddr, dst); + addr.iso_bdaddr_type = dst_type; + + err =connect (sock, (struct sockaddr *) &addr,sizeof (addr)); +if (err <0 && !(errno ==EAGAIN || errno ==EINPROGRESS )) +return -errno; + +return 0 ; +} +static gboolean sco_set (int sock,uint16_t mtu,uint16_t voice,GError **err) {struct sco_options sco_opt;
@@ -817,6 +857,17 @@ voice:return TRUE; } +static gboolean iso_set (int sock,struct bt_iso_qos *qos,GError **err) +{ +if (setsockopt (sock,SOL_BLUETOOTH ,BT_ISO_QOS , qos, +sizeof (*qos)) <0 ) { +ERROR_FAILED (err,"setsockopt(BT_ISO_QOS)" , errno); +return FALSE; + } + +return TRUE; +} +static gboolean parse_set_opts (struct set_opts *opts,GError **err,BtIOOption opt1,va_list args) {
@@ -894,6 +945,13 @@ static gboolean parse_set_opts(struct set_opts *opts, GError **err,break ;case BT_IO_OPT_MODE : opts->mode =va_arg (args, int); +if (opts->mode ==BT_IO_MODE_ISO ) { + opts->type =BT_IO_ISO ; +if (opts->src_type ==BDADDR_BREDR ) + opts->src_type =BDADDR_LE_PUBLIC ; +if (opts->dst_type ==BDADDR_BREDR ) + opts->dst_type =BDADDR_LE_PUBLIC ; + }break ;case BT_IO_OPT_FLUSHABLE : opts->flushable =va_arg (args, gboolean);
@@ -904,6 +962,9 @@ static gboolean parse_set_opts(struct set_opts *opts, GError **err,case BT_IO_OPT_VOICE : opts->voice =va_arg (args, int);break ; +case BT_IO_OPT_QOS : + opts->qos = *va_arg(args, struct bt_iso_qos *); +break ;case BT_IO_OPT_INVALID :case BT_IO_OPT_KEY_SIZE :case BT_IO_OPT_SOURCE_CHANNEL :
@@ -1227,6 +1288,7 @@ parse_opts:case BT_IO_OPT_DEST_CHANNEL :case BT_IO_OPT_MTU :case BT_IO_OPT_VOICE : +case BT_IO_OPT_QOS :default :g_set_error (err,BT_IO_ERROR ,EINVAL ,"Unknown option %d" , opt);
@@ -1380,6 +1442,7 @@ static gboolean rfcomm_get(int sock, GError **err, BtIOOption opt1,case BT_IO_OPT_FLUSHABLE :case BT_IO_OPT_PRIORITY :case BT_IO_OPT_VOICE : +case BT_IO_OPT_QOS :case BT_IO_OPT_INVALID :default : g_set_error(err, BT_IO_ERROR, EINVAL,
@@ -1489,6 +1552,95 @@ static gboolean sco_get(int sock, GError **err, BtIOOption opt1, va_list args)case BT_IO_OPT_FLUSHABLE :case BT_IO_OPT_PRIORITY :case BT_IO_OPT_VOICE : +case BT_IO_OPT_QOS : +case BT_IO_OPT_INVALID : +default : +g_set_error (err,BT_IO_ERROR ,EINVAL , +"Unknown option %d" , opt); +return FALSE; + } + + opt =va_arg (args, int); + } + +return TRUE; +} + +static gboolean iso_get (int sock,GError **err,BtIOOption opt1,va_list args) +{ +BtIOOption opt = opt1; +struct sockaddr_iso src, dst; +struct bt_iso_qos qos; +socklen_t len; +uint32_t phy; + + len =sizeof (qos); +memset (&qos,0 , len); +if (getsockopt (sock,SOL_BLUETOOTH ,BT_ISO_QOS , &qos, &len) <0 ) { +ERROR_FAILED (err,"getsockopt(BT_ISO_QOS)" , errno); +return FALSE; + } + +if (!get_src (sock, &src,sizeof (src), err)) +return FALSE; + +if (!get_dst (sock, &dst,sizeof (dst), err)) +return FALSE; + +while (opt !=BT_IO_OPT_INVALID ) { +switch (opt) { +case BT_IO_OPT_SOURCE : + ba2str(&src.iso_bdaddr, va_arg(args, char *)); +break ; +case BT_IO_OPT_SOURCE_BDADDR : + bacpy(va_arg(args, bdaddr_t *), &src.iso_bdaddr); +break ; +case BT_IO_OPT_SOURCE_TYPE : + *(va_arg(args, uint8_t *)) = src.iso_bdaddr_type; +break ; +case BT_IO_OPT_DEST : + ba2str(&dst.iso_bdaddr, va_arg(args, char *)); +break ; +case BT_IO_OPT_DEST_BDADDR : + bacpy(va_arg(args, bdaddr_t *), &dst.iso_bdaddr); +break ; +case BT_IO_OPT_DEST_TYPE : + *(va_arg(args, uint8_t *)) = dst.iso_bdaddr_type; +break ; +case BT_IO_OPT_MTU : + *(va_arg(args, uint16_t *)) = qos.out.sdu; +break ; +case BT_IO_OPT_IMTU : + *(va_arg(args, uint16_t *)) = qos.in.sdu; +break ; +case BT_IO_OPT_OMTU : + *(va_arg(args, uint16_t *)) = qos.out.sdu; +break ; +case BT_IO_OPT_PHY : +if (get_phy (sock, &phy) <0 ) { +ERROR_FAILED (err,"get_phy" , errno); +return FALSE; + } + *(va_arg(args, uint32_t *)) = phy; +break ; +case BT_IO_OPT_QOS : + *(va_arg(args, struct bt_iso_qos *)) = qos; +break ; +case BT_IO_OPT_HANDLE : +case BT_IO_OPT_CLASS : +case BT_IO_OPT_DEFER_TIMEOUT : +case BT_IO_OPT_SEC_LEVEL : +case BT_IO_OPT_KEY_SIZE : +case BT_IO_OPT_CHANNEL : +case BT_IO_OPT_SOURCE_CHANNEL : +case BT_IO_OPT_DEST_CHANNEL : +case BT_IO_OPT_PSM : +case BT_IO_OPT_CID : +case BT_IO_OPT_CENTRAL : +case BT_IO_OPT_MODE : +case BT_IO_OPT_FLUSHABLE : +case BT_IO_OPT_PRIORITY : +case BT_IO_OPT_VOICE :case BT_IO_OPT_INVALID :default : g_set_error(err, BT_IO_ERROR, EINVAL,
@@ -1516,6 +1668,8 @@ static gboolean get_valist(GIOChannel *io, BtIOType type, GError **err,return rfcomm_get (sock, err, opt1, args);case BT_IO_SCO :return sco_get (sock, err, opt1, args); +case BT_IO_ISO : +return iso_get (sock, err, opt1, args);case BT_IO_INVALID :default : g_set_error(err, BT_IO_ERROR, EINVAL,
@@ -1584,6 +1738,8 @@ gboolean bt_io_set(GIOChannel *io, GError **err, BtIOOption opt1, ...)return rfcomm_set (sock, opts.sec_level, opts.central, err);case BT_IO_SCO :return sco_set (sock, opts.mtu, opts.voice, err); +case BT_IO_ISO : +return iso_set (sock, &opts.qos, err);case BT_IO_INVALID :default : g_set_error(err, BT_IO_ERROR, EINVAL,
@@ -1655,6 +1811,17 @@ static GIOChannel *create_io(gboolean server, struct set_opts *opts,if (!sco_set (sock, opts->mtu, opts->voice, err)) goto failed;break ; +case BT_IO_ISO : + sock =socket (PF_BLUETOOTH ,SOCK_SEQPACKET ,BTPROTO_ISO ); +if (sock <0 ) { +ERROR_FAILED (err,"socket(SEQPACKET, ISO)" , errno); +return NULL ; + } +if (iso_bind (sock, &opts->src, opts->src_type, err) <0 ) + goto failed; +if (!iso_set (sock, &opts->qos, err)) + goto failed; +break ;case BT_IO_INVALID :default : g_set_error(err, BT_IO_ERROR, EINVAL,
@@ -1719,6 +1886,9 @@ GIOChannel *bt_io_connect(BtIOConnect connect, gpointer user_data,case BT_IO_SCO : err =sco_connect (sock, &opts.dst);break ; +case BT_IO_ISO : + err =iso_connect (sock, &opts.dst, opts.dst_type); +break ;case BT_IO_INVALID :default : g_set_error(gerr, BT_IO_ERROR, EINVAL,
btio/btio.h +3 -1
@@ -44,6 +44,7 @@ typedef enum {BT_IO_OPT_PRIORITY ,BT_IO_OPT_VOICE ,BT_IO_OPT_PHY , +BT_IO_OPT_QOS , } BtIOOption; typedef enum {
@@ -58,7 +59,8 @@ typedef enum {BT_IO_MODE_ERTM ,BT_IO_MODE_STREAMING ,BT_IO_MODE_LE_FLOWCTL , - BT_IO_MODE_EXT_FLOWCTL +BT_IO_MODE_EXT_FLOWCTL , + BT_IO_MODE_ISO } BtIOMode;typedef void (*BtIOConfirm )(GIOChannel *io,gpointer user_data);
tools/btiotest.c +110 -0
149 lines not on this page · raw message
Signature · 1 line
2.35.1
Luiz Augusto von Dentz
maintainerPATCH v3 6/8 tools: Add iso-tester
In reply to Luiz Augusto von DentzFrom: Luiz Augusto von Dentz <[email protected]>
This adds iso-tester which tests BTPROTO_ISO socket:
Basic Framework - Success
Basic ISO Socket - Success
Basic ISO Get Socket Option - Success
Basic ISO Set Socket Option - Success
ISO QoS 8_1_1 - Success
ISO QoS 8_2_1 - Success
ISO QoS 16_1_1 - Success
ISO QoS 16_2_1 - Success
ISO QoS 16_2_1 CIG 0x01 - Success
ISO QoS 16_2_1 CIG 0x01 CIS 0x01 - Success
ISO QoS 24_1_1 - Success
ISO QoS 24_2_1 - Success
ISO QoS 32_1_1 - Success
ISO QoS 32_2_1 - Success
ISO QoS 44_1_1 - Success
ISO QoS 44_2_1 - Success
ISO QoS 48_1_1 - Success
ISO QoS 48_2_1 - Success
ISO QoS 48_3_1 - Success
ISO QoS 48_4_1 - Success
ISO QoS 48_5_1 - Success
ISO QoS 48_6_1 - Success
ISO QoS 8_1_2 - Success
ISO QoS 8_2_2 - Success
ISO QoS 16_1_2 - Success
ISO QoS 16_2_2 - Success
ISO QoS 24_1_2 - Success
ISO QoS 24_2_2 - Success
ISO QoS 32_1_2 - Success
ISO QoS 32_2_2 - Success
ISO QoS 44_1_2 - Success
ISO QoS 44_2_2 - Success
ISO QoS 48_1_2 - Success
ISO QoS 48_2_2 - Success
ISO QoS 48_3_2 - Success
ISO QoS 48_4_2 - Success
ISO QoS 48_5_2 - Success
ISO QoS 48_6_2 - Success
ISO QoS - Invalid
ISO Connect2 CIG 0x01 - Success
ISO Send - Success
ISO Receive - Success
ISO Send and Receive - Success
ISO Broadcaster - Success
ISO Broadcaster BIG 0x01 - Success
ISO Broadcaster BIG 0x01 BIS 0x01 - Success
ISO Broadcaster Receiver - Success
--- Makefile.tools | 11 +- tools/iso-tester.c | 1487 +++++++++++++++++++++++++++++++++++++++++++ tools/test-runner.c | 5 +- 3 files changed, 1500 insertions(+), 3 deletions(-) create mode 100644 tools/iso-tester.c
Makefile.tools +10 -1
@@ -81,7 +81,7 @@ noinst_PROGRAMS += emulator/btvirt emulator/b1ee emulator/hfp \ tools/l2cap-tester tools/sco-tester \ tools/smp-tester tools/hci-tester \ tools/rfcomm-tester tools/bnep-tester \ - tools/userchan-tester + tools/userchan-tester tools/iso-tester emulator_btvirt_SOURCES = emulator/main.c monitor/bt.h \ emulator/serial.h emulator/serial.c \
@@ -189,6 +189,15 @@ tools_userchan_tester_SOURCES = tools/userchan-tester.c monitor/bt.h \ emulator/smp.c tools_userchan_tester_LDADD = lib/libbluetooth-internal.la \ src/libshared-glib.la $(GLIB_LIBS) + +tools_iso_tester_SOURCES = tools/iso-tester.c monitor/bt.h \ + emulator/hciemu.h emulator/hciemu.c \ + emulator/vhci.h emulator/vhci.c \ + emulator/btdev.h emulator/btdev.c \ + emulator/bthost.h emulator/bthost.c \ + emulator/smp.c +tools_iso_tester_LDADD = lib/libbluetooth-internal.la \ + src/libshared-glib.la $(GLIB_LIBS) endif if TOOLS
tools/iso-tester.c new file +1487 -0
1,487 lines not on this page · raw message
tools/test-runner.c +3 -2
@@ -190,7 +190,6 @@ static char *const qemu_argv[] = {"-machine" ,"type=q35,accel=kvm:tcg" ,"-m" ,"192M" ,"-nographic" , -"-vga" ,"none" ,"-net" ,"none" ,"-no-acpi" , "-no-hpet",
@@ -247,7 +246,7 @@ static void start_qemu(void)snprintf (cmdline,sizeof (cmdline),"console=ttyS0,115200n8 earlyprintk=serial " "rootfstype=9p " -"rootflags=trans=virtio,version=9p2000.L " +"rootflags=trans=virtio,version=9p2000.u " "acpi=off pci=noacpi noapic quiet ro init=%s " "bluetooth.enable_ecred=1" "TESTHOME=%s TESTDBUS=%u TESTDAEMON=%u "
@@ -535,6 +534,7 @@ static const char *test_table[] = {"l2cap-tester" ,"rfcomm-tester" ,"sco-tester" , +"iso-tester" ,"bnep-tester" ,"check-selftest" , "tools/mgmt-tester",
@@ -542,6 +542,7 @@ static const char *test_table[] = {"tools/l2cap-tester" ,"tools/rfcomm-tester" ,"tools/sco-tester" , +"tools/iso-tester" ,"tools/bnep-tester" ,"tools/check-selftest" ,NULL
Signature · 1 line
2.35.1
Luiz Augusto von Dentz
maintainerPATCH v3 7/8 tools: Add isotest tool
In reply to Luiz Augusto von DentzFrom: Luiz Augusto von Dentz <[email protected]>
This adds isotest tool which can be used to test ISO sockets.
--- Makefile.tools | 4 +- tools/isotest.c | 1203 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 1206 insertions(+), 1 deletion(-) create mode 100644 tools/isotest.c
Makefile.tools +3 -1
@@ -202,7 +202,7 @@ endif if TOOLS bin_PROGRAMS += tools/rctest tools/l2test tools/l2ping tools/bluemoon \ - tools/hex2hcd tools/mpris-proxy tools/btattach + tools/hex2hcd tools/mpris-proxy tools/btattach tools/isotest noinst_PROGRAMS += tools/bdaddr tools/avinfo tools/avtest \ tools/scotest tools/amptest tools/hwdb \
@@ -314,6 +314,8 @@ tools_gatt_service_SOURCES = tools/gatt-service.c tools_gatt_service_LDADD = gdbus/libgdbus-internal.la \ src/libshared-mainloop.la $(GLIB_LIBS) $(DBUS_LIBS) +tools_isotest_LDADD = lib/libbluetooth-internal.la + profiles_iap_iapd_SOURCES = profiles/iap/main.c profiles_iap_iapd_LDADD = gdbus/libgdbus-internal.la $(GLIB_LIBS) $(DBUS_LIBS)
tools/isotest.c new file +1203 -0
1,203 lines not on this page · raw message
Signature · 1 line
2.35.1
Luiz Augusto von Dentz
maintainerPATCH v3 8/8 isotest: Add documentation
In reply to Luiz Augusto von DentzFrom: Luiz Augusto von Dentz <[email protected]>
This adds isotest.rst which documents the modes and options of isotest(1) and is then converted isotest.1 manpage.
--- Makefile.tools | 4 +- tools/isotest.rst | 202 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 204 insertions(+), 2 deletions(-) create mode 100644 tools/isotest.rst
Makefile.tools +2 -2
@@ -320,7 +320,7 @@ profiles_iap_iapd_SOURCES = profiles/iap/main.c profiles_iap_iapd_LDADD = gdbus/libgdbus-internal.la $(GLIB_LIBS) $(DBUS_LIBS) if MANPAGES -man_MANS += tools/rctest.1 tools/l2ping.1 tools/btattach.1 +man_MANS += tools/rctest.1 tools/l2ping.1 tools/btattach.1 tools/isotest.1 endif if MESH
@@ -438,7 +438,7 @@ manual_pages += tools/hciattach.1 tools/hciconfig.1 \ tools/hcitool.1 tools/hcidump.1 \ tools/rfcomm.1 tools/sdptool.1 tools/ciptool.1 \ tools/rctest.1 tools/l2ping.1 tools/btattach.1 \ - tools/bdaddr.1 + tools/bdaddr.1 tools/isotest.1 if HID2HCI udevdir = $(UDEV_DIR)
tools/isotest.rst new file +202 -0
202 lines not on this page · raw message
Signature · 1 line
2.35.1