From aa7a814690d062349af4f3951f9d381086bb8994 Mon Sep 17 00:00:00 2001 From: Luiz Augusto von Dentz Date: Thu, 7 Mar 2024 11:55:15 -0500 Subject: [PATCH] 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. --- lib/bluetooth.h | 2 ++ profiles/audio/bap.c | 6 +++--- src/shared/bass.c | 4 ++-- tools/iso-tester.c | 4 ++-- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/lib/bluetooth.h b/lib/bluetooth.h index ba08c70e61..75dc960c83 100644 --- 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 index 1b8a47c521..1034202cb8 100644 --- 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 index 3f5bf307cf..c30537dee7 100644 --- 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 index d1f0be180c..1864b9e9d9 100644 --- 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, \ }, \ }