mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-04-16 17:42:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

avrcp: clean disconnect, improve notification registration

Browse Source
This commit is contained in:
Milanka Ringwald 2017-06-07 23:46:44 +02:00
parent b193c45e22
commit 294335f1d3
3 changed files with 18 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/classic/avrcp.c
View File

@ -516,9 +516,6 @@ static int avrcp_register_notification(avrcp_connection_t * connection, avrcp_no
} }
static void avrcp_prepare_notification(avrcp_connection_t * connection, avrcp_notification_event_id_t event_id){ static void avrcp_prepare_notification(avrcp_connection_t * connection, avrcp_notification_event_id_t event_id){
if (connection->state != AVCTP_CONNECTION_OPENED) return;
connection->state = AVCTP_W2_SEND_COMMAND;
connection->transaction_label++; connection->transaction_label++;
connection->command_opcode = AVRCP_CMD_OPCODE_VENDOR_DEPENDENT; connection->command_opcode = AVRCP_CMD_OPCODE_VENDOR_DEPENDENT;
connection->command_type = AVRCP_CTYPE_NOTIFY; connection->command_type = AVRCP_CTYPE_NOTIFY;
@ -568,9 +565,9 @@ static void avrcp_handle_l2cap_data_packet_for_signaling_connection(avrcp_connec
// // printf_hexdump(packet+pos, size-pos); // // printf_hexdump(packet+pos, size-pos);
switch (avrcp_cmd_opcode(packet,size)){ switch (avrcp_cmd_opcode(packet,size)){
case AVRCP_CMD_OPCODE_UNIT_INFO:{ case AVRCP_CMD_OPCODE_UNIT_INFO:{
if (connection->state == AVCTP_W2_RECEIVE_RESPONSE){ if (connection->state != AVCTP_W2_RECEIVE_RESPONSE) return;
connection->state = AVCTP_CONNECTION_OPENED; connection->state = AVCTP_CONNECTION_OPENED;
}
// operands: // operands:
memcpy(operands, packet+pos, 5); memcpy(operands, packet+pos, 5);
uint8_t unit_type = operands[1] >> 3; uint8_t unit_type = operands[1] >> 3;
@ -581,10 +578,6 @@ static void avrcp_handle_l2cap_data_packet_for_signaling_connection(avrcp_connec
break; break;
} }
case AVRCP_CMD_OPCODE_VENDOR_DEPENDENT: case AVRCP_CMD_OPCODE_VENDOR_DEPENDENT:
if (connection->state == AVCTP_W2_RECEIVE_RESPONSE){
connection->state = AVCTP_CONNECTION_OPENED;
}
if (size - pos < 7) { if (size - pos < 7) {
log_error("avrcp: wrong packet size"); log_error("avrcp: wrong packet size");
return; return;
@ -594,6 +587,14 @@ static void avrcp_handle_l2cap_data_packet_for_signaling_connection(avrcp_connec
pos += 7; pos += 7;
// uint32_t company_id = operands[0] << 16 | operands[1] << 8 | operands[2]; // uint32_t company_id = operands[0] << 16 | operands[1] << 8 | operands[2];
uint8_t pdu_id = operands[3]; uint8_t pdu_id = operands[3];
if (connection->state != AVCTP_W2_RECEIVE_RESPONSE && pdu_id != AVRCP_PDU_ID_REGISTER_NOTIFICATION){
printf("AVRCP_CMD_OPCODE_VENDOR_DEPENDENT state %d \n", connection->state);
return;
}
connection->state = AVCTP_CONNECTION_OPENED;
// uint8_t unit_type = operands[4] >> 3; // uint8_t unit_type = operands[4] >> 3;
// uint8_t unit = operands[4] & 0x07; // uint8_t unit = operands[4] & 0x07;
uint16_t param_length = big_endian_read_16(operands, 5); uint16_t param_length = big_endian_read_16(operands, 5);
@ -706,7 +707,6 @@ static void avrcp_handle_l2cap_data_packet_for_signaling_connection(avrcp_connec
case AVRCP_CTYPE_RESPONSE_INTERIM: case AVRCP_CTYPE_RESPONSE_INTERIM:
// register as enabled // register as enabled
connection->notifications_enabled |= event_mask; connection->notifications_enabled |= event_mask;
connection->state = AVCTP_CONNECTION_OPENED;
// printf("INTERIM notifications_enabled 0x%2x, notifications_to_register 0x%2x\n", connection->notifications_enabled, connection->notifications_to_register); // printf("INTERIM notifications_enabled 0x%2x, notifications_to_register 0x%2x\n", connection->notifications_enabled, connection->notifications_to_register);
break; break;
case AVRCP_CTYPE_RESPONSE_CHANGED_STABLE: case AVRCP_CTYPE_RESPONSE_CHANGED_STABLE:
@ -962,6 +962,7 @@ static void avrcp_handle_l2cap_data_packet_for_signaling_connection(avrcp_connec
break; break;
default: default:
// check for notifications? move state transition down // check for notifications? move state transition down
printf("AVRCP_CMD_OPCODE_PASS_THROUGH state %d\n", connection->state);
break; break;
} }
if (connection->state == AVCTP_W4_STOP){ if (connection->state == AVCTP_W4_STOP){
@ -996,19 +997,13 @@ static void avrcp_handle_can_send_now(avrcp_connection_t * connection){
avrcp_send_cmd(connection->l2cap_signaling_cid, connection); avrcp_send_cmd(connection->l2cap_signaling_cid, connection);
break; break;
case AVCTP_CONNECTION_OPENED: case AVCTP_CONNECTION_OPENED:
if (connection->disconnect){
connection->wait_to_send = 0;
connection->disconnect = 0;
connection->state = AVCTP_CONNECTION_W4_L2CAP_DISCONNECTED;
l2cap_disconnect(connection->l2cap_signaling_cid, 0);
return;
}
if (connection->notifications_to_register != 0){ if (connection->notifications_to_register != 0){
for (i = 1; i < 13; i++){ for (i = 1; i < 13; i++){
if (connection->notifications_to_register & (1<<i)){ if (connection->notifications_to_register & (1<<i)){
// clear registration bit before sending command // clear registration bit before sending command
connection->notifications_to_register &= ~ (1 <<i); connection->notifications_to_register &= ~ (1 << i);
avrcp_prepare_notification(connection, i); avrcp_prepare_notification(connection, i);
connection->state = AVCTP_W2_RECEIVE_RESPONSE;
avrcp_send_cmd(connection->l2cap_signaling_cid, connection); avrcp_send_cmd(connection->l2cap_signaling_cid, connection);
return; return;
} }
@ -1450,8 +1445,5 @@ void avrcp_disconnect(uint16_t avrcp_cid){
return; return;
} }
if (connection->state != AVCTP_CONNECTION_OPENED) return; if (connection->state != AVCTP_CONNECTION_OPENED) return;
if (connection->state == AVCTP_CONNECTION_W4_L2CAP_DISCONNECTED) return; l2cap_disconnect(connection->l2cap_signaling_cid, 0);
connection->disconnect = 1;
avrcp_request_can_send_now(connection, connection->l2cap_signaling_cid);
} }

5
src/classic/avrcp.h
View File

@ -180,8 +180,7 @@ typedef enum {
AVCTP_W4_STOP, AVCTP_W4_STOP,
AVCTP_W2_SEND_COMMAND, AVCTP_W2_SEND_COMMAND,
AVCTP_W2_RECEIVE_PRESS_RESPONSE, AVCTP_W2_RECEIVE_PRESS_RESPONSE,
AVCTP_W2_RECEIVE_RESPONSE, AVCTP_W2_RECEIVE_RESPONSE
AVCTP_CONNECTION_W4_L2CAP_DISCONNECTED
} avctp_connection_state_t; } avctp_connection_state_t;
typedef struct { typedef struct {
@ -206,8 +205,6 @@ typedef struct {
uint16_t notifications_enabled; uint16_t notifications_enabled;
uint16_t notifications_to_register; uint16_t notifications_to_register;
uint16_t notifications_to_deregister; uint16_t notifications_to_deregister;
uint8_t disconnect;
} avrcp_connection_t; } avrcp_connection_t;
typedef enum { typedef enum {

4
test/avrcp/avrcp_test.c
View File

@ -102,8 +102,8 @@ static void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packe
avrcp_subevent_connection_established_get_bd_addr(packet, event_addr); avrcp_subevent_connection_established_get_bd_addr(packet, event_addr);
printf("Channel successfully opened: %s, handle 0x%02x, local cid 0x%02x\n", bd_addr_to_str(event_addr), avrcp_con_handle, local_cid); printf("Channel successfully opened: %s, handle 0x%02x, local cid 0x%02x\n", bd_addr_to_str(event_addr), avrcp_con_handle, local_cid);
// automatically enable notifications // automatically enable notifications
avrcp_enable_notification(avrcp_con_handle, AVRCP_NOTIFICATION_EVENT_PLAYBACK_STATUS_CHANGED); avrcp_enable_notification(avrcp_cid, AVRCP_NOTIFICATION_EVENT_PLAYBACK_STATUS_CHANGED);
avrcp_enable_notification(avrcp_con_handle, AVRCP_NOTIFICATION_EVENT_NOW_PLAYING_CONTENT_CHANGED); avrcp_enable_notification(avrcp_cid, AVRCP_NOTIFICATION_EVENT_NOW_PLAYING_CONTENT_CHANGED);
return; return;
} }
case AVRCP_SUBEVENT_CONNECTION_RELEASED: case AVRCP_SUBEVENT_CONNECTION_RELEASED: