bluetooth: Add BT_ISO_SYNC_TIMEOUT

This defines BT_ISO_SYNC_TIMEOUT(20 sec) which shall be considered the default sync_timeout and make all instance previously hardcoding a value to use it.
bluez · Mar 8, 2024 · aa7a814 · aa7a814
1 parent 19f8fcd
commit aa7a814
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/lib/bluetooth.h b/lib/bluetooth.h
@@ -150,6 +150,8 @@ struct bt_voice {
 #define BT_ISO_QOS_BIG_UNSET	0xff
 #define BT_ISO_QOS_BIS_UNSET	0xff
 
+#define BT_ISO_SYNC_TIMEOUT	0x07d0 /* 20 secs */
+
 #define BT_ISO_QOS_GROUP_UNSET	0xff
 #define BT_ISO_QOS_STREAM_UNSET	0xff
 

diff --git a/profiles/audio/bap.c b/profiles/audio/bap.c
@@ -138,7 +138,7 @@ static struct bt_iso_qos bap_sink_pa_qos = {
 	.bcast = {
 		.options		= 0x00,
 		.skip			= 0x0000,
-		.sync_timeout	= 0x4000,
+		.sync_timeout		= BT_ISO_SYNC_TIMEOUT,
 		.sync_cte_type	= 0x00,
 		/* TODO: The following parameters are not needed for PA Sync.
 		 * They will be removed when the kernel checks will be removed.
@@ -148,8 +148,8 @@ static struct bt_iso_qos bap_sink_pa_qos = {
 		.encryption		= 0x00,
 		.bcode			= {0x00},
 		.mse			= 0x00,
-		.timeout		= 0x4000,
-		.sync_factor	= 0x07,
+		.timeout		= BT_ISO_SYNC_TIMEOUT,
+		.sync_factor		= 0x07,
 		.packing		= 0x00,
 		.framing		= 0x00,
 		.in = {

diff --git a/src/shared/bass.c b/src/shared/bass.c
@@ -111,10 +111,10 @@ static struct bt_iso_qos default_qos = {
 		.bcode			= {0x00},
 		.options		= 0x00,
 		.skip			= 0x0000,
-		.sync_timeout		= 0x4000,
+		.sync_timeout		= BT_ISO_SYNC_TIMEOUT,
 		.sync_cte_type		= 0x00,
 		.mse			= 0x00,
-		.timeout		= 0x4000,
+		.timeout		= BT_ISO_SYNC_TIMEOUT,
 	}
 };
 

diff --git a/tools/iso-tester.c b/tools/iso-tester.c
@@ -264,10 +264,10 @@
 		.bcode = _bcode, \
 		.options = 0x00, \
 		.skip = 0x0000, \
-		.sync_timeout = 0x4000, \
+		.sync_timeout = BT_ISO_SYNC_TIMEOUT, \
 		.sync_cte_type = 0x00, \
 		.mse = 0x00, \
-		.timeout = 0x4000, \
+		.timeout = BT_ISO_SYNC_TIMEOUT, \
 	}, \
 }