shared/bap: Fix not updating location
Luiz Augusto von Dentz
maintainerPATCH v4 1/4 shared/bap: Fix not updating location
From: Luiz Augusto von Dentz <[email protected]>
Fix not updating map.location when selecting.
--- src/shared/bap.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
src/shared/bap.c +2 -4
@@ -5163,12 +5163,10 @@ int bt_bap_select(struct bt_bap_pac *lpac, struct bt_bap_pac *rpac,/* Check if there are any channels left to select */ map.count &= ~(map.count & rc->count); -if (!map.count) -break ; -/* Check if there are any locations left to select */ map.location &= ~(map.location & rc->location); -if (!map.location) + +if (!map.count || !map.location)break ;/* Check if device require AC*(i) settings */
Signature · 1 line
2.44.0
Luiz Augusto von Dentz
maintainerPATCH v4 2/4 shared/bap: Make bt_bap_select fallback in case of no channel allocation
From: Luiz Augusto von Dentz <[email protected]>
If channel allocation could not be matched attempt to call .select without a channel allocation as the device might require a different matching algorithm.
--- src/shared/bap.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
src/shared/bap.c +12 -2
@@ -5116,6 +5116,7 @@ int bt_bap_select(struct bt_bap_pac *lpac, struct bt_bap_pac *rpac, void *user_data) {const struct queue_entry *lchan, *rchan; +int selected =0 ;if (!lpac || !rpac || !func)return -EINVAL ;
@@ -5158,8 +5159,7 @@ int bt_bap_select(struct bt_bap_pac *lpac, struct bt_bap_pac *rpac, rc->location, &rpac->qos, func, user_data, lpac->user_data); -if (count) - (*count)++; + selected++;/* Check if there are any channels left to select */ map.count &= ~(map.count & rc->count);
@@ -5175,6 +5175,16 @@ int bt_bap_select(struct bt_bap_pac *lpac, struct bt_bap_pac *rpac, } } +/* Fallback to no channel allocation since none could be matched. */ +if (!selected) { + lpac->ops->select (lpac, rpac,0 , &rpac->qos, func, user_data, + lpac->user_data); + selected++; + } + +if (count) + *count += selected; +return 0 ; }
Signature · 1 line
2.44.0
Luiz Augusto von Dentz
maintainerPATCH v4 3/4 shared/bap: Fix not resuming reading attributes
In reply to Luiz Augusto von DentzFrom: Luiz Augusto von Dentz <[email protected]>
If there is an unexpected disconnect and some attributes values where left uninitialized this attempts to resume reading them once a new session is attached.
--- src/shared/bap.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+)
src/shared/bap.c +54 -0
@@ -4703,6 +4703,18 @@ clone: } } +/* Resume reading sink locations if supported */ +if (pacs->sink && pacs->sink_loc && !pacs->sink_loc_value) { +if (gatt_db_attribute_get_char_data (pacs->sink_loc, +NULL , &value_handle, +NULL ,NULL ,NULL )) { +bt_gatt_client_read_value (bap->client, + value_handle, + read_sink_pac_loc, + bap,NULL ); + } + } +/* Resume reading sources if supported */ if (pacs->source &&queue_isempty (bap->rdb->sources)) { if (gatt_db_attribute_get_char_data(pacs->source,
@@ -4715,6 +4727,48 @@ clone: } } +/* Resume reading source locations if supported */ +if (pacs->source && pacs->source_loc && + !pacs->source_loc_value) { +if (gatt_db_attribute_get_char_data (pacs->source_loc, +NULL , &value_handle, +NULL ,NULL ,NULL )) { +bt_gatt_client_read_value (bap->client, + value_handle, + read_source_pac_loc, + bap,NULL ); + } + } + +/* Resume reading supported contexts if supported */ +if (pacs->sink && pacs->supported_context && + !pacs->supported_sink_context_value && + !pacs->supported_source_context_value) { +if (gatt_db_attribute_get_char_data ( + pacs->supported_context, +NULL , &value_handle, +NULL ,NULL ,NULL )) { +bt_gatt_client_read_value (bap->client, + value_handle, + read_pac_supported_context, + bap,NULL ); + } + } + +/* Resume reading contexts if supported */ +if (pacs->sink && pacs->context && + !pacs->sink_context_value && + !pacs->source_context_value) { +if (gatt_db_attribute_get_char_data (pacs->context, +NULL , &value_handle, +NULL ,NULL ,NULL )) { +bt_gatt_client_read_value (bap->client, + value_handle, + read_pac_context, + bap,NULL ); + } + } +queue_foreach (bap->remote_eps, bap_endpoint_foreach, bap);bap_cp_attach (bap);
Signature · 1 line
2.44.0
Luiz Augusto von Dentz
maintainerPATCH v4 4/4 bap: Update properties of endpoints
In reply to Luiz Augusto von DentzFrom: Luiz Augusto von Dentz <[email protected]>
If a MediaEndpoint if found during registration stage attempt to check and update properties since they may have been updated at later stage when a session has been attached.
--- profiles/audio/bap.c | 48 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 41 insertions(+), 7 deletions(-)
profiles/audio/bap.c +41 -7
@@ -92,6 +92,9 @@ struct bap_ep {struct bap_data *data;struct bt_bap_pac *lpac;struct bt_bap_pac *rpac; +uint32_t locations; +uint16_t supported_context; +uint16_t context;struct queue *setups; };
@@ -376,9 +379,10 @@ static gboolean get_locations(const GDBusPropertyTable *property, DBusMessageIter *iter, void *data) {struct bap_ep *ep = data; -uint32_t locations =bt_bap_pac_get_locations (ep->rpac); -dbus_message_iter_append_basic (iter,DBUS_TYPE_UINT32 , &locations); + ep->locations =bt_bap_pac_get_locations (ep->rpac); + +dbus_message_iter_append_basic (iter,DBUS_TYPE_UINT32 , &ep->locations);return TRUE; }
@@ -387,9 +391,11 @@ static gboolean get_supported_context(const GDBusPropertyTable *property, DBusMessageIter *iter, void *data) {struct bap_ep *ep = data; -uint16_t context =bt_bap_pac_get_supported_context (ep->rpac); -dbus_message_iter_append_basic (iter,DBUS_TYPE_UINT16 , &context); + ep->supported_context =bt_bap_pac_get_supported_context (ep->rpac); + +dbus_message_iter_append_basic (iter,DBUS_TYPE_UINT16 , + &ep->supported_context);return TRUE; }
@@ -398,9 +404,10 @@ static gboolean get_context(const GDBusPropertyTable *property, DBusMessageIter *iter, void *data) {struct bap_ep *ep = data; -uint16_t context =bt_bap_pac_get_context (ep->rpac); -dbus_message_iter_append_basic (iter,DBUS_TYPE_UINT16 , &context); + ep->context =bt_bap_pac_get_context (ep->rpac); + +dbus_message_iter_append_basic (iter,DBUS_TYPE_UINT16 , &ep->context);return TRUE; }
@@ -1261,6 +1268,31 @@ static struct bap_ep *ep_register_bcast(struct bap_data *data,return ep; } +static void ep_update_properties (struct bap_ep *ep) +{ +if (!ep->rpac) +return ; + +if (ep->locations !=bt_bap_pac_get_locations (ep->rpac)) +g_dbus_emit_property_changed (btd_get_dbus_connection (), + ep->path, +MEDIA_ENDPOINT_INTERFACE , +"Locations" ); + +if (ep->supported_context != +bt_bap_pac_get_supported_context (ep->rpac)) +g_dbus_emit_property_changed (btd_get_dbus_connection (), + ep->path, +MEDIA_ENDPOINT_INTERFACE , +"SupportedContext" ); + +if (ep->context !=bt_bap_pac_get_context (ep->rpac)) +g_dbus_emit_property_changed (btd_get_dbus_connection (), + ep->path, +MEDIA_ENDPOINT_INTERFACE , +"Context" ); +} +static struct bap_ep *ep_register (struct btd_service *service,struct bt_bap_pac *lpac,struct bt_bap_pac *rpac)
@@ -1289,8 +1321,10 @@ static struct bap_ep *ep_register(struct btd_service *service, } ep =queue_find (queue, match_ep, &match); -if (ep) +if (ep) { +ep_update_properties (ep);return ep; + } ep = new0(struct bap_ep, 1); ep->data = data;
Signature · 1 line
2.44.0
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=843758
---Test result---
Test Summary:
CheckPatch PASS 1.85 seconds GitLint FAIL 1.44 seconds BuildEll PASS 25.04 seconds BluezMake PASS 1714.50 seconds MakeCheck PASS 13.76 seconds MakeDistcheck PASS 179.88 seconds CheckValgrind PASS 249.74 seconds CheckSmatch WARNING 354.55 seconds bluezmakeextell PASS 121.59 seconds IncrementalBuild PASS 6157.17 seconds ScanBuild PASS 996.33 seconds
Details
##############################
Test: GitLint - FAIL
Desc: Run gitlint
Output:
[BlueZ,v4,2/4] shared/bap: Make bt_bap_select fallback in case of no channel allocation
WARNING: I3 - ignore-body-lines: gitlint will be switching from using Python regex 'match' (match beginning) to 'search' (match anywhere) semantics. Please review your ignore-body-lines.regex option accordingly. To remove this warning, set general.regex-style-search=True. More details: https://jorisroovers.github.io/gitlint/configuration/#regex-style-search
1: T1 Title exceeds max length (87>80): "[BlueZ,v4,2/4] shared/bap: Make bt_bap_select fallback in case of no channel allocation"
##############################
Test: CheckSmatch - WARNING
Desc: Run smatch tool with source
Output:src/shared/bap.c:282:25: warning: array of flexible structuressrc/shared/bap.c: note: in included file:./src/shared/ascs.h:88:25: warning: array of flexible structuressrc/shared/bap.c:282:25: warning: array of flexible structuressrc/shared/bap.c: note: in included file:./src/shared/ascs.h:88:25: warning: array of flexible structuressrc/shared/bap.c:282:25: warning: array of flexible structuressrc/shared/bap.c: note: in included file:./src/shared/ascs.h:88:25: warning: array of flexible structuressrc/shared/bap.c:282:25: warning: array of flexible structuressrc/shared/bap.c: note: in included file:./src/shared/ascs.h:88:25: warning: array of flexible structuressrc/shared/bap.c:282:25: warning: array of flexible structuressrc/shared/bap.c: note: in included file:./src/shared/ascs.h:88:25: warning: array of flexible structuressrc/shared/bap.c:282:25: warning: array of flexible structuressrc/shared/bap.c: note: in included file:./src/shared/ascs.h:88:25: warning: array of flexible structuressrc/shared/bap.c:282:25: warning: array of flexible structuressrc/shared/bap.c: note: in included file:./src/shared/ascs.h:88:25: warning: array of flexible structuressrc/shared/bap.c:282:25: warning: array of flexible structuressrc/shared/bap.c: note: in included file:./src/shared/ascs.h:88:25: warning: array of flexible structuressrc/shared/bap.c:282:25: warning: array of flexible structuressrc/shared/bap.c: note: in included file:./src/shared/ascs.h:88:25: warning: array of flexible structures
---
Regards,
Linux Bluetooth
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 6 lines · On Thu, 11 Apr 2024 16:03:02 -0400 you wrote:
From: Luiz Augusto von Dentz <[email protected]>
Fix not updating map.location when selecting.
--- src/shared/bap.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
Here is the summary with links:
- [BlueZ,v4,1/4] shared/bap: Fix not updating location
https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=be79cd19c5c5 - [BlueZ,v4,2/4] shared/bap: Make bt_bap_select fallback in case of no channel allocation https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=c7dcd064057f - [BlueZ,v4,3/4] shared/bap: Fix not resuming reading attributes https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=7db85520b76d - [BlueZ,v4,4/4] bap: Update properties of endpoints https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=9be5d8018dd1
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html