mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-04-23 11:43:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

avdtp_initiator: more log_debug

Browse Source
This commit is contained in:
Matthias Ringwald 2020-10-08 12:13:31 +02:00
parent 1cc8850a16
commit 3a69f723a4
2 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/classic/avdtp.c
View File

@ -1297,7 +1297,9 @@ uint8_t avdtp_set_configuration(uint16_t avdtp_cid, uint8_t local_seid, uint8_t
stream_endpoint->remote_configuration = configuration; stream_endpoint->remote_configuration = configuration;
stream_endpoint->initiator_config_state = AVDTP_INITIATOR_W2_SET_CONFIGURATION; stream_endpoint->initiator_config_state = AVDTP_INITIATOR_W2_SET_CONFIGURATION;
// cache media codec information for SBC log_debug("SE %p, initiator_config_state: 0x%02x", stream_endpoint->initiator_config_state);
// cache media codec information for SBC
stream_endpoint->media_codec_type = configuration.media_codec.media_codec_type; stream_endpoint->media_codec_type = configuration.media_codec.media_codec_type;
if (configuration.media_codec.media_codec_type == AVDTP_CODEC_SBC){ if (configuration.media_codec.media_codec_type == AVDTP_CODEC_SBC){
stream_endpoint->media_type = configuration.media_codec.media_type; stream_endpoint->media_type = configuration.media_codec.media_type;

40
src/classic/avdtp_initiator.c
View File

@ -82,14 +82,20 @@ void avdtp_initiator_stream_config_subsm(avdtp_connection_t *connection, uint8_t
if (connection->initiator_connection_state == AVDTP_SIGNALING_CONNECTION_INITIATOR_W4_ANSWER) { if (connection->initiator_connection_state == AVDTP_SIGNALING_CONNECTION_INITIATOR_W4_ANSWER) {
connection->initiator_connection_state = AVDTP_SIGNALING_CONNECTION_INITIATOR_IDLE; connection->initiator_connection_state = AVDTP_SIGNALING_CONNECTION_INITIATOR_IDLE;
} else { } else {
stream_endpoint = avdtp_get_stream_endpoint_associated_with_acp_seid(connection->initiator_remote_seid); stream_endpoint = avdtp_get_stream_endpoint_associated_with_acp_seid(connection->initiator_remote_seid);
if (!stream_endpoint){ if (stream_endpoint == NULL){
stream_endpoint = avdtp_get_stream_endpoint_with_seid(connection->initiator_local_seid); stream_endpoint = avdtp_get_stream_endpoint_with_seid(connection->initiator_local_seid);
} if (stream_endpoint == NULL){
if (!stream_endpoint) { log_debug("no stream endpoint for local %u, remote %u", connection->initiator_local_seid, connection->initiator_remote_seid);
log_error("stream_endpoint for seid 0x%02x not found", connection->initiator_local_seid); return;
return; } else {
} log_debug("Using stream endpoint %p for local seid %u", stream_endpoint, connection->initiator_local_seid);
}
} else {
log_debug("Using stream endpoint %p for remote seid %u", stream_endpoint, connection->initiator_remote_seid);
}
log_debug("SE %p, initiator_connection_state: 0x%02x, initiator_config_state: 0x%02x", connection->initiator_connection_state, tream_endpoint->initiator_config_state);
sep.seid = connection->initiator_remote_seid; sep.seid = connection->initiator_remote_seid;
if (stream_endpoint->initiator_config_state != AVDTP_INITIATOR_W4_ANSWER) { if (stream_endpoint->initiator_config_state != AVDTP_INITIATOR_W4_ANSWER) {
@ -340,7 +346,7 @@ static bool avdtp_initiator_stream_config_subsm_run_signaling(avdtp_connection_t
} }
static bool avdtp_initiator_stream_config_subsm_run_endpoint(avdtp_connection_t * connection, avdtp_stream_endpoint_t * stream_endpoint){ static bool avdtp_initiator_stream_config_subsm_run_endpoint(avdtp_connection_t * connection, avdtp_stream_endpoint_t * stream_endpoint){
log_debug("SE state: 0x2%x", stream_endpoint->initiator_config_state); log_debug("SE %p, initiator_config_state: 0x%02x", stream_endpoint->initiator_config_state);
switch (stream_endpoint->initiator_config_state){ switch (stream_endpoint->initiator_config_state){
case AVDTP_INITIATOR_W2_SET_CONFIGURATION: case AVDTP_INITIATOR_W2_SET_CONFIGURATION:
case AVDTP_INITIATOR_W2_RECONFIGURE_STREAM_WITH_SEID:{ case AVDTP_INITIATOR_W2_RECONFIGURE_STREAM_WITH_SEID:{
@ -416,12 +422,16 @@ void avdtp_initiator_stream_config_subsm_run(avdtp_connection_t *connection) {
if (sent) return; if (sent) return;
avdtp_stream_endpoint_t * stream_endpoint = avdtp_get_stream_endpoint_associated_with_acp_seid(connection->initiator_remote_seid); avdtp_stream_endpoint_t * stream_endpoint = avdtp_get_stream_endpoint_associated_with_acp_seid(connection->initiator_remote_seid);
if (!stream_endpoint){ if (stream_endpoint == NULL){
stream_endpoint = avdtp_get_stream_endpoint_with_seid(connection->initiator_local_seid); stream_endpoint = avdtp_get_stream_endpoint_with_seid(connection->initiator_local_seid);
} if (stream_endpoint == NULL){
if (!stream_endpoint) { log_debug("no stream endpoint for local %u, remote %u", connection->initiator_local_seid, connection->initiator_remote_seid);
log_debug("no stream endpoint (local %u, remote %u", connection->initiator_local_seid, connection->initiator_remote_seid); return;
return; } else {
log_debug("Using stream endpoint %p for local seid %u", stream_endpoint, connection->initiator_local_seid);
}
} else {
log_debug("Using stream endpoint %p for remote seid %u", stream_endpoint, connection->initiator_remote_seid);
} }
sent = avdtp_initiator_stream_config_subsm_run_endpoint(connection, stream_endpoint); sent = avdtp_initiator_stream_config_subsm_run_endpoint(connection, stream_endpoint);