mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-01-29 12:32:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

avrcp: rename event and timer

Browse Source
This commit is contained in:
Milanka Ringwald 2020-07-09 14:00:52 +02:00
parent ff53b16278
commit 37fae98766
3 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/classic/avrcp.c
View File

@ -404,7 +404,7 @@ static avrcp_connection_t * avrcp_create_connection(avrcp_role_t role, bd_addr_t
}
static void avrcp_finalize_connection(avrcp_connection_t * connection){
btstack_run_loop_remove_timer(&connection->reconnect_timer);
btstack_run_loop_remove_timer(&connection->retry_timer);
btstack_linked_list_remove(&connections, (btstack_linked_item_t*) connection);
btstack_memory_avrcp_connection_free(connection);
}
@ -625,7 +625,7 @@ static avrcp_connection_t * avrcp_handle_incoming_connection_for_role(avrcp_role
connection->state = AVCTP_CONNECTION_W4_L2CAP_CONNECTED;
connection->l2cap_signaling_cid = local_cid;
connection->avrcp_cid = avrcp_cid;
btstack_run_loop_remove_timer(&connection->reconnect_timer);
btstack_run_loop_remove_timer(&connection->retry_timer);
}
return connection;
}
@ -642,29 +642,29 @@ static void avrcp_handle_open_connection_for_role( avrcp_connection_t * connecti
log_info("L2CAP_EVENT_CHANNEL_OPENED avrcp_cid 0x%02x, l2cap_signaling_cid 0x%02x, role %d", connection->avrcp_cid, connection->l2cap_signaling_cid, connection->role);
}
static void avrcp_reconnect_timer_timeout_handler(btstack_timer_source_t * timer){
static void avrcp_retry_timer_timeout_handler(btstack_timer_source_t * timer){
uint16_t avrcp_cid = (uint16_t)(uintptr_t) btstack_run_loop_get_timer_context(timer);
avrcp_connection_t * connection_controller = avrcp_get_connection_for_avrcp_cid_for_role(AVRCP_CONTROLLER, avrcp_cid);
if (connection_controller == NULL) return;
avrcp_connection_t * connection_target = avrcp_get_connection_for_avrcp_cid_for_role(AVRCP_TARGET, avrcp_cid);
if (connection_target == NULL) return;
if (connection_controller->state == AVCTP_CONNECTION_W2_L2CAP_RECONNECT){
if (connection_controller->state == AVCTP_CONNECTION_W2_L2CAP_RETRY){
connection_controller->state = AVCTP_CONNECTION_W4_L2CAP_CONNECTED;
connection_target->state = AVCTP_CONNECTION_W4_L2CAP_CONNECTED;
l2cap_create_channel(&avrcp_packet_handler, connection_controller->remote_addr, connection_controller->avrcp_l2cap_psm, l2cap_max_mtu(), NULL);
}
}
static void avrcp_reconnect_timer_start(avrcp_connection_t * connection){
btstack_run_loop_set_timer_handler(&connection->reconnect_timer, avrcp_reconnect_timer_timeout_handler);
btstack_run_loop_set_timer_context(&connection->reconnect_timer, (void *)(uintptr_t)connection->avrcp_cid);
static void avrcp_retry_timer_start(avrcp_connection_t * connection){
btstack_run_loop_set_timer_handler(&connection->retry_timer, avrcp_retry_timer_timeout_handler);
btstack_run_loop_set_timer_context(&connection->retry_timer, (void *)(uintptr_t)connection->avrcp_cid);
// add some jitter/randomness to reconnect delay
uint32_t timeout = 100 + (btstack_run_loop_get_time_ms() & 0x7F);
btstack_run_loop_set_timer(&connection->reconnect_timer, timeout);
btstack_run_loop_set_timer(&connection->retry_timer, timeout);
btstack_run_loop_add_timer(&connection->reconnect_timer);
btstack_run_loop_add_timer(&connection->retry_timer);
}
static avrcp_frame_type_t avrcp_get_frame_type(uint8_t header){
@ -765,11 +765,11 @@ static void avrcp_packet_handler(uint8_t packet_type, uint16_t channel, uint8_t
case L2CAP_CONNECTION_RESPONSE_RESULT_REFUSED_RESOURCES:
if (connection_controller->incoming_declined == true){
log_info("Incoming connection was declined, and the outgoing failed");
connection_controller->state = AVCTP_CONNECTION_W2_L2CAP_RECONNECT;
connection_controller->state = AVCTP_CONNECTION_W2_L2CAP_RETRY;
connection_controller->incoming_declined = false;
connection_target->state = AVCTP_CONNECTION_W2_L2CAP_RECONNECT;
connection_target->state = AVCTP_CONNECTION_W2_L2CAP_RETRY;
connection_target->incoming_declined = false;
avrcp_reconnect_timer_start(connection_controller);
avrcp_retry_timer_start(connection_controller);
return;
}
break;

4
src/classic/avrcp.h
View File

@ -288,7 +288,7 @@ typedef enum {
AVCTP_CONNECTION_W4_SDP_QUERY_COMPLETE,
AVCTP_CONNECTION_W4_ERTM_CONFIGURATION,
AVCTP_CONNECTION_W4_L2CAP_CONNECTED,
AVCTP_CONNECTION_W2_L2CAP_RECONNECT,
AVCTP_CONNECTION_W2_L2CAP_RETRY,
AVCTP_CONNECTION_OPENED,
AVCTP_W2_SEND_PRESS_COMMAND,
AVCTP_W2_SEND_RELEASE_COMMAND,
@ -472,7 +472,7 @@ typedef struct {
uint16_t cmd_operands_fragmented_pos;
uint16_t cmd_operands_fragmented_len;
btstack_timer_source_t reconnect_timer;
btstack_timer_source_t retry_timer;
btstack_timer_source_t press_and_hold_cmd_timer;
uint8_t continuous_fast_forward_cmd;
uint16_t notifications_enabled;

24
src/classic/avrcp_browsing.c
View File

@ -65,7 +65,7 @@ void avrcp_browsing_request_can_send_now(avrcp_browsing_connection_t * connectio
l2cap_request_can_send_now_event(l2cap_cid);
}
static void avrcp_reconnect_timer_timeout_handler(btstack_timer_source_t * timer){
static void avrcp_retry_timer_timeout_handler(btstack_timer_source_t * timer){
uint16_t avrcp_cid = (uint16_t)(uintptr_t) btstack_run_loop_get_timer_context(timer);
avrcp_connection_t * connection_controller = avrcp_get_connection_for_avrcp_cid_for_role(AVRCP_CONTROLLER, avrcp_cid);
if (connection_controller == NULL) return;
@ -74,7 +74,7 @@ static void avrcp_reconnect_timer_timeout_handler(btstack_timer_source_t * timer
if ((connection_controller->browsing_connection == NULL) || (connection_target->browsing_connection == NULL)) return;
if (connection_controller->browsing_connection->state == AVCTP_CONNECTION_W2_L2CAP_RECONNECT){
if (connection_controller->browsing_connection->state == AVCTP_CONNECTION_W2_L2CAP_RETRY){
connection_controller->browsing_connection->state = AVCTP_CONNECTION_W4_L2CAP_CONNECTED;
connection_target->browsing_connection->state = AVCTP_CONNECTION_W4_L2CAP_CONNECTED;
@ -85,20 +85,20 @@ static void avrcp_reconnect_timer_timeout_handler(btstack_timer_source_t * timer
}
}
static void avrcp_reconnect_timer_start(avrcp_connection_t * connection){
btstack_run_loop_set_timer_handler(&connection->reconnect_timer, avrcp_reconnect_timer_timeout_handler);
btstack_run_loop_set_timer_context(&connection->reconnect_timer, (void *)(uintptr_t)connection->avrcp_cid);
static void avrcp_retry_timer_start(avrcp_connection_t * connection){
btstack_run_loop_set_timer_handler(&connection->retry_timer, avrcp_retry_timer_timeout_handler);
btstack_run_loop_set_timer_context(&connection->retry_timer, (void *)(uintptr_t)connection->avrcp_cid);
// add some jitter/randomness to reconnect delay
uint32_t timeout = 100 + (btstack_run_loop_get_time_ms() & 0x7F);
btstack_run_loop_set_timer(&connection->reconnect_timer, timeout);
btstack_run_loop_set_timer(&connection->retry_timer, timeout);
btstack_run_loop_add_timer(&connection->reconnect_timer);
btstack_run_loop_add_timer(&connection->retry_timer);
}
// AVRCP Browsing Service functions
static void avrcp_browsing_finalize_connection(avrcp_connection_t * connection){
btstack_run_loop_remove_timer(&connection->reconnect_timer);
btstack_run_loop_remove_timer(&connection->retry_timer);
btstack_memory_avrcp_browsing_connection_free(connection->browsing_connection);
connection->browsing_connection = NULL;
}
@ -182,7 +182,7 @@ static avrcp_browsing_connection_t * avrcp_browsing_handle_incoming_connection(a
if (connection->browsing_connection) {
connection->browsing_connection->l2cap_browsing_cid = local_cid;
connection->browsing_connection->state = AVCTP_CONNECTION_W4_ERTM_CONFIGURATION;
btstack_run_loop_remove_timer(&connection->reconnect_timer);
btstack_run_loop_remove_timer(&connection->retry_timer);
}
return connection->browsing_connection;
}
@ -315,11 +315,11 @@ static void avrcp_browsing_packet_handler(uint8_t packet_type, uint16_t channel,
case L2CAP_CONNECTION_RESPONSE_RESULT_REFUSED_RESOURCES:
if (connection_controller->browsing_connection->incoming_declined == true){
log_info("Incoming browsing connection was declined, and the outgoing failed");
connection_controller->browsing_connection->state = AVCTP_CONNECTION_W2_L2CAP_RECONNECT;
connection_controller->browsing_connection->state = AVCTP_CONNECTION_W2_L2CAP_RETRY;
connection_controller->browsing_connection->incoming_declined = false;
connection_target->browsing_connection->state = AVCTP_CONNECTION_W2_L2CAP_RECONNECT;
connection_target->browsing_connection->state = AVCTP_CONNECTION_W2_L2CAP_RETRY;
connection_target->browsing_connection->incoming_declined = false;
avrcp_reconnect_timer_start(connection_controller);
avrcp_retry_timer_start(connection_controller);
return;
}
break;