tequilaOS/platform_hardware_libhardware
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bluetooth: Multi HF support

Browse source 
This patch adds multi hf support in HAL
Adds bd_addr parameter for callbacks from stack.

Change-Id: I960bc127026d7e96dea79316e1f03b0b0915974a
This commit is contained in:
Sunny Kapdi 2014-03-14 18:21:58 -07:00 committed by Matthew Xie
parent d482efcd74
commit 6253b05364
1 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
include/hardware/bt_hf.h
View file

@ -79,65 +79,65 @@ typedef void (* bthf_audio_state_callback)(bthf_audio_state_t state, bt_bdaddr_t
/** Callback for VR connection state change. /** Callback for VR connection state change.
* state will have one of the values from BtHfVRState * state will have one of the values from BtHfVRState
*/ */
typedef void (* bthf_vr_cmd_callback)(bthf_vr_state_t state); typedef void (* bthf_vr_cmd_callback)(bthf_vr_state_t state, bt_bdaddr_t *bd_addr);
/** Callback for answer incoming call (ATA) /** Callback for answer incoming call (ATA)
*/ */
typedef void (* bthf_answer_call_cmd_callback)(); typedef void (* bthf_answer_call_cmd_callback)(bt_bdaddr_t *bd_addr);
/** Callback for disconnect call (AT+CHUP) /** Callback for disconnect call (AT+CHUP)
*/ */
typedef void (* bthf_hangup_call_cmd_callback)(); typedef void (* bthf_hangup_call_cmd_callback)(bt_bdaddr_t *bd_addr);
/** Callback for disconnect call (AT+CHUP) /** Callback for disconnect call (AT+CHUP)
* type will denote Speaker/Mic gain (BtHfVolumeControl). * type will denote Speaker/Mic gain (BtHfVolumeControl).
*/ */
typedef void (* bthf_volume_cmd_callback)(bthf_volume_type_t type, int volume); typedef void (* bthf_volume_cmd_callback)(bthf_volume_type_t type, int volume, bt_bdaddr_t *bd_addr);
/** Callback for dialing an outgoing call /** Callback for dialing an outgoing call
* If number is NULL, redial * If number is NULL, redial
*/ */
typedef void (* bthf_dial_call_cmd_callback)(char *number); typedef void (* bthf_dial_call_cmd_callback)(char *number, bt_bdaddr_t *bd_addr);
/** Callback for sending DTMF tones /** Callback for sending DTMF tones
* tone contains the dtmf character to be sent * tone contains the dtmf character to be sent
*/ */
typedef void (* bthf_dtmf_cmd_callback)(char tone); typedef void (* bthf_dtmf_cmd_callback)(char tone, bt_bdaddr_t *bd_addr);
/** Callback for enabling/disabling noise reduction/echo cancellation /** Callback for enabling/disabling noise reduction/echo cancellation
* value will be 1 to enable, 0 to disable * value will be 1 to enable, 0 to disable
*/ */
typedef void (* bthf_nrec_cmd_callback)(bthf_nrec_t nrec); typedef void (* bthf_nrec_cmd_callback)(bthf_nrec_t nrec, bt_bdaddr_t *bd_addr);
/** Callback for call hold handling (AT+CHLD) /** Callback for call hold handling (AT+CHLD)
* value will contain the call hold command (0, 1, 2, 3) * value will contain the call hold command (0, 1, 2, 3)
*/ */
typedef void (* bthf_chld_cmd_callback)(bthf_chld_type_t chld); typedef void (* bthf_chld_cmd_callback)(bthf_chld_type_t chld, bt_bdaddr_t *bd_addr);
/** Callback for CNUM (subscriber number) /** Callback for CNUM (subscriber number)
*/ */
typedef void (* bthf_cnum_cmd_callback)(); typedef void (* bthf_cnum_cmd_callback)(bt_bdaddr_t *bd_addr);
/** Callback for indicators (CIND) /** Callback for indicators (CIND)
*/ */
typedef void (* bthf_cind_cmd_callback)(); typedef void (* bthf_cind_cmd_callback)(bt_bdaddr_t *bd_addr);
/** Callback for operator selection (COPS) /** Callback for operator selection (COPS)
*/ */
typedef void (* bthf_cops_cmd_callback)(); typedef void (* bthf_cops_cmd_callback)(bt_bdaddr_t *bd_addr);
/** Callback for call list (AT+CLCC) /** Callback for call list (AT+CLCC)
*/ */
typedef void (* bthf_clcc_cmd_callback) (); typedef void (* bthf_clcc_cmd_callback) (bt_bdaddr_t *bd_addr);
/** Callback for unknown AT command recd from HF /** Callback for unknown AT command recd from HF
* at_string will contain the unparsed AT string * at_string will contain the unparsed AT string
*/ */
typedef void (* bthf_unknown_at_cmd_callback)(char *at_string); typedef void (* bthf_unknown_at_cmd_callback)(char *at_string, bt_bdaddr_t *bd_addr);
/** Callback for keypressed (HSP) event. /** Callback for keypressed (HSP) event.
*/ */
typedef void (* bthf_key_pressed_cmd_callback)(); typedef void (* bthf_key_pressed_cmd_callback)(bt_bdaddr_t *bd_addr);
/** BT-HF callback structure. */ /** BT-HF callback structure. */
typedef struct { typedef struct {
@ -213,7 +213,7 @@ typedef struct {
/** /**
* Register the BtHf callbacks * Register the BtHf callbacks
*/ */
bt_status_t (*init)( bthf_callbacks_t* callbacks ); bt_status_t (*init)( bthf_callbacks_t* callbacks, int max_hf_clients);
/** connect to headset */ /** connect to headset */
bt_status_t (*connect)( bt_bdaddr_t *bd_addr ); bt_status_t (*connect)( bt_bdaddr_t *bd_addr );
@ -228,33 +228,33 @@ typedef struct {
bt_status_t (*disconnect_audio)( bt_bdaddr_t *bd_addr ); bt_status_t (*disconnect_audio)( bt_bdaddr_t *bd_addr );
/** start voice recognition */ /** start voice recognition */
bt_status_t (*start_voice_recognition)(); bt_status_t (*start_voice_recognition)( bt_bdaddr_t *bd_addr );
/** stop voice recognition */ /** stop voice recognition */
bt_status_t (*stop_voice_recognition)(); bt_status_t (*stop_voice_recognition)( bt_bdaddr_t *bd_addr );
/** volume control */ /** volume control */
bt_status_t (*volume_control) (bthf_volume_type_t type, int volume); bt_status_t (*volume_control) (bthf_volume_type_t type, int volume, bt_bdaddr_t *bd_addr );
/** Combined device status change notification */ /** Combined device status change notification */
bt_status_t (*device_status_notification)(bthf_network_state_t ntk_state, bthf_service_type_t svc_type, int signal, bt_status_t (*device_status_notification)(bthf_network_state_t ntk_state, bthf_service_type_t svc_type, int signal,
int batt_chg); int batt_chg);
/** Response for COPS command */ /** Response for COPS command */
bt_status_t (*cops_response)(const char *cops); bt_status_t (*cops_response)(const char *cops, bt_bdaddr_t *bd_addr );
/** Response for CIND command */ /** Response for CIND command */
bt_status_t (*cind_response)(int svc, int num_active, int num_held, bthf_call_state_t call_setup_state, bt_status_t (*cind_response)(int svc, int num_active, int num_held, bthf_call_state_t call_setup_state,
int signal, int roam, int batt_chg); int signal, int roam, int batt_chg, bt_bdaddr_t *bd_addr );
/** Pre-formatted AT response, typically in response to unknown AT cmd */ /** Pre-formatted AT response, typically in response to unknown AT cmd */
bt_status_t (*formatted_at_response)(const char *rsp); bt_status_t (*formatted_at_response)(const char *rsp, bt_bdaddr_t *bd_addr );
/** ok/error response /** ok/error response
* ERROR (0) * ERROR (0)
* OK (1) * OK (1)
*/ */
bt_status_t (*at_response) (bthf_at_response_t response_code, int error_code); bt_status_t (*at_response) (bthf_at_response_t response_code, int error_code, bt_bdaddr_t *bd_addr );
/** response for CLCC command /** response for CLCC command
* Can be iteratively called for each call index * Can be iteratively called for each call index
@ -263,7 +263,7 @@ typedef struct {
bt_status_t (*clcc_response) (int index, bthf_call_direction_t dir, bt_status_t (*clcc_response) (int index, bthf_call_direction_t dir,
bthf_call_state_t state, bthf_call_mode_t mode, bthf_call_state_t state, bthf_call_mode_t mode,
bthf_call_mpty_type_t mpty, const char *number, bthf_call_mpty_type_t mpty, const char *number,
bthf_call_addrtype_t type); bthf_call_addrtype_t type, bt_bdaddr_t *bd_addr );
/** notify of a call state change /** notify of a call state change
* Each update notifies * Each update notifies