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

hfp_test: fix compile

Browse Source
This commit is contained in:
Matthias Ringwald 2016-02-12 16:25:11 +01:00
parent bfbabfe612
commit f4000eeb25
5 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/classic/hfp.c
View File

@ -103,6 +103,11 @@ static hfp_generic_status_indicator_t hfp_generic_status_indicators[HFP_MAX_NUM_
static btstack_linked_list_t hfp_connections = NULL;
static void parse_sequence(hfp_connection_t * context);
static hfp_callback_t hfp_callback;
void hfp_set_callback(hfp_callback_t callback){
hfp_callback = callback;
}
hfp_generic_status_indicator_t * get_hfp_generic_status_indicators(void){
return (hfp_generic_status_indicator_t *) &hfp_generic_status_indicators;
@ -415,6 +420,10 @@ void hfp_create_sdp_record(uint8_t * service, uint32_t service_record_handle, ui
static hfp_connection_t * connection_doing_sdp_query = NULL;
void handle_hci_event(uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size){
hfp_handle_hci_event(packet_type, packet, size);
}
static void handle_query_rfcomm_event(uint8_t packet_type, uint8_t *packet, uint16_t size){
hfp_connection_t * connection = connection_doing_sdp_query;
@ -433,7 +442,7 @@ static void handle_query_rfcomm_event(uint8_t packet_type, uint8_t *packet, uint
if (connection->rfcomm_channel_nr > 0){
connection->state = HFP_W4_RFCOMM_CONNECTED;
log_info("HFP: SDP_EVENT_QUERY_COMPLETE context %p, addr %s, state %d", connection, bd_addr_to_str( connection->remote_addr), connection->state);
rfcomm_create_channel(connection->remote_addr, connection->rfcomm_channel_nr, NULL);
rfcomm_create_channel(handle_hci_event, connection->remote_addr, connection->rfcomm_channel_nr, NULL);
break;
}
log_info("rfcomm service not found, status %u.", sdp_event_query_complete_get_status(packet));
@ -443,7 +452,7 @@ static void handle_query_rfcomm_event(uint8_t packet_type, uint8_t *packet, uint
}
}
void hfp_handle_hci_event(hfp_callback_t callback, uint8_t packet_type, uint8_t *packet, uint16_t size){
void hfp_handle_hci_event(uint8_t packet_type, uint8_t *packet, uint16_t size){
bd_addr_t event_addr;
uint16_t rfcomm_cid, handle;
hfp_connection_t * context = NULL;
@ -451,19 +460,6 @@ void hfp_handle_hci_event(hfp_callback_t callback, uint8_t packet_type, uint8_t
// printf("AG packet_handler type %u, packet[0] %x, size %u\n", packet_type, packet[0], size);
switch (packet[0]) {
case BTSTACK_EVENT_STATE:
// bt stack activated, get started
if (packet[2] == HCI_STATE_WORKING){
printf("BTstack activated, get started .\n");
}
break;
case HCI_EVENT_PIN_CODE_REQUEST:
// inform about pin code request
printf("Pin code request - using '0000'\n\r");
reverse_bd_addr(&packet[2], event_addr);
hci_send_cmd(&hci_pin_code_request_reply, &event_addr, 4, "0000");
break;
case RFCOMM_EVENT_INCOMING_CONNECTION:
// data: event (8), len(8), address(48), channel (8), rfcomm_cid (16)
@ -487,7 +483,7 @@ void hfp_handle_hci_event(hfp_callback_t callback, uint8_t packet_type, uint8_t
if (!context || context->state != HFP_W4_RFCOMM_CONNECTED) return;
if (packet[2]) {
hfp_emit_event(callback, HFP_SUBEVENT_SERVICE_LEVEL_CONNECTION_ESTABLISHED, packet[2]);
hfp_emit_event(hfp_callback, HFP_SUBEVENT_SERVICE_LEVEL_CONNECTION_ESTABLISHED, packet[2]);
remove_hfp_connection_context(context);
} else {
context->con_handle = little_endian_read_16(packet, 9);
@ -509,7 +505,7 @@ void hfp_handle_hci_event(hfp_callback_t callback, uint8_t packet_type, uint8_t
break;
}
// forward event to app, to learn about con_handle
(*callback)(packet, size);
(*hfp_callback)(packet, size);
}
break;
@ -598,7 +594,7 @@ void hfp_handle_hci_event(hfp_callback_t callback, uint8_t packet_type, uint8_t
context->sco_handle = sco_handle;
context->establish_audio_connection = 0;
context->state = HFP_AUDIO_CONNECTION_ESTABLISHED;
hfp_emit_audio_connection_established_event(callback, packet[2], sco_handle);
hfp_emit_audio_connection_established_event(hfp_callback, packet[2], sco_handle);
break;
}
@ -612,7 +608,7 @@ void hfp_handle_hci_event(hfp_callback_t callback, uint8_t packet_type, uint8_t
break;
}
hfp_emit_event(callback, HFP_SUBEVENT_SERVICE_LEVEL_CONNECTION_RELEASED, 0);
hfp_emit_event(hfp_callback, HFP_SUBEVENT_SERVICE_LEVEL_CONNECTION_RELEASED, 0);
remove_hfp_connection_context(context);
break;
@ -632,7 +628,7 @@ void hfp_handle_hci_event(hfp_callback_t callback, uint8_t packet_type, uint8_t
context->sco_handle = 0;
context->release_audio_connection = 0;
context->state = HFP_SERVICE_LEVEL_CONNECTION_ESTABLISHED;
hfp_emit_event(callback, HFP_SUBEVENT_AUDIO_CONNECTION_RELEASED, 0);
hfp_emit_event(hfp_callback, HFP_SUBEVENT_AUDIO_CONNECTION_RELEASED, 0);
break;
}
break;
@ -643,7 +639,7 @@ void hfp_handle_hci_event(hfp_callback_t callback, uint8_t packet_type, uint8_t
case BTSTACK_EVENT_REMOTE_NAME_CACHED:
case HCI_EVENT_REMOTE_NAME_REQUEST_COMPLETE:
// forward inquiry events to app - TODO: replace with new event handler architecture
(*callback)(packet, size);
(*hfp_callback)(packet, size);
break;
}
}

10
src/classic/hfp.h
View File

@ -42,8 +42,8 @@
// *****************************************************************************
#ifndef btstack_hfp_h
#define btstack_hfp_h
#ifndef __BTSTACK_HFP_H
#define __BTSTACK_HFP_H
#include "hci.h"
#include "classic/sdp_query_rfcomm.h"
@ -616,8 +616,10 @@ int get_bit(uint16_t bitmap, int position);
int store_bit(uint32_t bitmap, int position, uint8_t value);
// UTILS_END
void hfp_set_callback(hfp_callback_t callback);
void hfp_create_sdp_record(uint8_t * service, uint32_t service_record_handle, uint16_t service_uuid, int rfcomm_channel_nr, const char * name);
void hfp_handle_hci_event(hfp_callback_t callback, uint8_t packet_type, uint8_t *packet, uint16_t size);
void hfp_handle_hci_event(uint8_t packet_type, uint8_t *packet, uint16_t size);
void hfp_emit_event(hfp_callback_t callback, uint8_t event_subtype, uint8_t value);
void hfp_emit_string_event(hfp_callback_t callback, uint8_t event_subtype, const char * value);
@ -648,4 +650,4 @@ const char * hfp_ag_feature(int index);
}
#endif
#endif
#endif // __BTSTACK_HFP_H

5
src/classic/hfp_ag.c
View File

@ -150,6 +150,7 @@ void hfp_ag_register_packet_handler(hfp_callback_t callback){
return;
}
hfp_callback = callback;
hfp_set_callback(callback);
}
static int use_in_band_tone(){
@ -1966,7 +1967,7 @@ static void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packe
hfp_handle_rfcomm_data(packet_type, channel, packet, size);
break;
case HCI_EVENT_PACKET:
hfp_handle_hci_event(hfp_callback, packet_type, packet, size);
hfp_handle_hci_event(packet_type, packet, size);
break;
default:
break;
@ -1998,7 +1999,7 @@ void hfp_ag_init(uint16_t rfcomm_channel_nr, uint32_t supported_features,
rfcomm_register_service(packet_handler, rfcomm_channel_nr, 0xffff);
hfp_init();
hfp_supported_features = supported_features;
hfp_codecs_nr = codecs_nr;

3
src/classic/hfp_hf.c
View File

@ -92,6 +92,7 @@ void hfp_hf_register_packet_handler(hfp_callback_t callback){
return;
}
hfp_callback = callback;
hfp_set_callback(callback);
}
static int hfp_hf_supports_codec(uint8_t codec){
@ -1017,7 +1018,7 @@ static void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packe
hfp_handle_rfcomm_event(packet_type, channel, packet, size);
break;
case HCI_EVENT_PACKET:
hfp_handle_hci_event(hfp_callback, packet_type, packet, size);
hfp_handle_hci_event(packet_type, packet, size);
default:
break;
}

6
test/hfp/mock.c
View File

@ -229,7 +229,7 @@ void sdp_query_rfcomm_channel_and_name_for_uuid(bd_addr_t remote, uint16_t uuid)
}
uint8_t rfcomm_create_channel(bd_addr_t addr, uint8_t channel, uint16_t * out_cid){
uint8_t rfcomm_create_channel(btstack_packet_handler_t handler, bd_addr_t addr, uint8_t channel, uint16_t * out_cid){
// RFCOMM_EVENT_OPEN_CHANNEL_COMPLETE
uint8_t event[16];
uint8_t pos = 0;
@ -266,7 +266,7 @@ void rfcomm_disconnect(uint16_t rfcomm_cid){
(*registered_rfcomm_packet_handler)(HCI_EVENT_PACKET, 0, (uint8_t *) event, sizeof(event));
}
uint8_t rfcomm_register_service(btstack_packet_handler_t packet_handler, uint8_t channel, uint16_t max_frame_size){
uint8_t rfcomm_register_service(btstack_packet_handler_t handler, uint8_t channel, uint16_t max_frame_size){
printf("rfcomm_register_service\n");
registered_rfcomm_packet_handler = handler;
return 0;
@ -314,7 +314,7 @@ uint16_t hci_get_sco_voice_setting(){
return 0x40;
}
int hci_remote_eSCO_supported(hci_con_handle_t handle){
int hci_remote_esco_supported(hci_con_handle_t handle){
return 0;
}