Adapter: use heap memory to cache discovered devices. #396
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
gzh-terry
requested review from
chengkai15,
huangyulong3,
hyson710,
zhangyuan376 and
zhongzhijie1
as code owners
There was a problem hiding this comment.
Pull request overview
This PR refactors BR/EDR discovery in the Zephyr SAL to use heap-allocated storage for discovery results and to pass Zephyr’s bt_br_discovery_param directly, with additional logging and state checks.
Changes:
- Replace the ad‑hoc discovery timeout/limited struct in
sal_adapter_args_twithstruct bt_br_discovery_paramand wire it throughbt_sal_start_discoveryandstart_discovery. - Introduce a global heap-allocated
g_discovery_resultsbuffer sized byBT_DISCOVERY_DEVICE_MAX, with allocation on discovery start and cleanup on completion/stop. - Add discovery-related logging and guard redundant start/stop calls by checking
g_discovery_results.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
gzh-terry
force-pushed
the
memory
branch
2 times, most recently
from
27ba798 to
30ad8b2
Compare
chengkai15
reviewed
Jan 26, 2026
gzh-terry
force-pushed
the
memory
branch
2 times, most recently
from
30ad8b2 to
04770ce
Compare
chengkai15
reviewed
Jan 27, 2026
chengkai15
previously approved these changes
Jan 27, 2026
chengkai15
reviewed
Jan 27, 2026
| if (err != 0 && err != -ENODEV && err != -EALREADY) | ||
| BT_LOGE("failed to stop discovery, err = %d", err); | ||
|
|
||
| free(g_discovery_results); |
Contributor
There was a problem hiding this comment.
note: g_discovery_results maybe reused by zblue stack
Contributor
Author
There was a problem hiding this comment.
Almost safe, if zephyr codes are not changed in the future.
There is a hdev->discovery_results = NULL; within bt_br_discovery_stop_mc, regardless of success or failure.
chengkai15
approved these changes
Jan 27, 2026
Bug: v/84859 Root cause: The inquiry command currently takes static memory, consuming 7620 bytes even when not in use. Signed-off-by: Zihao Gao <gaozihao@xiaomi.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.