Skip to content

bluetooth: gatt: add err param to discover cb #81432

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
JordanYates wants to merge 3 commits into from
Closed

bluetooth: gatt: add err param to discover cb #81432

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b4abd83
tests: bluetooth: ascs: remove unused variables
JordanYates Nov 15, 2024
d08a2a5
bluetooth: gatt: add `err` param to discover cb
JordanYates Nov 15, 2024
29803c5
bluetooth: update `bt_gatt_discover_func_t` usage
JordanYates Nov 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions tests/bluetooth/audio/ascs/src/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,10 @@ static void ascs_test_suite_fixture_init(struct ascs_test_suite_fixture *fixture
CONFIG_BT_ASCS_MAX_ASE_SNK_COUNT,
CONFIG_BT_ASCS_MAX_ASE_SRC_COUNT
};
int err;

memset(fixture, 0, sizeof(*fixture));

err = bt_bap_unicast_server_register(&param);
(void)bt_bap_unicast_server_register(&param);
Copy link
Contributor

@Thalley Thalley Nov 15, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This isn't the correct solution. If you want to change this in this PR (IMO should be a separate PR), then it should be something like zassert_equal(bt_bap_unicast_server_register(&param), 0); or zassert_equal(err, 0);`

Copy link
Contributor Author

@JordanYates JordanYates Nov 15, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I only made the change to pass CI, since this is currently failing on main I assumed it would be properly fixed for the release.

Copy link
Contributor

@Thalley Thalley Nov 17, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What was the CI error? Unused variable?

Copy link
Contributor Author

@JordanYates JordanYates Nov 17, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes

Copy link
Contributor

@Thalley Thalley Nov 18, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. I'm having a look at how to properly fix this, but it seems non-trivial. Will let you know when I have a PR

Copy link
Contributor

@Thalley Thalley Nov 18, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here's the non-trivial and proper fix: #81515


fixture->ase_cp = test_ase_control_point_get();

Expand Down Expand Up @@ -268,11 +267,9 @@ ZTEST_F(ascs_test_suite, test_ascs_unregister_without_register)

ZTEST_F(ascs_test_suite, test_ascs_unregister_with_ases_in_config_state)
{
const struct test_ase_chrc_value_hdr *hdr;
const struct bt_gatt_attr *ase;
struct bt_bap_stream *stream = &fixture->stream;
struct bt_conn *conn = &fixture->conn;
struct bt_gatt_notify_params *notify_params;
uint8_t ase_id;
int err;

Expand Down