mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-04-01 04:20:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

avrcp: add packet handler registration for target and controller in avrcp

Browse Source
This commit is contained in:
Milanka Ringwald 2019-02-19 15:48:35 +01:00
parent 94d9400d03
commit b106f72829
4 changed files with 113 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/classic/avrcp.c
View File

@ -61,6 +61,9 @@ static uint8_t attribute_value[1000];
static const unsigned int attribute_value_buffer_size = sizeof(attribute_value);
static btstack_linked_list_t connections;
static btstack_packet_handler_t avrcp_controller_packet_handler;
static btstack_packet_handler_t avrcp_target_packet_handler;
// static int l2cap_service_registered = 0;
static const char * avrcp_subunit_type_name[] = {
"MONITOR", "AUDIO", "PRINTER", "DISC", "TAPE_RECORDER_PLAYER", "TUNER",
@ -591,8 +594,20 @@ void avrcp_packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packet
avrcp_connection_t * connection = NULL;
uint16_t psm;
if (packet_type != HCI_EVENT_PACKET) return;
switch (packet_type) {
#if 0
case L2CAP_DATA_PACKET:
// figure out role!
connection = get_avrcp_connection_for_l2cap_signaling_cid(AVRCP_CONTROLLER, channel);
// or?
connection = get_avrcp_connection_for_l2cap_signaling_cid(AVRCP_TARGET, channel);
if (!connection) break;
// call correct controller/target packet hander
break;
#endif
case HCI_EVENT_PACKET:
switch (hci_event_packet_get_type(packet)) {
case HCI_EVENT_DISCONNECTION_COMPLETE:
avrcp_emit_connection_closed(context->avrcp_callback, 0);
@ -600,6 +615,8 @@ void avrcp_packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packet
case L2CAP_EVENT_INCOMING_CONNECTION:
l2cap_event_incoming_connection_get_address(packet, event_addr);
local_cid = l2cap_event_incoming_connection_get_local_cid(packet);
// create two connection objects (both)
connection = avrcp_create_connection(context->role, event_addr);
if (!connection) {
log_error("Failed to alloc connection structure");
@ -635,6 +652,7 @@ void avrcp_packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packet
}
if (status != ERROR_CODE_SUCCESS){
log_info("L2CAP connection to connection %s failed. status code 0x%02x", bd_addr_to_str(event_addr), status);
// emit twice for each role
avrcp_emit_connection_established(context->avrcp_callback, connection->avrcp_cid, event_addr, status);
avrcp_finalize_connection(connection);
break;
@ -650,6 +668,7 @@ void avrcp_packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packet
log_info("L2CAP_EVENT_CHANNEL_OPENED avrcp_cid 0x%02x, l2cap_signaling_cid 0x%02x", connection->avrcp_cid, connection->l2cap_signaling_cid);
connection->state = AVCTP_CONNECTION_OPENED;
// emit twice for each role
avrcp_emit_connection_established(context->avrcp_callback, connection->avrcp_cid, event_addr, ERROR_CODE_SUCCESS);
}
break;
@ -658,6 +677,7 @@ void avrcp_packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packet
// data: event (8), len(8), channel (16)
local_cid = l2cap_event_channel_closed_get_local_cid(packet);
connection = get_avrcp_connection_for_l2cap_signaling_cid(context->role, local_cid);
// emit twice for each role
if (connection){
avrcp_emit_connection_closed(context->avrcp_callback, connection->avrcp_cid);
avrcp_finalize_connection(connection);
@ -667,6 +687,10 @@ void avrcp_packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packet
default:
break;
}
break;
default:
break;
}
}
uint8_t avrcp_connect(avrcp_role_t role, bd_addr_t bd_addr, avrcp_context_t * context, uint16_t * avrcp_cid){
@ -698,4 +722,21 @@ uint8_t avrcp_connect(avrcp_role_t role, bd_addr_t bd_addr, avrcp_context_t * co
void avrcp_init(void){
connections = NULL;
#if 0
if (l2cap_service_registered) return;
int status = l2cap_register_service(&avrcp_packet_handler, BLUETOOTH_PROTOCOL_AVCTP, 0xffff, LEVEL_2);
if (status != ERROR_CODE_SUCCESS) return;
l2cap_service_registered = 1;
#endif
}
void avrcp_register_controller_packet_handler(btstack_packet_handler_t callback){
avrcp_controller_packet_handler = callback;
}
void avrcp_register_target_packet_handler(btstack_packet_handler_t callback){
avrcp_target_packet_handler = callback;
}

3
src/classic/avrcp.h
View File

@ -536,6 +536,9 @@ const char * avrcp_shuffle2str(uint8_t index);
void avrcp_init(void);
void avrcp_register_controller_packet_handler(btstack_packet_handler_t avrcp_controller_packet_handler);
void avrcp_register_target_packet_handler(btstack_packet_handler_t avrcp_target_packet_handler);
void avrcp_packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size, avrcp_context_t * context);
void avrcp_create_sdp_record(uint8_t controller, uint8_t * service, uint32_t service_record_handle, uint8_t browsing, uint16_t supported_features, const char * service_name, const char * service_provider_name);

1
src/classic/avrcp_controller.c
View File

@ -931,6 +931,7 @@ void avrcp_controller_init(void){
avrcp_init();
avrcp_controller_context.role = AVRCP_CONTROLLER;
avrcp_controller_context.packet_handler = avrcp_controller_packet_handler;
avrcp_register_controller_packet_handler(&avrcp_controller_packet_handler);
l2cap_register_service(&avrcp_controller_packet_handler, BLUETOOTH_PROTOCOL_AVCTP, 0xffff, LEVEL_2);
}

1
src/classic/avrcp_target.c
View File

@ -1242,6 +1242,7 @@ void avrcp_target_init(void){
avrcp_init();
avrcp_target_context.role = AVRCP_TARGET;
avrcp_target_context.packet_handler = avrcp_target_packet_handler;
avrcp_register_controller_packet_handler(&avrcp_target_packet_handler);
l2cap_register_service(&avrcp_target_packet_handler, BLUETOOTH_PROTOCOL_AVCTP, 0xffff, LEVEL_2);
}