mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-02-03 20:54:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/bluekitchen/btstack

Browse Source
This commit is contained in:
Matthias Ringwald 2015-07-10 14:32:31 +02:00
commit fe800568da
8 changed files with 87 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
src/hfp.c
View File

@ -62,7 +62,6 @@
static hfp_callback_t hfp_callback;
static linked_list_t hfp_connections = NULL;
static void hfp_run(void);
static linked_item_t * get_hfp_connections(){
return (linked_item_t *) &hfp_connections;
@ -231,50 +230,13 @@ static void handle_query_rfcomm_event(sdp_query_event_t * event, void * context)
}
}
static void hfp_run(void){
linked_item_t *it;
for (it = get_hfp_connections(); it ; it = it->next){
hfp_connection_t * connection = (hfp_connection_t *) it;
switch (connection->state){
case HFP_SDP_QUERY_RFCOMM_CHANNEL:
connection->state = HFP_W4_SDP_QUERY_COMPLETE;
switch (connection->role){
case HFP_HANDSFREE:
sdp_query_rfcomm_channel_and_name_for_uuid(connection->remote_addr, SDP_HandsfreeAudioGateway);
break;
case HFP_HANDSFREE_AUDIO_GATEWAY:
sdp_query_rfcomm_channel_and_name_for_uuid(connection->remote_addr, SDP_Handsfree);
break;
}
break;
default:
break;
}
}
}
static void handle_rfcomm_data_packet(uint16_t channel, uint8_t *packet, uint16_t size){
// printf("packet_handler type %u, packet[0] %x\n", packet_type, packet[0]);
}
static void packet_handler(void * connection, uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size){
// printf("packet_handler type %u, packet[0] %x\n", packet_type, packet[0]);
uint8_t event = packet[0];
hfp_connection_t * handle_hci_event(uint8_t packet_type, uint8_t *packet, uint16_t size){
if (packet_type != HCI_EVENT_PACKET) return NULL;
bd_addr_t event_addr;
hfp_connection_t * context = NULL;
if (packet_type == RFCOMM_DATA_PACKET){
handle_rfcomm_data_packet(channel, packet, size);
hfp_run();
return;
}
if (packet_type != HCI_EVENT_PACKET) return;
switch (event) {
switch (packet[0]) {
case BTSTACK_EVENT_STATE:
// bt stack activated, get started
if (packet[2] == HCI_STATE_WORKING){
@ -294,7 +256,7 @@ static void packet_handler(void * connection, uint8_t packet_type, uint16_t chan
bt_flip_addr(event_addr, &packet[2]);
context = provide_hfp_connection_context_for_bd_addr(event_addr);
if (context && context->state != HFP_IDLE) return;
if (!context || context->state != HFP_IDLE) return context;
context->rfcomm_cid = READ_BT_16(packet, 9);
context->state = HFP_W4_RFCOMM_CONNECTED;
@ -311,7 +273,7 @@ static void packet_handler(void * connection, uint8_t packet_type, uint16_t chan
bt_flip_addr(event_addr, &packet[2]);
context = provide_hfp_connection_context_for_bd_addr(event_addr);
if (context && context->state != HFP_W4_RFCOMM_CONNECTED) return;
if (!context || context->state != HFP_W4_RFCOMM_CONNECTED) return context;
context->con_handle = READ_BT_16(packet, 9);
context->rfcomm_cid = READ_BT_16(packet, 12);
@ -328,30 +290,25 @@ static void packet_handler(void * connection, uint8_t packet_type, uint16_t chan
default:
break;
}
hfp_run();
return context;
}
void hfp_init(uint16_t rfcomm_channel_nr){
rfcomm_register_service_internal(NULL, rfcomm_channel_nr, 0xffff);
rfcomm_register_packet_handler(packet_handler);
sdp_query_rfcomm_register_callback(handle_query_rfcomm_event, NULL);
}
void hfp_connect(bd_addr_t bd_addr, hfp_role_t role){
void hfp_connect(bd_addr_t bd_addr, uint16_t service_uuid){
hfp_connection_t * connection = provide_hfp_connection_context_for_bd_addr(bd_addr);
if (!connection) {
log_error("hfp_hf_connect for addr %s failed", bd_addr_to_str(bd_addr));
return;
}
if (connection->state != HFP_IDLE) return;
connection->state = HFP_SDP_QUERY_RFCOMM_CHANNEL;
connection->state = HFP_W4_SDP_QUERY_COMPLETE;
memcpy(connection->remote_addr, bd_addr, 6);
connection->role = role;
connection_doing_sdp_query = connection;
hfp_run();
sdp_query_rfcomm_channel_and_name_for_uuid(connection->remote_addr, service_uuid);
}
void hfp_disconnect(bd_addr_t bd_addr){
}

19
src/hfp.h
View File

@ -52,11 +52,6 @@
extern "C" {
#endif
typedef enum {
HFP_HANDSFREE,
HFP_HANDSFREE_AUDIO_GATEWAY
} hfp_role_t;
typedef enum {
HFP_IDLE,
HFP_SDP_QUERY_RFCOMM_CHANNEL,
@ -78,20 +73,16 @@ typedef struct hfp_connection {
uint16_t con_handle;
uint16_t rfcomm_channel_nr;
uint16_t rfcomm_cid;
hfp_role_t role;
uint16_t query_service_uuid;
hfp_callback_t callback;
} hfp_connection_t;
void hfp_create_service(uint8_t * service, uint16_t service_uuid, int rfcomm_channel_nr, const char * name, uint16_t supported_features);
void hfp_init(uint16_t rfcomm_channel_nr);
void hfp_register_packet_handler(hfp_callback_t callback);
hfp_connection_t * provide_hfp_connection_context_for_conn_handle(uint16_t con_handle);
void hfp_connect(bd_addr_t bd_addr, hfp_role_t role);
void hfp_disconnect(bd_addr_t bd_addr);
hfp_connection_t * handle_hci_event(uint8_t packet_type, uint8_t *packet, uint16_t size);
void hfp_init(uint16_t rfcomm_channel_nr);
void hfp_connect(bd_addr_t bd_addr, uint16_t service_uuid);
#if defined __cplusplus
}

36
src/hfp_ag.c
View File

@ -63,6 +63,8 @@
static const char default_hfp_ag_service_name[] = "Voice gateway";
static void packet_handler(void * connection, uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size);
void hfp_ag_create_service(uint8_t * service, int rfcomm_channel_nr, const char * name, uint8_t ability_to_reject_call, uint16_t supported_features){
if (!name){
name = default_hfp_ag_service_name;
@ -77,8 +79,38 @@ void hfp_ag_create_service(uint8_t * service, int rfcomm_channel_nr, const char
*/
}
void hfp_ag_connect(bd_addr_t bd_addr){
hfp_connect(bd_addr, HFP_HANDSFREE_AUDIO_GATEWAY);
static void hfp_run(hfp_connection_t * connection){
if (!connection) return;
switch (connection->state){
default:
break;
}
}
static void packet_handler(void * connection, uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size){
// printf("packet_handler type %u, packet[0] %x\n", packet_type, packet[0]);
hfp_connection_t * context = NULL;
if (packet_type == RFCOMM_DATA_PACKET){
hfp_run(context);
return;
}
context = handle_hci_event(packet_type, packet, size);
hfp_run(context);
}
void hfp_ag_init(uint16_t rfcomm_channel_nr){
rfcomm_register_packet_handler(packet_handler);
hfp_init(rfcomm_channel_nr);
}
void hfp_ag_connect(bd_addr_t bd_addr){
hfp_connect(bd_addr, SDP_Handsfree);
}
void hfp_ag_disconnect(bd_addr_t bd_addr){
}

2
src/hfp_ag.h
View File

@ -54,7 +54,9 @@ extern "C" {
#endif
void hfp_ag_create_service(uint8_t * service, int rfcomm_channel_nr, const char * name, uint8_t ability_to_reject_call, uint16_t supported_features);
void hfp_ag_init(uint16_t rfcomm_channel_nr);
void hfp_ag_connect(bd_addr_t bd_addr);
void hfp_ag_disconnect(bd_addr_t bd_addr);
#if defined __cplusplus
}

34
src/hfp_hf.c
View File

@ -63,8 +63,7 @@
static const char default_hfp_hf_service_name[] = "Hands-Free unit";
static linked_item_t * get_hfp_connections();
static void packet_handler(void * connection, uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size);
void hfp_hf_create_service(uint8_t * service, int rfcomm_channel_nr, const char * name, uint16_t supported_features){
if (!name){
@ -73,7 +72,6 @@ void hfp_hf_create_service(uint8_t * service, int rfcomm_channel_nr, const char
hfp_create_service(service, SDP_Handsfree, rfcomm_channel_nr, name, supported_features);
}
// static void hfp_hf_reset_state(uint16_t con_handle){
// hfp_connection_t * connection = provide_hfp_connection_context_for_conn_handle(con_handle);
// if (!connection) {
@ -83,11 +81,37 @@ void hfp_hf_create_service(uint8_t * service, int rfcomm_channel_nr, const char
// connection->state = HFP_IDLE;
// }
void hfp_hf_connect(bd_addr_t bd_addr){
hfp_connect(bd_addr, HFP_HANDSFREE);
void hfp_hf_init(uint16_t rfcomm_channel_nr){
hfp_init(rfcomm_channel_nr);
rfcomm_register_packet_handler(packet_handler);
}
static void hfp_run(hfp_connection_t * connection){
if (!connection) return;
switch (connection->state){
default:
break;
}
}
static void packet_handler(void * connection, uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size){
// printf("packet_handler type %u, packet[0] %x\n", packet_type, packet[0]);
hfp_connection_t * context = NULL;
if (packet_type == RFCOMM_DATA_PACKET){
hfp_run(context);
return;
}
context = handle_hci_event(packet_type, packet, size);
hfp_run(context);
}
void hfp_hf_connect(bd_addr_t bd_addr){
hfp_connect(bd_addr, SDP_HandsfreeAudioGateway);
}
void hfp_hf_disconnect(bd_addr_t bd_addr){
}

2
src/hfp_hf.h
View File

@ -55,7 +55,9 @@ extern "C" {
void hfp_hf_create_service(uint8_t * service, int rfcomm_channel_nr, const char * name, uint16_t supported_features);
void hfp_hf_init(uint16_t rfcomm_channel_nr);
void hfp_hf_connect(bd_addr_t bd_addr);
void hfp_hf_disconnect(bd_addr_t bd_addr);
#if defined __cplusplus
}

4
test/pts/hfp_ag_test.c
View File

@ -107,7 +107,7 @@ static int stdin_process(struct data_source *ds){
break;
case 'd':
printf("Releasing audio connection.\n");
hfp_disconnect(pts_addr);
hfp_ag_disconnect(pts_addr);
break;
default:
show_usage();
@ -130,7 +130,7 @@ int btstack_main(int argc, const char * argv[]){
l2cap_init();
rfcomm_init();
hfp_init(rfcomm_channel_nr);
hfp_ag_init(rfcomm_channel_nr);
hfp_register_packet_handler(packet_handler);
sdp_init();

4
test/pts/hfp_hf_test.c
View File

@ -106,7 +106,7 @@ static int stdin_process(struct data_source *ds){
break;
case 'd':
printf("Releasing audio connection.\n");
hfp_disconnect(pts_addr);
hfp_hf_disconnect(pts_addr);
break;
default:
show_usage();
@ -129,7 +129,7 @@ int btstack_main(int argc, const char * argv[]){
l2cap_init();
rfcomm_init();
hfp_init(rfcomm_channel_nr);
hfp_hf_init(rfcomm_channel_nr);
hfp_register_packet_handler(packet_handler);
sdp_init();