diff options
| author | 2023-04-12 11:02:28 -0700 | |
|---|---|---|
| committer | 2023-04-27 21:43:34 +0000 | |
| commit | 4e3bbe9aef3e8a0c2ff5aa0da6d1d667fc7b5079 (patch) | |
| tree | 661a4035bd0a183614edbcca4b9f37a9aaccce3e | |
| parent | 1f3cdb147599ec3a10bbec6f3f4c5430f1bc9473 (diff) | |
Remove extern specifiers from function prototype declarations
The extern specifier in this case has no effect as the default
for functions is to have external linkage. However the extern
specifier affects code search ability to explore function
declarations and occurences as the prototype differs from
the declaration.
Test: mmm packages/modules/Bluetooth
Bug: 279964152
Change-Id: I4f2e680d49068a0f708c40373bbe865e110f7db1
141 files changed, 3078 insertions, 3361 deletions
diff --git a/system/audio_hearing_aid_hw/include/audio_hearing_aid_hw.h b/system/audio_hearing_aid_hw/include/audio_hearing_aid_hw.h index 8e4f2559d8..d4e8193e56 100644 --- a/system/audio_hearing_aid_hw/include/audio_hearing_aid_hw.h +++ b/system/audio_hearing_aid_hw/include/audio_hearing_aid_hw.h @@ -139,7 +139,7 @@ typedef uint8_t tHA_CHANNEL_COUNT; // // Returns the computed buffer size. If any of the input parameters is // invalid, the return value is the default |AUDIO_STREAM_OUTPUT_BUFFER_SZ|. -extern size_t audio_ha_hw_stream_compute_buffer_size( +size_t audio_ha_hw_stream_compute_buffer_size( btav_a2dp_codec_sample_rate_t codec_sample_rate, btav_a2dp_codec_bits_per_sample_t codec_bits_per_sample, btav_a2dp_codec_channel_mode_t codec_channel_mode); diff --git a/system/bta/ag/bta_ag_at.h b/system/bta/ag/bta_ag_at.h index e324e197fb..0d61a06c19 100644 --- a/system/bta/ag/bta_ag_at.h +++ b/system/bta/ag/bta_ag_at.h @@ -93,7 +93,7 @@ typedef struct { * Returns void * ****************************************************************************/ -extern void bta_ag_at_init(tBTA_AG_AT_CB* p_cb); +void bta_ag_at_init(tBTA_AG_AT_CB* p_cb); /***************************************************************************** * @@ -107,7 +107,7 @@ extern void bta_ag_at_init(tBTA_AG_AT_CB* p_cb); * Returns void * ****************************************************************************/ -extern void bta_ag_at_reinit(tBTA_AG_AT_CB* p_cb); +void bta_ag_at_reinit(tBTA_AG_AT_CB* p_cb); /***************************************************************************** * @@ -121,6 +121,6 @@ extern void bta_ag_at_reinit(tBTA_AG_AT_CB* p_cb); * Returns void * ****************************************************************************/ -extern void bta_ag_at_parse(tBTA_AG_AT_CB* p_cb, char* p_buf, uint16_t len); +void bta_ag_at_parse(tBTA_AG_AT_CB* p_cb, char* p_buf, uint16_t len); #endif /* BTA_AG_AT_H */ diff --git a/system/bta/ag/bta_ag_int.h b/system/bta/ag/bta_ag_int.h index 68e4de2ac6..c5f21b8ea5 100644 --- a/system/bta/ag/bta_ag_int.h +++ b/system/bta/ag/bta_ag_int.h @@ -321,109 +321,99 @@ extern const tBTA_AG_HF_IND bta_ag_local_hf_ind_cfg[]; bool bta_ag_hdl_event(BT_HDR_RIGID* p_msg); /* API functions */ -extern void bta_ag_api_enable(tBTA_AG_CBACK* p_cback); -extern void bta_ag_api_disable(); -extern void bta_ag_api_set_active_device(const RawAddress& new_active_device); -extern void bta_ag_api_register(tBTA_SERVICE_MASK services, - tBTA_AG_FEAT features, - const std::vector<std::string>& service_names, - uint8_t app_id); -extern void bta_ag_api_result(uint16_t handle, tBTA_AG_RES result, - const tBTA_AG_RES_DATA& result_data); +void bta_ag_api_enable(tBTA_AG_CBACK* p_cback); +void bta_ag_api_disable(); +void bta_ag_api_set_active_device(const RawAddress& new_active_device); +void bta_ag_api_register(tBTA_SERVICE_MASK services, tBTA_AG_FEAT features, + const std::vector<std::string>& service_names, + uint8_t app_id); +void bta_ag_api_result(uint16_t handle, tBTA_AG_RES result, + const tBTA_AG_RES_DATA& result_data); /* main functions */ -extern void bta_ag_scb_dealloc(tBTA_AG_SCB* p_scb); -extern uint16_t bta_ag_scb_to_idx(tBTA_AG_SCB* p_scb); -extern tBTA_AG_SCB* bta_ag_scb_by_idx(uint16_t idx); -extern uint8_t bta_ag_service_to_idx(tBTA_SERVICE_MASK services); -extern uint16_t bta_ag_idx_by_bdaddr(const RawAddress* peer_addr); -extern bool bta_ag_other_scb_open(tBTA_AG_SCB* p_curr_scb); -extern bool bta_ag_scb_open(tBTA_AG_SCB* p_curr_scb); -extern void bta_ag_sm_execute(tBTA_AG_SCB* p_scb, uint16_t event, - const tBTA_AG_DATA& data); -extern void bta_ag_sm_execute_by_handle(uint16_t handle, uint16_t event, - const tBTA_AG_DATA& data); -extern void bta_ag_collision_cback(tBTA_SYS_CONN_STATUS status, uint8_t id, - uint8_t app_id, const RawAddress& peer_addr); -extern void bta_ag_resume_open(tBTA_AG_SCB* p_scb); +void bta_ag_scb_dealloc(tBTA_AG_SCB* p_scb); +uint16_t bta_ag_scb_to_idx(tBTA_AG_SCB* p_scb); +tBTA_AG_SCB* bta_ag_scb_by_idx(uint16_t idx); +uint8_t bta_ag_service_to_idx(tBTA_SERVICE_MASK services); +uint16_t bta_ag_idx_by_bdaddr(const RawAddress* peer_addr); +bool bta_ag_other_scb_open(tBTA_AG_SCB* p_curr_scb); +bool bta_ag_scb_open(tBTA_AG_SCB* p_curr_scb); +void bta_ag_sm_execute(tBTA_AG_SCB* p_scb, uint16_t event, + const tBTA_AG_DATA& data); +void bta_ag_sm_execute_by_handle(uint16_t handle, uint16_t event, + const tBTA_AG_DATA& data); +void bta_ag_collision_cback(tBTA_SYS_CONN_STATUS status, uint8_t id, + uint8_t app_id, const RawAddress& peer_addr); +void bta_ag_resume_open(tBTA_AG_SCB* p_scb); /* SDP functions */ -extern bool bta_ag_add_record(uint16_t service_uuid, const char* p_service_name, - uint8_t scn, tBTA_AG_FEAT features, - uint32_t sdp_handle); -extern void bta_ag_create_records(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data); -extern void bta_ag_del_records(tBTA_AG_SCB* p_scb); -extern bool bta_ag_sdp_find_attr(tBTA_AG_SCB* p_scb, tBTA_SERVICE_MASK service); -extern void bta_ag_do_disc(tBTA_AG_SCB* p_scb, tBTA_SERVICE_MASK service); -extern void bta_ag_free_db(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data); +bool bta_ag_add_record(uint16_t service_uuid, const char* p_service_name, + uint8_t scn, tBTA_AG_FEAT features, uint32_t sdp_handle); +void bta_ag_create_records(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data); +void bta_ag_del_records(tBTA_AG_SCB* p_scb); +bool bta_ag_sdp_find_attr(tBTA_AG_SCB* p_scb, tBTA_SERVICE_MASK service); +void bta_ag_do_disc(tBTA_AG_SCB* p_scb, tBTA_SERVICE_MASK service); +void bta_ag_free_db(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data); /* RFCOMM functions */ -extern void bta_ag_start_servers(tBTA_AG_SCB* p_scb, - tBTA_SERVICE_MASK services); -extern void bta_ag_close_servers(tBTA_AG_SCB* p_scb, - tBTA_SERVICE_MASK services); -extern bool bta_ag_is_server_closed(tBTA_AG_SCB* p_scb); -extern void bta_ag_rfc_do_close(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data); -extern void bta_ag_rfc_do_open(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data); +void bta_ag_start_servers(tBTA_AG_SCB* p_scb, tBTA_SERVICE_MASK services); +void bta_ag_close_servers(tBTA_AG_SCB* p_scb, tBTA_SERVICE_MASK services); +bool bta_ag_is_server_closed(tBTA_AG_SCB* p_scb); +void bta_ag_rfc_do_close(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data); +void bta_ag_rfc_do_open(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data); /* SCO functions */ -extern bool bta_ag_sco_is_active_device(const RawAddress& bd_addr); -extern bool bta_ag_sco_is_open(tBTA_AG_SCB* p_scb); -extern bool bta_ag_sco_is_opening(tBTA_AG_SCB* p_scb); -extern void bta_ag_sco_conn_rsp(tBTA_AG_SCB* p_scb, - tBTM_ESCO_CONN_REQ_EVT_DATA* data); +bool bta_ag_sco_is_active_device(const RawAddress& bd_addr); +bool bta_ag_sco_is_open(tBTA_AG_SCB* p_scb); +bool bta_ag_sco_is_opening(tBTA_AG_SCB* p_scb); +void bta_ag_sco_conn_rsp(tBTA_AG_SCB* p_scb, tBTM_ESCO_CONN_REQ_EVT_DATA* data); /* AT command functions */ -extern void bta_ag_at_hsp_cback(tBTA_AG_SCB* p_scb, uint16_t cmd, - uint8_t arg_type, char* p_arg, char* p_end, - int16_t int_arg); -extern void bta_ag_at_hfp_cback(tBTA_AG_SCB* p_scb, uint16_t cmd, - uint8_t arg_type, char* p_arg, char* p_end, - int16_t int_arg); -extern void bta_ag_at_err_cback(tBTA_AG_SCB* p_scb, bool unknown, - const char* p_arg); -extern bool bta_ag_inband_enabled(tBTA_AG_SCB* p_scb); -extern void bta_ag_send_call_inds(tBTA_AG_SCB* p_scb, tBTA_AG_RES result); +void bta_ag_at_hsp_cback(tBTA_AG_SCB* p_scb, uint16_t cmd, uint8_t arg_type, + char* p_arg, char* p_end, int16_t int_arg); +void bta_ag_at_hfp_cback(tBTA_AG_SCB* p_scb, uint16_t cmd, uint8_t arg_type, + char* p_arg, char* p_end, int16_t int_arg); +void bta_ag_at_err_cback(tBTA_AG_SCB* p_scb, bool unknown, const char* p_arg); +bool bta_ag_inband_enabled(tBTA_AG_SCB* p_scb); +void bta_ag_send_call_inds(tBTA_AG_SCB* p_scb, tBTA_AG_RES result); /* Action functions */ -extern void bta_ag_register(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data); -extern void bta_ag_deregister(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data); -extern void bta_ag_start_dereg(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data); -extern void bta_ag_start_close(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data); -extern void bta_ag_start_open(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data); -extern void bta_ag_disc_int_res(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data); -extern void bta_ag_disc_acp_res(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data); -extern void bta_ag_disc_fail(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data); -extern void bta_ag_open_fail(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data); -extern void bta_ag_rfc_fail(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data); -extern void bta_ag_rfc_close(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data); -extern void bta_ag_rfc_open(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data); -extern void bta_ag_rfc_acp_open(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data); -extern void bta_ag_rfc_data(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data); -extern void bta_ag_sco_listen(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data); -extern void bta_ag_sco_open(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data); -extern void bta_ag_sco_close(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data); -extern void bta_ag_sco_shutdown(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data); -extern void bta_ag_sco_conn_open(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data); -extern void bta_ag_sco_conn_close(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data); -extern void bta_ag_post_sco_open(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data); -extern void bta_ag_post_sco_close(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data); -extern void bta_ag_svc_conn_open(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data); -extern void bta_ag_result(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data); -extern void bta_ag_setcodec(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data); -extern void bta_ag_send_ring(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data); -extern void bta_ag_handle_collision(tBTA_AG_SCB* p_scb, - const tBTA_AG_DATA& data); +void bta_ag_register(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data); +void bta_ag_deregister(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data); +void bta_ag_start_dereg(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data); +void bta_ag_start_close(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data); +void bta_ag_start_open(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data); +void bta_ag_disc_int_res(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data); +void bta_ag_disc_acp_res(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data); +void bta_ag_disc_fail(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data); +void bta_ag_open_fail(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data); +void bta_ag_rfc_fail(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data); +void bta_ag_rfc_close(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data); +void bta_ag_rfc_open(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data); +void bta_ag_rfc_acp_open(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data); +void bta_ag_rfc_data(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data); +void bta_ag_sco_listen(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data); +void bta_ag_sco_open(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data); +void bta_ag_sco_close(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data); +void bta_ag_sco_shutdown(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data); +void bta_ag_sco_conn_open(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data); +void bta_ag_sco_conn_close(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data); +void bta_ag_post_sco_open(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data); +void bta_ag_post_sco_close(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data); +void bta_ag_svc_conn_open(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data); +void bta_ag_result(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data); +void bta_ag_setcodec(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data); +void bta_ag_send_ring(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data); +void bta_ag_handle_collision(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data); /* Internal utility functions */ -extern void bta_ag_sco_codec_nego(tBTA_AG_SCB* p_scb, bool result); -extern void bta_ag_codec_negotiate(tBTA_AG_SCB* p_scb); -extern bool bta_ag_is_sco_open_allowed(tBTA_AG_SCB* p_scb, - const std::string event); -extern void bta_ag_send_bcs(tBTA_AG_SCB* p_scb); -extern void bta_ag_set_sco_offload_enabled(bool value); -extern void bta_ag_set_sco_allowed(bool value); -extern const RawAddress& bta_ag_get_active_device(); -extern void bta_clear_active_device(); +void bta_ag_sco_codec_nego(tBTA_AG_SCB* p_scb, bool result); +void bta_ag_codec_negotiate(tBTA_AG_SCB* p_scb); +bool bta_ag_is_sco_open_allowed(tBTA_AG_SCB* p_scb, const std::string event); +void bta_ag_send_bcs(tBTA_AG_SCB* p_scb); +void bta_ag_set_sco_offload_enabled(bool value); +void bta_ag_set_sco_allowed(bool value); +const RawAddress& bta_ag_get_active_device(); +void bta_clear_active_device(); #endif /* BTA_AG_INT_H */ diff --git a/system/bta/av/bta_av_int.h b/system/bta/av/bta_av_int.h index f50f5bc067..997aa9b0c5 100644 --- a/system/bta/av/bta_av_int.h +++ b/system/bta/av/bta_av_int.h @@ -699,131 +699,128 @@ extern uint16_t* p_bta_av_rc_id; extern uint16_t* p_bta_av_rc_id_ac; extern const tBTA_AV_CO_FUNCTS bta_av_a2dp_cos; -extern void bta_av_sink_data_cback(uint8_t handle, BT_HDR* p_pkt, - uint32_t time_stamp, uint8_t m_pt); +void bta_av_sink_data_cback(uint8_t handle, BT_HDR* p_pkt, uint32_t time_stamp, + uint8_t m_pt); /***************************************************************************** * Function prototypes ****************************************************************************/ /* utility functions */ -extern tBTA_AV_SCB* bta_av_hndl_to_scb(uint16_t handle); +tBTA_AV_SCB* bta_av_hndl_to_scb(uint16_t handle); tBTA_AV_SCB* bta_av_addr_to_scb(const RawAddress& bd_addr); -extern bool bta_av_chk_start(tBTA_AV_SCB* p_scb); -extern void bta_av_restore_switch(void); -extern void bta_av_conn_cback(uint8_t handle, const RawAddress& bd_addr, - uint8_t event, tAVDT_CTRL* p_data, - uint8_t scb_index); -extern uint8_t bta_av_rc_create(tBTA_AV_CB* p_cb, uint8_t role, uint8_t shdl, - uint8_t lidx); -extern void bta_av_stream_chg(tBTA_AV_SCB* p_scb, bool started); -extern bool bta_av_is_scb_opening(tBTA_AV_SCB* p_scb); -extern bool bta_av_is_scb_incoming(tBTA_AV_SCB* p_scb); -extern void bta_av_set_scb_sst_init(tBTA_AV_SCB* p_scb); -extern bool bta_av_is_scb_init(tBTA_AV_SCB* p_scb); -extern void bta_av_set_scb_sst_incoming(tBTA_AV_SCB* p_scb); -extern tBTA_AV_LCB* bta_av_find_lcb(const RawAddress& addr, uint8_t op); -extern const char* bta_av_sst_code(uint8_t state); -extern void bta_av_free_scb(tBTA_AV_SCB* p_scb); +bool bta_av_chk_start(tBTA_AV_SCB* p_scb); +void bta_av_restore_switch(void); +void bta_av_conn_cback(uint8_t handle, const RawAddress& bd_addr, uint8_t event, + tAVDT_CTRL* p_data, uint8_t scb_index); +uint8_t bta_av_rc_create(tBTA_AV_CB* p_cb, uint8_t role, uint8_t shdl, + uint8_t lidx); +void bta_av_stream_chg(tBTA_AV_SCB* p_scb, bool started); +bool bta_av_is_scb_opening(tBTA_AV_SCB* p_scb); +bool bta_av_is_scb_incoming(tBTA_AV_SCB* p_scb); +void bta_av_set_scb_sst_init(tBTA_AV_SCB* p_scb); +bool bta_av_is_scb_init(tBTA_AV_SCB* p_scb); +void bta_av_set_scb_sst_incoming(tBTA_AV_SCB* p_scb); +tBTA_AV_LCB* bta_av_find_lcb(const RawAddress& addr, uint8_t op); +const char* bta_av_sst_code(uint8_t state); +void bta_av_free_scb(tBTA_AV_SCB* p_scb); /* main functions */ -extern void bta_av_api_deregister(tBTA_AV_DATA* p_data); -extern void bta_av_dup_audio_buf(tBTA_AV_SCB* p_scb, BT_HDR* p_buf); -extern void bta_av_sm_execute(tBTA_AV_CB* p_cb, uint16_t event, - tBTA_AV_DATA* p_data); -extern void bta_av_ssm_execute(tBTA_AV_SCB* p_scb, uint16_t event, - tBTA_AV_DATA* p_data); -extern bool bta_av_hdl_event(BT_HDR_RIGID* p_msg); -extern const char* bta_av_evt_code(uint16_t evt_code); -extern bool bta_av_switch_if_needed(tBTA_AV_SCB* p_scb); -extern bool bta_av_link_role_ok(tBTA_AV_SCB* p_scb, uint8_t bits); +void bta_av_api_deregister(tBTA_AV_DATA* p_data); +void bta_av_dup_audio_buf(tBTA_AV_SCB* p_scb, BT_HDR* p_buf); +void bta_av_sm_execute(tBTA_AV_CB* p_cb, uint16_t event, tBTA_AV_DATA* p_data); +void bta_av_ssm_execute(tBTA_AV_SCB* p_scb, uint16_t event, + tBTA_AV_DATA* p_data); +bool bta_av_hdl_event(BT_HDR_RIGID* p_msg); +const char* bta_av_evt_code(uint16_t evt_code); +bool bta_av_switch_if_needed(tBTA_AV_SCB* p_scb); +bool bta_av_link_role_ok(tBTA_AV_SCB* p_scb, uint8_t bits); /* nsm action functions */ -extern void bta_av_api_disconnect(tBTA_AV_DATA* p_data); -extern void bta_av_set_use_latency_mode(tBTA_AV_SCB* p_scb, - bool use_latency_mode); -extern void bta_av_api_set_latency(tBTA_AV_DATA* p_data); -extern void bta_av_sig_chg(tBTA_AV_DATA* p_data); -extern void bta_av_signalling_timer(tBTA_AV_DATA* p_data); -extern void bta_av_rc_disc_done(tBTA_AV_DATA* p_data); -extern void bta_av_rc_closed(tBTA_AV_DATA* p_data); -extern void bta_av_rc_browse_opened(tBTA_AV_DATA* p_data); -extern void bta_av_rc_browse_closed(tBTA_AV_DATA* p_data); -extern void bta_av_rc_disc(uint8_t disc); -extern void bta_av_conn_chg(tBTA_AV_DATA* p_data); -extern void bta_av_dereg_comp(tBTA_AV_DATA* p_data); +void bta_av_api_disconnect(tBTA_AV_DATA* p_data); +void bta_av_set_use_latency_mode(tBTA_AV_SCB* p_scb, bool use_latency_mode); +void bta_av_api_set_latency(tBTA_AV_DATA* p_data); +void bta_av_sig_chg(tBTA_AV_DATA* p_data); +void bta_av_signalling_timer(tBTA_AV_DATA* p_data); +void bta_av_rc_disc_done(tBTA_AV_DATA* p_data); +void bta_av_rc_closed(tBTA_AV_DATA* p_data); +void bta_av_rc_browse_opened(tBTA_AV_DATA* p_data); +void bta_av_rc_browse_closed(tBTA_AV_DATA* p_data); +void bta_av_rc_disc(uint8_t disc); +void bta_av_conn_chg(tBTA_AV_DATA* p_data); +void bta_av_dereg_comp(tBTA_AV_DATA* p_data); /* sm action functions */ -extern void bta_av_disable(tBTA_AV_CB* p_cb, tBTA_AV_DATA* p_data); -extern void bta_av_rc_opened(tBTA_AV_CB* p_cb, tBTA_AV_DATA* p_data); -extern void bta_av_rc_remote_cmd(tBTA_AV_CB* p_cb, tBTA_AV_DATA* p_data); -extern void bta_av_rc_vendor_cmd(tBTA_AV_CB* p_cb, tBTA_AV_DATA* p_data); -extern void bta_av_rc_vendor_rsp(tBTA_AV_CB* p_cb, tBTA_AV_DATA* p_data); -extern void bta_av_rc_msg(tBTA_AV_CB* p_cb, tBTA_AV_DATA* p_data); -extern void bta_av_rc_close(tBTA_AV_CB* p_cb, tBTA_AV_DATA* p_data); -extern void bta_av_rc_meta_rsp(tBTA_AV_CB* p_cb, tBTA_AV_DATA* p_data); -extern void bta_av_rc_free_rsp(tBTA_AV_CB* p_cb, tBTA_AV_DATA* p_data); -extern void bta_av_rc_free_browse_msg(tBTA_AV_CB* p_cb, tBTA_AV_DATA* p_data); - -extern tBTA_AV_RCB* bta_av_get_rcb_by_shdl(uint8_t shdl); -extern void bta_av_del_rc(tBTA_AV_RCB* p_rcb); - -extern void bta_av_proc_stream_evt(uint8_t handle, const RawAddress& bd_addr, - uint8_t event, tAVDT_CTRL* p_data, - uint8_t scb_index); +void bta_av_disable(tBTA_AV_CB* p_cb, tBTA_AV_DATA* p_data); +void bta_av_rc_opened(tBTA_AV_CB* p_cb, tBTA_AV_DATA* p_data); +void bta_av_rc_remote_cmd(tBTA_AV_CB* p_cb, tBTA_AV_DATA* p_data); +void bta_av_rc_vendor_cmd(tBTA_AV_CB* p_cb, tBTA_AV_DATA* p_data); +void bta_av_rc_vendor_rsp(tBTA_AV_CB* p_cb, tBTA_AV_DATA* p_data); +void bta_av_rc_msg(tBTA_AV_CB* p_cb, tBTA_AV_DATA* p_data); +void bta_av_rc_close(tBTA_AV_CB* p_cb, tBTA_AV_DATA* p_data); +void bta_av_rc_meta_rsp(tBTA_AV_CB* p_cb, tBTA_AV_DATA* p_data); +void bta_av_rc_free_rsp(tBTA_AV_CB* p_cb, tBTA_AV_DATA* p_data); +void bta_av_rc_free_browse_msg(tBTA_AV_CB* p_cb, tBTA_AV_DATA* p_data); + +tBTA_AV_RCB* bta_av_get_rcb_by_shdl(uint8_t shdl); +void bta_av_del_rc(tBTA_AV_RCB* p_rcb); + +void bta_av_proc_stream_evt(uint8_t handle, const RawAddress& bd_addr, + uint8_t event, tAVDT_CTRL* p_data, + uint8_t scb_index); /* ssm action functions */ -extern void bta_av_do_disc_a2dp(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); -extern void bta_av_cleanup(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); -extern void bta_av_free_sdb(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); -extern void bta_av_config_ind(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); -extern void bta_av_disconnect_req(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); -extern void bta_av_security_req(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); -extern void bta_av_security_rsp(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); -extern void bta_av_setconfig_rsp(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); -extern void bta_av_str_opened(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); -extern void bta_av_security_ind(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); -extern void bta_av_security_cfm(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); -extern void bta_av_do_close(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); -extern void bta_av_connect_req(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); -extern void bta_av_sdp_failed(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); -extern void bta_av_disc_results(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); -extern void bta_av_disc_res_as_acp(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); -extern void bta_av_open_failed(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); -extern void bta_av_getcap_results(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); -extern void bta_av_setconfig_rej(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); -extern void bta_av_discover_req(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); -extern void bta_av_conn_failed(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); -extern void bta_av_do_start(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); -extern void bta_av_str_stopped(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); -extern void bta_av_reconfig(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); -extern void bta_av_data_path(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); -extern void bta_av_start_ok(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); -extern void bta_av_start_failed(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); -extern void bta_av_str_closed(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); -extern void bta_av_clr_cong(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); -extern void bta_av_suspend_cfm(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); -extern void bta_av_rcfg_str_ok(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); -extern void bta_av_rcfg_failed(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); -extern void bta_av_rcfg_connect(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); -extern void bta_av_rcfg_discntd(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); -extern void bta_av_suspend_cont(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); -extern void bta_av_rcfg_cfm(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); -extern void bta_av_rcfg_open(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); -extern void bta_av_security_rej(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); -extern void bta_av_open_rc(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); -extern void bta_av_chk_2nd_start(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); -extern void bta_av_save_caps(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); -extern void bta_av_rej_conn(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); -extern void bta_av_rej_conn(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); -extern void bta_av_set_use_rc(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); -extern void bta_av_cco_close(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); -extern void bta_av_switch_role(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); -extern void bta_av_role_res(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); -extern void bta_av_delay_co(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); -extern void bta_av_open_at_inc(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); -extern void bta_av_offload_req(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); -extern void bta_av_offload_rsp(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); -extern void bta_av_vendor_offload_stop(void); -extern void bta_av_st_rc_timer(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); +void bta_av_do_disc_a2dp(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); +void bta_av_cleanup(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); +void bta_av_free_sdb(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); +void bta_av_config_ind(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); +void bta_av_disconnect_req(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); +void bta_av_security_req(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); +void bta_av_security_rsp(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); +void bta_av_setconfig_rsp(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); +void bta_av_str_opened(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); +void bta_av_security_ind(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); +void bta_av_security_cfm(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); +void bta_av_do_close(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); +void bta_av_connect_req(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); +void bta_av_sdp_failed(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); +void bta_av_disc_results(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); +void bta_av_disc_res_as_acp(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); +void bta_av_open_failed(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); +void bta_av_getcap_results(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); +void bta_av_setconfig_rej(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); +void bta_av_discover_req(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); +void bta_av_conn_failed(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); +void bta_av_do_start(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); +void bta_av_str_stopped(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); +void bta_av_reconfig(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); +void bta_av_data_path(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); +void bta_av_start_ok(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); +void bta_av_start_failed(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); +void bta_av_str_closed(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); +void bta_av_clr_cong(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); +void bta_av_suspend_cfm(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); +void bta_av_rcfg_str_ok(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); +void bta_av_rcfg_failed(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); +void bta_av_rcfg_connect(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); +void bta_av_rcfg_discntd(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); +void bta_av_suspend_cont(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); +void bta_av_rcfg_cfm(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); +void bta_av_rcfg_open(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); +void bta_av_security_rej(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); +void bta_av_open_rc(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); +void bta_av_chk_2nd_start(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); +void bta_av_save_caps(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); +void bta_av_rej_conn(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); +void bta_av_rej_conn(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); +void bta_av_set_use_rc(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); +void bta_av_cco_close(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); +void bta_av_switch_role(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); +void bta_av_role_res(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); +void bta_av_delay_co(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); +void bta_av_open_at_inc(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); +void bta_av_offload_req(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); +void bta_av_offload_rsp(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); +void bta_av_vendor_offload_stop(void); +void bta_av_st_rc_timer(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); #endif /* BTA_AV_INT_H */ diff --git a/system/bta/dm/bta_dm_act.cc b/system/bta/dm/bta_dm_act.cc index effb652c73..bd27d70828 100644 --- a/system/bta/dm/bta_dm_act.cc +++ b/system/bta/dm/bta_dm_act.cc @@ -140,7 +140,7 @@ static void bta_dm_ble_id_key_cback(uint8_t key_type, static void bta_dm_gattc_register(void); static void btm_dm_start_gatt_discovery(const RawAddress& bd_addr); static void bta_dm_gattc_callback(tBTA_GATTC_EVT event, tBTA_GATTC* p_data); -extern tBTM_CONTRL_STATE bta_dm_pm_obtain_controller_state(void); +tBTM_CONTRL_STATE bta_dm_pm_obtain_controller_state(void); #if (BLE_VND_INCLUDED == TRUE) static void bta_dm_ctrl_features_rd_cmpl_cback(tHCI_STATUS result); #endif diff --git a/system/bta/dm/bta_dm_api.cc b/system/bta/dm/bta_dm_api.cc index 879bb440ef..325d82ef75 100644 --- a/system/bta/dm/bta_dm_api.cc +++ b/system/bta/dm/bta_dm_api.cc @@ -588,8 +588,8 @@ void BTA_DmCloseACL(const RawAddress& bd_addr, bool remove_dev, * Returns void. * ******************************************************************************/ -extern void BTA_DmBleObserve(bool start, uint8_t duration, - tBTA_DM_SEARCH_CBACK* p_results_cb) { +void BTA_DmBleObserve(bool start, uint8_t duration, + tBTA_DM_SEARCH_CBACK* p_results_cb) { APPL_TRACE_API("%s:start = %d ", __func__, start); do_in_main_thread( FROM_HERE, base::Bind(bta_dm_ble_observe, start, duration, p_results_cb)); @@ -609,7 +609,7 @@ extern void BTA_DmBleObserve(bool start, uint8_t duration, * Returns void * ******************************************************************************/ -extern void BTA_DmBleScan(bool start, uint8_t duration_sec) { +void BTA_DmBleScan(bool start, uint8_t duration_sec) { APPL_TRACE_API("%s:start = %d ", __func__, start); do_in_main_thread(FROM_HERE, base::Bind(bta_dm_ble_scan, start, duration_sec)); diff --git a/system/bta/dm/bta_dm_int.h b/system/bta/dm/bta_dm_int.h index ad1684a7f8..947d5ab5a7 100644 --- a/system/bta/dm/bta_dm_int.h +++ b/system/bta/dm/bta_dm_int.h @@ -503,101 +503,96 @@ extern tBTA_DM_SEARCH_CB bta_dm_search_cb; /* DI control block */ extern tBTA_DM_DI_CB bta_dm_di_cb; -extern bool bta_dm_search_sm_execute(BT_HDR_RIGID* p_msg); -extern void bta_dm_search_sm_disable(void); - -extern void bta_dm_enable(tBTA_DM_SEC_CBACK*); -extern void bta_dm_disable(); -extern void bta_dm_init_cb(void); -extern void bta_dm_deinit_cb(void); -extern void bta_dm_set_dev_name(const std::vector<uint8_t>&); -extern void bta_dm_set_visibility(tBTA_DM_DISC, tBTA_DM_CONN); -extern void bta_dm_set_scan_config(tBTA_DM_MSG* p_data); -extern void bta_dm_vendor_spec_command(tBTA_DM_MSG* p_data); -extern void bta_dm_bond(const RawAddress&, tBLE_ADDR_TYPE, tBT_TRANSPORT, - tBT_DEVICE_TYPE); -extern void bta_dm_bond_cancel(const RawAddress&); -extern void bta_dm_pin_reply(std::unique_ptr<tBTA_DM_API_PIN_REPLY> msg); -extern void bta_dm_add_device(std::unique_ptr<tBTA_DM_API_ADD_DEVICE> msg); -extern void bta_dm_remove_device(const RawAddress& bd_addr); -extern void bta_dm_close_acl(const RawAddress&, bool, tBT_TRANSPORT); - -extern void bta_dm_pm_btm_status(const RawAddress&, tBTM_PM_STATUS, uint16_t, - tHCI_STATUS); -extern void bta_dm_pm_timer(const RawAddress&, tBTA_DM_PM_ACTION); -extern void bta_dm_add_ampkey(tBTA_DM_MSG* p_data); - -extern void bta_dm_add_blekey(const RawAddress& bd_addr, - tBTA_LE_KEY_VALUE blekey, - tBTM_LE_KEY_TYPE key_type); -extern void bta_dm_add_ble_device(const RawAddress& bd_addr, - tBLE_ADDR_TYPE addr_type, - tBT_DEVICE_TYPE dev_type); -extern void bta_dm_ble_passkey_reply(const RawAddress& bd_addr, bool accept, - uint32_t passkey); -extern void bta_dm_ble_confirm_reply(const RawAddress&, bool); -extern void bta_dm_ble_set_conn_params(const RawAddress&, uint16_t, uint16_t, - uint16_t, uint16_t); -extern void bta_dm_close_gatt_conn(tBTA_DM_MSG* p_data); -extern void bta_dm_ble_observe(bool, uint8_t, tBTA_DM_SEARCH_CBACK*); -extern void bta_dm_ble_scan(bool, uint8_t); -extern void bta_dm_ble_csis_observe(bool, tBTA_DM_SEARCH_CBACK*); -extern void bta_dm_ble_update_conn_params(const RawAddress&, uint16_t, uint16_t, - uint16_t, uint16_t, uint16_t, - uint16_t); -extern void bta_dm_ble_config_local_privacy(bool); - -extern void bta_dm_ble_set_data_length(const RawAddress& bd_addr); - -extern void bta_dm_ble_get_energy_info(tBTA_BLE_ENERGY_INFO_CBACK*); - -extern void bta_dm_set_encryption(const RawAddress&, tBT_TRANSPORT, - tBTA_DM_ENCRYPT_CBACK*, tBTM_BLE_SEC_ACT); -extern void bta_dm_confirm(const RawAddress&, bool); - -extern void bta_dm_ci_rmt_oob_act(std::unique_ptr<tBTA_DM_CI_RMT_OOB> msg); - -extern void bta_dm_init_pm(void); -extern void bta_dm_disable_pm(void); - -extern uint8_t bta_dm_get_av_count(void); -extern void bta_dm_search_start(tBTA_DM_MSG* p_data); -extern void bta_dm_search_cancel(); -extern void bta_dm_discover(tBTA_DM_MSG* p_data); -extern void bta_dm_inq_cmpl(uint8_t num); -extern void bta_dm_rmt_name(tBTA_DM_MSG* p_data); -extern void bta_dm_sdp_result(tBTA_DM_MSG* p_data); -extern void bta_dm_search_cmpl(); -extern void bta_dm_free_sdp_db(); -extern void bta_dm_disc_result(tBTA_DM_MSG* p_data); -extern void bta_dm_search_result(tBTA_DM_MSG* p_data); -extern void bta_dm_discovery_cmpl(tBTA_DM_MSG* p_data); -extern void bta_dm_queue_search(tBTA_DM_MSG* p_data); -extern void bta_dm_queue_disc(tBTA_DM_MSG* p_data); -extern void bta_dm_execute_queued_request(); -extern bool bta_dm_is_search_request_queued(); -extern void bta_dm_search_clear_queue(); -extern void bta_dm_search_cancel_notify(); -extern void bta_dm_disc_rmt_name(tBTA_DM_MSG* p_data); -extern tBTA_DM_PEER_DEVICE* bta_dm_find_peer_device( - const RawAddress& peer_addr); - -extern void bta_dm_clear_event_filter(void); -extern void bta_dm_clear_event_mask(void); -extern void bta_dm_clear_filter_accept_list(void); -extern void bta_dm_disconnect_all_acls(void); -extern void bta_dm_le_rand(LeRandCallback cb); -extern void bta_dm_set_event_filter_connection_setup_all_devices(); -extern void bta_dm_allow_wake_by_hid( +bool bta_dm_search_sm_execute(BT_HDR_RIGID* p_msg); +void bta_dm_search_sm_disable(void); + +void bta_dm_enable(tBTA_DM_SEC_CBACK*); +void bta_dm_disable(); +void bta_dm_init_cb(void); +void bta_dm_deinit_cb(void); +void bta_dm_set_dev_name(const std::vector<uint8_t>&); +void bta_dm_set_visibility(tBTA_DM_DISC, tBTA_DM_CONN); +void bta_dm_set_scan_config(tBTA_DM_MSG* p_data); +void bta_dm_vendor_spec_command(tBTA_DM_MSG* p_data); +void bta_dm_bond(const RawAddress&, tBLE_ADDR_TYPE, tBT_TRANSPORT, + tBT_DEVICE_TYPE); +void bta_dm_bond_cancel(const RawAddress&); +void bta_dm_pin_reply(std::unique_ptr<tBTA_DM_API_PIN_REPLY> msg); +void bta_dm_add_device(std::unique_ptr<tBTA_DM_API_ADD_DEVICE> msg); +void bta_dm_remove_device(const RawAddress& bd_addr); +void bta_dm_close_acl(const RawAddress&, bool, tBT_TRANSPORT); + +void bta_dm_pm_btm_status(const RawAddress&, tBTM_PM_STATUS, uint16_t, + tHCI_STATUS); +void bta_dm_pm_timer(const RawAddress&, tBTA_DM_PM_ACTION); +void bta_dm_add_ampkey(tBTA_DM_MSG* p_data); + +void bta_dm_add_blekey(const RawAddress& bd_addr, tBTA_LE_KEY_VALUE blekey, + tBTM_LE_KEY_TYPE key_type); +void bta_dm_add_ble_device(const RawAddress& bd_addr, tBLE_ADDR_TYPE addr_type, + tBT_DEVICE_TYPE dev_type); +void bta_dm_ble_passkey_reply(const RawAddress& bd_addr, bool accept, + uint32_t passkey); +void bta_dm_ble_confirm_reply(const RawAddress&, bool); +void bta_dm_ble_set_conn_params(const RawAddress&, uint16_t, uint16_t, uint16_t, + uint16_t); +void bta_dm_close_gatt_conn(tBTA_DM_MSG* p_data); +void bta_dm_ble_observe(bool, uint8_t, tBTA_DM_SEARCH_CBACK*); +void bta_dm_ble_scan(bool, uint8_t); +void bta_dm_ble_csis_observe(bool, tBTA_DM_SEARCH_CBACK*); +void bta_dm_ble_update_conn_params(const RawAddress&, uint16_t, uint16_t, + uint16_t, uint16_t, uint16_t, uint16_t); +void bta_dm_ble_config_local_privacy(bool); + +void bta_dm_ble_set_data_length(const RawAddress& bd_addr); + +void bta_dm_ble_get_energy_info(tBTA_BLE_ENERGY_INFO_CBACK*); + +void bta_dm_set_encryption(const RawAddress&, tBT_TRANSPORT, + tBTA_DM_ENCRYPT_CBACK*, tBTM_BLE_SEC_ACT); +void bta_dm_confirm(const RawAddress&, bool); + +void bta_dm_ci_rmt_oob_act(std::unique_ptr<tBTA_DM_CI_RMT_OOB> msg); + +void bta_dm_init_pm(void); +void bta_dm_disable_pm(void); + +uint8_t bta_dm_get_av_count(void); +void bta_dm_search_start(tBTA_DM_MSG* p_data); +void bta_dm_search_cancel(); +void bta_dm_discover(tBTA_DM_MSG* p_data); +void bta_dm_inq_cmpl(uint8_t num); +void bta_dm_rmt_name(tBTA_DM_MSG* p_data); +void bta_dm_sdp_result(tBTA_DM_MSG* p_data); +void bta_dm_search_cmpl(); +void bta_dm_free_sdp_db(); +void bta_dm_disc_result(tBTA_DM_MSG* p_data); +void bta_dm_search_result(tBTA_DM_MSG* p_data); +void bta_dm_discovery_cmpl(tBTA_DM_MSG* p_data); +void bta_dm_queue_search(tBTA_DM_MSG* p_data); +void bta_dm_queue_disc(tBTA_DM_MSG* p_data); +void bta_dm_execute_queued_request(); +bool bta_dm_is_search_request_queued(); +void bta_dm_search_clear_queue(); +void bta_dm_search_cancel_notify(); +void bta_dm_disc_rmt_name(tBTA_DM_MSG* p_data); +tBTA_DM_PEER_DEVICE* bta_dm_find_peer_device(const RawAddress& peer_addr); + +void bta_dm_clear_event_filter(void); +void bta_dm_clear_event_mask(void); +void bta_dm_clear_filter_accept_list(void); +void bta_dm_disconnect_all_acls(void); +void bta_dm_le_rand(LeRandCallback cb); +void bta_dm_set_event_filter_connection_setup_all_devices(); +void bta_dm_allow_wake_by_hid( std::vector<RawAddress> classic_hid_devices, std::vector<std::pair<RawAddress, uint8_t>> le_hid_devices); -extern void bta_dm_restore_filter_accept_list( +void bta_dm_restore_filter_accept_list( std::vector<std::pair<RawAddress, uint8_t>> le_devices); -extern void bta_dm_set_default_event_mask_except(uint64_t mask, - uint64_t le_mask); -extern void bta_dm_set_event_filter_inquiry_result_all_devices(); +void bta_dm_set_default_event_mask_except(uint64_t mask, uint64_t le_mask); +void bta_dm_set_event_filter_inquiry_result_all_devices(); -extern void bta_dm_ble_reset_id(void); +void bta_dm_ble_reset_id(void); tBTA_DM_STATE bta_dm_search_get_state(); void bta_dm_search_set_state(tBTA_DM_STATE state); @@ -608,8 +603,7 @@ void bta_dm_eir_update_cust_uuid(const tBTA_CUSTOM_UUID &curr, bool adding); void bta_dm_ble_subrate_request(const RawAddress& bd_addr, uint16_t subrate_min, uint16_t subrate_max, uint16_t max_latency, uint16_t cont_num, uint16_t timeout); -extern void bta_dm_consolidate(const RawAddress& identity_addr, - const RawAddress& rpa); +void bta_dm_consolidate(const RawAddress& identity_addr, const RawAddress& rpa); #undef CASE_RETURN_TEXT #endif /* BTA_DM_INT_H */ diff --git a/system/bta/gatt/bta_gattc_int.h b/system/bta/gatt/bta_gattc_int.h index 4bde58ddb9..cc76645cd7 100644 --- a/system/bta/gatt/bta_gattc_int.h +++ b/system/bta/gatt/bta_gattc_int.h @@ -334,168 +334,147 @@ extern tBTA_GATTC_CB bta_gattc_cb; /***************************************************************************** * Function prototypes ****************************************************************************/ -extern bool bta_gattc_hdl_event(BT_HDR_RIGID* p_msg); -extern bool bta_gattc_sm_execute(tBTA_GATTC_CLCB* p_clcb, uint16_t event, - const tBTA_GATTC_DATA* p_data); +bool bta_gattc_hdl_event(BT_HDR_RIGID* p_msg); +bool bta_gattc_sm_execute(tBTA_GATTC_CLCB* p_clcb, uint16_t event, + const tBTA_GATTC_DATA* p_data); /* function processed outside SM */ -extern void bta_gattc_disable(); -extern void bta_gattc_register(const bluetooth::Uuid& app_uuid, - tBTA_GATTC_CBACK* p_data, - BtaAppRegisterCallback cb, bool eatt_support); -extern void bta_gattc_process_api_open(const tBTA_GATTC_DATA* p_msg); -extern void bta_gattc_process_api_open_cancel(const tBTA_GATTC_DATA* p_msg); -extern void bta_gattc_deregister(tBTA_GATTC_RCB* p_clreg); +void bta_gattc_disable(); +void bta_gattc_register(const bluetooth::Uuid& app_uuid, + tBTA_GATTC_CBACK* p_data, BtaAppRegisterCallback cb, + bool eatt_support); +void bta_gattc_process_api_open(const tBTA_GATTC_DATA* p_msg); +void bta_gattc_process_api_open_cancel(const tBTA_GATTC_DATA* p_msg); +void bta_gattc_deregister(tBTA_GATTC_RCB* p_clreg); /* function within state machine */ -extern void bta_gattc_open(tBTA_GATTC_CLCB* p_clcb, +void bta_gattc_open(tBTA_GATTC_CLCB* p_clcb, const tBTA_GATTC_DATA* p_data); +void bta_gattc_open_fail(tBTA_GATTC_CLCB* p_clcb, + const tBTA_GATTC_DATA* p_data); +void bta_gattc_open_error(tBTA_GATTC_CLCB* p_clcb, + const tBTA_GATTC_DATA* p_data); + +void bta_gattc_cancel_open(tBTA_GATTC_CLCB* p_clcb, const tBTA_GATTC_DATA* p_data); -extern void bta_gattc_open_fail(tBTA_GATTC_CLCB* p_clcb, - const tBTA_GATTC_DATA* p_data); -extern void bta_gattc_open_error(tBTA_GATTC_CLCB* p_clcb, +void bta_gattc_cancel_open_ok(tBTA_GATTC_CLCB* p_clcb, + const tBTA_GATTC_DATA* p_data); +void bta_gattc_cancel_open_error(tBTA_GATTC_CLCB* p_clcb, const tBTA_GATTC_DATA* p_data); -extern void bta_gattc_cancel_open(tBTA_GATTC_CLCB* p_clcb, - const tBTA_GATTC_DATA* p_data); -extern void bta_gattc_cancel_open_ok(tBTA_GATTC_CLCB* p_clcb, - const tBTA_GATTC_DATA* p_data); -extern void bta_gattc_cancel_open_error(tBTA_GATTC_CLCB* p_clcb, - const tBTA_GATTC_DATA* p_data); - -extern void bta_gattc_conn(tBTA_GATTC_CLCB* p_clcb, - const tBTA_GATTC_DATA* p_data); +void bta_gattc_conn(tBTA_GATTC_CLCB* p_clcb, const tBTA_GATTC_DATA* p_data); -extern void bta_gattc_close(tBTA_GATTC_CLCB* p_clcb, - const tBTA_GATTC_DATA* p_data); -extern void bta_gattc_close_fail(tBTA_GATTC_CLCB* p_clcb, - const tBTA_GATTC_DATA* p_data); -extern void bta_gattc_disc_close(tBTA_GATTC_CLCB* p_clcb, - const tBTA_GATTC_DATA* p_data); +void bta_gattc_close(tBTA_GATTC_CLCB* p_clcb, const tBTA_GATTC_DATA* p_data); +void bta_gattc_close_fail(tBTA_GATTC_CLCB* p_clcb, + const tBTA_GATTC_DATA* p_data); +void bta_gattc_disc_close(tBTA_GATTC_CLCB* p_clcb, + const tBTA_GATTC_DATA* p_data); -extern void bta_gattc_start_discover(tBTA_GATTC_CLCB* p_clcb, - const tBTA_GATTC_DATA* p_data); -extern void bta_gattc_start_discover_internal(tBTA_GATTC_CLCB* p_clcb); -extern void bta_gattc_disc_cmpl(tBTA_GATTC_CLCB* p_clcb, - const tBTA_GATTC_DATA* p_data); -extern void bta_gattc_read(tBTA_GATTC_CLCB* p_clcb, - const tBTA_GATTC_DATA* p_data); -extern void bta_gattc_write(tBTA_GATTC_CLCB* p_clcb, - const tBTA_GATTC_DATA* p_data); -extern void bta_gattc_op_cmpl(tBTA_GATTC_CLCB* p_clcb, - const tBTA_GATTC_DATA* p_data); -extern void bta_gattc_q_cmd(tBTA_GATTC_CLCB* p_clcb, - const tBTA_GATTC_DATA* p_data); -extern void bta_gattc_search(tBTA_GATTC_CLCB* p_clcb, - const tBTA_GATTC_DATA* p_data); -extern void bta_gattc_fail(tBTA_GATTC_CLCB* p_clcb, - const tBTA_GATTC_DATA* p_data); -extern void bta_gattc_confirm(tBTA_GATTC_CLCB* p_clcb, - const tBTA_GATTC_DATA* p_data); -extern void bta_gattc_execute(tBTA_GATTC_CLCB* p_clcb, - const tBTA_GATTC_DATA* p_data); -extern void bta_gattc_read_multi(tBTA_GATTC_CLCB* p_clcb, - const tBTA_GATTC_DATA* p_data); -extern void bta_gattc_ci_open(tBTA_GATTC_CLCB* p_clcb, - const tBTA_GATTC_DATA* p_data); -extern void bta_gattc_ci_close(tBTA_GATTC_CLCB* p_clcb, - const tBTA_GATTC_DATA* p_data); -extern void bta_gattc_op_cmpl_during_discovery(tBTA_GATTC_CLCB* p_clcb, - const tBTA_GATTC_DATA* p_data); -extern void bta_gattc_restart_discover(tBTA_GATTC_CLCB* p_clcb, - const tBTA_GATTC_DATA* p_msg); -extern void bta_gattc_cancel_bk_conn(const tBTA_GATTC_API_CANCEL_OPEN* p_data); -extern void bta_gattc_send_open_cback(tBTA_GATTC_RCB* p_clreg, - tGATT_STATUS status, - const RawAddress& remote_bda, - uint16_t conn_id, tBT_TRANSPORT transport, - uint16_t mtu); -extern void bta_gattc_process_api_refresh(const RawAddress& remote_bda); -extern void bta_gattc_cfg_mtu(tBTA_GATTC_CLCB* p_clcb, +void bta_gattc_start_discover(tBTA_GATTC_CLCB* p_clcb, const tBTA_GATTC_DATA* p_data); -extern void bta_gattc_listen(tBTA_GATTC_DATA* p_msg); -extern void bta_gattc_broadcast(tBTA_GATTC_DATA* p_msg); +void bta_gattc_start_discover_internal(tBTA_GATTC_CLCB* p_clcb); +void bta_gattc_disc_cmpl(tBTA_GATTC_CLCB* p_clcb, + const tBTA_GATTC_DATA* p_data); +void bta_gattc_read(tBTA_GATTC_CLCB* p_clcb, const tBTA_GATTC_DATA* p_data); +void bta_gattc_write(tBTA_GATTC_CLCB* p_clcb, const tBTA_GATTC_DATA* p_data); +void bta_gattc_op_cmpl(tBTA_GATTC_CLCB* p_clcb, const tBTA_GATTC_DATA* p_data); +void bta_gattc_q_cmd(tBTA_GATTC_CLCB* p_clcb, const tBTA_GATTC_DATA* p_data); +void bta_gattc_search(tBTA_GATTC_CLCB* p_clcb, const tBTA_GATTC_DATA* p_data); +void bta_gattc_fail(tBTA_GATTC_CLCB* p_clcb, const tBTA_GATTC_DATA* p_data); +void bta_gattc_confirm(tBTA_GATTC_CLCB* p_clcb, const tBTA_GATTC_DATA* p_data); +void bta_gattc_execute(tBTA_GATTC_CLCB* p_clcb, const tBTA_GATTC_DATA* p_data); +void bta_gattc_read_multi(tBTA_GATTC_CLCB* p_clcb, + const tBTA_GATTC_DATA* p_data); +void bta_gattc_ci_open(tBTA_GATTC_CLCB* p_clcb, const tBTA_GATTC_DATA* p_data); +void bta_gattc_ci_close(tBTA_GATTC_CLCB* p_clcb, const tBTA_GATTC_DATA* p_data); +void bta_gattc_op_cmpl_during_discovery(tBTA_GATTC_CLCB* p_clcb, + const tBTA_GATTC_DATA* p_data); +void bta_gattc_restart_discover(tBTA_GATTC_CLCB* p_clcb, + const tBTA_GATTC_DATA* p_msg); +void bta_gattc_cancel_bk_conn(const tBTA_GATTC_API_CANCEL_OPEN* p_data); +void bta_gattc_send_open_cback(tBTA_GATTC_RCB* p_clreg, tGATT_STATUS status, + const RawAddress& remote_bda, uint16_t conn_id, + tBT_TRANSPORT transport, uint16_t mtu); +void bta_gattc_process_api_refresh(const RawAddress& remote_bda); +void bta_gattc_cfg_mtu(tBTA_GATTC_CLCB* p_clcb, const tBTA_GATTC_DATA* p_data); +void bta_gattc_listen(tBTA_GATTC_DATA* p_msg); +void bta_gattc_broadcast(tBTA_GATTC_DATA* p_msg); /* utility functions */ -extern tBTA_GATTC_CLCB* bta_gattc_find_clcb_by_cif(uint8_t client_if, - const RawAddress& remote_bda, - tBT_TRANSPORT transport); -extern tBTA_GATTC_CLCB* bta_gattc_find_clcb_by_conn_id(uint16_t conn_id); -extern tBTA_GATTC_CLCB* bta_gattc_clcb_alloc(tGATT_IF client_if, - const RawAddress& remote_bda, - tBT_TRANSPORT transport); -extern void bta_gattc_clcb_dealloc(tBTA_GATTC_CLCB* p_clcb); -extern void bta_gattc_server_disconnected(tBTA_GATTC_SERV* p_srcb); -extern tBTA_GATTC_CLCB* bta_gattc_find_alloc_clcb(tGATT_IF client_if, - const RawAddress& remote_bda, - tBT_TRANSPORT transport); -extern tBTA_GATTC_RCB* bta_gattc_cl_get_regcb(uint8_t client_if); -extern tBTA_GATTC_SERV* bta_gattc_find_srcb(const RawAddress& bda); -extern tBTA_GATTC_SERV* bta_gattc_srcb_alloc(const RawAddress& bda); -extern tBTA_GATTC_SERV* bta_gattc_find_scb_by_cid(uint16_t conn_id); -extern tBTA_GATTC_CLCB* bta_gattc_find_int_conn_clcb(tBTA_GATTC_DATA* p_msg); -extern tBTA_GATTC_CLCB* bta_gattc_find_int_disconn_clcb(tBTA_GATTC_DATA* p_msg); +tBTA_GATTC_CLCB* bta_gattc_find_clcb_by_cif(uint8_t client_if, + const RawAddress& remote_bda, + tBT_TRANSPORT transport); +tBTA_GATTC_CLCB* bta_gattc_find_clcb_by_conn_id(uint16_t conn_id); +tBTA_GATTC_CLCB* bta_gattc_clcb_alloc(tGATT_IF client_if, + const RawAddress& remote_bda, + tBT_TRANSPORT transport); +void bta_gattc_clcb_dealloc(tBTA_GATTC_CLCB* p_clcb); +void bta_gattc_server_disconnected(tBTA_GATTC_SERV* p_srcb); +tBTA_GATTC_CLCB* bta_gattc_find_alloc_clcb(tGATT_IF client_if, + const RawAddress& remote_bda, + tBT_TRANSPORT transport); +tBTA_GATTC_RCB* bta_gattc_cl_get_regcb(uint8_t client_if); +tBTA_GATTC_SERV* bta_gattc_find_srcb(const RawAddress& bda); +tBTA_GATTC_SERV* bta_gattc_srcb_alloc(const RawAddress& bda); +tBTA_GATTC_SERV* bta_gattc_find_scb_by_cid(uint16_t conn_id); +tBTA_GATTC_CLCB* bta_gattc_find_int_conn_clcb(tBTA_GATTC_DATA* p_msg); +tBTA_GATTC_CLCB* bta_gattc_find_int_disconn_clcb(tBTA_GATTC_DATA* p_msg); enum BtaEnqueuedResult_t { ENQUEUED_READY_TO_SEND, ENQUEUED_FOR_LATER, }; -extern BtaEnqueuedResult_t bta_gattc_enqueue(tBTA_GATTC_CLCB* p_clcb, - const tBTA_GATTC_DATA* p_data); -extern bool bta_gattc_is_data_queued(tBTA_GATTC_CLCB* p_clcb, - const tBTA_GATTC_DATA* p_data); -extern void bta_gattc_continue(tBTA_GATTC_CLCB* p_clcb); -extern void bta_gattc_send_mtu_response(tBTA_GATTC_CLCB* p_clcb, - const tBTA_GATTC_DATA* p_data, - uint16_t current_mtu); -extern void bta_gattc_cmpl_sendmsg(uint16_t conn_id, tGATTC_OPTYPE op, - tGATT_STATUS status, - tGATT_CL_COMPLETE* p_data); - -extern bool bta_gattc_check_notif_registry(tBTA_GATTC_RCB* p_clreg, - tBTA_GATTC_SERV* p_srcb, - tBTA_GATTC_NOTIFY* p_notify); -extern bool bta_gattc_mark_bg_conn(tGATT_IF client_if, - const RawAddress& remote_bda, bool add); -extern bool bta_gattc_check_bg_conn(tGATT_IF client_if, - const RawAddress& remote_bda, uint8_t role); -extern uint8_t bta_gattc_num_reg_app(void); -extern void bta_gattc_clear_notif_registration(tBTA_GATTC_SERV* p_srcb, - uint16_t conn_id, - uint16_t start_handle, - uint16_t end_handle); -extern tBTA_GATTC_SERV* bta_gattc_find_srvr_cache(const RawAddress& bda); -extern bool bta_gattc_is_robust_caching_enabled(); +BtaEnqueuedResult_t bta_gattc_enqueue(tBTA_GATTC_CLCB* p_clcb, + const tBTA_GATTC_DATA* p_data); +bool bta_gattc_is_data_queued(tBTA_GATTC_CLCB* p_clcb, + const tBTA_GATTC_DATA* p_data); +void bta_gattc_continue(tBTA_GATTC_CLCB* p_clcb); +void bta_gattc_send_mtu_response(tBTA_GATTC_CLCB* p_clcb, + const tBTA_GATTC_DATA* p_data, + uint16_t current_mtu); +void bta_gattc_cmpl_sendmsg(uint16_t conn_id, tGATTC_OPTYPE op, + tGATT_STATUS status, tGATT_CL_COMPLETE* p_data); + +bool bta_gattc_check_notif_registry(tBTA_GATTC_RCB* p_clreg, + tBTA_GATTC_SERV* p_srcb, + tBTA_GATTC_NOTIFY* p_notify); +bool bta_gattc_mark_bg_conn(tGATT_IF client_if, const RawAddress& remote_bda, + bool add); +bool bta_gattc_check_bg_conn(tGATT_IF client_if, const RawAddress& remote_bda, + uint8_t role); +uint8_t bta_gattc_num_reg_app(void); +void bta_gattc_clear_notif_registration(tBTA_GATTC_SERV* p_srcb, + uint16_t conn_id, uint16_t start_handle, + uint16_t end_handle); +tBTA_GATTC_SERV* bta_gattc_find_srvr_cache(const RawAddress& bda); +bool bta_gattc_is_robust_caching_enabled(); /* discovery functions */ -extern void bta_gattc_disc_res_cback(uint16_t conn_id, - tGATT_DISC_TYPE disc_type, - tGATT_DISC_RES* p_data); -extern void bta_gattc_disc_cmpl_cback(uint16_t conn_id, - tGATT_DISC_TYPE disc_type, - tGATT_STATUS status); -extern tGATT_STATUS bta_gattc_discover_pri_service(uint16_t conn_id, - tBTA_GATTC_SERV* p_server_cb, - tGATT_DISC_TYPE disc_type); -extern void bta_gattc_search_service(tBTA_GATTC_CLCB* p_clcb, - bluetooth::Uuid* p_uuid); -extern const std::list<gatt::Service>* bta_gattc_get_services(uint16_t conn_id); -extern const gatt::Service* bta_gattc_get_service_for_handle(uint16_t conn_id, - uint16_t handle); +void bta_gattc_disc_res_cback(uint16_t conn_id, tGATT_DISC_TYPE disc_type, + tGATT_DISC_RES* p_data); +void bta_gattc_disc_cmpl_cback(uint16_t conn_id, tGATT_DISC_TYPE disc_type, + tGATT_STATUS status); +tGATT_STATUS bta_gattc_discover_pri_service(uint16_t conn_id, + tBTA_GATTC_SERV* p_server_cb, + tGATT_DISC_TYPE disc_type); +void bta_gattc_search_service(tBTA_GATTC_CLCB* p_clcb, bluetooth::Uuid* p_uuid); +const std::list<gatt::Service>* bta_gattc_get_services(uint16_t conn_id); +const gatt::Service* bta_gattc_get_service_for_handle(uint16_t conn_id, + uint16_t handle); const gatt::Characteristic* bta_gattc_get_characteristic_srcb( tBTA_GATTC_SERV* p_srcb, uint16_t handle); -extern const gatt::Service* bta_gattc_get_service_for_handle_srcb( +const gatt::Service* bta_gattc_get_service_for_handle_srcb( tBTA_GATTC_SERV* p_srcb, uint16_t handle); -extern const gatt::Characteristic* bta_gattc_get_characteristic( - uint16_t conn_id, uint16_t handle); -extern const gatt::Descriptor* bta_gattc_get_descriptor(uint16_t conn_id, - uint16_t handle); -extern const gatt::Characteristic* bta_gattc_get_owning_characteristic( +const gatt::Characteristic* bta_gattc_get_characteristic(uint16_t conn_id, + uint16_t handle); +const gatt::Descriptor* bta_gattc_get_descriptor(uint16_t conn_id, + uint16_t handle); +const gatt::Characteristic* bta_gattc_get_owning_characteristic( uint16_t conn_id, uint16_t handle); -extern void bta_gattc_get_gatt_db(uint16_t conn_id, uint16_t start_handle, - uint16_t end_handle, btgatt_db_element_t** db, - int* count); -extern void bta_gattc_init_cache(tBTA_GATTC_SERV* p_srvc_cb); +void bta_gattc_get_gatt_db(uint16_t conn_id, uint16_t start_handle, + uint16_t end_handle, btgatt_db_element_t** db, + int* count); +void bta_gattc_init_cache(tBTA_GATTC_SERV* p_srvc_cb); enum class RobustCachingSupport { UNSUPPORTED, @@ -505,26 +484,23 @@ enum class RobustCachingSupport { RobustCachingSupport GetRobustCachingSupport(const tBTA_GATTC_CLCB* p_clcb, const gatt::Database& db); -extern void bta_gattc_reset_discover_st(tBTA_GATTC_SERV* p_srcb, - tGATT_STATUS status); +void bta_gattc_reset_discover_st(tBTA_GATTC_SERV* p_srcb, tGATT_STATUS status); -extern tBTA_GATTC_CONN* bta_gattc_conn_alloc(const RawAddress& remote_bda); -extern tBTA_GATTC_CONN* bta_gattc_conn_find(const RawAddress& remote_bda); -extern tBTA_GATTC_CONN* bta_gattc_conn_find_alloc(const RawAddress& remote_bda); -extern bool bta_gattc_conn_dealloc(const RawAddress& remote_bda); +tBTA_GATTC_CONN* bta_gattc_conn_alloc(const RawAddress& remote_bda); +tBTA_GATTC_CONN* bta_gattc_conn_find(const RawAddress& remote_bda); +tBTA_GATTC_CONN* bta_gattc_conn_find_alloc(const RawAddress& remote_bda); +bool bta_gattc_conn_dealloc(const RawAddress& remote_bda); /* bta_gattc_cache */ -extern bool bta_gattc_read_db_hash(tBTA_GATTC_CLCB* p_clcb, bool is_svc_chg); +bool bta_gattc_read_db_hash(tBTA_GATTC_CLCB* p_clcb, bool is_svc_chg); /* bta_gattc_db_storage */ -extern gatt::Database bta_gattc_hash_load(const Octet16& hash); -extern bool bta_gattc_hash_write(const Octet16& hash, - const gatt::Database& database); -extern gatt::Database bta_gattc_cache_load(const RawAddress& server_bda); -extern void bta_gattc_cache_write(const RawAddress& server_bda, - const gatt::Database& database); -extern void bta_gattc_cache_link(const RawAddress& server_bda, - const Octet16& hash); -extern void bta_gattc_cache_reset(const RawAddress& server_bda); +gatt::Database bta_gattc_hash_load(const Octet16& hash); +bool bta_gattc_hash_write(const Octet16& hash, const gatt::Database& database); +gatt::Database bta_gattc_cache_load(const RawAddress& server_bda); +void bta_gattc_cache_write(const RawAddress& server_bda, + const gatt::Database& database); +void bta_gattc_cache_link(const RawAddress& server_bda, const Octet16& hash); +void bta_gattc_cache_reset(const RawAddress& server_bda); #endif /* BTA_GATTC_INT_H */ diff --git a/system/bta/gatt/bta_gatts_api.cc b/system/bta/gatt/bta_gatts_api.cc index 5853c96089..7a282a5707 100644 --- a/system/bta/gatt/bta_gatts_api.cc +++ b/system/bta/gatt/bta_gatts_api.cc @@ -173,9 +173,9 @@ void bta_gatts_add_service_impl(tGATT_IF server_if, * service cannot be added. * ******************************************************************************/ -extern void BTA_GATTS_AddService(tGATT_IF server_if, - std::vector<btgatt_db_element_t> service, - BTA_GATTS_AddServiceCb cb) { +void BTA_GATTS_AddService(tGATT_IF server_if, + std::vector<btgatt_db_element_t> service, + BTA_GATTS_AddServiceCb cb) { do_in_main_thread(FROM_HERE, base::Bind(&bta_gatts_add_service_impl, server_if, std::move(service), std::move(cb))); diff --git a/system/bta/gatt/bta_gatts_int.h b/system/bta/gatt/bta_gatts_int.h index 767213054e..102ea3e6f5 100644 --- a/system/bta/gatt/bta_gatts_int.h +++ b/system/bta/gatt/bta_gatts_int.h @@ -168,33 +168,32 @@ extern tBTA_GATTS_CB bta_gatts_cb; /***************************************************************************** * Function prototypes ****************************************************************************/ -extern bool bta_gatts_hdl_event(BT_HDR_RIGID* p_msg); - -extern void bta_gatts_api_disable(tBTA_GATTS_CB* p_cb); -extern void bta_gatts_api_enable(tBTA_GATTS_CB* p_cb, tBTA_GATTS_DATA* p_data); -extern void bta_gatts_register(tBTA_GATTS_CB* p_cb, tBTA_GATTS_DATA* p_msg); -extern void bta_gatts_start_if(tBTA_GATTS_CB* p_cb, tBTA_GATTS_DATA* p_msg); -extern void bta_gatts_deregister(tBTA_GATTS_CB* p_cb, tBTA_GATTS_DATA* p_msg); -extern void bta_gatts_delete_service(tBTA_GATTS_SRVC_CB* p_srvc_cb, - tBTA_GATTS_DATA* p_msg); -extern void bta_gatts_stop_service(tBTA_GATTS_SRVC_CB* p_srvc_cb, - tBTA_GATTS_DATA* p_msg); - -extern void bta_gatts_send_rsp(tBTA_GATTS_CB* p_cb, tBTA_GATTS_DATA* p_msg); -extern void bta_gatts_indicate_handle(tBTA_GATTS_CB* p_cb, - tBTA_GATTS_DATA* p_msg); - -extern void bta_gatts_open(tBTA_GATTS_CB* p_cb, tBTA_GATTS_DATA* p_msg); -extern void bta_gatts_cancel_open(tBTA_GATTS_CB* p_cb, tBTA_GATTS_DATA* p_msg); -extern void bta_gatts_close(tBTA_GATTS_CB* p_cb, tBTA_GATTS_DATA* p_msg); - -extern tBTA_GATTS_RCB* bta_gatts_find_app_rcb_by_app_if(tGATT_IF server_if); -extern uint8_t bta_gatts_find_app_rcb_idx_by_app_if(tBTA_GATTS_CB* p_cb, - tGATT_IF server_if); -extern uint8_t bta_gatts_alloc_srvc_cb(tBTA_GATTS_CB* p_cb, uint8_t rcb_idx); -extern tBTA_GATTS_SRVC_CB* bta_gatts_find_srvc_cb_by_srvc_id( - tBTA_GATTS_CB* p_cb, uint16_t service_id); -extern tBTA_GATTS_SRVC_CB* bta_gatts_find_srvc_cb_by_attr_id( - tBTA_GATTS_CB* p_cb, uint16_t attr_id); +bool bta_gatts_hdl_event(BT_HDR_RIGID* p_msg); + +void bta_gatts_api_disable(tBTA_GATTS_CB* p_cb); +void bta_gatts_api_enable(tBTA_GATTS_CB* p_cb, tBTA_GATTS_DATA* p_data); +void bta_gatts_register(tBTA_GATTS_CB* p_cb, tBTA_GATTS_DATA* p_msg); +void bta_gatts_start_if(tBTA_GATTS_CB* p_cb, tBTA_GATTS_DATA* p_msg); +void bta_gatts_deregister(tBTA_GATTS_CB* p_cb, tBTA_GATTS_DATA* p_msg); +void bta_gatts_delete_service(tBTA_GATTS_SRVC_CB* p_srvc_cb, + tBTA_GATTS_DATA* p_msg); +void bta_gatts_stop_service(tBTA_GATTS_SRVC_CB* p_srvc_cb, + tBTA_GATTS_DATA* p_msg); + +void bta_gatts_send_rsp(tBTA_GATTS_CB* p_cb, tBTA_GATTS_DATA* p_msg); +void bta_gatts_indicate_handle(tBTA_GATTS_CB* p_cb, tBTA_GATTS_DATA* p_msg); + +void bta_gatts_open(tBTA_GATTS_CB* p_cb, tBTA_GATTS_DATA* p_msg); +void bta_gatts_cancel_open(tBTA_GATTS_CB* p_cb, tBTA_GATTS_DATA* p_msg); +void bta_gatts_close(tBTA_GATTS_CB* p_cb, tBTA_GATTS_DATA* p_msg); + +tBTA_GATTS_RCB* bta_gatts_find_app_rcb_by_app_if(tGATT_IF server_if); +uint8_t bta_gatts_find_app_rcb_idx_by_app_if(tBTA_GATTS_CB* p_cb, + tGATT_IF server_if); +uint8_t bta_gatts_alloc_srvc_cb(tBTA_GATTS_CB* p_cb, uint8_t rcb_idx); +tBTA_GATTS_SRVC_CB* bta_gatts_find_srvc_cb_by_srvc_id(tBTA_GATTS_CB* p_cb, + uint16_t service_id); +tBTA_GATTS_SRVC_CB* bta_gatts_find_srvc_cb_by_attr_id(tBTA_GATTS_CB* p_cb, + uint16_t attr_id); #endif /* BTA_GATTS_INT_H */ diff --git a/system/bta/has/has_client.cc b/system/bta/has/has_client.cc index ca4f114e27..de953622a9 100644 --- a/system/bta/has/has_client.cc +++ b/system/bta/has/has_client.cc @@ -87,7 +87,7 @@ void btif_storage_set_leaudio_has_active_preset(const RawAddress& address, uint8_t active_preset); void btif_storage_remove_leaudio_has(const RawAddress& address); -extern bool gatt_profile_get_eatt_support(const RawAddress& remote_bda); +bool gatt_profile_get_eatt_support(const RawAddress& remote_bda); namespace { class HasClientImpl; diff --git a/system/bta/hd/bta_hd_act.cc b/system/bta/hd/bta_hd_act.cc index f9a934d352..76fc8ece9c 100644 --- a/system/bta/hd/bta_hd_act.cc +++ b/system/bta/hd/bta_hd_act.cc @@ -276,7 +276,7 @@ void bta_hd_unregister2_act(tBTA_HD_DATA* p_data) { * Returns void * ******************************************************************************/ -extern void bta_hd_connect_act(tBTA_HD_DATA* p_data) { +void bta_hd_connect_act(tBTA_HD_DATA* p_data) { tHID_STATUS ret; tBTA_HD_DEVICE_CTRL* p_ctrl = (tBTA_HD_DEVICE_CTRL*)p_data; tBTA_HD cback_data; @@ -310,7 +310,7 @@ extern void bta_hd_connect_act(tBTA_HD_DATA* p_data) { * Returns void * ******************************************************************************/ -extern void bta_hd_disconnect_act() { +void bta_hd_disconnect_act() { tHID_STATUS ret; tBTA_HD cback_data; @@ -338,7 +338,7 @@ extern void bta_hd_disconnect_act() { * Returns void * ******************************************************************************/ -extern void bta_hd_add_device_act(tBTA_HD_DATA* p_data) { +void bta_hd_add_device_act(tBTA_HD_DATA* p_data) { tBTA_HD_DEVICE_CTRL* p_ctrl = (tBTA_HD_DEVICE_CTRL*)p_data; APPL_TRACE_API("%s", __func__); @@ -355,7 +355,7 @@ extern void bta_hd_add_device_act(tBTA_HD_DATA* p_data) { * Returns void * ******************************************************************************/ -extern void bta_hd_remove_device_act(tBTA_HD_DATA* p_data) { +void bta_hd_remove_device_act(tBTA_HD_DATA* p_data) { tBTA_HD_DEVICE_CTRL* p_ctrl = (tBTA_HD_DEVICE_CTRL*)p_data; APPL_TRACE_API("%s", __func__); @@ -372,7 +372,7 @@ extern void bta_hd_remove_device_act(tBTA_HD_DATA* p_data) { * Returns void * ******************************************************************************/ -extern void bta_hd_send_report_act(tBTA_HD_DATA* p_data) { +void bta_hd_send_report_act(tBTA_HD_DATA* p_data) { tBTA_HD_SEND_REPORT* p_report = (tBTA_HD_SEND_REPORT*)p_data; uint8_t channel; uint8_t report_id; @@ -400,7 +400,7 @@ extern void bta_hd_send_report_act(tBTA_HD_DATA* p_data) { * Returns void * ******************************************************************************/ -extern void bta_hd_report_error_act(tBTA_HD_DATA* p_data) { +void bta_hd_report_error_act(tBTA_HD_DATA* p_data) { tBTA_HD_REPORT_ERR* p_report = (tBTA_HD_REPORT_ERR*)p_data; tHID_STATUS ret; @@ -422,7 +422,7 @@ extern void bta_hd_report_error_act(tBTA_HD_DATA* p_data) { * Returns void * ******************************************************************************/ -extern void bta_hd_vc_unplug_act() { +void bta_hd_vc_unplug_act() { tHID_STATUS ret; APPL_TRACE_API("%s", __func__); @@ -450,7 +450,7 @@ extern void bta_hd_vc_unplug_act() { * Returns void * ******************************************************************************/ -extern void bta_hd_open_act(tBTA_HD_DATA* p_data) { +void bta_hd_open_act(tBTA_HD_DATA* p_data) { tBTA_HD_CBACK_DATA* p_cback = (tBTA_HD_CBACK_DATA*)p_data; tBTA_HD cback_data; @@ -474,7 +474,7 @@ extern void bta_hd_open_act(tBTA_HD_DATA* p_data) { * Returns void * ******************************************************************************/ -extern void bta_hd_close_act(tBTA_HD_DATA* p_data) { +void bta_hd_close_act(tBTA_HD_DATA* p_data) { tBTA_HD_CBACK_DATA* p_cback = (tBTA_HD_CBACK_DATA*)p_data; tBTA_HD cback_data; tBTA_HD_EVT cback_event = BTA_HD_CLOSE_EVT; @@ -504,7 +504,7 @@ extern void bta_hd_close_act(tBTA_HD_DATA* p_data) { * Returns void * ******************************************************************************/ -extern void bta_hd_intr_data_act(tBTA_HD_DATA* p_data) { +void bta_hd_intr_data_act(tBTA_HD_DATA* p_data) { tBTA_HD_CBACK_DATA* p_cback = (tBTA_HD_CBACK_DATA*)p_data; BT_HDR* p_msg = p_cback->p_data; uint16_t len = p_msg->len; @@ -542,7 +542,7 @@ extern void bta_hd_intr_data_act(tBTA_HD_DATA* p_data) { * Returns void * ******************************************************************************/ -extern void bta_hd_get_report_act(tBTA_HD_DATA* p_data) { +void bta_hd_get_report_act(tBTA_HD_DATA* p_data) { tBTA_HD_CBACK_DATA* p_cback = (tBTA_HD_CBACK_DATA*)p_data; bool rep_size_follows = p_cback->data; BT_HDR* p_msg = p_cback->p_data; @@ -590,7 +590,7 @@ extern void bta_hd_get_report_act(tBTA_HD_DATA* p_data) { * Returns void * ******************************************************************************/ -extern void bta_hd_set_report_act(tBTA_HD_DATA* p_data) { +void bta_hd_set_report_act(tBTA_HD_DATA* p_data) { tBTA_HD_CBACK_DATA* p_cback = (tBTA_HD_CBACK_DATA*)p_data; BT_HDR* p_msg = p_cback->p_data; uint16_t len = p_msg->len; @@ -635,7 +635,7 @@ extern void bta_hd_set_report_act(tBTA_HD_DATA* p_data) { * Returns void * ******************************************************************************/ -extern void bta_hd_set_protocol_act(tBTA_HD_DATA* p_data) { +void bta_hd_set_protocol_act(tBTA_HD_DATA* p_data) { tBTA_HD_CBACK_DATA* p_cback = (tBTA_HD_CBACK_DATA*)p_data; tBTA_HD cback_data; @@ -656,7 +656,7 @@ extern void bta_hd_set_protocol_act(tBTA_HD_DATA* p_data) { * Returns void * ******************************************************************************/ -extern void bta_hd_vc_unplug_done_act(tBTA_HD_DATA* p_data) { +void bta_hd_vc_unplug_done_act(tBTA_HD_DATA* p_data) { tBTA_HD_CBACK_DATA* p_cback = (tBTA_HD_CBACK_DATA*)p_data; tBTA_HD cback_data; @@ -681,7 +681,7 @@ extern void bta_hd_vc_unplug_done_act(tBTA_HD_DATA* p_data) { * Returns void * ******************************************************************************/ -extern void bta_hd_suspend_act(tBTA_HD_DATA* p_data) { +void bta_hd_suspend_act(tBTA_HD_DATA* p_data) { tBTA_HD_CBACK_DATA* p_cback = (tBTA_HD_CBACK_DATA*)p_data; APPL_TRACE_API("%s", __func__); @@ -698,7 +698,7 @@ extern void bta_hd_suspend_act(tBTA_HD_DATA* p_data) { * Returns void * ******************************************************************************/ -extern void bta_hd_exit_suspend_act(tBTA_HD_DATA* p_data) { +void bta_hd_exit_suspend_act(tBTA_HD_DATA* p_data) { tBTA_HD_CBACK_DATA* p_cback = (tBTA_HD_CBACK_DATA*)p_data; APPL_TRACE_API("%s", __func__); diff --git a/system/bta/hd/bta_hd_api.cc b/system/bta/hd/bta_hd_api.cc index 93a9155096..72ed04198f 100644 --- a/system/bta/hd/bta_hd_api.cc +++ b/system/bta/hd/bta_hd_api.cc @@ -99,9 +99,8 @@ void BTA_HdDisable(void) { * Returns void * ******************************************************************************/ -extern void BTA_HdRegisterApp(tBTA_HD_APP_INFO* p_app_info, - tBTA_HD_QOS_INFO* p_in_qos, - tBTA_HD_QOS_INFO* p_out_qos) { +void BTA_HdRegisterApp(tBTA_HD_APP_INFO* p_app_info, tBTA_HD_QOS_INFO* p_in_qos, + tBTA_HD_QOS_INFO* p_out_qos) { APPL_TRACE_API("%s", __func__); tBTA_HD_REGISTER_APP* p_buf = @@ -153,7 +152,7 @@ extern void BTA_HdRegisterApp(tBTA_HD_APP_INFO* p_app_info, * Returns void * ******************************************************************************/ -extern void BTA_HdUnregisterApp(void) { +void BTA_HdUnregisterApp(void) { APPL_TRACE_API("%s", __func__); BT_HDR_RIGID* p_buf = (BT_HDR_RIGID*)osi_malloc(sizeof(BT_HDR_RIGID)); @@ -171,7 +170,7 @@ extern void BTA_HdUnregisterApp(void) { * Returns void * ******************************************************************************/ -extern void BTA_HdSendReport(tBTA_HD_REPORT* p_report) { +void BTA_HdSendReport(tBTA_HD_REPORT* p_report) { APPL_TRACE_VERBOSE("%s", __func__); if (p_report->len > BTA_HD_REPORT_LEN) { @@ -204,7 +203,7 @@ extern void BTA_HdSendReport(tBTA_HD_REPORT* p_report) { * Returns void * ******************************************************************************/ -extern void BTA_HdVirtualCableUnplug(void) { +void BTA_HdVirtualCableUnplug(void) { APPL_TRACE_API("%s", __func__); BT_HDR_RIGID* p_buf = (BT_HDR_RIGID*)osi_malloc(sizeof(BT_HDR_RIGID)); @@ -223,7 +222,7 @@ extern void BTA_HdVirtualCableUnplug(void) { * Returns void * ******************************************************************************/ -extern void BTA_HdConnect(const RawAddress& addr) { +void BTA_HdConnect(const RawAddress& addr) { APPL_TRACE_API("%s", __func__); tBTA_HD_DEVICE_CTRL* p_buf = @@ -244,7 +243,7 @@ extern void BTA_HdConnect(const RawAddress& addr) { * Returns void * ******************************************************************************/ -extern void BTA_HdDisconnect(void) { +void BTA_HdDisconnect(void) { APPL_TRACE_API("%s", __func__); BT_HDR_RIGID* p_buf = (BT_HDR_RIGID*)osi_malloc(sizeof(BT_HDR_RIGID)); p_buf->event = BTA_HD_API_DISCONNECT_EVT; @@ -261,7 +260,7 @@ extern void BTA_HdDisconnect(void) { * Returns void * ******************************************************************************/ -extern void BTA_HdAddDevice(const RawAddress& addr) { +void BTA_HdAddDevice(const RawAddress& addr) { APPL_TRACE_API("%s", __func__); tBTA_HD_DEVICE_CTRL* p_buf = (tBTA_HD_DEVICE_CTRL*)osi_malloc(sizeof(tBTA_HD_DEVICE_CTRL)); @@ -281,7 +280,7 @@ extern void BTA_HdAddDevice(const RawAddress& addr) { * Returns void * ******************************************************************************/ -extern void BTA_HdRemoveDevice(const RawAddress& addr) { +void BTA_HdRemoveDevice(const RawAddress& addr) { APPL_TRACE_API("%s", __func__); tBTA_HD_DEVICE_CTRL* p_buf = (tBTA_HD_DEVICE_CTRL*)osi_malloc(sizeof(tBTA_HD_DEVICE_CTRL)); @@ -301,7 +300,7 @@ extern void BTA_HdRemoveDevice(const RawAddress& addr) { * Returns void * ******************************************************************************/ -extern void BTA_HdReportError(uint8_t error) { +void BTA_HdReportError(uint8_t error) { APPL_TRACE_API("%s", __func__); tBTA_HD_REPORT_ERR* p_buf = (tBTA_HD_REPORT_ERR*)osi_malloc(sizeof(tBTA_HD_REPORT_ERR)); diff --git a/system/bta/hd/bta_hd_int.h b/system/bta/hd/bta_hd_int.h index 638ceac675..4953da60df 100644 --- a/system/bta/hd/bta_hd_int.h +++ b/system/bta/hd/bta_hd_int.h @@ -151,30 +151,30 @@ extern tBTA_HD_CB bta_hd_cb; /***************************************************************************** * Function prototypes ****************************************************************************/ -extern bool bta_hd_hdl_event(BT_HDR_RIGID* p_msg); - -extern void bta_hd_api_enable(tBTA_HD_DATA* p_data); -extern void bta_hd_api_disable(void); - -extern void bta_hd_register_act(tBTA_HD_DATA* p_data); -extern void bta_hd_unregister_act(); -extern void bta_hd_unregister2_act(tBTA_HD_DATA* p_data); -extern void bta_hd_connect_act(tBTA_HD_DATA* p_data); -extern void bta_hd_disconnect_act(); -extern void bta_hd_add_device_act(tBTA_HD_DATA* p_data); -extern void bta_hd_remove_device_act(tBTA_HD_DATA* p_data); -extern void bta_hd_send_report_act(tBTA_HD_DATA* p_data); -extern void bta_hd_report_error_act(tBTA_HD_DATA* p_data); -extern void bta_hd_vc_unplug_act(); - -extern void bta_hd_open_act(tBTA_HD_DATA* p_data); -extern void bta_hd_close_act(tBTA_HD_DATA* p_data); -extern void bta_hd_intr_data_act(tBTA_HD_DATA* p_data); -extern void bta_hd_get_report_act(tBTA_HD_DATA* p_data); -extern void bta_hd_set_report_act(tBTA_HD_DATA* p_data); -extern void bta_hd_set_protocol_act(tBTA_HD_DATA* p_data); -extern void bta_hd_vc_unplug_done_act(tBTA_HD_DATA* p_data); -extern void bta_hd_suspend_act(tBTA_HD_DATA* p_data); -extern void bta_hd_exit_suspend_act(tBTA_HD_DATA* p_data); +bool bta_hd_hdl_event(BT_HDR_RIGID* p_msg); + +void bta_hd_api_enable(tBTA_HD_DATA* p_data); +void bta_hd_api_disable(void); + +void bta_hd_register_act(tBTA_HD_DATA* p_data); +void bta_hd_unregister_act(); +void bta_hd_unregister2_act(tBTA_HD_DATA* p_data); +void bta_hd_connect_act(tBTA_HD_DATA* p_data); +void bta_hd_disconnect_act(); +void bta_hd_add_device_act(tBTA_HD_DATA* p_data); +void bta_hd_remove_device_act(tBTA_HD_DATA* p_data); +void bta_hd_send_report_act(tBTA_HD_DATA* p_data); +void bta_hd_report_error_act(tBTA_HD_DATA* p_data); +void bta_hd_vc_unplug_act(); + +void bta_hd_open_act(tBTA_HD_DATA* p_data); +void bta_hd_close_act(tBTA_HD_DATA* p_data); +void bta_hd_intr_data_act(tBTA_HD_DATA* p_data); +void bta_hd_get_report_act(tBTA_HD_DATA* p_data); +void bta_hd_set_report_act(tBTA_HD_DATA* p_data); +void bta_hd_set_protocol_act(tBTA_HD_DATA* p_data); +void bta_hd_vc_unplug_done_act(tBTA_HD_DATA* p_data); +void bta_hd_suspend_act(tBTA_HD_DATA* p_data); +void bta_hd_exit_suspend_act(tBTA_HD_DATA* p_data); #endif diff --git a/system/bta/hf_client/bta_hf_client_int.h b/system/bta/hf_client/bta_hf_client_int.h index 5f2e2706c1..a66b27e522 100644 --- a/system/bta/hf_client/bta_hf_client_int.h +++ b/system/bta/hf_client/bta_hf_client_int.h @@ -214,140 +214,122 @@ extern tBTA_HF_CLIENT_CB_ARR bta_hf_client_cb_arr; ****************************************************************************/ /* main functions */ -extern tBTA_HF_CLIENT_CB* bta_hf_client_find_cb_by_handle(uint16_t handle); -extern tBTA_HF_CLIENT_CB* bta_hf_client_find_cb_by_bda( - const RawAddress& bd_addr); -extern tBTA_HF_CLIENT_CB* bta_hf_client_find_cb_by_rfc_handle(uint16_t handle); -extern tBTA_HF_CLIENT_CB* bta_hf_client_find_cb_by_sco_handle(uint16_t handle); -extern bool bta_hf_client_hdl_event(BT_HDR_RIGID* p_msg); -extern void bta_hf_client_sm_execute(uint16_t event, - tBTA_HF_CLIENT_DATA* p_data); -extern void bta_hf_client_slc_seq(tBTA_HF_CLIENT_CB* client_cb, bool error); -extern bool bta_hf_client_allocate_handle(const RawAddress& bd_addr, - uint16_t* p_handle); -extern void bta_hf_client_app_callback(uint16_t event, tBTA_HF_CLIENT* data); -extern void bta_hf_client_collision_cback(tBTA_SYS_CONN_STATUS status, - uint8_t id, uint8_t app_id, - const RawAddress& peer_addr); -extern void bta_hf_client_resume_open(tBTA_HF_CLIENT_CB* client_cb); -extern tBTA_STATUS bta_hf_client_api_enable(tBTA_HF_CLIENT_CBACK* p_cback, - tBTA_HF_CLIENT_FEAT features, - const char* p_service_name); - -extern void bta_hf_client_api_disable(void); -extern void bta_hf_client_dump_statistics(int fd); -extern void bta_hf_client_cb_arr_init(void); +tBTA_HF_CLIENT_CB* bta_hf_client_find_cb_by_handle(uint16_t handle); +tBTA_HF_CLIENT_CB* bta_hf_client_find_cb_by_bda(const RawAddress& bd_addr); +tBTA_HF_CLIENT_CB* bta_hf_client_find_cb_by_rfc_handle(uint16_t handle); +tBTA_HF_CLIENT_CB* bta_hf_client_find_cb_by_sco_handle(uint16_t handle); +bool bta_hf_client_hdl_event(BT_HDR_RIGID* p_msg); +void bta_hf_client_sm_execute(uint16_t event, tBTA_HF_CLIENT_DATA* p_data); +void bta_hf_client_slc_seq(tBTA_HF_CLIENT_CB* client_cb, bool error); +bool bta_hf_client_allocate_handle(const RawAddress& bd_addr, + uint16_t* p_handle); +void bta_hf_client_app_callback(uint16_t event, tBTA_HF_CLIENT* data); +void bta_hf_client_collision_cback(tBTA_SYS_CONN_STATUS status, uint8_t id, + uint8_t app_id, const RawAddress& peer_addr); +void bta_hf_client_resume_open(tBTA_HF_CLIENT_CB* client_cb); +tBTA_STATUS bta_hf_client_api_enable(tBTA_HF_CLIENT_CBACK* p_cback, + tBTA_HF_CLIENT_FEAT features, + const char* p_service_name); + +void bta_hf_client_api_disable(void); +void bta_hf_client_dump_statistics(int fd); +void bta_hf_client_cb_arr_init(void); /* SDP functions */ -extern bool bta_hf_client_add_record(const char* p_service_name, uint8_t scn, - tBTA_HF_CLIENT_FEAT features, - uint32_t sdp_handle); -extern void bta_hf_client_create_record(tBTA_HF_CLIENT_CB_ARR* client_cb, - const char* p_data); -extern void bta_hf_client_del_record(tBTA_HF_CLIENT_CB_ARR* client_cb); -extern bool bta_hf_client_sdp_find_attr(tBTA_HF_CLIENT_CB* client_cb); -extern void bta_hf_client_do_disc(tBTA_HF_CLIENT_CB* client_cb); -extern void bta_hf_client_free_db(tBTA_HF_CLIENT_DATA* p_data); +bool bta_hf_client_add_record(const char* p_service_name, uint8_t scn, + tBTA_HF_CLIENT_FEAT features, + uint32_t sdp_handle); +void bta_hf_client_create_record(tBTA_HF_CLIENT_CB_ARR* client_cb, + const char* p_data); +void bta_hf_client_del_record(tBTA_HF_CLIENT_CB_ARR* client_cb); +bool bta_hf_client_sdp_find_attr(tBTA_HF_CLIENT_CB* client_cb); +void bta_hf_client_do_disc(tBTA_HF_CLIENT_CB* client_cb); +void bta_hf_client_free_db(tBTA_HF_CLIENT_DATA* p_data); /* RFCOMM functions */ -extern void bta_hf_client_setup_port(uint16_t handle); -extern void bta_hf_client_start_server(); -extern void bta_hf_client_close_server(); -extern void bta_hf_client_rfc_do_open(tBTA_HF_CLIENT_DATA* p_data); -extern void bta_hf_client_rfc_do_close(tBTA_HF_CLIENT_DATA* p_data); +void bta_hf_client_setup_port(uint16_t handle); +void bta_hf_client_start_server(); +void bta_hf_client_close_server(); +void bta_hf_client_rfc_do_open(tBTA_HF_CLIENT_DATA* p_data); +void bta_hf_client_rfc_do_close(tBTA_HF_CLIENT_DATA* p_data); /* SCO functions */ -extern void bta_hf_client_sco_listen(tBTA_HF_CLIENT_DATA* p_data); -extern void bta_hf_client_sco_conn_open(tBTA_HF_CLIENT_DATA* p_data); -extern void bta_hf_client_sco_conn_close(tBTA_HF_CLIENT_DATA* p_data); -extern void bta_hf_client_sco_open(tBTA_HF_CLIENT_DATA* p_data); -extern void bta_hf_client_sco_close(tBTA_HF_CLIENT_DATA* p_data); -extern void bta_hf_client_sco_shutdown(tBTA_HF_CLIENT_CB* client_cb); -extern void bta_hf_client_cback_sco(tBTA_HF_CLIENT_CB* client_cb, - uint8_t event); +void bta_hf_client_sco_listen(tBTA_HF_CLIENT_DATA* p_data); +void bta_hf_client_sco_conn_open(tBTA_HF_CLIENT_DATA* p_data); +void bta_hf_client_sco_conn_close(tBTA_HF_CLIENT_DATA* p_data); +void bta_hf_client_sco_open(tBTA_HF_CLIENT_DATA* p_data); +void bta_hf_client_sco_close(tBTA_HF_CLIENT_DATA* p_data); +void bta_hf_client_sco_shutdown(tBTA_HF_CLIENT_CB* client_cb); +void bta_hf_client_cback_sco(tBTA_HF_CLIENT_CB* client_cb, uint8_t event); /* AT command functions */ -extern void bta_hf_client_at_parse(tBTA_HF_CLIENT_CB* client_cb, char* buf, - unsigned int len); -extern void bta_hf_client_send_at_brsf(tBTA_HF_CLIENT_CB* client_cb, - tBTA_HF_CLIENT_FEAT features); -extern void bta_hf_client_send_at_bac(tBTA_HF_CLIENT_CB* client_cb); -extern void bta_hf_client_send_at_cind(tBTA_HF_CLIENT_CB* client_cb, - bool status); -extern void bta_hf_client_send_at_cmer(tBTA_HF_CLIENT_CB* client_cb, - bool activate); -extern void bta_hf_client_send_at_chld(tBTA_HF_CLIENT_CB* client_cb, char cmd, - uint32_t idx); -extern void bta_hf_client_send_at_bind(tBTA_HF_CLIENT_CB* client_cb, int step); -extern void bta_hf_client_send_at_biev(tBTA_HF_CLIENT_CB* client_cb, int ind_id, - int value); -extern void bta_hf_client_send_at_clip(tBTA_HF_CLIENT_CB* client_cb, - bool activate); -extern void bta_hf_client_send_at_ccwa(tBTA_HF_CLIENT_CB* client_cb, - bool activate); -extern void bta_hf_client_send_at_cmee(tBTA_HF_CLIENT_CB* client_cb, - bool activate); -extern void bta_hf_client_send_at_cops(tBTA_HF_CLIENT_CB* client_cb, - bool query); -extern void bta_hf_client_send_at_clcc(tBTA_HF_CLIENT_CB* client_cb); -extern void bta_hf_client_send_at_bvra(tBTA_HF_CLIENT_CB* client_cb, - bool enable); -extern void bta_hf_client_send_at_vgs(tBTA_HF_CLIENT_CB* client_cb, - uint32_t volume); -extern void bta_hf_client_send_at_vgm(tBTA_HF_CLIENT_CB* client_cb, - uint32_t volume); -extern void bta_hf_client_send_at_atd(tBTA_HF_CLIENT_CB* client_cb, - char* number, uint32_t memory); -extern void bta_hf_client_send_at_bldn(tBTA_HF_CLIENT_CB* client_cb); -extern void bta_hf_client_send_at_ata(tBTA_HF_CLIENT_CB* client_cb); -extern void bta_hf_client_send_at_chup(tBTA_HF_CLIENT_CB* client_cb); -extern void bta_hf_client_send_at_btrh(tBTA_HF_CLIENT_CB* client_cb, bool query, - uint32_t val); -extern void bta_hf_client_send_at_vts(tBTA_HF_CLIENT_CB* client_cb, char code); -extern void bta_hf_client_send_at_bcc(tBTA_HF_CLIENT_CB* client_cb); -extern void bta_hf_client_send_at_bcs(tBTA_HF_CLIENT_CB* client_cb, - uint32_t codec); -extern void bta_hf_client_send_at_cnum(tBTA_HF_CLIENT_CB* client_cb); -extern void bta_hf_client_send_at_nrec(tBTA_HF_CLIENT_CB* client_cb); -extern void bta_hf_client_send_at_binp(tBTA_HF_CLIENT_CB* client_cb, - uint32_t action); -extern void bta_hf_client_send_at_bia(tBTA_HF_CLIENT_CB* client_cb); +void bta_hf_client_at_parse(tBTA_HF_CLIENT_CB* client_cb, char* buf, + unsigned int len); +void bta_hf_client_send_at_brsf(tBTA_HF_CLIENT_CB* client_cb, + tBTA_HF_CLIENT_FEAT features); +void bta_hf_client_send_at_bac(tBTA_HF_CLIENT_CB* client_cb); +void bta_hf_client_send_at_cind(tBTA_HF_CLIENT_CB* client_cb, bool status); +void bta_hf_client_send_at_cmer(tBTA_HF_CLIENT_CB* client_cb, bool activate); +void bta_hf_client_send_at_chld(tBTA_HF_CLIENT_CB* client_cb, char cmd, + uint32_t idx); +void bta_hf_client_send_at_bind(tBTA_HF_CLIENT_CB* client_cb, int step); +void bta_hf_client_send_at_biev(tBTA_HF_CLIENT_CB* client_cb, int ind_id, + int value); +void bta_hf_client_send_at_clip(tBTA_HF_CLIENT_CB* client_cb, bool activate); +void bta_hf_client_send_at_ccwa(tBTA_HF_CLIENT_CB* client_cb, bool activate); +void bta_hf_client_send_at_cmee(tBTA_HF_CLIENT_CB* client_cb, bool activate); +void bta_hf_client_send_at_cops(tBTA_HF_CLIENT_CB* client_cb, bool query); +void bta_hf_client_send_at_clcc(tBTA_HF_CLIENT_CB* client_cb); +void bta_hf_client_send_at_bvra(tBTA_HF_CLIENT_CB* client_cb, bool enable); +void bta_hf_client_send_at_vgs(tBTA_HF_CLIENT_CB* client_cb, uint32_t volume); +void bta_hf_client_send_at_vgm(tBTA_HF_CLIENT_CB* client_cb, uint32_t volume); +void bta_hf_client_send_at_atd(tBTA_HF_CLIENT_CB* client_cb, char* number, + uint32_t memory); +void bta_hf_client_send_at_bldn(tBTA_HF_CLIENT_CB* client_cb); +void bta_hf_client_send_at_ata(tBTA_HF_CLIENT_CB* client_cb); +void bta_hf_client_send_at_chup(tBTA_HF_CLIENT_CB* client_cb); +void bta_hf_client_send_at_btrh(tBTA_HF_CLIENT_CB* client_cb, bool query, + uint32_t val); +void bta_hf_client_send_at_vts(tBTA_HF_CLIENT_CB* client_cb, char code); +void bta_hf_client_send_at_bcc(tBTA_HF_CLIENT_CB* client_cb); +void bta_hf_client_send_at_bcs(tBTA_HF_CLIENT_CB* client_cb, uint32_t codec); +void bta_hf_client_send_at_cnum(tBTA_HF_CLIENT_CB* client_cb); +void bta_hf_client_send_at_nrec(tBTA_HF_CLIENT_CB* client_cb); +void bta_hf_client_send_at_binp(tBTA_HF_CLIENT_CB* client_cb, uint32_t action); +void bta_hf_client_send_at_bia(tBTA_HF_CLIENT_CB* client_cb); /* AT API Functions */ void bta_hf_client_at_init(tBTA_HF_CLIENT_CB* client_cb); void bta_hf_client_at_reset(tBTA_HF_CLIENT_CB* client_cb); -extern void bta_hf_client_ind(tBTA_HF_CLIENT_CB* client_cb, - tBTA_HF_CLIENT_IND_TYPE type, uint16_t value); -extern void bta_hf_client_evt_val(tBTA_HF_CLIENT_CB* client_cb, - tBTA_HF_CLIENT_EVT type, uint16_t value); -extern void bta_hf_client_operator_name(tBTA_HF_CLIENT_CB* client_name, - char* name); -extern void bta_hf_client_clip(tBTA_HF_CLIENT_CB* client_cb, char* number); -extern void bta_hf_client_ccwa(tBTA_HF_CLIENT_CB* client_cb, char* number); -extern void bta_hf_client_at_result(tBTA_HF_CLIENT_CB* client_cb, - tBTA_HF_CLIENT_AT_RESULT_TYPE type, - uint16_t cme); -extern void bta_hf_client_clcc(tBTA_HF_CLIENT_CB* client_cb, uint32_t idx, - bool incoming, uint8_t status, bool mpty, - char* number); -extern void bta_hf_client_cnum(tBTA_HF_CLIENT_CB* client_cb, char* number, - uint16_t service); -extern void bta_hf_client_binp(tBTA_HF_CLIENT_CB* client_cb, char* number); +void bta_hf_client_ind(tBTA_HF_CLIENT_CB* client_cb, + tBTA_HF_CLIENT_IND_TYPE type, uint16_t value); +void bta_hf_client_evt_val(tBTA_HF_CLIENT_CB* client_cb, + tBTA_HF_CLIENT_EVT type, uint16_t value); +void bta_hf_client_operator_name(tBTA_HF_CLIENT_CB* client_name, char* name); +void bta_hf_client_clip(tBTA_HF_CLIENT_CB* client_cb, char* number); +void bta_hf_client_ccwa(tBTA_HF_CLIENT_CB* client_cb, char* number); +void bta_hf_client_at_result(tBTA_HF_CLIENT_CB* client_cb, + tBTA_HF_CLIENT_AT_RESULT_TYPE type, uint16_t cme); +void bta_hf_client_clcc(tBTA_HF_CLIENT_CB* client_cb, uint32_t idx, + bool incoming, uint8_t status, bool mpty, char* number); +void bta_hf_client_cnum(tBTA_HF_CLIENT_CB* client_cb, char* number, + uint16_t service); +void bta_hf_client_binp(tBTA_HF_CLIENT_CB* client_cb, char* number); /* Action functions */ -extern void bta_hf_client_start_close(tBTA_HF_CLIENT_DATA* p_data); -extern void bta_hf_client_start_open(tBTA_HF_CLIENT_DATA* p_data); -extern void bta_hf_client_rfc_acp_open(tBTA_HF_CLIENT_DATA* p_data); -extern void bta_hf_client_rfc_open(tBTA_HF_CLIENT_DATA* p_data); -extern void bta_hf_client_rfc_fail(tBTA_HF_CLIENT_DATA* p_data); -extern void bta_hf_client_disc_fail(tBTA_HF_CLIENT_DATA* p_data); -extern void bta_hf_client_open_fail(tBTA_HF_CLIENT_DATA* p_data); -extern void bta_hf_client_rfc_close(tBTA_HF_CLIENT_DATA* p_data); -extern void bta_hf_client_disc_acp_res(tBTA_HF_CLIENT_DATA* p_data); -extern void bta_hf_client_rfc_data(tBTA_HF_CLIENT_DATA* p_data); -extern void bta_hf_client_disc_int_res(tBTA_HF_CLIENT_DATA* p_data); -extern void bta_hf_client_svc_conn_open(tBTA_HF_CLIENT_DATA* p_data); +void bta_hf_client_start_close(tBTA_HF_CLIENT_DATA* p_data); +void bta_hf_client_start_open(tBTA_HF_CLIENT_DATA* p_data); +void bta_hf_client_rfc_acp_open(tBTA_HF_CLIENT_DATA* p_data); +void bta_hf_client_rfc_open(tBTA_HF_CLIENT_DATA* p_data); +void bta_hf_client_rfc_fail(tBTA_HF_CLIENT_DATA* p_data); +void bta_hf_client_disc_fail(tBTA_HF_CLIENT_DATA* p_data); +void bta_hf_client_open_fail(tBTA_HF_CLIENT_DATA* p_data); +void bta_hf_client_rfc_close(tBTA_HF_CLIENT_DATA* p_data); +void bta_hf_client_disc_acp_res(tBTA_HF_CLIENT_DATA* p_data); +void bta_hf_client_rfc_data(tBTA_HF_CLIENT_DATA* p_data); +void bta_hf_client_disc_int_res(tBTA_HF_CLIENT_DATA* p_data); +void bta_hf_client_svc_conn_open(tBTA_HF_CLIENT_DATA* p_data); /* Commands handling functions */ -extern void bta_hf_client_dial(tBTA_HF_CLIENT_DATA* p_data); -extern void bta_hf_client_send_at_cmd(tBTA_HF_CLIENT_DATA* p_data); +void bta_hf_client_dial(tBTA_HF_CLIENT_DATA* p_data); +void bta_hf_client_send_at_cmd(tBTA_HF_CLIENT_DATA* p_data); diff --git a/system/bta/hh/bta_hh_act.cc b/system/bta/hh/bta_hh_act.cc index 95ca53cd4c..02957a6f5a 100644 --- a/system/bta/hh/bta_hh_act.cc +++ b/system/bta/hh/bta_hh_act.cc @@ -564,7 +564,7 @@ void bta_hh_connect(tBTA_HH_DEV_CB* p_cb, const tBTA_HH_DATA* p_data) { * Returns void * ******************************************************************************/ -extern void btif_hh_remove_device(RawAddress bd_addr); +void btif_hh_remove_device(RawAddress bd_addr); void bta_hh_api_disc_act(tBTA_HH_DEV_CB* p_cb, const tBTA_HH_DATA* p_data) { CHECK(p_cb != nullptr); diff --git a/system/bta/hh/bta_hh_int.h b/system/bta/hh/bta_hh_int.h index 96ef7c8af7..ee76bd05a7 100644 --- a/system/bta/hh/bta_hh_int.h +++ b/system/bta/hh/bta_hh_int.h @@ -241,87 +241,75 @@ extern tBTA_HH_CFG* p_bta_hh_cfg; /***************************************************************************** * Function prototypes ****************************************************************************/ -extern bool bta_hh_hdl_event(BT_HDR_RIGID* p_msg); -extern void bta_hh_sm_execute(tBTA_HH_DEV_CB* p_cb, uint16_t event, - const tBTA_HH_DATA* p_data); +bool bta_hh_hdl_event(BT_HDR_RIGID* p_msg); +void bta_hh_sm_execute(tBTA_HH_DEV_CB* p_cb, uint16_t event, + const tBTA_HH_DATA* p_data); /* action functions */ -extern void bta_hh_api_disc_act(tBTA_HH_DEV_CB* p_cb, - const tBTA_HH_DATA* p_data); -extern void bta_hh_open_act(tBTA_HH_DEV_CB* p_cb, const tBTA_HH_DATA* p_data); -extern void bta_hh_close_act(tBTA_HH_DEV_CB* p_cb, const tBTA_HH_DATA* p_data); -extern void bta_hh_data_act(tBTA_HH_DEV_CB* p_cb, const tBTA_HH_DATA* p_data); -extern void bta_hh_ctrl_dat_act(tBTA_HH_DEV_CB* p_cb, - const tBTA_HH_DATA* p_data); -extern void bta_hh_connect(tBTA_HH_DEV_CB* p_cb, const tBTA_HH_DATA* p_data); -extern void bta_hh_sdp_cmpl(tBTA_HH_DEV_CB* p_cb, const tBTA_HH_DATA* p_data); -extern void bta_hh_write_dev_act(tBTA_HH_DEV_CB* p_cb, - const tBTA_HH_DATA* p_data); -extern void bta_hh_get_dscp_act(tBTA_HH_DEV_CB* p_cb, - const tBTA_HH_DATA* p_data); -extern void bta_hh_handsk_act(tBTA_HH_DEV_CB* p_cb, const tBTA_HH_DATA* p_data); -extern void bta_hh_maint_dev_act(tBTA_HH_DEV_CB* p_cb, - const tBTA_HH_DATA* p_data); -extern void bta_hh_open_cmpl_act(tBTA_HH_DEV_CB* p_cb, - const tBTA_HH_DATA* p_data); -extern void bta_hh_open_failure(tBTA_HH_DEV_CB* p_cb, - const tBTA_HH_DATA* p_data); +void bta_hh_api_disc_act(tBTA_HH_DEV_CB* p_cb, const tBTA_HH_DATA* p_data); +void bta_hh_open_act(tBTA_HH_DEV_CB* p_cb, const tBTA_HH_DATA* p_data); +void bta_hh_close_act(tBTA_HH_DEV_CB* p_cb, const tBTA_HH_DATA* p_data); +void bta_hh_data_act(tBTA_HH_DEV_CB* p_cb, const tBTA_HH_DATA* p_data); +void bta_hh_ctrl_dat_act(tBTA_HH_DEV_CB* p_cb, const tBTA_HH_DATA* p_data); +void bta_hh_connect(tBTA_HH_DEV_CB* p_cb, const tBTA_HH_DATA* p_data); +void bta_hh_sdp_cmpl(tBTA_HH_DEV_CB* p_cb, const tBTA_HH_DATA* p_data); +void bta_hh_write_dev_act(tBTA_HH_DEV_CB* p_cb, const tBTA_HH_DATA* p_data); +void bta_hh_get_dscp_act(tBTA_HH_DEV_CB* p_cb, const tBTA_HH_DATA* p_data); +void bta_hh_handsk_act(tBTA_HH_DEV_CB* p_cb, const tBTA_HH_DATA* p_data); +void bta_hh_maint_dev_act(tBTA_HH_DEV_CB* p_cb, const tBTA_HH_DATA* p_data); +void bta_hh_open_cmpl_act(tBTA_HH_DEV_CB* p_cb, const tBTA_HH_DATA* p_data); +void bta_hh_open_failure(tBTA_HH_DEV_CB* p_cb, const tBTA_HH_DATA* p_data); /* utility functions */ -extern uint8_t bta_hh_find_cb(const RawAddress& bda); -extern tBTA_HH_DEV_CB* bta_hh_get_cb(const RawAddress& bda); -extern bool bta_hh_tod_spt(tBTA_HH_DEV_CB* p_cb, uint8_t sub_class); -extern void bta_hh_clean_up_kdev(tBTA_HH_DEV_CB* p_cb); - -extern void bta_hh_add_device_to_list(tBTA_HH_DEV_CB* p_cb, uint8_t handle, - uint16_t attr_mask, - const tHID_DEV_DSCP_INFO* p_dscp_info, - uint8_t sub_class, uint16_t max_latency, - uint16_t min_tout, uint8_t app_id); -extern void bta_hh_update_di_info(tBTA_HH_DEV_CB* p_cb, uint16_t vendor_id, - uint16_t product_id, uint16_t version, - uint8_t flag, uint8_t ctry_code); -extern void bta_hh_cleanup_disable(tBTA_HH_STATUS status); - -extern uint8_t bta_hh_dev_handle_to_cb_idx(uint8_t dev_handle); +uint8_t bta_hh_find_cb(const RawAddress& bda); +tBTA_HH_DEV_CB* bta_hh_get_cb(const RawAddress& bda); +bool bta_hh_tod_spt(tBTA_HH_DEV_CB* p_cb, uint8_t sub_class); +void bta_hh_clean_up_kdev(tBTA_HH_DEV_CB* p_cb); + +void bta_hh_add_device_to_list(tBTA_HH_DEV_CB* p_cb, uint8_t handle, + uint16_t attr_mask, + const tHID_DEV_DSCP_INFO* p_dscp_info, + uint8_t sub_class, uint16_t max_latency, + uint16_t min_tout, uint8_t app_id); +void bta_hh_update_di_info(tBTA_HH_DEV_CB* p_cb, uint16_t vendor_id, + uint16_t product_id, uint16_t version, uint8_t flag, + uint8_t ctry_code); +void bta_hh_cleanup_disable(tBTA_HH_STATUS status); + +uint8_t bta_hh_dev_handle_to_cb_idx(uint8_t dev_handle); /* action functions used outside state machine */ -extern void bta_hh_api_enable(tBTA_HH_CBACK* p_cback, bool enable_hid, bool enable_hogp); -extern void bta_hh_api_disable(void); -extern void bta_hh_disc_cmpl(void); +void bta_hh_api_enable(tBTA_HH_CBACK* p_cback, bool enable_hid, + bool enable_hogp); +void bta_hh_api_disable(void); +void bta_hh_disc_cmpl(void); -extern tBTA_HH_STATUS bta_hh_read_ssr_param(const RawAddress& bd_addr, - uint16_t* p_max_ssr_lat, - uint16_t* p_min_ssr_tout); +tBTA_HH_STATUS bta_hh_read_ssr_param(const RawAddress& bd_addr, + uint16_t* p_max_ssr_lat, + uint16_t* p_min_ssr_tout); /* functions for LE HID */ -extern void bta_hh_le_enable(void); -extern void bta_hh_le_deregister(void); -extern void bta_hh_le_open_conn(tBTA_HH_DEV_CB* p_cb, - const RawAddress& remote_bda); -extern void bta_hh_le_api_disc_act(tBTA_HH_DEV_CB* p_cb); -extern void bta_hh_le_get_dscp_act(tBTA_HH_DEV_CB* p_cb); -extern void bta_hh_le_write_dev_act(tBTA_HH_DEV_CB* p_cb, - const tBTA_HH_DATA* p_data); -extern uint8_t bta_hh_le_add_device(tBTA_HH_DEV_CB* p_cb, - const tBTA_HH_MAINT_DEV* p_dev_info); -extern void bta_hh_le_remove_dev_bg_conn(tBTA_HH_DEV_CB* p_cb); -extern void bta_hh_le_open_fail(tBTA_HH_DEV_CB* p_cb, - const tBTA_HH_DATA* p_data); -extern void bta_hh_gatt_open(tBTA_HH_DEV_CB* p_cb, const tBTA_HH_DATA* p_data); -extern void bta_hh_gatt_close(tBTA_HH_DEV_CB* p_cb, const tBTA_HH_DATA* p_data); -extern void bta_hh_start_security(tBTA_HH_DEV_CB* p_cb, - const tBTA_HH_DATA* p_buf); - -extern void bta_hh_start_security(tBTA_HH_DEV_CB* p_cb, - const tBTA_HH_DATA* p_buf); -extern void bta_hh_security_cmpl(tBTA_HH_DEV_CB* p_cb, - const tBTA_HH_DATA* p_buf); -extern void bta_hh_le_notify_enc_cmpl(tBTA_HH_DEV_CB* p_cb, - const tBTA_HH_DATA* p_data); +void bta_hh_le_enable(void); +void bta_hh_le_deregister(void); +void bta_hh_le_open_conn(tBTA_HH_DEV_CB* p_cb, const RawAddress& remote_bda); +void bta_hh_le_api_disc_act(tBTA_HH_DEV_CB* p_cb); +void bta_hh_le_get_dscp_act(tBTA_HH_DEV_CB* p_cb); +void bta_hh_le_write_dev_act(tBTA_HH_DEV_CB* p_cb, const tBTA_HH_DATA* p_data); +uint8_t bta_hh_le_add_device(tBTA_HH_DEV_CB* p_cb, + const tBTA_HH_MAINT_DEV* p_dev_info); +void bta_hh_le_remove_dev_bg_conn(tBTA_HH_DEV_CB* p_cb); +void bta_hh_le_open_fail(tBTA_HH_DEV_CB* p_cb, const tBTA_HH_DATA* p_data); +void bta_hh_gatt_open(tBTA_HH_DEV_CB* p_cb, const tBTA_HH_DATA* p_data); +void bta_hh_gatt_close(tBTA_HH_DEV_CB* p_cb, const tBTA_HH_DATA* p_data); +void bta_hh_start_security(tBTA_HH_DEV_CB* p_cb, const tBTA_HH_DATA* p_buf); + +void bta_hh_start_security(tBTA_HH_DEV_CB* p_cb, const tBTA_HH_DATA* p_buf); +void bta_hh_security_cmpl(tBTA_HH_DEV_CB* p_cb, const tBTA_HH_DATA* p_buf); +void bta_hh_le_notify_enc_cmpl(tBTA_HH_DEV_CB* p_cb, + const tBTA_HH_DATA* p_data); #if (BTA_HH_DEBUG == TRUE) -extern void bta_hh_trace_dev_db(void); +void bta_hh_trace_dev_db(void); #endif #endif diff --git a/system/bta/include/bta_api.h b/system/bta/include/bta_api.h index 6b979a0f4e..fa2ae42277 100644 --- a/system/bta/include/bta_api.h +++ b/system/bta/include/bta_api.h @@ -750,7 +750,7 @@ void BTA_dm_init(); * Returns void * ******************************************************************************/ -extern void BTA_DmSetDeviceName(const char* p_name); +void BTA_DmSetDeviceName(const char* p_name); /******************************************************************************* * @@ -766,7 +766,7 @@ extern void BTA_DmSetDeviceName(const char* p_name); * Returns void * ******************************************************************************/ -extern bool BTA_DmSetVisibility(bt_scan_mode_t mode); +bool BTA_DmSetVisibility(bt_scan_mode_t mode); /******************************************************************************* * @@ -782,7 +782,7 @@ extern bool BTA_DmSetVisibility(bt_scan_mode_t mode); * Returns void * ******************************************************************************/ -extern void BTA_DmSearch(tBTA_DM_SEARCH_CBACK* p_cback); +void BTA_DmSearch(tBTA_DM_SEARCH_CBACK* p_cback); /******************************************************************************* * @@ -795,7 +795,7 @@ extern void BTA_DmSearch(tBTA_DM_SEARCH_CBACK* p_cback); * Returns void * ******************************************************************************/ -extern void BTA_DmSearchCancel(void); +void BTA_DmSearchCancel(void); /******************************************************************************* * @@ -808,9 +808,8 @@ extern void BTA_DmSearchCancel(void); * Returns void * ******************************************************************************/ -extern void BTA_DmDiscover(const RawAddress& bd_addr, - tBTA_DM_SEARCH_CBACK* p_cback, - tBT_TRANSPORT transport); +void BTA_DmDiscover(const RawAddress& bd_addr, tBTA_DM_SEARCH_CBACK* p_cback, + tBT_TRANSPORT transport); /******************************************************************************* * @@ -838,8 +837,8 @@ tBTA_STATUS BTA_DmGetCachedRemoteName(const RawAddress& remote_device, * Returns void * ******************************************************************************/ -extern void BTA_DmBond(const RawAddress& bd_addr, tBLE_ADDR_TYPE addr_type, - tBT_TRANSPORT transport, tBT_DEVICE_TYPE device_type); +void BTA_DmBond(const RawAddress& bd_addr, tBLE_ADDR_TYPE addr_type, + tBT_TRANSPORT transport, tBT_DEVICE_TYPE device_type); /******************************************************************************* * @@ -852,7 +851,7 @@ extern void BTA_DmBond(const RawAddress& bd_addr, tBLE_ADDR_TYPE addr_type, * Returns void * ******************************************************************************/ -extern void BTA_DmBondCancel(const RawAddress& bd_addr); +void BTA_DmBondCancel(const RawAddress& bd_addr); /******************************************************************************* * @@ -867,8 +866,8 @@ extern void BTA_DmBondCancel(const RawAddress& bd_addr); * Returns void * ******************************************************************************/ -extern void BTA_DmPinReply(const RawAddress& bd_addr, bool accept, - uint8_t pin_len, uint8_t* p_pin); +void BTA_DmPinReply(const RawAddress& bd_addr, bool accept, uint8_t pin_len, + uint8_t* p_pin); /******************************************************************************* * @@ -880,7 +879,7 @@ extern void BTA_DmPinReply(const RawAddress& bd_addr, bool accept, * Returns void * ******************************************************************************/ -extern void BTA_DmLocalOob(void); +void BTA_DmLocalOob(void); /******************************************************************************* * @@ -892,7 +891,7 @@ extern void BTA_DmLocalOob(void); * Returns void * ******************************************************************************/ -extern void BTA_DmConfirm(const RawAddress& bd_addr, bool accept); +void BTA_DmConfirm(const RawAddress& bd_addr, bool accept); /******************************************************************************* * @@ -907,9 +906,9 @@ extern void BTA_DmConfirm(const RawAddress& bd_addr, bool accept); * Returns void * ******************************************************************************/ -extern void BTA_DmAddDevice(const RawAddress& bd_addr, DEV_CLASS dev_class, - const LinkKey& link_key, uint8_t key_type, - uint8_t pin_length); +void BTA_DmAddDevice(const RawAddress& bd_addr, DEV_CLASS dev_class, + const LinkKey& link_key, uint8_t key_type, + uint8_t pin_length); /******************************************************************************* * @@ -924,7 +923,7 @@ extern void BTA_DmAddDevice(const RawAddress& bd_addr, DEV_CLASS dev_class, * BTA_FAIL if operation failed. * ******************************************************************************/ -extern tBTA_STATUS BTA_DmRemoveDevice(const RawAddress& bd_addr); +tBTA_STATUS BTA_DmRemoveDevice(const RawAddress& bd_addr); /******************************************************************************* * @@ -939,8 +938,8 @@ extern tBTA_STATUS BTA_DmRemoveDevice(const RawAddress& bd_addr); * Returns None * ******************************************************************************/ -extern void BTA_GetEirService(const uint8_t* p_eir, size_t eir_len, - tBTA_SERVICE_MASK* p_services); +void BTA_GetEirService(const uint8_t* p_eir, size_t eir_len, + tBTA_SERVICE_MASK* p_services); /******************************************************************************* * @@ -951,7 +950,7 @@ extern void BTA_GetEirService(const uint8_t* p_eir, size_t eir_len, * Returns true if the device is NOT connected, false otherwise. * ******************************************************************************/ -extern bool BTA_DmGetConnectionState(const RawAddress& bd_addr); +bool BTA_DmGetConnectionState(const RawAddress& bd_addr); /******************************************************************************* * @@ -962,8 +961,8 @@ extern bool BTA_DmGetConnectionState(const RawAddress& bd_addr); * Returns BTA_SUCCESS if record set sucessfully, otherwise error code. * ******************************************************************************/ -extern tBTA_STATUS BTA_DmSetLocalDiRecord(tSDP_DI_RECORD* p_device_info, - uint32_t* p_handle); +tBTA_STATUS BTA_DmSetLocalDiRecord(tSDP_DI_RECORD* p_device_info, + uint32_t* p_handle); /******************************************************************************* * @@ -982,8 +981,8 @@ extern tBTA_STATUS BTA_DmSetLocalDiRecord(tSDP_DI_RECORD* p_device_info, * Returns void. * ******************************************************************************/ -extern void BTA_DmCloseACL(const RawAddress& bd_addr, bool remove_dev, - tBT_TRANSPORT transport); +void BTA_DmCloseACL(const RawAddress& bd_addr, bool remove_dev, + tBT_TRANSPORT transport); /* BLE related API functions */ /******************************************************************************* @@ -998,8 +997,8 @@ extern void BTA_DmCloseACL(const RawAddress& bd_addr, bool remove_dev, * Returns void * ******************************************************************************/ -extern void BTA_DmBleSecurityGrant(const RawAddress& bd_addr, - tBTA_DM_BLE_SEC_GRANT res); +void BTA_DmBleSecurityGrant(const RawAddress& bd_addr, + tBTA_DM_BLE_SEC_GRANT res); /******************************************************************************* * @@ -1015,8 +1014,8 @@ extern void BTA_DmBleSecurityGrant(const RawAddress& bd_addr, * Returns void * ******************************************************************************/ -extern void BTA_DmBlePasskeyReply(const RawAddress& bd_addr, bool accept, - uint32_t passkey); +void BTA_DmBlePasskeyReply(const RawAddress& bd_addr, bool accept, + uint32_t passkey); /******************************************************************************* * @@ -1031,7 +1030,7 @@ extern void BTA_DmBlePasskeyReply(const RawAddress& bd_addr, bool accept, * Returns void * ******************************************************************************/ -extern void BTA_DmBleConfirmReply(const RawAddress& bd_addr, bool accept); +void BTA_DmBleConfirmReply(const RawAddress& bd_addr, bool accept); /******************************************************************************* * @@ -1048,9 +1047,8 @@ extern void BTA_DmBleConfirmReply(const RawAddress& bd_addr, bool accept); * Returns void * ******************************************************************************/ -extern void BTA_DmAddBleDevice(const RawAddress& bd_addr, - tBLE_ADDR_TYPE addr_type, - tBT_DEVICE_TYPE dev_type); +void BTA_DmAddBleDevice(const RawAddress& bd_addr, tBLE_ADDR_TYPE addr_type, + tBT_DEVICE_TYPE dev_type); /******************************************************************************* * @@ -1067,9 +1065,8 @@ extern void BTA_DmAddBleDevice(const RawAddress& bd_addr, * Returns void * ******************************************************************************/ -extern void BTA_DmAddBleKey(const RawAddress& bd_addr, - tBTA_LE_KEY_VALUE* p_le_key, - tBTM_LE_KEY_TYPE key_type); +void BTA_DmAddBleKey(const RawAddress& bd_addr, tBTA_LE_KEY_VALUE* p_le_key, + tBTM_LE_KEY_TYPE key_type); /******************************************************************************* * @@ -1088,11 +1085,10 @@ extern void BTA_DmAddBleKey(const RawAddress& bd_addr, * Returns void * ******************************************************************************/ -extern void BTA_DmSetBlePrefConnParams(const RawAddress& bd_addr, - uint16_t min_conn_int, - uint16_t max_conn_int, - uint16_t peripheral_latency, - uint16_t supervision_tout); +void BTA_DmSetBlePrefConnParams(const RawAddress& bd_addr, + uint16_t min_conn_int, uint16_t max_conn_int, + uint16_t peripheral_latency, + uint16_t supervision_tout); /******************************************************************************* * @@ -1117,10 +1113,9 @@ extern void BTA_DmSetBlePrefConnParams(const RawAddress& bd_addr, * * ******************************************************************************/ -extern void BTA_DmSetEncryption(const RawAddress& bd_addr, - tBT_TRANSPORT transport, - tBTA_DM_ENCRYPT_CBACK* p_callback, - tBTM_BLE_SEC_ACT sec_act); +void BTA_DmSetEncryption(const RawAddress& bd_addr, tBT_TRANSPORT transport, + tBTA_DM_ENCRYPT_CBACK* p_callback, + tBTM_BLE_SEC_ACT sec_act); /******************************************************************************* * @@ -1137,8 +1132,8 @@ extern void BTA_DmSetEncryption(const RawAddress& bd_addr, * Returns void * ******************************************************************************/ -extern void BTA_DmBleObserve(bool start, uint8_t duration, - tBTA_DM_SEARCH_CBACK* p_results_cb); +void BTA_DmBleObserve(bool start, uint8_t duration, + tBTA_DM_SEARCH_CBACK* p_results_cb); /******************************************************************************* * @@ -1154,7 +1149,7 @@ extern void BTA_DmBleObserve(bool start, uint8_t duration, * Returns void * ******************************************************************************/ -extern void BTA_DmBleScan(bool start, uint8_t duration); +void BTA_DmBleScan(bool start, uint8_t duration); /******************************************************************************* * @@ -1169,8 +1164,7 @@ extern void BTA_DmBleScan(bool start, uint8_t duration); * Returns void * ******************************************************************************/ -extern void BTA_DmBleCsisObserve(bool observe, - tBTA_DM_SEARCH_CBACK* p_results_cb); +void BTA_DmBleCsisObserve(bool observe, tBTA_DM_SEARCH_CBACK* p_results_cb); /******************************************************************************* * @@ -1183,7 +1177,7 @@ extern void BTA_DmBleCsisObserve(bool observe, * Returns void * ******************************************************************************/ -extern void BTA_DmBleConfigLocalPrivacy(bool privacy_enable); +void BTA_DmBleConfigLocalPrivacy(bool privacy_enable); /******************************************************************************* * @@ -1197,8 +1191,8 @@ extern void BTA_DmBleConfigLocalPrivacy(bool privacy_enable); * Returns void * ******************************************************************************/ -extern void BTA_DmBleEnableRemotePrivacy(const RawAddress& bd_addr, - bool privacy_enable); +void BTA_DmBleEnableRemotePrivacy(const RawAddress& bd_addr, + bool privacy_enable); /******************************************************************************* * @@ -1216,11 +1210,10 @@ extern void BTA_DmBleEnableRemotePrivacy(const RawAddress& bd_addr, * Returns void * ******************************************************************************/ -extern void BTA_DmBleUpdateConnectionParams(const RawAddress& bd_addr, - uint16_t min_int, uint16_t max_int, - uint16_t latency, uint16_t timeout, - uint16_t min_ce_len, - uint16_t max_ce_len); +void BTA_DmBleUpdateConnectionParams(const RawAddress& bd_addr, + uint16_t min_int, uint16_t max_int, + uint16_t latency, uint16_t timeout, + uint16_t min_ce_len, uint16_t max_ce_len); /******************************************************************************* * @@ -1231,7 +1224,7 @@ extern void BTA_DmBleUpdateConnectionParams(const RawAddress& bd_addr, * Returns void * ******************************************************************************/ -extern void BTA_DmBleRequestMaxTxDataLength(const RawAddress& remote_device); +void BTA_DmBleRequestMaxTxDataLength(const RawAddress& remote_device); /******************************************************************************* * @@ -1244,7 +1237,7 @@ extern void BTA_DmBleRequestMaxTxDataLength(const RawAddress& remote_device); * Returns void * ******************************************************************************/ -extern void BTA_DmBleGetEnergyInfo(tBTA_BLE_ENERGY_INFO_CBACK* p_cmpl_cback); +void BTA_DmBleGetEnergyInfo(tBTA_BLE_ENERGY_INFO_CBACK* p_cmpl_cback); /******************************************************************************* * @@ -1256,7 +1249,7 @@ extern void BTA_DmBleGetEnergyInfo(tBTA_BLE_ENERGY_INFO_CBACK* p_cmpl_cback); * Returns void * ******************************************************************************/ -extern void BTA_VendorInit(void); +void BTA_VendorInit(void); /******************************************************************************* * @@ -1267,7 +1260,7 @@ extern void BTA_VendorInit(void); * Returns void * ******************************************************************************/ -extern void BTA_DmClearEventFilter(void); +void BTA_DmClearEventFilter(void); /******************************************************************************* * @@ -1278,7 +1271,7 @@ extern void BTA_DmClearEventFilter(void); * Returns void * ******************************************************************************/ -extern void BTA_DmClearEventMask(void); +void BTA_DmClearEventMask(void); /******************************************************************************* * @@ -1289,7 +1282,7 @@ extern void BTA_DmClearEventMask(void); * Returns void * ******************************************************************************/ -extern void BTA_DmDisconnectAllAcls(void); +void BTA_DmDisconnectAllAcls(void); /******************************************************************************* * @@ -1300,7 +1293,7 @@ extern void BTA_DmDisconnectAllAcls(void); * Returns void * ******************************************************************************/ -extern void BTA_DmClearFilterAcceptList(void); +void BTA_DmClearFilterAcceptList(void); using LeRandCallback = base::Callback<void(uint64_t)>; /******************************************************************************* @@ -1312,7 +1305,7 @@ using LeRandCallback = base::Callback<void(uint64_t)>; * Returns cb: callback to receive the resulting random number * ******************************************************************************/ -extern void BTA_DmLeRand(LeRandCallback cb); +void BTA_DmLeRand(LeRandCallback cb); /******************************************************************************* * @@ -1323,7 +1316,7 @@ extern void BTA_DmLeRand(LeRandCallback cb); * Parameters * *******************************************************************************/ -extern void BTA_DmSetEventFilterConnectionSetupAllDevices(); +void BTA_DmSetEventFilterConnectionSetupAllDevices(); /******************************************************************************* * @@ -1334,7 +1327,7 @@ extern void BTA_DmSetEventFilterConnectionSetupAllDevices(); * Parameters * *******************************************************************************/ -extern void BTA_DmAllowWakeByHid( +void BTA_DmAllowWakeByHid( std::vector<RawAddress> classic_hid_devices, std::vector<std::pair<RawAddress, uint8_t>> le_hid_devices); @@ -1347,7 +1340,7 @@ extern void BTA_DmAllowWakeByHid( * Parameters * *******************************************************************************/ -extern void BTA_DmRestoreFilterAcceptList( +void BTA_DmRestoreFilterAcceptList( std::vector<std::pair<RawAddress, uint8_t>> le_devices); /******************************************************************************* @@ -1362,7 +1355,7 @@ extern void BTA_DmRestoreFilterAcceptList( * disabled in the final value. * *******************************************************************************/ -extern void BTA_DmSetDefaultEventMaskExcept(uint64_t mask, uint64_t le_mask); +void BTA_DmSetDefaultEventMaskExcept(uint64_t mask, uint64_t le_mask); /******************************************************************************* * @@ -1373,7 +1366,7 @@ extern void BTA_DmSetDefaultEventMaskExcept(uint64_t mask, uint64_t le_mask); * Parameters * *******************************************************************************/ -extern void BTA_DmSetEventFilterInquiryResultAllDevices(); +void BTA_DmSetEventFilterInquiryResultAllDevices(); /******************************************************************************* * @@ -1384,7 +1377,7 @@ extern void BTA_DmSetEventFilterInquiryResultAllDevices(); * Returns void * ******************************************************************************/ -extern void BTA_DmBleResetId(void); +void BTA_DmBleResetId(void); /******************************************************************************* * @@ -1402,10 +1395,9 @@ extern void BTA_DmBleResetId(void); * Returns void * ******************************************************************************/ -extern void BTA_DmBleSubrateRequest(const RawAddress& bd_addr, - uint16_t subrate_min, uint16_t subrate_max, - uint16_t max_latency, uint16_t cont_num, - uint16_t timeout); +void BTA_DmBleSubrateRequest(const RawAddress& bd_addr, uint16_t subrate_min, + uint16_t subrate_max, uint16_t max_latency, + uint16_t cont_num, uint16_t timeout); /******************************************************************************* * @@ -1416,5 +1408,5 @@ extern void BTA_DmBleSubrateRequest(const RawAddress& bd_addr, * Returns True if Le Audio capable device, false otherwise * ******************************************************************************/ -extern bool BTA_DmCheckLeAudioCapable(const RawAddress& address); +bool BTA_DmCheckLeAudioCapable(const RawAddress& address); #endif /* BTA_API_H */ diff --git a/system/bta/include/bta_ar_api.h b/system/bta/include/bta_ar_api.h index 8e4483a6fe..c6807d884b 100644 --- a/system/bta/include/bta_ar_api.h +++ b/system/bta/include/bta_ar_api.h @@ -48,7 +48,7 @@ * Returns void * ******************************************************************************/ -extern void bta_ar_init(void); +void bta_ar_init(void); /******************************************************************************* * @@ -59,7 +59,7 @@ extern void bta_ar_init(void); * Returns void * ******************************************************************************/ -extern void bta_ar_reg_avdt(AvdtpRcb* p_reg, tAVDT_CTRL_CBACK* p_cback); +void bta_ar_reg_avdt(AvdtpRcb* p_reg, tAVDT_CTRL_CBACK* p_cback); /******************************************************************************* * @@ -70,7 +70,7 @@ extern void bta_ar_reg_avdt(AvdtpRcb* p_reg, tAVDT_CTRL_CBACK* p_cback); * Returns void * ******************************************************************************/ -extern void bta_ar_dereg_avdt(); +void bta_ar_dereg_avdt(); /******************************************************************************* * @@ -84,8 +84,8 @@ extern void bta_ar_dereg_avdt(); * Returns void * ******************************************************************************/ -extern void bta_ar_avdt_conn(tBTA_SYS_ID sys_id, const RawAddress& bd_addr, - uint8_t scb_index); +void bta_ar_avdt_conn(tBTA_SYS_ID sys_id, const RawAddress& bd_addr, + uint8_t scb_index); /******************************************************************************* * @@ -96,7 +96,7 @@ extern void bta_ar_avdt_conn(tBTA_SYS_ID sys_id, const RawAddress& bd_addr, * Returns void * ******************************************************************************/ -extern void bta_ar_reg_avct(); +void bta_ar_reg_avct(); /******************************************************************************* * @@ -107,7 +107,7 @@ extern void bta_ar_reg_avct(); * Returns void * ******************************************************************************/ -extern void bta_ar_dereg_avct(); +void bta_ar_dereg_avct(); /****************************************************************************** * @@ -118,9 +118,9 @@ extern void bta_ar_dereg_avct(); * Returns void * *****************************************************************************/ -extern void bta_ar_reg_avrc(uint16_t service_uuid, const char* p_service_name, - const char* p_provider_name, uint16_t categories, - bool browse_supported, uint16_t profile_version); +void bta_ar_reg_avrc(uint16_t service_uuid, const char* p_service_name, + const char* p_provider_name, uint16_t categories, + bool browse_supported, uint16_t profile_version); /****************************************************************************** * @@ -132,6 +132,6 @@ extern void bta_ar_reg_avrc(uint16_t service_uuid, const char* p_service_name, * Returns void * *****************************************************************************/ -extern void bta_ar_dereg_avrc(uint16_t service_uuid); +void bta_ar_dereg_avrc(uint16_t service_uuid); #endif /* BTA_AR_API_H */ diff --git a/system/bta/include/bta_av_ci.h b/system/bta/include/bta_av_ci.h index fedba46a30..73f16b46ac 100644 --- a/system/bta/include/bta_av_ci.h +++ b/system/bta/include/bta_av_ci.h @@ -42,7 +42,7 @@ * Returns void * ******************************************************************************/ -extern void bta_av_ci_src_data_ready(tBTA_AV_CHNL chnl); +void bta_av_ci_src_data_ready(tBTA_AV_CHNL chnl); /******************************************************************************* * @@ -57,9 +57,8 @@ extern void bta_av_ci_src_data_ready(tBTA_AV_CHNL chnl); * Returns void * ******************************************************************************/ -extern void bta_av_ci_setconfig(tBTA_AV_HNDL bta_av_handle, uint8_t err_code, - uint8_t category, uint8_t num_seid, - uint8_t* p_seid, bool recfg_needed, - uint8_t avdt_handle); +void bta_av_ci_setconfig(tBTA_AV_HNDL bta_av_handle, uint8_t err_code, + uint8_t category, uint8_t num_seid, uint8_t* p_seid, + bool recfg_needed, uint8_t avdt_handle); #endif /* BTA_AV_CI_H */ diff --git a/system/bta/include/bta_dm_ci.h b/system/bta/include/bta_dm_ci.h index a7b6210922..2109e41439 100644 --- a/system/bta/include/bta_dm_ci.h +++ b/system/bta/include/bta_dm_ci.h @@ -44,8 +44,8 @@ * Returns void * ******************************************************************************/ -extern void bta_dm_ci_rmt_oob(bool accept, const RawAddress& bd_addr, - const Octet16& c, const Octet16& r); +void bta_dm_ci_rmt_oob(bool accept, const RawAddress& bd_addr, const Octet16& c, + const Octet16& r); /******************************************************************************* * * Function bta_dm_sco_ci_data_ready @@ -56,6 +56,6 @@ extern void bta_dm_ci_rmt_oob(bool accept, const RawAddress& bd_addr, * Returns void * ******************************************************************************/ -extern void bta_dm_sco_ci_data_ready(uint16_t event, uint16_t sco_handle); +void bta_dm_sco_ci_data_ready(uint16_t event, uint16_t sco_handle); #endif diff --git a/system/bta/include/bta_dm_co.h b/system/bta/include/bta_dm_co.h index 9b0bfe8a6a..016c7a1f61 100644 --- a/system/bta/include/bta_dm_co.h +++ b/system/bta/include/bta_dm_co.h @@ -55,9 +55,9 @@ * Returns void. * ******************************************************************************/ -extern void bta_dm_co_io_req(const RawAddress& bd_addr, tBTM_IO_CAP* p_io_cap, - tBTM_OOB_DATA* p_oob_data, - tBTM_AUTH_REQ* p_auth_req, bool is_orig); +void bta_dm_co_io_req(const RawAddress& bd_addr, tBTM_IO_CAP* p_io_cap, + tBTM_OOB_DATA* p_oob_data, tBTM_AUTH_REQ* p_auth_req, + bool is_orig); /******************************************************************************* * @@ -76,8 +76,8 @@ extern void bta_dm_co_io_req(const RawAddress& bd_addr, tBTM_IO_CAP* p_io_cap, * Returns void. * ******************************************************************************/ -extern void bta_dm_co_io_rsp(const RawAddress& bd_addr, tBTM_IO_CAP io_cap, - tBTM_OOB_DATA oob_data, tBTM_AUTH_REQ auth_req); +void bta_dm_co_io_rsp(const RawAddress& bd_addr, tBTM_IO_CAP io_cap, + tBTM_OOB_DATA oob_data, tBTM_AUTH_REQ auth_req); /******************************************************************************* * @@ -93,7 +93,7 @@ extern void bta_dm_co_io_rsp(const RawAddress& bd_addr, tBTM_IO_CAP io_cap, * Returns void. * ******************************************************************************/ -extern void bta_dm_co_loc_oob(bool valid, const Octet16& c, const Octet16& r); +void bta_dm_co_loc_oob(bool valid, const Octet16& c, const Octet16& r); /******************************************************************************* * @@ -107,7 +107,7 @@ extern void bta_dm_co_loc_oob(bool valid, const Octet16& c, const Octet16& r); * Returns void. * ******************************************************************************/ -extern void bta_dm_co_rmt_oob(const RawAddress& bd_addr); +void bta_dm_co_rmt_oob(const RawAddress& bd_addr); /******************************************************************************* * @@ -119,8 +119,7 @@ extern void bta_dm_co_rmt_oob(const RawAddress& bd_addr); * Returns void * ******************************************************************************/ -extern void bta_dm_sco_co_open(uint16_t handle, uint8_t pkt_size, - uint16_t event); +void bta_dm_sco_co_open(uint16_t handle, uint8_t pkt_size, uint16_t event); /******************************************************************************* * @@ -132,7 +131,7 @@ extern void bta_dm_sco_co_open(uint16_t handle, uint8_t pkt_size, * Returns void * ******************************************************************************/ -extern void bta_dm_sco_co_close(void); +void bta_dm_sco_co_close(void); /******************************************************************************* * @@ -143,7 +142,7 @@ extern void bta_dm_sco_co_close(void); * Returns void * ******************************************************************************/ -extern void bta_dm_sco_co_out_data(BT_HDR** p_buf); +void bta_dm_sco_co_out_data(BT_HDR** p_buf); /******************************************************************************* * @@ -155,7 +154,7 @@ extern void bta_dm_sco_co_out_data(BT_HDR** p_buf); * Returns void * ******************************************************************************/ -extern void bta_dm_sco_co_in_data(BT_HDR* p_buf, tBTM_SCO_DATA_FLAG status); +void bta_dm_sco_co_in_data(BT_HDR* p_buf, tBTM_SCO_DATA_FLAG status); /******************************************************************************* * @@ -177,10 +176,11 @@ extern void bta_dm_sco_co_in_data(BT_HDR* p_buf, tBTM_SCO_DATA_FLAG status); * Returns void. * ******************************************************************************/ -extern void bta_dm_co_ble_io_req( - const RawAddress& bd_addr, tBTM_IO_CAP* p_io_cap, tBTM_OOB_DATA* p_oob_data, - tBTM_LE_AUTH_REQ* p_auth_req, uint8_t* p_max_key_size, - tBTM_LE_KEY_TYPE* p_init_key, tBTM_LE_KEY_TYPE* p_resp_key); +void bta_dm_co_ble_io_req(const RawAddress& bd_addr, tBTM_IO_CAP* p_io_cap, + tBTM_OOB_DATA* p_oob_data, + tBTM_LE_AUTH_REQ* p_auth_req, uint8_t* p_max_key_size, + tBTM_LE_KEY_TYPE* p_init_key, + tBTM_LE_KEY_TYPE* p_resp_key); /******************************************************************************* * @@ -194,8 +194,8 @@ extern void bta_dm_co_ble_io_req( * Returns void. * ******************************************************************************/ -extern void bta_dm_co_ble_load_local_keys( - tBTA_DM_BLE_LOCAL_KEY_MASK* p_key_mask, Octet16* p_er, - tBTA_BLE_LOCAL_ID_KEYS* p_id_keys); +void bta_dm_co_ble_load_local_keys(tBTA_DM_BLE_LOCAL_KEY_MASK* p_key_mask, + Octet16* p_er, + tBTA_BLE_LOCAL_ID_KEYS* p_id_keys); #endif /* BTA_DM_CO_H */ diff --git a/system/bta/include/bta_gatt_api.h b/system/bta/include/bta_gatt_api.h index a355059db5..f93d3f9c16 100644 --- a/system/bta/include/bta_gatt_api.h +++ b/system/bta/include/bta_gatt_api.h @@ -434,7 +434,7 @@ typedef void(tBTA_GATTS_CBACK)(tBTA_GATTS_EVT event, tBTA_GATTS* p_data); * Returns None * ******************************************************************************/ -extern void BTA_GATTC_Disable(void); +void BTA_GATTC_Disable(void); using BtaAppRegisterCallback = base::Callback<void(uint8_t /* app_id */, uint8_t /* status */)>; @@ -444,8 +444,8 @@ using BtaAppRegisterCallback = *module. * p_client_cb - pointer to the application callback function. **/ -extern void BTA_GATTC_AppRegister(tBTA_GATTC_CBACK* p_client_cb, - BtaAppRegisterCallback cb, bool eatt_support); +void BTA_GATTC_AppRegister(tBTA_GATTC_CBACK* p_client_cb, + BtaAppRegisterCallback cb, bool eatt_support); /******************************************************************************* * @@ -459,7 +459,7 @@ extern void BTA_GATTC_AppRegister(tBTA_GATTC_CBACK* p_client_cb, * Returns None * ******************************************************************************/ -extern void BTA_GATTC_AppDeregister(tGATT_IF client_if); +void BTA_GATTC_AppDeregister(tGATT_IF client_if); /******************************************************************************* * @@ -474,18 +474,15 @@ extern void BTA_GATTC_AppDeregister(tGATT_IF client_if); * initiating_phys: LE PHY to use, optional * ******************************************************************************/ -extern void BTA_GATTC_Open(tGATT_IF client_if, const RawAddress& remote_bda, - tBTM_BLE_CONN_TYPE connection_type, - bool opportunistic); -extern void BTA_GATTC_Open(tGATT_IF client_if, const RawAddress& remote_bda, - tBTM_BLE_CONN_TYPE connection_type, - tBT_TRANSPORT transport, bool opportunistic, - uint8_t initiating_phys); -extern void BTA_GATTC_Open(tGATT_IF client_if, const RawAddress& remote_bda, - tBLE_ADDR_TYPE addr_type, - tBTM_BLE_CONN_TYPE connection_type, - tBT_TRANSPORT transport, bool opportunistic, - uint8_t initiating_phys); +void BTA_GATTC_Open(tGATT_IF client_if, const RawAddress& remote_bda, + tBTM_BLE_CONN_TYPE connection_type, bool opportunistic); +void BTA_GATTC_Open(tGATT_IF client_if, const RawAddress& remote_bda, + tBTM_BLE_CONN_TYPE connection_type, tBT_TRANSPORT transport, + bool opportunistic, uint8_t initiating_phys); +void BTA_GATTC_Open(tGATT_IF client_if, const RawAddress& remote_bda, + tBLE_ADDR_TYPE addr_type, + tBTM_BLE_CONN_TYPE connection_type, tBT_TRANSPORT transport, + bool opportunistic, uint8_t initiating_phys); /******************************************************************************* * @@ -501,8 +498,8 @@ extern void BTA_GATTC_Open(tGATT_IF client_if, const RawAddress& remote_bda, * Returns void * ******************************************************************************/ -extern void BTA_GATTC_CancelOpen(tGATT_IF client_if, - const RawAddress& remote_bda, bool is_direct); +void BTA_GATTC_CancelOpen(tGATT_IF client_if, const RawAddress& remote_bda, + bool is_direct); /******************************************************************************* * @@ -515,7 +512,7 @@ extern void BTA_GATTC_CancelOpen(tGATT_IF client_if, * Returns void * ******************************************************************************/ -extern void BTA_GATTC_Close(uint16_t conn_id); +void BTA_GATTC_Close(uint16_t conn_id); /******************************************************************************* * @@ -533,15 +530,15 @@ extern void BTA_GATTC_Close(uint16_t conn_id); * Returns None * ******************************************************************************/ -extern void BTA_GATTC_ServiceSearchRequest(uint16_t conn_id, - const bluetooth::Uuid* p_srvc_uuid); +void BTA_GATTC_ServiceSearchRequest(uint16_t conn_id, + const bluetooth::Uuid* p_srvc_uuid); /** * This function is called to send "Find service by UUID" request. Used only for * PTS tests. */ -extern void BTA_GATTC_DiscoverServiceByUuid(uint16_t conn_id, - const bluetooth::Uuid& srvc_uuid); +void BTA_GATTC_DiscoverServiceByUuid(uint16_t conn_id, + const bluetooth::Uuid& srvc_uuid); /******************************************************************************* * @@ -555,7 +552,7 @@ extern void BTA_GATTC_DiscoverServiceByUuid(uint16_t conn_id, * Returns returns list of gatt::Service or NULL. * ******************************************************************************/ -extern const std::list<gatt::Service>* BTA_GATTC_GetServices(uint16_t conn_id); +const std::list<gatt::Service>* BTA_GATTC_GetServices(uint16_t conn_id); /******************************************************************************* * @@ -570,8 +567,8 @@ extern const std::list<gatt::Service>* BTA_GATTC_GetServices(uint16_t conn_id); * Returns returns pointer to gatt::Characteristic or NULL. * ******************************************************************************/ -extern const gatt::Characteristic* BTA_GATTC_GetCharacteristic(uint16_t conn_id, - uint16_t handle); +const gatt::Characteristic* BTA_GATTC_GetCharacteristic(uint16_t conn_id, + uint16_t handle); /******************************************************************************* * @@ -586,18 +583,18 @@ extern const gatt::Characteristic* BTA_GATTC_GetCharacteristic(uint16_t conn_id, * Returns returns pointer to gatt::Descriptor or NULL. * ******************************************************************************/ -extern const gatt::Descriptor* BTA_GATTC_GetDescriptor(uint16_t conn_id, - uint16_t handle); +const gatt::Descriptor* BTA_GATTC_GetDescriptor(uint16_t conn_id, + uint16_t handle); /* Return characteristic that owns descriptor with handle equal to |handle|, or * NULL */ -extern const gatt::Characteristic* BTA_GATTC_GetOwningCharacteristic( - uint16_t conn_id, uint16_t handle); +const gatt::Characteristic* BTA_GATTC_GetOwningCharacteristic(uint16_t conn_id, + uint16_t handle); /* Return service that owns descriptor or characteristic with handle equal to * |handle|, or NULL */ -extern const gatt::Service* BTA_GATTC_GetOwningService(uint16_t conn_id, - uint16_t handle); +const gatt::Service* BTA_GATTC_GetOwningService(uint16_t conn_id, + uint16_t handle); /******************************************************************************* * @@ -611,9 +608,9 @@ extern const gatt::Service* BTA_GATTC_GetOwningService(uint16_t conn_id, * count: number of elements in db. * ******************************************************************************/ -extern void BTA_GATTC_GetGattDb(uint16_t conn_id, uint16_t start_handle, - uint16_t end_handle, btgatt_db_element_t** db, - int* count); +void BTA_GATTC_GetGattDb(uint16_t conn_id, uint16_t start_handle, + uint16_t end_handle, btgatt_db_element_t** db, + int* count); typedef void (*GATT_READ_OP_CB)(uint16_t conn_id, tGATT_STATUS status, uint16_t handle, uint16_t len, uint8_t* value, @@ -715,7 +712,7 @@ void BTA_GATTC_WriteCharDescr(uint16_t conn_id, uint16_t handle, * Returns None * ******************************************************************************/ -extern void BTA_GATTC_SendIndConfirm(uint16_t conn_id, uint16_t cid); +void BTA_GATTC_SendIndConfirm(uint16_t conn_id, uint16_t cid); /******************************************************************************* * @@ -731,8 +728,9 @@ extern void BTA_GATTC_SendIndConfirm(uint16_t conn_id, uint16_t cid); * Returns OK if registration succeed, otherwise failed. * ******************************************************************************/ -extern tGATT_STATUS BTA_GATTC_RegisterForNotifications( - tGATT_IF client_if, const RawAddress& remote_bda, uint16_t handle); +tGATT_STATUS BTA_GATTC_RegisterForNotifications(tGATT_IF client_if, + const RawAddress& remote_bda, + uint16_t handle); /******************************************************************************* * @@ -748,8 +746,9 @@ extern tGATT_STATUS BTA_GATTC_RegisterForNotifications( * Returns OK if deregistration succeed, otherwise failed. * ******************************************************************************/ -extern tGATT_STATUS BTA_GATTC_DeregisterForNotifications( - tGATT_IF client_if, const RawAddress& remote_bda, uint16_t handle); +tGATT_STATUS BTA_GATTC_DeregisterForNotifications(tGATT_IF client_if, + const RawAddress& remote_bda, + uint16_t handle); /******************************************************************************* * @@ -766,10 +765,9 @@ extern tGATT_STATUS BTA_GATTC_DeregisterForNotifications( * Returns None * ******************************************************************************/ -extern void BTA_GATTC_PrepareWrite(uint16_t conn_id, uint16_t handle, - uint16_t offset, std::vector<uint8_t> value, - tGATT_AUTH_REQ auth_req, - GATT_WRITE_OP_CB callback, void* cb_data); +void BTA_GATTC_PrepareWrite(uint16_t conn_id, uint16_t handle, uint16_t offset, + std::vector<uint8_t> value, tGATT_AUTH_REQ auth_req, + GATT_WRITE_OP_CB callback, void* cb_data); /******************************************************************************* * @@ -784,7 +782,7 @@ extern void BTA_GATTC_PrepareWrite(uint16_t conn_id, uint16_t handle, * Returns None * ******************************************************************************/ -extern void BTA_GATTC_ExecuteWrite(uint16_t conn_id, bool is_execute); +void BTA_GATTC_ExecuteWrite(uint16_t conn_id, bool is_execute); /******************************************************************************* * @@ -799,9 +797,8 @@ extern void BTA_GATTC_ExecuteWrite(uint16_t conn_id, bool is_execute); * Returns None * ******************************************************************************/ -extern void BTA_GATTC_ReadMultiple(uint16_t conn_id, - tBTA_GATTC_MULTI* p_read_multi, - tGATT_AUTH_REQ auth_req); +void BTA_GATTC_ReadMultiple(uint16_t conn_id, tBTA_GATTC_MULTI* p_read_multi, + tGATT_AUTH_REQ auth_req); /******************************************************************************* * @@ -814,7 +811,7 @@ extern void BTA_GATTC_ReadMultiple(uint16_t conn_id, * Returns void * ******************************************************************************/ -extern void BTA_GATTC_Refresh(const RawAddress& remote_bda); +void BTA_GATTC_Refresh(const RawAddress& remote_bda); /******************************************************************************* * @@ -829,10 +826,9 @@ extern void BTA_GATTC_Refresh(const RawAddress& remote_bda); * Returns void * ******************************************************************************/ -extern void BTA_GATTC_ConfigureMTU(uint16_t conn_id, uint16_t mtu); -extern void BTA_GATTC_ConfigureMTU(uint16_t conn_id, uint16_t mtu, - GATT_CONFIGURE_MTU_OP_CB callback, - void* cb_data); +void BTA_GATTC_ConfigureMTU(uint16_t conn_id, uint16_t mtu); +void BTA_GATTC_ConfigureMTU(uint16_t conn_id, uint16_t mtu, + GATT_CONFIGURE_MTU_OP_CB callback, void* cb_data); /******************************************************************************* * BTA GATT Server API @@ -849,7 +845,7 @@ extern void BTA_GATTC_ConfigureMTU(uint16_t conn_id, uint16_t mtu, * Returns None * ******************************************************************************/ -extern void BTA_GATTS_Init(); +void BTA_GATTS_Init(); /******************************************************************************* * @@ -862,7 +858,7 @@ extern void BTA_GATTS_Init(); * Returns None * ******************************************************************************/ -extern void BTA_GATTS_Disable(void); +void BTA_GATTS_Disable(void); /******************************************************************************* * @@ -878,8 +874,8 @@ extern void BTA_GATTS_Disable(void); * Returns None * ******************************************************************************/ -extern void BTA_GATTS_AppRegister(const bluetooth::Uuid& app_uuid, - tBTA_GATTS_CBACK* p_cback, bool eatt_support); +void BTA_GATTS_AppRegister(const bluetooth::Uuid& app_uuid, + tBTA_GATTS_CBACK* p_cback, bool eatt_support); /******************************************************************************* * @@ -892,7 +888,7 @@ extern void BTA_GATTS_AppRegister(const bluetooth::Uuid& app_uuid, * Returns void * ******************************************************************************/ -extern void BTA_GATTS_AppDeregister(tGATT_IF server_if); +void BTA_GATTS_AppDeregister(tGATT_IF server_if); /******************************************************************************* * @@ -913,9 +909,9 @@ typedef base::Callback<void(tGATT_STATUS status, int server_if, std::vector<btgatt_db_element_t> service)> BTA_GATTS_AddServiceCb; -extern void BTA_GATTS_AddService(tGATT_IF server_if, - std::vector<btgatt_db_element_t> service, - BTA_GATTS_AddServiceCb cb); +void BTA_GATTS_AddService(tGATT_IF server_if, + std::vector<btgatt_db_element_t> service, + BTA_GATTS_AddServiceCb cb); /******************************************************************************* * @@ -930,7 +926,7 @@ extern void BTA_GATTS_AddService(tGATT_IF server_if, * Returns returns none. * ******************************************************************************/ -extern void BTA_GATTS_DeleteService(uint16_t service_id); +void BTA_GATTS_DeleteService(uint16_t service_id); /******************************************************************************* * @@ -943,7 +939,7 @@ extern void BTA_GATTS_DeleteService(uint16_t service_id); * Returns None * ******************************************************************************/ -extern void BTA_GATTS_StopService(uint16_t service_id); +void BTA_GATTS_StopService(uint16_t service_id); /******************************************************************************* * @@ -961,9 +957,9 @@ extern void BTA_GATTS_StopService(uint16_t service_id); * Returns None * ******************************************************************************/ -extern void BTA_GATTS_HandleValueIndication(uint16_t conn_id, uint16_t attr_id, - std::vector<uint8_t> value, - bool need_confirm); +void BTA_GATTS_HandleValueIndication(uint16_t conn_id, uint16_t attr_id, + std::vector<uint8_t> value, + bool need_confirm); /******************************************************************************* * @@ -979,8 +975,8 @@ extern void BTA_GATTS_HandleValueIndication(uint16_t conn_id, uint16_t attr_id, * Returns None * ******************************************************************************/ -extern void BTA_GATTS_SendRsp(uint16_t conn_id, uint32_t trans_id, - tGATT_STATUS status, tGATTS_RSP* p_msg); +void BTA_GATTS_SendRsp(uint16_t conn_id, uint32_t trans_id, tGATT_STATUS status, + tGATTS_RSP* p_msg); /******************************************************************************* * @@ -996,8 +992,8 @@ extern void BTA_GATTS_SendRsp(uint16_t conn_id, uint32_t trans_id, * Returns void * ******************************************************************************/ -extern void BTA_GATTS_Open(tGATT_IF server_if, const RawAddress& remote_bda, - bool is_direct, tBT_TRANSPORT transport); +void BTA_GATTS_Open(tGATT_IF server_if, const RawAddress& remote_bda, + bool is_direct, tBT_TRANSPORT transport); /******************************************************************************* * @@ -1013,8 +1009,8 @@ extern void BTA_GATTS_Open(tGATT_IF server_if, const RawAddress& remote_bda, * Returns void * ******************************************************************************/ -extern void BTA_GATTS_CancelOpen(tGATT_IF server_if, - const RawAddress& remote_bda, bool is_direct); +void BTA_GATTS_CancelOpen(tGATT_IF server_if, const RawAddress& remote_bda, + bool is_direct); /******************************************************************************* * @@ -1027,9 +1023,9 @@ extern void BTA_GATTS_CancelOpen(tGATT_IF server_if, * Returns void * ******************************************************************************/ -extern void BTA_GATTS_Close(uint16_t conn_id); +void BTA_GATTS_Close(uint16_t conn_id); // Adds bonded device for GATT server tracking service changes -extern void BTA_GATTS_InitBonded(void); +void BTA_GATTS_InitBonded(void); #endif /* BTA_GATT_API_H */ diff --git a/system/bta/include/bta_hd_api.h b/system/bta/include/bta_hd_api.h index 4d89a0ecd9..00bd75783d 100644 --- a/system/bta/include/bta_hd_api.h +++ b/system/bta/include/bta_hd_api.h @@ -147,7 +147,7 @@ extern "C" { * Returns void * ******************************************************************************/ -extern void BTA_HdEnable(tBTA_HD_CBACK* p_cback); +void BTA_HdEnable(tBTA_HD_CBACK* p_cback); /******************************************************************************* * @@ -158,7 +158,7 @@ extern void BTA_HdEnable(tBTA_HD_CBACK* p_cback); * Returns void * ******************************************************************************/ -extern void BTA_HdDisable(void); +void BTA_HdDisable(void); /******************************************************************************* * @@ -170,9 +170,8 @@ extern void BTA_HdDisable(void); * Returns void * ******************************************************************************/ -extern void BTA_HdRegisterApp(tBTA_HD_APP_INFO* p_app_info, - tBTA_HD_QOS_INFO* p_in_qos, - tBTA_HD_QOS_INFO* p_out_qos); +void BTA_HdRegisterApp(tBTA_HD_APP_INFO* p_app_info, tBTA_HD_QOS_INFO* p_in_qos, + tBTA_HD_QOS_INFO* p_out_qos); /******************************************************************************* * @@ -184,7 +183,7 @@ extern void BTA_HdRegisterApp(tBTA_HD_APP_INFO* p_app_info, * Returns void * ******************************************************************************/ -extern void BTA_HdUnregisterApp(void); +void BTA_HdUnregisterApp(void); /******************************************************************************* * @@ -195,7 +194,7 @@ extern void BTA_HdUnregisterApp(void); * Returns void * ******************************************************************************/ -extern void BTA_HdSendReport(tBTA_HD_REPORT* p_report); +void BTA_HdSendReport(tBTA_HD_REPORT* p_report); /******************************************************************************* * @@ -206,7 +205,7 @@ extern void BTA_HdSendReport(tBTA_HD_REPORT* p_report); * Returns void * ******************************************************************************/ -extern void BTA_HdVirtualCableUnplug(void); +void BTA_HdVirtualCableUnplug(void); /******************************************************************************* * @@ -218,7 +217,7 @@ extern void BTA_HdVirtualCableUnplug(void); * Returns void * ******************************************************************************/ -extern void BTA_HdConnect(const RawAddress& addr); +void BTA_HdConnect(const RawAddress& addr); /******************************************************************************* * @@ -229,7 +228,7 @@ extern void BTA_HdConnect(const RawAddress& addr); * Returns void * ******************************************************************************/ -extern void BTA_HdDisconnect(void); +void BTA_HdDisconnect(void); /******************************************************************************* * @@ -240,7 +239,7 @@ extern void BTA_HdDisconnect(void); * Returns void * ******************************************************************************/ -extern void BTA_HdAddDevice(const RawAddress& addr); +void BTA_HdAddDevice(const RawAddress& addr); /******************************************************************************* * @@ -251,7 +250,7 @@ extern void BTA_HdAddDevice(const RawAddress& addr); * Returns void * ******************************************************************************/ -extern void BTA_HdRemoveDevice(const RawAddress& addr); +void BTA_HdRemoveDevice(const RawAddress& addr); /******************************************************************************* * @@ -262,7 +261,7 @@ extern void BTA_HdRemoveDevice(const RawAddress& addr); * Returns void * ******************************************************************************/ -extern void BTA_HdReportError(uint8_t error); +void BTA_HdReportError(uint8_t error); #ifdef __cplusplus } diff --git a/system/bta/include/bta_hh_api.h b/system/bta/include/bta_hh_api.h index 505f79598a..a19c270806 100644 --- a/system/bta/include/bta_hh_api.h +++ b/system/bta/include/bta_hh_api.h @@ -335,8 +335,7 @@ typedef void(tBTA_HH_CBACK)(tBTA_HH_EVT event, tBTA_HH* p_data); * Returns void * ******************************************************************************/ -extern void BTA_HhEnable(tBTA_HH_CBACK* p_cback, bool enable_hid, - bool enable_hogp); +void BTA_HhEnable(tBTA_HH_CBACK* p_cback, bool enable_hid, bool enable_hogp); /******************************************************************************* * @@ -347,7 +346,7 @@ extern void BTA_HhEnable(tBTA_HH_CBACK* p_cback, bool enable_hid, * Returns void * ******************************************************************************/ -extern void BTA_HhDisable(void); +void BTA_HhDisable(void); /******************************************************************************* * @@ -360,7 +359,7 @@ extern void BTA_HhDisable(void); * Returns void * ******************************************************************************/ -extern void BTA_HhOpen(const RawAddress& dev_bda); +void BTA_HhOpen(const RawAddress& dev_bda); /******************************************************************************* * @@ -371,7 +370,7 @@ extern void BTA_HhOpen(const RawAddress& dev_bda); * Returns void * ******************************************************************************/ -extern void BTA_HhClose(uint8_t dev_handle); +void BTA_HhClose(uint8_t dev_handle); /******************************************************************************* * @@ -382,7 +381,7 @@ extern void BTA_HhClose(uint8_t dev_handle); * Returns void * ******************************************************************************/ -extern void BTA_HhSetProtoMode(uint8_t handle, tBTA_HH_PROTO_MODE t_type); +void BTA_HhSetProtoMode(uint8_t handle, tBTA_HH_PROTO_MODE t_type); /******************************************************************************* * @@ -394,7 +393,7 @@ extern void BTA_HhSetProtoMode(uint8_t handle, tBTA_HH_PROTO_MODE t_type); * Returns void * ******************************************************************************/ -extern void BTA_HhGetProtoMode(uint8_t dev_handle); +void BTA_HhGetProtoMode(uint8_t dev_handle); /******************************************************************************* * * Function BTA_HhSetReport @@ -404,8 +403,8 @@ extern void BTA_HhGetProtoMode(uint8_t dev_handle); * Returns void * ******************************************************************************/ -extern void BTA_HhSetReport(uint8_t dev_handle, tBTA_HH_RPT_TYPE r_type, - BT_HDR* p_data); +void BTA_HhSetReport(uint8_t dev_handle, tBTA_HH_RPT_TYPE r_type, + BT_HDR* p_data); /******************************************************************************* * @@ -416,8 +415,8 @@ extern void BTA_HhSetReport(uint8_t dev_handle, tBTA_HH_RPT_TYPE r_type, * Returns void * ******************************************************************************/ -extern void BTA_HhGetReport(uint8_t dev_handle, tBTA_HH_RPT_TYPE r_type, - uint8_t rpt_id, uint16_t buf_size); +void BTA_HhGetReport(uint8_t dev_handle, tBTA_HH_RPT_TYPE r_type, + uint8_t rpt_id, uint16_t buf_size); /******************************************************************************* * * Function BTA_HhSetIdle @@ -427,7 +426,7 @@ extern void BTA_HhGetReport(uint8_t dev_handle, tBTA_HH_RPT_TYPE r_type, * Returns void * ******************************************************************************/ -extern void BTA_HhSetIdle(uint8_t dev_handle, uint16_t idle_rate); +void BTA_HhSetIdle(uint8_t dev_handle, uint16_t idle_rate); /******************************************************************************* * @@ -438,7 +437,7 @@ extern void BTA_HhSetIdle(uint8_t dev_handle, uint16_t idle_rate); * Returns void * ******************************************************************************/ -extern void BTA_HhGetIdle(uint8_t dev_handle); +void BTA_HhGetIdle(uint8_t dev_handle); /******************************************************************************* * @@ -449,7 +448,7 @@ extern void BTA_HhGetIdle(uint8_t dev_handle); * Returns void * ******************************************************************************/ -extern void BTA_HhSendCtrl(uint8_t dev_handle, tBTA_HH_TRANS_CTRL_TYPE c_type); +void BTA_HhSendCtrl(uint8_t dev_handle, tBTA_HH_TRANS_CTRL_TYPE c_type); /******************************************************************************* * @@ -460,7 +459,7 @@ extern void BTA_HhSendCtrl(uint8_t dev_handle, tBTA_HH_TRANS_CTRL_TYPE c_type); * Returns void * ******************************************************************************/ -extern void BTA_HhSetIdle(uint8_t dev_handle, uint16_t idle_rate); +void BTA_HhSetIdle(uint8_t dev_handle, uint16_t idle_rate); /******************************************************************************* * @@ -471,7 +470,7 @@ extern void BTA_HhSetIdle(uint8_t dev_handle, uint16_t idle_rate); * Returns void * ******************************************************************************/ -extern void BTA_HhGetIdle(uint8_t dev_handle); +void BTA_HhGetIdle(uint8_t dev_handle); /******************************************************************************* * @@ -482,8 +481,8 @@ extern void BTA_HhGetIdle(uint8_t dev_handle); * Returns void * ******************************************************************************/ -extern void BTA_HhSendData(uint8_t dev_handle, const RawAddress& dev_bda, - BT_HDR* p_buf); +void BTA_HhSendData(uint8_t dev_handle, const RawAddress& dev_bda, + BT_HDR* p_buf); /******************************************************************************* * @@ -494,7 +493,7 @@ extern void BTA_HhSendData(uint8_t dev_handle, const RawAddress& dev_bda, * Returns void * ******************************************************************************/ -extern void BTA_HhGetDscpInfo(uint8_t dev_handle); +void BTA_HhGetDscpInfo(uint8_t dev_handle); /******************************************************************************* * Function BTA_HhAddDev @@ -507,9 +506,9 @@ extern void BTA_HhGetDscpInfo(uint8_t dev_handle); * Returns void * ******************************************************************************/ -extern void BTA_HhAddDev(const RawAddress& bda, tBTA_HH_ATTR_MASK attr_mask, - uint8_t sub_class, uint8_t app_id, - tBTA_HH_DEV_DSCP_INFO dscp_info); +void BTA_HhAddDev(const RawAddress& bda, tBTA_HH_ATTR_MASK attr_mask, + uint8_t sub_class, uint8_t app_id, + tBTA_HH_DEV_DSCP_INFO dscp_info); /******************************************************************************* * * Function BTA_HhRemoveDev @@ -519,6 +518,6 @@ extern void BTA_HhAddDev(const RawAddress& bda, tBTA_HH_ATTR_MASK attr_mask, * Returns void * ******************************************************************************/ -extern void BTA_HhRemoveDev(uint8_t dev_handle); +void BTA_HhRemoveDev(uint8_t dev_handle); #endif /* BTA_HH_API_H */ diff --git a/system/bta/include/bta_hh_co.h b/system/bta/include/bta_hh_co.h index 25b9e6ba41..21a1662f8b 100644 --- a/system/bta/include/bta_hh_co.h +++ b/system/bta/include/bta_hh_co.h @@ -49,10 +49,10 @@ typedef struct { * Returns void. * ******************************************************************************/ -extern void bta_hh_co_data(uint8_t dev_handle, uint8_t* p_rpt, uint16_t len, - tBTA_HH_PROTO_MODE mode, uint8_t sub_class, - uint8_t ctry_code, const RawAddress& peer_addr, - uint8_t app_id); +void bta_hh_co_data(uint8_t dev_handle, uint8_t* p_rpt, uint16_t len, + tBTA_HH_PROTO_MODE mode, uint8_t sub_class, + uint8_t ctry_code, const RawAddress& peer_addr, + uint8_t app_id); /******************************************************************************* * @@ -65,8 +65,8 @@ extern void bta_hh_co_data(uint8_t dev_handle, uint8_t* p_rpt, uint16_t len, * Returns void. * ******************************************************************************/ -extern void bta_hh_co_open(uint8_t dev_handle, uint8_t sub_class, - uint16_t attr_mask, uint8_t app_id); +void bta_hh_co_open(uint8_t dev_handle, uint8_t sub_class, uint16_t attr_mask, + uint8_t app_id); /******************************************************************************* * @@ -78,7 +78,7 @@ extern void bta_hh_co_open(uint8_t dev_handle, uint8_t sub_class, * Returns void. * ******************************************************************************/ -extern void bta_hh_co_close(uint8_t dev_handle, uint8_t app_id); +void bta_hh_co_close(uint8_t dev_handle, uint8_t app_id); /******************************************************************************* * @@ -90,7 +90,7 @@ extern void bta_hh_co_close(uint8_t dev_handle, uint8_t app_id); * Returns void. * ******************************************************************************/ -extern void bta_hh_co_set_rpt_rsp(uint8_t dev_handle, uint8_t status); +void bta_hh_co_set_rpt_rsp(uint8_t dev_handle, uint8_t status); /******************************************************************************* * @@ -102,8 +102,8 @@ extern void bta_hh_co_set_rpt_rsp(uint8_t dev_handle, uint8_t status); * Returns void. * ******************************************************************************/ -extern void bta_hh_co_get_rpt_rsp(uint8_t dev_handle, uint8_t status, - const uint8_t* p_rpt, uint16_t len); +void bta_hh_co_get_rpt_rsp(uint8_t dev_handle, uint8_t status, + const uint8_t* p_rpt, uint16_t len); /******************************************************************************* * @@ -121,9 +121,8 @@ extern void bta_hh_co_get_rpt_rsp(uint8_t dev_handle, uint8_t status, * Returns void. * ******************************************************************************/ -extern void bta_hh_le_co_rpt_info(const RawAddress& remote_bda, - tBTA_HH_RPT_CACHE_ENTRY* p_entry, - uint8_t app_id); +void bta_hh_le_co_rpt_info(const RawAddress& remote_bda, + tBTA_HH_RPT_CACHE_ENTRY* p_entry, uint8_t app_id); /******************************************************************************* * @@ -141,8 +140,9 @@ extern void bta_hh_le_co_rpt_info(const RawAddress& remote_bda, * Returns the acched report array * ******************************************************************************/ -extern tBTA_HH_RPT_CACHE_ENTRY* bta_hh_le_co_cache_load( - const RawAddress& remote_bda, uint8_t* p_num_rpt, uint8_t app_id); +tBTA_HH_RPT_CACHE_ENTRY* bta_hh_le_co_cache_load(const RawAddress& remote_bda, + uint8_t* p_num_rpt, + uint8_t app_id); /******************************************************************************* * @@ -155,7 +155,6 @@ extern tBTA_HH_RPT_CACHE_ENTRY* bta_hh_le_co_cache_load( * Returns none * ******************************************************************************/ -extern void bta_hh_le_co_reset_rpt_cache(const RawAddress& remote_bda, - uint8_t app_id); +void bta_hh_le_co_reset_rpt_cache(const RawAddress& remote_bda, uint8_t app_id); #endif /* BTA_HH_CO_H */ diff --git a/system/bta/include/bta_jv_co.h b/system/bta/include/bta_jv_co.h index a166396029..35562dd0a0 100644 --- a/system/bta/include/bta_jv_co.h +++ b/system/bta/include/bta_jv_co.h @@ -44,9 +44,9 @@ * ******************************************************************************/ -extern int bta_co_rfc_data_incoming(uint32_t rfcomm_slot_id, BT_HDR* p_buf); -extern int bta_co_rfc_data_outgoing_size(uint32_t rfcomm_slot_id, int* size); -extern int bta_co_rfc_data_outgoing(uint32_t rfcomm_slot_id, uint8_t* buf, - uint16_t size); +int bta_co_rfc_data_incoming(uint32_t rfcomm_slot_id, BT_HDR* p_buf); +int bta_co_rfc_data_outgoing_size(uint32_t rfcomm_slot_id, int* size); +int bta_co_rfc_data_outgoing(uint32_t rfcomm_slot_id, uint8_t* buf, + uint16_t size); #endif /* BTA_DG_CO_H */ diff --git a/system/bta/include/bta_pan_api.h b/system/bta/include/bta_pan_api.h index b776b01b49..da41c97a11 100644 --- a/system/bta/include/bta_pan_api.h +++ b/system/bta/include/bta_pan_api.h @@ -118,7 +118,7 @@ typedef void(tBTA_PAN_CBACK)(tBTA_PAN_EVT event, tBTA_PAN* p_data); * Returns void * ******************************************************************************/ -extern void BTA_PanEnable(tBTA_PAN_CBACK p_cback); +void BTA_PanEnable(tBTA_PAN_CBACK p_cback); /******************************************************************************* * @@ -129,7 +129,7 @@ extern void BTA_PanEnable(tBTA_PAN_CBACK p_cback); * Returns void * ******************************************************************************/ -extern void BTA_PanDisable(void); +void BTA_PanDisable(void); /******************************************************************************* * @@ -170,6 +170,6 @@ void BTA_PanOpen(const RawAddress& bd_addr, tBTA_PAN_ROLE local_role, * Returns void * ******************************************************************************/ -extern void BTA_PanClose(uint16_t handle); +void BTA_PanClose(uint16_t handle); #endif /* BTA_PAN_API_H */ diff --git a/system/bta/include/bta_pan_ci.h b/system/bta/include/bta_pan_ci.h index 62da8d62fc..d58a24cd38 100644 --- a/system/bta/include/bta_pan_ci.h +++ b/system/bta/include/bta_pan_ci.h @@ -47,7 +47,7 @@ * Returns void * ******************************************************************************/ -extern void bta_pan_ci_tx_ready(uint16_t handle); +void bta_pan_ci_tx_ready(uint16_t handle); /******************************************************************************* * @@ -62,7 +62,7 @@ extern void bta_pan_ci_tx_ready(uint16_t handle); * Returns void * ******************************************************************************/ -extern void bta_pan_ci_rx_ready(uint16_t handle); +void bta_pan_ci_rx_ready(uint16_t handle); /******************************************************************************* * @@ -79,7 +79,7 @@ extern void bta_pan_ci_rx_ready(uint16_t handle); * Returns void * ******************************************************************************/ -extern void bta_pan_ci_tx_flow(uint16_t handle, bool enable); +void bta_pan_ci_tx_flow(uint16_t handle, bool enable); /******************************************************************************* * @@ -95,9 +95,9 @@ extern void bta_pan_ci_tx_flow(uint16_t handle, bool enable); * Returns true if flow enabled * ******************************************************************************/ -extern void bta_pan_ci_rx_writebuf(uint16_t handle, const RawAddress& src, - const RawAddress& dst, uint16_t protocol, - BT_HDR* p_buf, bool ext); +void bta_pan_ci_rx_writebuf(uint16_t handle, const RawAddress& src, + const RawAddress& dst, uint16_t protocol, + BT_HDR* p_buf, bool ext); /******************************************************************************* * @@ -112,8 +112,7 @@ extern void bta_pan_ci_rx_writebuf(uint16_t handle, const RawAddress& src, * Returns void * ******************************************************************************/ -extern BT_HDR* bta_pan_ci_readbuf(uint16_t handle, RawAddress& src, - RawAddress& dst, uint16_t* p_protocol, - bool* p_ext, bool* p_forward); +BT_HDR* bta_pan_ci_readbuf(uint16_t handle, RawAddress& src, RawAddress& dst, + uint16_t* p_protocol, bool* p_ext, bool* p_forward); #endif /* BTA_PAN_CI_H */ diff --git a/system/bta/include/bta_pan_co.h b/system/bta/include/bta_pan_co.h index 86baff01d7..63f778439b 100644 --- a/system/bta/include/bta_pan_co.h +++ b/system/bta/include/bta_pan_co.h @@ -60,7 +60,7 @@ * Returns Data flow mask. * ******************************************************************************/ -extern uint8_t bta_pan_co_init(uint8_t* q_level); +uint8_t bta_pan_co_init(uint8_t* q_level); /******************************************************************************* * @@ -73,7 +73,7 @@ extern uint8_t bta_pan_co_init(uint8_t* q_level); * Returns void * ******************************************************************************/ -extern void bta_pan_co_close(uint16_t handle, uint8_t app_id); +void bta_pan_co_close(uint16_t handle, uint8_t app_id); /******************************************************************************* * @@ -88,7 +88,7 @@ extern void bta_pan_co_close(uint16_t handle, uint8_t app_id); * Returns void * ******************************************************************************/ -extern void bta_pan_co_tx_path(uint16_t handle, uint8_t app_id); +void bta_pan_co_tx_path(uint16_t handle, uint8_t app_id); /******************************************************************************* * @@ -103,7 +103,7 @@ extern void bta_pan_co_tx_path(uint16_t handle, uint8_t app_id); * Returns void * ******************************************************************************/ -extern void bta_pan_co_rx_path(uint16_t handle, uint8_t app_id); +void bta_pan_co_rx_path(uint16_t handle, uint8_t app_id); /******************************************************************************* * @@ -119,7 +119,7 @@ extern void bta_pan_co_rx_path(uint16_t handle, uint8_t app_id); * Returns void * ******************************************************************************/ -extern void bta_pan_co_rx_flow(uint16_t handle, uint8_t app_id, bool enable); +void bta_pan_co_rx_flow(uint16_t handle, uint8_t app_id, bool enable); /******************************************************************************* * @@ -130,9 +130,9 @@ extern void bta_pan_co_rx_flow(uint16_t handle, uint8_t app_id, bool enable); * Returns void * ******************************************************************************/ -extern void bta_pan_co_pfilt_ind(uint16_t handle, bool indication, - tBTA_PAN_STATUS result, uint16_t len, - uint8_t* p_filters); +void bta_pan_co_pfilt_ind(uint16_t handle, bool indication, + tBTA_PAN_STATUS result, uint16_t len, + uint8_t* p_filters); /******************************************************************************* * @@ -143,8 +143,8 @@ extern void bta_pan_co_pfilt_ind(uint16_t handle, bool indication, * Returns void * ******************************************************************************/ -extern void bta_pan_co_mfilt_ind(uint16_t handle, bool indication, - tBTA_PAN_STATUS result, uint16_t len, - uint8_t* p_filters); +void bta_pan_co_mfilt_ind(uint16_t handle, bool indication, + tBTA_PAN_STATUS result, uint16_t len, + uint8_t* p_filters); #endif /* BTA_PAN_CO_H */ diff --git a/system/bta/include/bta_sdp_api.h b/system/bta/include/bta_sdp_api.h index 826b626c19..7731cc1354 100644 --- a/system/bta/include/bta_sdp_api.h +++ b/system/bta/include/bta_sdp_api.h @@ -114,7 +114,7 @@ typedef struct { * BTA_SDP_FAIL if internal failure. * ******************************************************************************/ -extern tBTA_SDP_STATUS BTA_SdpEnable(tBTA_SDP_DM_CBACK* p_cback); +tBTA_SDP_STATUS BTA_SdpEnable(tBTA_SDP_DM_CBACK* p_cback); /******************************************************************************* * @@ -128,8 +128,8 @@ extern tBTA_SDP_STATUS BTA_SdpEnable(tBTA_SDP_DM_CBACK* p_cback); * BTA_SDP_FAIL if internal failure. * ******************************************************************************/ -extern tBTA_SDP_STATUS BTA_SdpSearch(const RawAddress& bd_addr, - const bluetooth::Uuid& uuid); +tBTA_SDP_STATUS BTA_SdpSearch(const RawAddress& bd_addr, + const bluetooth::Uuid& uuid); /******************************************************************************* * @@ -143,7 +143,7 @@ extern tBTA_SDP_STATUS BTA_SdpSearch(const RawAddress& bd_addr, * BTA_SDP_FAILURE, otherwise. * ******************************************************************************/ -extern tBTA_SDP_STATUS BTA_SdpCreateRecordByUser(void* user_data); +tBTA_SDP_STATUS BTA_SdpCreateRecordByUser(void* user_data); /******************************************************************************* * @@ -157,6 +157,6 @@ extern tBTA_SDP_STATUS BTA_SdpCreateRecordByUser(void* user_data); * BTA_SDP_FAILURE, otherwise. * ******************************************************************************/ -extern tBTA_SDP_STATUS BTA_SdpRemoveRecordByUser(void* user_data); +tBTA_SDP_STATUS BTA_SdpRemoveRecordByUser(void* user_data); #endif /* BTA_SDP_API_H */ diff --git a/system/bta/include/utl.h b/system/bta/include/utl.h index 362a35edae..75f293ba0e 100644 --- a/system/bta/include/utl.h +++ b/system/bta/include/utl.h @@ -66,7 +66,7 @@ typedef struct { * Returns Integer value or -1 on error. * ******************************************************************************/ -extern int16_t utl_str2int(const char* p_s); +int16_t utl_str2int(const char* p_s); /******************************************************************************* * @@ -81,7 +81,7 @@ extern int16_t utl_str2int(const char* p_s); * Returns 0 if strings match, nonzero otherwise. * ******************************************************************************/ -extern int utl_strucmp(const char* p_s, const char* p_t); +int utl_strucmp(const char* p_s, const char* p_t); /******************************************************************************* * @@ -95,7 +95,7 @@ extern int utl_strucmp(const char* p_s, const char* p_t); * Returns Length of string. * ******************************************************************************/ -extern uint8_t utl_itoa(uint16_t i, char* p_s); +uint8_t utl_itoa(uint16_t i, char* p_s); /******************************************************************************* * @@ -121,7 +121,7 @@ extern uint8_t utl_itoa(uint16_t i, char* p_s); * Returns true if successful, Otherwise false * ******************************************************************************/ -extern bool utl_set_device_class(tBTA_UTL_COD* p_cod, uint8_t cmd); +bool utl_set_device_class(tBTA_UTL_COD* p_cod, uint8_t cmd); /******************************************************************************* * @@ -134,7 +134,7 @@ extern bool utl_set_device_class(tBTA_UTL_COD* p_cod, uint8_t cmd); * Returns true if successful, Otherwise false * ******************************************************************************/ -extern bool utl_isintstr(const char* p_s); +bool utl_isintstr(const char* p_s); /******************************************************************************* * @@ -146,7 +146,7 @@ extern bool utl_isintstr(const char* p_s); * Returns true if successful, Otherwise false * ******************************************************************************/ -extern bool utl_isdialchar(const char d); +bool utl_isdialchar(const char d); /******************************************************************************* * @@ -159,6 +159,6 @@ extern bool utl_isdialchar(const char d); * Returns true if successful, Otherwise false * ******************************************************************************/ -extern bool utl_isdialstr(const char* p_s); +bool utl_isdialstr(const char* p_s); #endif /* UTL_H */ diff --git a/system/bta/jv/bta_jv_int.h b/system/bta/jv/bta_jv_int.h index f8a260efdc..476baf5f37 100644 --- a/system/bta/jv/bta_jv_int.h +++ b/system/bta/jv/bta_jv_int.h @@ -141,50 +141,49 @@ extern tBTA_JV_CB bta_jv_cb; extern std::unordered_set<uint16_t> used_l2cap_classic_dynamic_psm; -extern void bta_jv_enable(tBTA_JV_DM_CBACK* p_cback); -extern void bta_jv_disable(); -extern void bta_jv_get_channel_id(int32_t type, int32_t channel, - uint32_t l2cap_socket_id, - uint32_t rfcomm_slot_id); -extern void bta_jv_free_scn(int32_t type, uint16_t scn); -extern void bta_jv_start_discovery(const RawAddress& bd_addr, uint16_t num_uuid, - bluetooth::Uuid* uuid_list, - uint32_t rfcomm_slot_id); -extern void bta_jv_create_record(uint32_t rfcomm_slot_id); -extern void bta_jv_delete_record(uint32_t handle); -extern void bta_jv_l2cap_connect(int32_t type, tBTA_SEC sec_mask, - tBTA_JV_ROLE role, uint16_t remote_psm, - uint16_t rx_mtu, - const RawAddress& peer_bd_addr, - std::unique_ptr<tL2CAP_CFG_INFO> cfg, - std::unique_ptr<tL2CAP_ERTM_INFO> ertm_info, - tBTA_JV_L2CAP_CBACK* p_cback, - uint32_t l2cap_socket_id); -extern void bta_jv_l2cap_close(uint32_t handle, tBTA_JV_L2C_CB* p_cb); -extern void bta_jv_l2cap_start_server( - int32_t type, tBTA_SEC sec_mask, tBTA_JV_ROLE role, uint16_t local_psm, - uint16_t rx_mtu, std::unique_ptr<tL2CAP_CFG_INFO> cfg_param, - std::unique_ptr<tL2CAP_ERTM_INFO> ertm_info, tBTA_JV_L2CAP_CBACK* p_cback, - uint32_t l2cap_socket_id); -extern void bta_jv_l2cap_stop_server(uint16_t local_psm, - uint32_t l2cap_socket_id); -extern void bta_jv_l2cap_write(uint32_t handle, uint32_t req_id, BT_HDR* msg, - uint32_t user_id, tBTA_JV_L2C_CB* p_cb); -extern void bta_jv_rfcomm_connect(tBTA_SEC sec_mask, uint8_t remote_scn, - const RawAddress& peer_bd_addr, - tBTA_JV_RFCOMM_CBACK* p_cback, - uint32_t rfcomm_slot_id); -extern void bta_jv_rfcomm_close(uint32_t handle, uint32_t rfcomm_slot_id); -extern void bta_jv_rfcomm_start_server(tBTA_SEC sec_mask, uint8_t local_scn, - uint8_t max_session, - tBTA_JV_RFCOMM_CBACK* p_cback, - uint32_t rfcomm_slot_id); -extern void bta_jv_rfcomm_stop_server(uint32_t handle, uint32_t rfcomm_slot_id); -extern void bta_jv_rfcomm_write(uint32_t handle, uint32_t req_id, - tBTA_JV_RFC_CB* p_cb, tBTA_JV_PCB* p_pcb); -extern void bta_jv_set_pm_profile(uint32_t handle, tBTA_JV_PM_ID app_id, - tBTA_JV_CONN_STATE init_st); - -extern void bta_jv_l2cap_stop_server_le(uint16_t local_chan); +void bta_jv_enable(tBTA_JV_DM_CBACK* p_cback); +void bta_jv_disable(); +void bta_jv_get_channel_id(int32_t type, int32_t channel, + uint32_t l2cap_socket_id, uint32_t rfcomm_slot_id); +void bta_jv_free_scn(int32_t type, uint16_t scn); +void bta_jv_start_discovery(const RawAddress& bd_addr, uint16_t num_uuid, + bluetooth::Uuid* uuid_list, + uint32_t rfcomm_slot_id); +void bta_jv_create_record(uint32_t rfcomm_slot_id); +void bta_jv_delete_record(uint32_t handle); +void bta_jv_l2cap_connect(int32_t type, tBTA_SEC sec_mask, tBTA_JV_ROLE role, + uint16_t remote_psm, uint16_t rx_mtu, + const RawAddress& peer_bd_addr, + std::unique_ptr<tL2CAP_CFG_INFO> cfg, + std::unique_ptr<tL2CAP_ERTM_INFO> ertm_info, + tBTA_JV_L2CAP_CBACK* p_cback, + uint32_t l2cap_socket_id); +void bta_jv_l2cap_close(uint32_t handle, tBTA_JV_L2C_CB* p_cb); +void bta_jv_l2cap_start_server(int32_t type, tBTA_SEC sec_mask, + tBTA_JV_ROLE role, uint16_t local_psm, + uint16_t rx_mtu, + std::unique_ptr<tL2CAP_CFG_INFO> cfg_param, + std::unique_ptr<tL2CAP_ERTM_INFO> ertm_info, + tBTA_JV_L2CAP_CBACK* p_cback, + uint32_t l2cap_socket_id); +void bta_jv_l2cap_stop_server(uint16_t local_psm, uint32_t l2cap_socket_id); +void bta_jv_l2cap_write(uint32_t handle, uint32_t req_id, BT_HDR* msg, + uint32_t user_id, tBTA_JV_L2C_CB* p_cb); +void bta_jv_rfcomm_connect(tBTA_SEC sec_mask, uint8_t remote_scn, + const RawAddress& peer_bd_addr, + tBTA_JV_RFCOMM_CBACK* p_cback, + uint32_t rfcomm_slot_id); +void bta_jv_rfcomm_close(uint32_t handle, uint32_t rfcomm_slot_id); +void bta_jv_rfcomm_start_server(tBTA_SEC sec_mask, uint8_t local_scn, + uint8_t max_session, + tBTA_JV_RFCOMM_CBACK* p_cback, + uint32_t rfcomm_slot_id); +void bta_jv_rfcomm_stop_server(uint32_t handle, uint32_t rfcomm_slot_id); +void bta_jv_rfcomm_write(uint32_t handle, uint32_t req_id, tBTA_JV_RFC_CB* p_cb, + tBTA_JV_PCB* p_pcb); +void bta_jv_set_pm_profile(uint32_t handle, tBTA_JV_PM_ID app_id, + tBTA_JV_CONN_STATE init_st); + +void bta_jv_l2cap_stop_server_le(uint16_t local_chan); #endif /* BTA_JV_INT_H */ diff --git a/system/bta/pan/bta_pan_int.h b/system/bta/pan/bta_pan_int.h index 0c0c4893c5..50eb5be59e 100644 --- a/system/bta/pan/bta_pan_int.h +++ b/system/bta/pan/bta_pan_int.h @@ -162,24 +162,24 @@ extern tBTA_PAN_CB bta_pan_cb; /***************************************************************************** * Function prototypes ****************************************************************************/ -extern tBTA_PAN_SCB* bta_pan_scb_alloc(void); -extern void bta_pan_scb_dealloc(tBTA_PAN_SCB* p_scb); -extern uint8_t bta_pan_scb_to_idx(tBTA_PAN_SCB* p_scb); -extern tBTA_PAN_SCB* bta_pan_scb_by_handle(uint16_t handle); -extern bool bta_pan_hdl_event(BT_HDR_RIGID* p_msg); +tBTA_PAN_SCB* bta_pan_scb_alloc(void); +void bta_pan_scb_dealloc(tBTA_PAN_SCB* p_scb); +uint8_t bta_pan_scb_to_idx(tBTA_PAN_SCB* p_scb); +tBTA_PAN_SCB* bta_pan_scb_by_handle(uint16_t handle); +bool bta_pan_hdl_event(BT_HDR_RIGID* p_msg); /* action functions */ -extern void bta_pan_enable(tBTA_PAN_DATA* p_data); -extern void bta_pan_disable(void); -extern void bta_pan_set_role(tBTA_PAN_DATA* p_data); -extern void bta_pan_open(tBTA_PAN_SCB* p_scb, tBTA_PAN_DATA* p_data); -extern void bta_pan_api_close(tBTA_PAN_SCB* p_scb, tBTA_PAN_DATA* p_data); -extern void bta_pan_rx_path(tBTA_PAN_SCB* p_scb, tBTA_PAN_DATA* p_data); -extern void bta_pan_tx_path(tBTA_PAN_SCB* p_scb, tBTA_PAN_DATA* p_data); -extern void bta_pan_tx_flow(tBTA_PAN_SCB* p_scb, tBTA_PAN_DATA* p_data); -extern void bta_pan_conn_open(tBTA_PAN_SCB* p_scb, tBTA_PAN_DATA* p_data); -extern void bta_pan_conn_close(tBTA_PAN_SCB* p_scb, tBTA_PAN_DATA* p_data); -extern void bta_pan_write_buf(tBTA_PAN_SCB* p_scb, tBTA_PAN_DATA* p_data); -extern void bta_pan_free_buf(tBTA_PAN_SCB* p_scb, tBTA_PAN_DATA* p_data); +void bta_pan_enable(tBTA_PAN_DATA* p_data); +void bta_pan_disable(void); +void bta_pan_set_role(tBTA_PAN_DATA* p_data); +void bta_pan_open(tBTA_PAN_SCB* p_scb, tBTA_PAN_DATA* p_data); +void bta_pan_api_close(tBTA_PAN_SCB* p_scb, tBTA_PAN_DATA* p_data); +void bta_pan_rx_path(tBTA_PAN_SCB* p_scb, tBTA_PAN_DATA* p_data); +void bta_pan_tx_path(tBTA_PAN_SCB* p_scb, tBTA_PAN_DATA* p_data); +void bta_pan_tx_flow(tBTA_PAN_SCB* p_scb, tBTA_PAN_DATA* p_data); +void bta_pan_conn_open(tBTA_PAN_SCB* p_scb, tBTA_PAN_DATA* p_data); +void bta_pan_conn_close(tBTA_PAN_SCB* p_scb, tBTA_PAN_DATA* p_data); +void bta_pan_write_buf(tBTA_PAN_SCB* p_scb, tBTA_PAN_DATA* p_data); +void bta_pan_free_buf(tBTA_PAN_SCB* p_scb, tBTA_PAN_DATA* p_data); #endif /* BTA_PAN_INT_H */ diff --git a/system/bta/sdp/bta_sdp_int.h b/system/bta/sdp/bta_sdp_int.h index 03c888f99c..0416880a2e 100644 --- a/system/bta/sdp/bta_sdp_int.h +++ b/system/bta/sdp/bta_sdp_int.h @@ -48,10 +48,9 @@ extern tBTA_SDP_CB bta_sdp_cb; /* config struct */ extern tBTA_SDP_CFG* p_bta_sdp_cfg; -extern void bta_sdp_enable(tBTA_SDP_DM_CBACK* p_cback); -extern void bta_sdp_search(const RawAddress bd_addr, - const bluetooth::Uuid uuid); -extern void bta_sdp_create_record(void* user_data); -extern void bta_sdp_remove_record(void* user_data); +void bta_sdp_enable(tBTA_SDP_DM_CBACK* p_cback); +void bta_sdp_search(const RawAddress bd_addr, const bluetooth::Uuid uuid); +void bta_sdp_create_record(void* user_data); +void bta_sdp_remove_record(void* user_data); #endif /* BTA_SDP_INT_H */ diff --git a/system/bta/sys/bta_sys.h b/system/bta/sys/bta_sys.h index b5a88dc8e7..522b3b2253 100644 --- a/system/bta/sys/bta_sys.h +++ b/system/bta/sys/bta_sys.h @@ -205,61 +205,51 @@ extern uint8_t appl_trace_level; void bta_set_forward_hw_failures(bool value); void BTA_sys_signal_hw_error(); -extern void bta_sys_init(void); -extern void bta_sys_register(uint8_t id, const tBTA_SYS_REG* p_reg); -extern void bta_sys_deregister(uint8_t id); -extern bool bta_sys_is_register(uint8_t id); -extern void bta_sys_sendmsg(void* p_msg); -extern void bta_sys_sendmsg_delayed(void* p_msg, const base::TimeDelta& delay); -extern void bta_sys_start_timer(alarm_t* alarm, uint64_t interval_ms, - uint16_t event, uint16_t layer_specific); -extern void bta_sys_disable(); - -extern void bta_sys_rm_register(tBTA_SYS_CONN_CBACK* p_cback); -extern void bta_sys_pm_register(tBTA_SYS_CONN_CBACK* p_cback); - -extern void bta_sys_sco_register(tBTA_SYS_CONN_CBACK* p_cback); - -extern void bta_sys_conn_open(uint8_t id, uint8_t app_id, - const RawAddress& peer_addr); -extern void bta_sys_conn_close(uint8_t id, uint8_t app_id, - const RawAddress& peer_addr); -extern void bta_sys_app_open(uint8_t id, uint8_t app_id, - const RawAddress& peer_addr); -extern void bta_sys_app_close(uint8_t id, uint8_t app_id, - const RawAddress& peer_addr); -extern void bta_sys_sco_open(uint8_t id, uint8_t app_id, - const RawAddress& peer_addr); -extern void bta_sys_sco_close(uint8_t id, uint8_t app_id, - const RawAddress& peer_addr); -extern void bta_sys_sco_use(uint8_t id, uint8_t app_id, - const RawAddress& peer_addr); -extern void bta_sys_sco_unuse(uint8_t id, uint8_t app_id, - const RawAddress& peer_addr); -extern void bta_sys_idle(uint8_t id, uint8_t app_id, - const RawAddress& peer_addr); -extern void bta_sys_busy(uint8_t id, uint8_t app_id, - const RawAddress& peer_addr); - -extern void bta_sys_ssr_cfg_register(tBTA_SYS_SSR_CFG_CBACK* p_cback); -extern void bta_sys_chg_ssr_config(uint8_t id, uint8_t app_id, - uint16_t max_latency, uint16_t min_tout); - -extern void bta_sys_role_chg_register(tBTA_SYS_CONN_CBACK* p_cback); -extern void bta_sys_notify_role_chg(const RawAddress& peer_addr, - tHCI_ROLE new_role, tHCI_STATUS hci_status); -extern void bta_sys_collision_register(uint8_t bta_id, - tBTA_SYS_CONN_CBACK* p_cback); -extern void bta_sys_notify_collision(const RawAddress& peer_addr); +void bta_sys_init(void); +void bta_sys_register(uint8_t id, const tBTA_SYS_REG* p_reg); +void bta_sys_deregister(uint8_t id); +bool bta_sys_is_register(uint8_t id); +void bta_sys_sendmsg(void* p_msg); +void bta_sys_sendmsg_delayed(void* p_msg, const base::TimeDelta& delay); +void bta_sys_start_timer(alarm_t* alarm, uint64_t interval_ms, uint16_t event, + uint16_t layer_specific); +void bta_sys_disable(); + +void bta_sys_rm_register(tBTA_SYS_CONN_CBACK* p_cback); +void bta_sys_pm_register(tBTA_SYS_CONN_CBACK* p_cback); + +void bta_sys_sco_register(tBTA_SYS_CONN_CBACK* p_cback); + +void bta_sys_conn_open(uint8_t id, uint8_t app_id, const RawAddress& peer_addr); +void bta_sys_conn_close(uint8_t id, uint8_t app_id, + const RawAddress& peer_addr); +void bta_sys_app_open(uint8_t id, uint8_t app_id, const RawAddress& peer_addr); +void bta_sys_app_close(uint8_t id, uint8_t app_id, const RawAddress& peer_addr); +void bta_sys_sco_open(uint8_t id, uint8_t app_id, const RawAddress& peer_addr); +void bta_sys_sco_close(uint8_t id, uint8_t app_id, const RawAddress& peer_addr); +void bta_sys_sco_use(uint8_t id, uint8_t app_id, const RawAddress& peer_addr); +void bta_sys_sco_unuse(uint8_t id, uint8_t app_id, const RawAddress& peer_addr); +void bta_sys_idle(uint8_t id, uint8_t app_id, const RawAddress& peer_addr); +void bta_sys_busy(uint8_t id, uint8_t app_id, const RawAddress& peer_addr); + +void bta_sys_ssr_cfg_register(tBTA_SYS_SSR_CFG_CBACK* p_cback); +void bta_sys_chg_ssr_config(uint8_t id, uint8_t app_id, uint16_t max_latency, + uint16_t min_tout); + +void bta_sys_role_chg_register(tBTA_SYS_CONN_CBACK* p_cback); +void bta_sys_notify_role_chg(const RawAddress& peer_addr, tHCI_ROLE new_role, + tHCI_STATUS hci_status); +void bta_sys_collision_register(uint8_t bta_id, tBTA_SYS_CONN_CBACK* p_cback); +void bta_sys_notify_collision(const RawAddress& peer_addr); #if (BTA_EIR_CANNED_UUID_LIST != TRUE) -extern void bta_sys_eir_register(tBTA_SYS_EIR_CBACK* p_cback); -extern void bta_sys_eir_unregister(); -extern void bta_sys_add_uuid(uint16_t uuid16); -extern void bta_sys_remove_uuid(uint16_t uuid16); -extern void bta_sys_cust_eir_register(tBTA_SYS_CUST_EIR_CBACK* p_cback); -extern void bta_sys_add_cust_uuid(const tBTA_CUSTOM_UUID& curr); -extern void bta_sys_remove_cust_uuid(const tBTA_CUSTOM_UUID& curr); +void bta_sys_eir_register(tBTA_SYS_EIR_CBACK* p_cback); +void bta_sys_eir_unregister(); +void bta_sys_add_uuid(uint16_t uuid16); +void bta_sys_remove_uuid(uint16_t uuid16); +void bta_sys_cust_eir_register(tBTA_SYS_CUST_EIR_CBACK* p_cback); +void bta_sys_add_cust_uuid(const tBTA_CUSTOM_UUID& curr); +void bta_sys_remove_cust_uuid(const tBTA_CUSTOM_UUID& curr); #else #define bta_sys_eir_register(ut) #define bta_sys_eir_unregister() diff --git a/system/bta/test/bta_dm_test.cc b/system/bta/test/bta_dm_test.cc index 86dbec2437..c7e6b16b9d 100644 --- a/system/bta/test/bta_dm_test.cc +++ b/system/bta/test/bta_dm_test.cc @@ -311,10 +311,8 @@ TEST_F(BtaDmTest, bta_dm_set_encryption) { BTA_DM_ENCRYPT_CBACK_queue = {}; } -extern void bta_dm_encrypt_cback(const RawAddress* bd_addr, - tBT_TRANSPORT transport, - UNUSED_ATTR void* p_ref_data, - tBTM_STATUS result); +void bta_dm_encrypt_cback(const RawAddress* bd_addr, tBT_TRANSPORT transport, + UNUSED_ATTR void* p_ref_data, tBTM_STATUS result); TEST_F(BtaDmTest, bta_dm_encrypt_cback) { const RawAddress bd_addr{{0x11, 0x22, 0x33, 0x44, 0x55, 0x66}}; diff --git a/system/btif/include/btif_common.h b/system/btif/include/btif_common.h index 187e0a04c2..32488b78b2 100644 --- a/system/btif/include/btif_common.h +++ b/system/btif/include/btif_common.h @@ -152,11 +152,11 @@ typedef struct { * Functions ******************************************************************************/ -extern bt_status_t do_in_jni_thread(base::OnceClosure task); -extern bt_status_t do_in_jni_thread(const base::Location& from_here, - base::OnceClosure task); -extern bool is_on_jni_thread(); -extern btbase::AbstractMessageLoop* get_jni_message_loop(); +bt_status_t do_in_jni_thread(base::OnceClosure task); +bt_status_t do_in_jni_thread(const base::Location& from_here, + base::OnceClosure task); +bool is_on_jni_thread(); +btbase::AbstractMessageLoop* get_jni_message_loop(); using BtJniClosure = std::function<void()>; void post_on_bt_jni(BtJniClosure closure); diff --git a/system/btif/include/btif_gatt_util.h b/system/btif/include/btif_gatt_util.h index a9e8c09a72..7308e41984 100644 --- a/system/btif/include/btif_gatt_util.h +++ b/system/btif/include/btif_gatt_util.h @@ -30,7 +30,7 @@ void btif_to_bta_response(tGATTS_RSP* p_dest, btgatt_response_t* p_src); void btif_gatt_check_encrypted_link(RawAddress bd_addr, tBT_TRANSPORT transport); -extern void btif_gatt_move_track_adv_data(btgatt_track_adv_info_t* p_dest, - btgatt_track_adv_info_t* p_src); +void btif_gatt_move_track_adv_data(btgatt_track_adv_info_t* p_dest, + btgatt_track_adv_info_t* p_src); #endif diff --git a/system/btif/include/btif_hd.h b/system/btif/include/btif_hd.h index b4ebdcf087..337deefc7a 100644 --- a/system/btif/include/btif_hd.h +++ b/system/btif/include/btif_hd.h @@ -43,7 +43,7 @@ typedef struct { extern btif_hd_cb_t btif_hd_cb; -extern void btif_hd_remove_device(RawAddress bd_addr); -extern void btif_hd_service_registration(); +void btif_hd_remove_device(RawAddress bd_addr); +void btif_hd_service_registration(); #endif diff --git a/system/btif/include/btif_hh.h b/system/btif/include/btif_hh.h index ad40b838b6..49e016ee33 100644 --- a/system/btif/include/btif_hh.h +++ b/system/btif/include/btif_hh.h @@ -133,22 +133,18 @@ typedef struct { extern btif_hh_cb_t btif_hh_cb; -extern btif_hh_device_t* btif_hh_find_connected_dev_by_handle(uint8_t handle); -extern void btif_hh_remove_device(RawAddress bd_addr); -extern bool btif_hh_add_added_dev(const RawAddress& bda, - tBTA_HH_ATTR_MASK attr_mask); -extern bt_status_t btif_hh_virtual_unplug(const RawAddress* bd_addr); -extern void btif_hh_disconnect(RawAddress* bd_addr); -extern void btif_hh_setreport(btif_hh_device_t* p_dev, - bthh_report_type_t r_type, uint16_t size, - uint8_t* report); -extern void btif_hh_senddata(btif_hh_device_t* p_dev, uint16_t size, - uint8_t* report); -extern void btif_hh_getreport(btif_hh_device_t* p_dev, - bthh_report_type_t r_type, uint8_t reportId, - uint16_t bufferSize); -extern void btif_hh_service_registration(bool enable); - -extern void DumpsysHid(int fd); +btif_hh_device_t* btif_hh_find_connected_dev_by_handle(uint8_t handle); +void btif_hh_remove_device(RawAddress bd_addr); +bool btif_hh_add_added_dev(const RawAddress& bda, tBTA_HH_ATTR_MASK attr_mask); +bt_status_t btif_hh_virtual_unplug(const RawAddress* bd_addr); +void btif_hh_disconnect(RawAddress* bd_addr); +void btif_hh_setreport(btif_hh_device_t* p_dev, bthh_report_type_t r_type, + uint16_t size, uint8_t* report); +void btif_hh_senddata(btif_hh_device_t* p_dev, uint16_t size, uint8_t* report); +void btif_hh_getreport(btif_hh_device_t* p_dev, bthh_report_type_t r_type, + uint8_t reportId, uint16_t bufferSize); +void btif_hh_service_registration(bool enable); + +void DumpsysHid(int fd); #endif diff --git a/system/btif/src/bluetooth.cc b/system/btif/src/bluetooth.cc index 4128ffb6ca..9d0ef836c2 100644 --- a/system/btif/src/bluetooth.cc +++ b/system/btif/src/bluetooth.cc @@ -174,12 +174,12 @@ extern CsisClientInterface* btif_csis_client_get_interface(); /* Volume Control client */ extern VolumeControlInterface* btif_volume_control_get_interface(); -extern bt_status_t btif_av_sink_execute_service(bool b_enable); -extern bt_status_t btif_hh_execute_service(bool b_enable); -extern bt_status_t btif_hf_client_execute_service(bool b_enable); -extern bt_status_t btif_sdp_execute_service(bool b_enable); -extern bt_status_t btif_hh_connect(const RawAddress* bd_addr); -extern bt_status_t btif_hd_execute_service(bool b_enable); +bt_status_t btif_av_sink_execute_service(bool b_enable); +bt_status_t btif_hh_execute_service(bool b_enable); +bt_status_t btif_hf_client_execute_service(bool b_enable); +bt_status_t btif_sdp_execute_service(bool b_enable); +bt_status_t btif_hh_connect(const RawAddress* bd_addr); +bt_status_t btif_hd_execute_service(bool b_enable); /******************************************************************************* * Callbacks from bluetooth::core (see go/invisalign-bt) diff --git a/system/btif/src/btif_dm.cc b/system/btif/src/btif_dm.cc index d62c1f6749..ae294bc54a 100644 --- a/system/btif/src/btif_dm.cc +++ b/system/btif/src/btif_dm.cc @@ -282,9 +282,9 @@ static void btif_stats_add_bond_event(const RawAddress& bd_addr, /****************************************************************************** * Externs *****************************************************************************/ -extern bt_status_t btif_sdp_execute_service(bool b_enable); -extern void btif_iot_update_remote_info(tBTA_DM_AUTH_CMPL* p_auth_cmpl, - bool is_ble, bool is_ssp); +bt_status_t btif_sdp_execute_service(bool b_enable); +void btif_iot_update_remote_info(tBTA_DM_AUTH_CMPL* p_auth_cmpl, bool is_ble, + bool is_ssp); /****************************************************************************** * Functions diff --git a/system/btif/src/btif_gatt_client.cc b/system/btif/src/btif_gatt_client.cc index 476e26fbfa..a0054692dd 100644 --- a/system/btif/src/btif_gatt_client.cc +++ b/system/btif/src/btif_gatt_client.cc @@ -61,12 +61,11 @@ using base::Owned; using bluetooth::Uuid; using std::vector; -extern bool btif_get_address_type(const RawAddress& bda, - tBLE_ADDR_TYPE* p_addr_type); -extern bool btif_get_device_type(const RawAddress& bda, int* p_device_type); +bool btif_get_address_type(const RawAddress& bda, tBLE_ADDR_TYPE* p_addr_type); +bool btif_get_device_type(const RawAddress& bda, int* p_device_type); -extern bt_status_t btif_gattc_test_command_impl( - int command, const btgatt_test_params_t* params); +bt_status_t btif_gattc_test_command_impl(int command, + const btgatt_test_params_t* params); extern const btgatt_callbacks_t* bt_gatt_callbacks; /******************************************************************************* diff --git a/system/btif/src/btif_gatt_server.cc b/system/btif/src/btif_gatt_server.cc index b97f2df18f..441e0fac53 100644 --- a/system/btif/src/btif_gatt_server.cc +++ b/system/btif/src/btif_gatt_server.cc @@ -50,9 +50,8 @@ #include "types/bt_transport.h" #include "types/raw_address.h" -extern bool btif_get_address_type(const RawAddress& bda, - tBLE_ADDR_TYPE* p_addr_type); -extern bool btif_get_device_type(const RawAddress& bda, int* p_device_type); +bool btif_get_address_type(const RawAddress& bda, tBLE_ADDR_TYPE* p_addr_type); +bool btif_get_device_type(const RawAddress& bda, int* p_device_type); using base::Bind; using base::Owned; diff --git a/system/btif/src/btif_hd.cc b/system/btif/src/btif_hd.cc index 7fbb3ef036..5509d44b51 100644 --- a/system/btif/src/btif_hd.cc +++ b/system/btif/src/btif_hd.cc @@ -53,10 +53,10 @@ #define COD_HID_COMBO 0x05C0 #define COD_HID_MAJOR 0x0500 -extern bool bta_dm_check_if_only_hd_connected(const RawAddress& peer_addr); -extern bool check_cod_hid(const RawAddress* remote_bdaddr); -extern bool check_cod_hid(const RawAddress& bd_addr); -extern void btif_hh_service_registration(bool enable); +bool bta_dm_check_if_only_hd_connected(const RawAddress& peer_addr); +bool check_cod_hid(const RawAddress* remote_bdaddr); +bool check_cod_hid(const RawAddress& bd_addr); +void btif_hh_service_registration(bool enable); /* HD request events */ typedef enum { BTIF_HD_DUMMY_REQ_EVT = 0 } btif_hd_req_evt_t; diff --git a/system/btif/src/btif_hh.cc b/system/btif/src/btif_hh.cc index faa013f31b..f219eb70bd 100644 --- a/system/btif/src/btif_hh.cc +++ b/system/btif/src/btif_hh.cc @@ -120,19 +120,18 @@ static tHID_KB_LIST hid_kb_numlock_on_list[] = {{LOGITECH_KB_MX5500_PRODUCT_ID, /******************************************************************************* * Externs ******************************************************************************/ -extern bool check_cod(const RawAddress* remote_bdaddr, uint32_t cod); -extern bool check_cod_hid(const RawAddress* remote_bdaddr); -extern void bta_hh_co_destroy(int fd); -extern void bta_hh_co_send_hid_info(btif_hh_device_t* p_dev, - const char* dev_name, uint16_t vendor_id, - uint16_t product_id, uint16_t version, - uint8_t ctry_code, int dscp_len, - uint8_t* p_dscp); -extern void bta_hh_co_write(int fd, uint8_t* rpt, uint16_t len); -extern void bte_hh_evt(tBTA_HH_EVT event, tBTA_HH* p_data); -extern void btif_dm_hh_open_failed(RawAddress* bdaddr); -extern void btif_hd_service_registration(); -extern void btif_hh_timer_timeout(void* data); +bool check_cod(const RawAddress* remote_bdaddr, uint32_t cod); +bool check_cod_hid(const RawAddress* remote_bdaddr); +void bta_hh_co_destroy(int fd); +void bta_hh_co_send_hid_info(btif_hh_device_t* p_dev, const char* dev_name, + uint16_t vendor_id, uint16_t product_id, + uint16_t version, uint8_t ctry_code, int dscp_len, + uint8_t* p_dscp); +void bta_hh_co_write(int fd, uint8_t* rpt, uint16_t len); +void bte_hh_evt(tBTA_HH_EVT event, tBTA_HH* p_data); +void btif_dm_hh_open_failed(RawAddress* bdaddr); +void btif_hd_service_registration(); +void btif_hh_timer_timeout(void* data); /******************************************************************************* * Functions diff --git a/system/btif/src/btif_profile_storage.cc b/system/btif/src/btif_profile_storage.cc index 4773cfeea3..ad7197b49f 100644 --- a/system/btif/src/btif_profile_storage.cc +++ b/system/btif/src/btif_profile_storage.cc @@ -276,8 +276,7 @@ static bool btif_device_supports_classic_hid(const std::string& device) { * ******************************************************************************/ -extern bool btif_get_address_type(const RawAddress& bda, - tBLE_ADDR_TYPE* p_addr_type); +bool btif_get_address_type(const RawAddress& bda, tBLE_ADDR_TYPE* p_addr_type); std::vector<std::pair<RawAddress, uint8_t>> btif_storage_get_le_hid_devices( void) { diff --git a/system/btif/src/btif_rc.cc b/system/btif/src/btif_rc.cc index 9fe1dde06e..e3812edc82 100644 --- a/system/btif/src/btif_rc.cc +++ b/system/btif/src/btif_rc.cc @@ -400,7 +400,7 @@ static const uint8_t media_attr_list_no_cover_art_size = /***************************************************************************** * Externs *****************************************************************************/ -extern bool check_cod(const RawAddress& remote_bdaddr, uint32_t cod); +bool check_cod(const RawAddress& remote_bdaddr, uint32_t cod); /***************************************************************************** * Functions diff --git a/system/btif/src/btif_sock.cc b/system/btif/src/btif_sock.cc index 30167275f3..f94478700c 100644 --- a/system/btif/src/btif_sock.cc +++ b/system/btif/src/btif_sock.cc @@ -44,9 +44,8 @@ #include "types/bluetooth/uuid.h" #include "types/raw_address.h" -extern bool btif_get_address_type(const RawAddress& bda, - tBLE_ADDR_TYPE* p_addr_type); -extern bool btif_get_device_type(const RawAddress& bda, int* p_device_type); +bool btif_get_address_type(const RawAddress& bda, tBLE_ADDR_TYPE* p_addr_type); +bool btif_get_device_type(const RawAddress& bda, int* p_device_type); using bluetooth::Uuid; diff --git a/system/btif/src/btif_storage.cc b/system/btif/src/btif_storage.cc index 817f7a5924..e23edd0a46 100644 --- a/system/btif/src/btif_storage.cc +++ b/system/btif/src/btif_storage.cc @@ -119,7 +119,7 @@ using bluetooth::Uuid; * External functions ******************************************************************************/ -extern void btif_gatts_add_bonded_dev_from_nv(const RawAddress& bda); +void btif_gatts_add_bonded_dev_from_nv(const RawAddress& bda); /******************************************************************************* * Internal Functions diff --git a/system/btif/test/btif_hh_test.cc b/system/btif/test/btif_hh_test.cc index b88f2c72d3..f773cefa57 100644 --- a/system/btif/test/btif_hh_test.cc +++ b/system/btif/test/btif_hh_test.cc @@ -51,10 +51,10 @@ module_t rust_module; const tBTA_AG_RES_DATA tBTA_AG_RES_DATA::kEmpty = {}; -extern void bte_hh_evt(tBTA_HH_EVT event, tBTA_HH* p_data); -extern const bthh_interface_t* btif_hh_get_interface(); -extern bt_status_t btif_hh_connect(const RawAddress* bd_addr); -extern bt_status_t btif_hh_virtual_unplug(const RawAddress* bd_addr); +void bte_hh_evt(tBTA_HH_EVT event, tBTA_HH* p_data); +const bthh_interface_t* btif_hh_get_interface(); +bt_status_t btif_hh_connect(const RawAddress* bd_addr); +bt_status_t btif_hh_virtual_unplug(const RawAddress* bd_addr); namespace test { namespace mock { diff --git a/system/btif/test/btif_rc_test.cc b/system/btif/test/btif_rc_test.cc index 3b4f0bc63a..48f3b748ae 100644 --- a/system/btif/test/btif_rc_test.cc +++ b/system/btif/test/btif_rc_test.cc @@ -32,7 +32,7 @@ #undef LOG_TAG #include "btif/src/btif_rc.cc" -extern void allocation_tracker_uninit(void); +void allocation_tracker_uninit(void); namespace { int AVRC_BldResponse_ = 0; diff --git a/system/embdrv/sbc/encoder/include/sbc_enc_func_declare.h b/system/embdrv/sbc/encoder/include/sbc_enc_func_declare.h index 081f8abe3f..cc1bb977ba 100644 --- a/system/embdrv/sbc/encoder/include/sbc_enc_func_declare.h +++ b/system/embdrv/sbc/encoder/include/sbc_enc_func_declare.h @@ -37,19 +37,19 @@ extern const int32_t gas32CoeffFor8SBs[]; /* Global functions*/ -extern void sbc_enc_bit_alloc_mono(SBC_ENC_PARAMS* CodecParams); -extern void sbc_enc_bit_alloc_ste(SBC_ENC_PARAMS* CodecParams); +void sbc_enc_bit_alloc_mono(SBC_ENC_PARAMS* CodecParams); +void sbc_enc_bit_alloc_ste(SBC_ENC_PARAMS* CodecParams); -extern void SbcAnalysisInit(void); +void SbcAnalysisInit(void); -extern void SbcAnalysisFilter4(SBC_ENC_PARAMS* strEncParams, int16_t* input); -extern void SbcAnalysisFilter8(SBC_ENC_PARAMS* strEncParams, int16_t* input); +void SbcAnalysisFilter4(SBC_ENC_PARAMS* strEncParams, int16_t* input); +void SbcAnalysisFilter8(SBC_ENC_PARAMS* strEncParams, int16_t* input); -extern void SBC_FastIDCT8(int32_t* pInVect, int32_t* pOutVect); -extern void SBC_FastIDCT4(int32_t* x0, int32_t* pOutVect); +void SBC_FastIDCT8(int32_t* pInVect, int32_t* pOutVect); +void SBC_FastIDCT4(int32_t* x0, int32_t* pOutVect); -extern uint32_t EncPacking(SBC_ENC_PARAMS* strEncParams, uint8_t* output); -extern void EncQuantizer(SBC_ENC_PARAMS*); +uint32_t EncPacking(SBC_ENC_PARAMS* strEncParams, uint8_t* output); +void EncQuantizer(SBC_ENC_PARAMS*); #if (SBC_DSP_OPT == TRUE) int32_t SBC_Multiply_32_16_Simplified(int32_t s32In2Temp, int32_t s32In1Temp); #endif diff --git a/system/embdrv/sbc/encoder/include/sbc_encoder.h b/system/embdrv/sbc/encoder/include/sbc_encoder.h index 3a8554fb2d..fa54da25b0 100644 --- a/system/embdrv/sbc/encoder/include/sbc_encoder.h +++ b/system/embdrv/sbc/encoder/include/sbc_encoder.h @@ -201,9 +201,9 @@ extern "C" { /* Encode the frame using SBC. The output is written into |output|. Return * number of bytes written. */ -extern uint32_t SBC_Encode(SBC_ENC_PARAMS* strEncParams, int16_t* input, - uint8_t* output); -extern void SBC_Encoder_Init(SBC_ENC_PARAMS* strEncParams); +uint32_t SBC_Encode(SBC_ENC_PARAMS* strEncParams, int16_t* input, + uint8_t* output); +void SBC_Encoder_Init(SBC_ENC_PARAMS* strEncParams); #ifdef __cplusplus } diff --git a/system/gd/crypto_toolbox/crypto_toolbox.h b/system/gd/crypto_toolbox/crypto_toolbox.h index 4e7ed13db5..aa15d6ead8 100644 --- a/system/gd/crypto_toolbox/crypto_toolbox.h +++ b/system/gd/crypto_toolbox/crypto_toolbox.h @@ -38,18 +38,30 @@ Octet16 c1( const uint8_t* ra); Octet16 s1(const Octet16& k, const Octet16& r1, const Octet16& r2); -extern Octet16 aes_128(const Octet16& key, const Octet16& message); -extern Octet16 aes_cmac(const Octet16& key, const uint8_t* message, uint16_t length); -extern Octet16 f4(uint8_t* u, uint8_t* v, const Octet16& x, uint8_t z); -extern void f5( - uint8_t* w, const Octet16& n1, const Octet16& n2, uint8_t* a1, uint8_t* a2, Octet16* mac_key, Octet16* ltk); -extern Octet16 f6( - const Octet16& w, const Octet16& n1, const Octet16& n2, const Octet16& r, uint8_t* iocap, uint8_t* a1, uint8_t* a2); -extern Octet16 h6(const Octet16& w, std::array<uint8_t, 4> keyid); -extern Octet16 h7(const Octet16& salt, const Octet16& w); -extern uint32_t g2(uint8_t* u, uint8_t* v, const Octet16& x, const Octet16& y); -extern Octet16 ltk_to_link_key(const Octet16& ltk, bool use_h7); -extern Octet16 link_key_to_ltk(const Octet16& link_key, bool use_h7); +Octet16 aes_128(const Octet16& key, const Octet16& message); +Octet16 aes_cmac(const Octet16& key, const uint8_t* message, uint16_t length); +Octet16 f4(uint8_t* u, uint8_t* v, const Octet16& x, uint8_t z); +void f5( + uint8_t* w, + const Octet16& n1, + const Octet16& n2, + uint8_t* a1, + uint8_t* a2, + Octet16* mac_key, + Octet16* ltk); +Octet16 f6( + const Octet16& w, + const Octet16& n1, + const Octet16& n2, + const Octet16& r, + uint8_t* iocap, + uint8_t* a1, + uint8_t* a2); +Octet16 h6(const Octet16& w, std::array<uint8_t, 4> keyid); +Octet16 h7(const Octet16& salt, const Octet16& w); +uint32_t g2(uint8_t* u, uint8_t* v, const Octet16& x, const Octet16& y); +Octet16 ltk_to_link_key(const Octet16& ltk, bool use_h7); +Octet16 link_key_to_ltk(const Octet16& link_key, bool use_h7); /* This function computes AES_128(key, message). |key| must be 128bit. * |message| can be at most 16 bytes long, it's length in bytes is given in diff --git a/system/gd/crypto_toolbox/crypto_toolbox_test.cc b/system/gd/crypto_toolbox/crypto_toolbox_test.cc index 5c21a5dfb4..f28c34efe1 100644 --- a/system/gd/crypto_toolbox/crypto_toolbox_test.cc +++ b/system/gd/crypto_toolbox/crypto_toolbox_test.cc @@ -296,7 +296,7 @@ TEST(CryptoToolboxTest, bt_spec_example_d_8_test) { EXPECT_EQ(expected_aes_cmac, aes_cmac); } -extern Octet16 smp_calculate_ltk_to_link_key(const Octet16& ltk, bool use_h7); +Octet16 smp_calculate_ltk_to_link_key(const Octet16& ltk, bool use_h7); // BT Spec 5.0 | Vol 3, Part H D.9 TEST(CryptoToolboxTest, bt_spec_example_d_9_test) { diff --git a/system/gd/fuzz_test.cc b/system/gd/fuzz_test.cc index ef358b5740..c9358b069b 100644 --- a/system/gd/fuzz_test.cc +++ b/system/gd/fuzz_test.cc @@ -17,13 +17,13 @@ #include <stddef.h> #include <stdint.h> -extern void RunL2capClassicDynamicChannelAllocatorFuzzTest(const uint8_t* data, size_t size); -extern void RunL2capPacketFuzzTest(const uint8_t* data, size_t size); -extern void RunHciPacketFuzzTest(const uint8_t* data, size_t size); +void RunL2capClassicDynamicChannelAllocatorFuzzTest(const uint8_t* data, size_t size); +void RunL2capPacketFuzzTest(const uint8_t* data, size_t size); +void RunHciPacketFuzzTest(const uint8_t* data, size_t size); extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { RunL2capClassicDynamicChannelAllocatorFuzzTest(data, size); RunL2capPacketFuzzTest(data, size); RunHciPacketFuzzTest(data, size); return 0; -}
\ No newline at end of file +} diff --git a/system/hci/test/packet_fragmenter_host_test.cc b/system/hci/test/packet_fragmenter_host_test.cc index cc8e799c1d..7c566f5b35 100644 --- a/system/hci/test/packet_fragmenter_host_test.cc +++ b/system/hci/test/packet_fragmenter_host_test.cc @@ -25,7 +25,7 @@ #include "osi/test/AllocationTestHarness.h" #include "stack/include/bt_hdr.h" -extern void allocation_tracker_uninit(void); +void allocation_tracker_uninit(void); enum kPacketOrder { kStart = 1, diff --git a/system/main/bte_main.cc b/system/main/bte_main.cc index 59e1d42cf4..c9e93653e2 100644 --- a/system/main/bte_main.cc +++ b/system/main/bte_main.cc @@ -50,7 +50,7 @@ static const hci_t* hci; /******************************************************************************* * Externs ******************************************************************************/ -extern void btu_hci_msg_process(BT_HDR* p_msg); +void btu_hci_msg_process(BT_HDR* p_msg); /******************************************************************************* * Static functions diff --git a/system/main/shim/btm.cc b/system/main/shim/btm.cc index 69d98b4002..14a58d27bd 100644 --- a/system/main/shim/btm.cc +++ b/system/main/shim/btm.cc @@ -53,32 +53,36 @@ static constexpr bool kPassiveScanning = false; using BtmRemoteDeviceName = tBTM_REMOTE_DEV_NAME; -extern void btm_process_cancel_complete(tHCI_STATUS status, uint8_t mode); -extern void btm_process_inq_complete(tHCI_STATUS status, uint8_t result_type); -extern void btm_ble_process_adv_addr(RawAddress& raw_address, - tBLE_ADDR_TYPE* address_type); -extern void btm_ble_process_adv_pkt_cont( - uint16_t event_type, tBLE_ADDR_TYPE address_type, - const RawAddress& raw_address, uint8_t primary_phy, uint8_t secondary_phy, - uint8_t advertising_sid, int8_t tx_power, int8_t rssi, - uint16_t periodic_adv_int, uint8_t data_len, const uint8_t* data, - const RawAddress& original_bda); - -extern void btm_api_process_inquiry_result(const RawAddress& raw_address, - uint8_t page_scan_rep_mode, - DEV_CLASS device_class, - uint16_t clock_offset); - -extern void btm_api_process_inquiry_result_with_rssi(RawAddress raw_address, - uint8_t page_scan_rep_mode, - DEV_CLASS device_class, - uint16_t clock_offset, - int8_t rssi); - -extern void btm_api_process_extended_inquiry_result( - RawAddress raw_address, uint8_t page_scan_rep_mode, DEV_CLASS device_class, - uint16_t clock_offset, int8_t rssi, const uint8_t* eir_data, - size_t eir_len); +void btm_process_cancel_complete(tHCI_STATUS status, uint8_t mode); +void btm_process_inq_complete(tHCI_STATUS status, uint8_t result_type); +void btm_ble_process_adv_addr(RawAddress& raw_address, + tBLE_ADDR_TYPE* address_type); +void btm_ble_process_adv_pkt_cont(uint16_t event_type, + tBLE_ADDR_TYPE address_type, + const RawAddress& raw_address, + uint8_t primary_phy, uint8_t secondary_phy, + uint8_t advertising_sid, int8_t tx_power, + int8_t rssi, uint16_t periodic_adv_int, + uint8_t data_len, const uint8_t* data, + const RawAddress& original_bda); + +void btm_api_process_inquiry_result(const RawAddress& raw_address, + uint8_t page_scan_rep_mode, + DEV_CLASS device_class, + uint16_t clock_offset); + +void btm_api_process_inquiry_result_with_rssi(RawAddress raw_address, + uint8_t page_scan_rep_mode, + DEV_CLASS device_class, + uint16_t clock_offset, + int8_t rssi); + +void btm_api_process_extended_inquiry_result(RawAddress raw_address, + uint8_t page_scan_rep_mode, + DEV_CLASS device_class, + uint16_t clock_offset, int8_t rssi, + const uint8_t* eir_data, + size_t eir_len); namespace bluetooth { diff --git a/system/main/shim/btm_api.cc b/system/main/shim/btm_api.cc index a991a87088..be36dc7ef9 100644 --- a/system/main/shim/btm_api.cc +++ b/system/main/shim/btm_api.cc @@ -64,19 +64,19 @@ using bluetooth::common::MetricIdAllocator; extern tBTM_CB btm_cb; std::mutex btm_cb_mutex_; -extern bool btm_inq_find_bdaddr(const RawAddress& p_bda); +bool btm_inq_find_bdaddr(const RawAddress& p_bda); extern tINQ_DB_ENT* btm_inq_db_find(const RawAddress& raw_address); extern tINQ_DB_ENT* btm_inq_db_new(const RawAddress& p_bda); /** * Legacy bluetooth btm stack entry points */ -extern void btm_acl_update_inquiry_status(uint8_t status); -extern void btm_clear_all_pending_le_entry(void); -extern void btm_clr_inq_result_flt(void); -extern void btm_set_eir_uuid(const uint8_t* p_eir, tBTM_INQ_RESULTS* p_results); -extern void btm_sort_inq_result(void); -extern void btm_process_inq_complete(tHCI_STATUS status, uint8_t result_type); +void btm_acl_update_inquiry_status(uint8_t status); +void btm_clear_all_pending_le_entry(void); +void btm_clr_inq_result_flt(void); +void btm_set_eir_uuid(const uint8_t* p_eir, tBTM_INQ_RESULTS* p_results); +void btm_sort_inq_result(void); +void btm_process_inq_complete(tHCI_STATUS status, uint8_t result_type); static bool is_classic_device(tBT_DEVICE_TYPE device_type) { return device_type == BT_DEVICE_TYPE_BREDR; diff --git a/system/main/shim/l2c_api.cc b/system/main/shim/l2c_api.cc index 5f88b82562..0021426495 100644 --- a/system/main/shim/l2c_api.cc +++ b/system/main/shim/l2c_api.cc @@ -47,11 +47,11 @@ #include "types/ble_address_with_type.h" #include "types/raw_address.h" -extern void gatt_notify_conn_update(const RawAddress& remote, uint16_t interval, - uint16_t latency, uint16_t timeout, - tHCI_STATUS status); -extern void gatt_notify_phy_updated(tGATT_STATUS status, uint16_t handle, - uint8_t tx_phy, uint8_t rx_phy); +void gatt_notify_conn_update(const RawAddress& remote, uint16_t interval, + uint16_t latency, uint16_t timeout, + tHCI_STATUS status); +void gatt_notify_phy_updated(tGATT_STATUS status, uint16_t handle, + uint8_t tx_phy, uint8_t rx_phy); void process_ssr_event(tHCI_STATUS status, uint16_t handle, uint16_t max_tx_lat, uint16_t max_rx_lat); diff --git a/system/main/shim/l2c_api.h b/system/main/shim/l2c_api.h index c70b913b4a..5e74daf9dd 100644 --- a/system/main/shim/l2c_api.h +++ b/system/main/shim/l2c_api.h @@ -195,10 +195,9 @@ extern std::vector<uint16_t> L2CA_ConnectCreditBasedReq( * ******************************************************************************/ -extern bool L2CA_ConnectCreditBasedRsp(const RawAddress& p_bd_addr, uint8_t id, - std::vector<uint16_t>& accepted_lcids, - uint16_t result, - tL2CAP_LE_CFG_INFO* p_cfg); +bool L2CA_ConnectCreditBasedRsp(const RawAddress& p_bd_addr, uint8_t id, + std::vector<uint16_t>& accepted_lcids, + uint16_t result, tL2CAP_LE_CFG_INFO* p_cfg); /******************************************************************************* * diff --git a/system/main/shim/le_scanning_manager.cc b/system/main/shim/le_scanning_manager.cc index 3b55932cb4..221cb249b1 100644 --- a/system/main/shim/le_scanning_manager.cc +++ b/system/main/shim/le_scanning_manager.cc @@ -120,18 +120,18 @@ extern ::ScanningCallbacks* bluetooth::shim::default_scanning_callback; extern tBTM_CB btm_cb; -extern void btm_ble_process_adv_pkt_cont_for_inquiry( +void btm_ble_process_adv_pkt_cont_for_inquiry( uint16_t event_type, tBLE_ADDR_TYPE address_type, const RawAddress& raw_address, uint8_t primary_phy, uint8_t secondary_phy, uint8_t advertising_sid, int8_t tx_power, int8_t rssi, uint16_t periodic_adv_int, std::vector<uint8_t> advertising_data); -extern void btif_dm_update_ble_remote_properties(const RawAddress& bd_addr, - BD_NAME bd_name, - tBT_DEVICE_TYPE dev_type); +void btif_dm_update_ble_remote_properties(const RawAddress& bd_addr, + BD_NAME bd_name, + tBT_DEVICE_TYPE dev_type); -extern void btm_ble_process_adv_addr(RawAddress& raw_address, - tBLE_ADDR_TYPE* address_type); +void btm_ble_process_adv_addr(RawAddress& raw_address, + tBLE_ADDR_TYPE* address_type); using bluetooth::shim::BleScannerInterfaceImpl; @@ -396,12 +396,12 @@ void BleScannerInterfaceImpl::BatchscanReadReports(int client_if, batch_scan_mode); } -extern bool btm_random_pseudo_to_identity_addr( - RawAddress* random_pseudo, tBLE_ADDR_TYPE* p_identity_addr_type); +bool btm_random_pseudo_to_identity_addr(RawAddress* random_pseudo, + tBLE_ADDR_TYPE* p_identity_addr_type); -extern bool btm_identity_addr_to_random_pseudo(RawAddress* bd_addr, - tBLE_ADDR_TYPE* p_addr_type, - bool refresh); +bool btm_identity_addr_to_random_pseudo(RawAddress* bd_addr, + tBLE_ADDR_TYPE* p_addr_type, + bool refresh); extern tACL_CONN* btm_acl_for_bda(const RawAddress& bd_addr, tBT_TRANSPORT transport); diff --git a/system/osi/include/socket_utils/sockets.h b/system/osi/include/socket_utils/sockets.h index d2a05d3365..22f598c06f 100644 --- a/system/osi/include/socket_utils/sockets.h +++ b/system/osi/include/socket_utils/sockets.h @@ -62,9 +62,8 @@ static inline int osi_android_get_control_socket(const char* name) { // Normal filesystem namespace #define ANDROID_SOCKET_NAMESPACE_FILESYSTEM 2 -extern int osi_socket_local_server(const char* name, int namespaceId, int type); -extern int osi_socket_local_server_bind(int s, const char* name, - int namespaceId); -extern int osi_socket_local_client_connect(int fd, const char* name, - int namespaceId, int type); -extern int osi_socket_local_client(const char* name, int namespaceId, int type); +int osi_socket_local_server(const char* name, int namespaceId, int type); +int osi_socket_local_server_bind(int s, const char* name, int namespaceId); +int osi_socket_local_client_connect(int fd, const char* name, int namespaceId, + int type); +int osi_socket_local_client(const char* name, int namespaceId, int type); diff --git a/system/rust/src/gatt/ffi/gatt_shim.cc b/system/rust/src/gatt/ffi/gatt_shim.cc index 128b591fec..59c9524841 100644 --- a/system/rust/src/gatt/ffi/gatt_shim.cc +++ b/system/rust/src/gatt/ffi/gatt_shim.cc @@ -30,8 +30,8 @@ #include "types/bluetooth/uuid.h" #include "types/raw_address.h" -extern bt_status_t do_in_jni_thread(const base::Location& from_here, - base::OnceClosure task); +bt_status_t do_in_jni_thread(const base::Location& from_here, + base::OnceClosure task); namespace { std::optional<RawAddress> AddressOfConnection(uint16_t conn_id) { diff --git a/system/stack/a2dp/a2dp_int.h b/system/stack/a2dp/a2dp_int.h index 708f908cb5..0a718e195e 100644 --- a/system/stack/a2dp/a2dp_int.h +++ b/system/stack/a2dp/a2dp_int.h @@ -60,6 +60,6 @@ typedef struct { extern tA2DP_CB a2dp_cb; /* Used only for conformance testing */ -extern void a2dp_set_avdt_sdp_ver(uint16_t avdt_sdp_ver); +void a2dp_set_avdt_sdp_ver(uint16_t avdt_sdp_ver); #endif /* A2DP_INT_H */ diff --git a/system/stack/acl/acl.h b/system/stack/acl/acl.h index e74e27ada8..d369716401 100644 --- a/system/stack/acl/acl.h +++ b/system/stack/acl/acl.h @@ -421,5 +421,4 @@ struct tACL_CB { } }; -extern tACL_CONN* btm_acl_for_bda(const RawAddress& bd_addr, - tBT_TRANSPORT transport); +tACL_CONN* btm_acl_for_bda(const RawAddress& bd_addr, tBT_TRANSPORT transport); diff --git a/system/stack/acl/btm_acl.cc b/system/stack/acl/btm_acl.cc index 5c686b7026..3f8e25fb94 100644 --- a/system/stack/acl/btm_acl.cc +++ b/system/stack/acl/btm_acl.cc @@ -95,8 +95,8 @@ void l2c_link_hci_conn_comp(tHCI_STATUS status, uint16_t handle, void BTM_db_reset(void); extern tBTM_CB btm_cb; -extern void btm_iot_save_remote_properties(tACL_CONN* p_acl_cb); -extern void btm_iot_save_remote_versions(tACL_CONN* p_acl_cb); +void btm_iot_save_remote_properties(tACL_CONN* p_acl_cb); +void btm_iot_save_remote_versions(tACL_CONN* p_acl_cb); struct StackAclBtmAcl { tACL_CONN* acl_allocate_connection(); diff --git a/system/stack/acl/btm_ble_connection_establishment.cc b/system/stack/acl/btm_ble_connection_establishment.cc index fb615fb72d..0f8d8162df 100644 --- a/system/stack/acl/btm_ble_connection_establishment.cc +++ b/system/stack/acl/btm_ble_connection_establishment.cc @@ -38,11 +38,11 @@ extern tBTM_CB btm_cb; -extern void btm_ble_advertiser_notify_terminated_legacy( - uint8_t status, uint16_t connection_handle); +void btm_ble_advertiser_notify_terminated_legacy(uint8_t status, + uint16_t connection_handle); -extern bool btm_ble_init_pseudo_addr(tBTM_SEC_DEV_REC* p_dev_rec, - const RawAddress& new_pseudo_addr); +bool btm_ble_init_pseudo_addr(tBTM_SEC_DEV_REC* p_dev_rec, + const RawAddress& new_pseudo_addr); /** LE connection complete. */ void btm_ble_create_ll_conn_complete(tHCI_STATUS status) { if (status == HCI_SUCCESS) return; diff --git a/system/stack/avct/avct_int.h b/system/stack/avct/avct_int.h index 8975380190..3139dbce3a 100644 --- a/system/stack/avct/avct_int.h +++ b/system/stack/avct/avct_int.h @@ -140,69 +140,66 @@ typedef struct { ****************************************************************************/ /* LCB function declarations */ -extern void avct_lcb_event(tAVCT_LCB* p_lcb, uint8_t event, - tAVCT_LCB_EVT* p_data); -extern void avct_bcb_event(tAVCT_BCB* p_bcb, uint8_t event, - tAVCT_LCB_EVT* p_data); -extern void avct_close_bcb(tAVCT_LCB* p_lcb, tAVCT_LCB_EVT* p_data); -extern tAVCT_LCB* avct_lcb_by_bcb(tAVCT_BCB* p_bcb); -extern tAVCT_BCB* avct_bcb_by_lcb(tAVCT_LCB* p_lcb); -extern uint8_t avct_bcb_get_last_ccb_index(tAVCT_BCB* p_bcb, - tAVCT_CCB* p_ccb_last); -extern tAVCT_BCB* avct_bcb_by_lcid(uint16_t lcid); -extern tAVCT_LCB* avct_lcb_by_bd(const RawAddress& bd_addr); -extern tAVCT_LCB* avct_lcb_alloc(const RawAddress& bd_addr); -extern void avct_lcb_dealloc(tAVCT_LCB* p_lcb, tAVCT_LCB_EVT* p_data); -extern tAVCT_LCB* avct_lcb_by_lcid(uint16_t lcid); -extern tAVCT_CCB* avct_lcb_has_pid(tAVCT_LCB* p_lcb, uint16_t pid); -extern bool avct_lcb_last_ccb(tAVCT_LCB* p_lcb, tAVCT_CCB* p_ccb_last); +void avct_lcb_event(tAVCT_LCB* p_lcb, uint8_t event, tAVCT_LCB_EVT* p_data); +void avct_bcb_event(tAVCT_BCB* p_bcb, uint8_t event, tAVCT_LCB_EVT* p_data); +void avct_close_bcb(tAVCT_LCB* p_lcb, tAVCT_LCB_EVT* p_data); +tAVCT_LCB* avct_lcb_by_bcb(tAVCT_BCB* p_bcb); +tAVCT_BCB* avct_bcb_by_lcb(tAVCT_LCB* p_lcb); +uint8_t avct_bcb_get_last_ccb_index(tAVCT_BCB* p_bcb, tAVCT_CCB* p_ccb_last); +tAVCT_BCB* avct_bcb_by_lcid(uint16_t lcid); +tAVCT_LCB* avct_lcb_by_bd(const RawAddress& bd_addr); +tAVCT_LCB* avct_lcb_alloc(const RawAddress& bd_addr); +void avct_lcb_dealloc(tAVCT_LCB* p_lcb, tAVCT_LCB_EVT* p_data); +tAVCT_LCB* avct_lcb_by_lcid(uint16_t lcid); +tAVCT_CCB* avct_lcb_has_pid(tAVCT_LCB* p_lcb, uint16_t pid); +bool avct_lcb_last_ccb(tAVCT_LCB* p_lcb, tAVCT_CCB* p_ccb_last); /* LCB action functions */ -extern void avct_lcb_chnl_open(tAVCT_LCB* p_lcb, tAVCT_LCB_EVT* p_data); -extern void avct_lcb_unbind_disc(tAVCT_LCB* p_lcb, tAVCT_LCB_EVT* p_data); -extern void avct_lcb_open_ind(tAVCT_LCB* p_lcb, tAVCT_LCB_EVT* p_data); -extern void avct_lcb_open_fail(tAVCT_LCB* p_lcb, tAVCT_LCB_EVT* p_data); -extern void avct_lcb_close_ind(tAVCT_LCB* p_lcb, tAVCT_LCB_EVT* p_data); -extern void avct_lcb_close_cfm(tAVCT_LCB* p_lcb, tAVCT_LCB_EVT* p_data); -extern void avct_lcb_bind_conn(tAVCT_LCB* p_lcb, tAVCT_LCB_EVT* p_data); -extern void avct_lcb_chk_disc(tAVCT_LCB* p_lcb, tAVCT_LCB_EVT* p_data); -extern void avct_lcb_chnl_disc(tAVCT_LCB* p_lcb, tAVCT_LCB_EVT* p_data); -extern void avct_lcb_bind_fail(tAVCT_LCB* p_lcb, tAVCT_LCB_EVT* p_data); -extern void avct_lcb_cong_ind(tAVCT_LCB* p_lcb, tAVCT_LCB_EVT* p_data); -extern void avct_lcb_discard_msg(tAVCT_LCB* p_lcb, tAVCT_LCB_EVT* p_data); -extern void avct_lcb_send_msg(tAVCT_LCB* p_lcb, tAVCT_LCB_EVT* p_data); -extern void avct_lcb_msg_ind(tAVCT_LCB* p_lcb, tAVCT_LCB_EVT* p_data); -extern void avct_lcb_free_msg_ind(tAVCT_LCB* p_lcb, tAVCT_LCB_EVT* p_data); +void avct_lcb_chnl_open(tAVCT_LCB* p_lcb, tAVCT_LCB_EVT* p_data); +void avct_lcb_unbind_disc(tAVCT_LCB* p_lcb, tAVCT_LCB_EVT* p_data); +void avct_lcb_open_ind(tAVCT_LCB* p_lcb, tAVCT_LCB_EVT* p_data); +void avct_lcb_open_fail(tAVCT_LCB* p_lcb, tAVCT_LCB_EVT* p_data); +void avct_lcb_close_ind(tAVCT_LCB* p_lcb, tAVCT_LCB_EVT* p_data); +void avct_lcb_close_cfm(tAVCT_LCB* p_lcb, tAVCT_LCB_EVT* p_data); +void avct_lcb_bind_conn(tAVCT_LCB* p_lcb, tAVCT_LCB_EVT* p_data); +void avct_lcb_chk_disc(tAVCT_LCB* p_lcb, tAVCT_LCB_EVT* p_data); +void avct_lcb_chnl_disc(tAVCT_LCB* p_lcb, tAVCT_LCB_EVT* p_data); +void avct_lcb_bind_fail(tAVCT_LCB* p_lcb, tAVCT_LCB_EVT* p_data); +void avct_lcb_cong_ind(tAVCT_LCB* p_lcb, tAVCT_LCB_EVT* p_data); +void avct_lcb_discard_msg(tAVCT_LCB* p_lcb, tAVCT_LCB_EVT* p_data); +void avct_lcb_send_msg(tAVCT_LCB* p_lcb, tAVCT_LCB_EVT* p_data); +void avct_lcb_msg_ind(tAVCT_LCB* p_lcb, tAVCT_LCB_EVT* p_data); +void avct_lcb_free_msg_ind(tAVCT_LCB* p_lcb, tAVCT_LCB_EVT* p_data); /* BCB action functions */ typedef void (*tAVCT_BCB_ACTION)(tAVCT_BCB* p_bcb, tAVCT_LCB_EVT* p_data); -extern void avct_bcb_chnl_open(tAVCT_BCB* p_bcb, tAVCT_LCB_EVT* p_data); -extern void avct_bcb_unbind_disc(tAVCT_BCB* p_bcb, tAVCT_LCB_EVT* p_data); -extern void avct_bcb_open_ind(tAVCT_BCB* p_bcb, tAVCT_LCB_EVT* p_data); -extern void avct_bcb_open_fail(tAVCT_BCB* p_bcb, tAVCT_LCB_EVT* p_data); -extern void avct_bcb_close_ind(tAVCT_BCB* p_bcb, tAVCT_LCB_EVT* p_data); -extern void avct_bcb_close_cfm(tAVCT_BCB* p_bcb, tAVCT_LCB_EVT* p_data); -extern void avct_bcb_bind_conn(tAVCT_BCB* p_bcb, tAVCT_LCB_EVT* p_data); -extern void avct_bcb_chk_disc(tAVCT_BCB* p_bcb, tAVCT_LCB_EVT* p_data); -extern void avct_bcb_chnl_disc(tAVCT_BCB* p_bcb, tAVCT_LCB_EVT* p_data); -extern void avct_bcb_bind_fail(tAVCT_BCB* p_bcb, tAVCT_LCB_EVT* p_data); -extern void avct_bcb_cong_ind(tAVCT_BCB* p_bcb, tAVCT_LCB_EVT* p_data); -extern void avct_bcb_discard_msg(tAVCT_BCB* p_bcb, tAVCT_LCB_EVT* p_data); -extern void avct_bcb_send_msg(tAVCT_BCB* p_bcb, tAVCT_LCB_EVT* p_data); -extern void avct_bcb_msg_ind(tAVCT_BCB* p_bcb, tAVCT_LCB_EVT* p_data); -extern void avct_bcb_free_msg_ind(tAVCT_BCB* p_bcb, tAVCT_LCB_EVT* p_data); - -extern void avct_bcb_dealloc(tAVCT_BCB* p_bcb, tAVCT_LCB_EVT* p_data); +void avct_bcb_chnl_open(tAVCT_BCB* p_bcb, tAVCT_LCB_EVT* p_data); +void avct_bcb_unbind_disc(tAVCT_BCB* p_bcb, tAVCT_LCB_EVT* p_data); +void avct_bcb_open_ind(tAVCT_BCB* p_bcb, tAVCT_LCB_EVT* p_data); +void avct_bcb_open_fail(tAVCT_BCB* p_bcb, tAVCT_LCB_EVT* p_data); +void avct_bcb_close_ind(tAVCT_BCB* p_bcb, tAVCT_LCB_EVT* p_data); +void avct_bcb_close_cfm(tAVCT_BCB* p_bcb, tAVCT_LCB_EVT* p_data); +void avct_bcb_bind_conn(tAVCT_BCB* p_bcb, tAVCT_LCB_EVT* p_data); +void avct_bcb_chk_disc(tAVCT_BCB* p_bcb, tAVCT_LCB_EVT* p_data); +void avct_bcb_chnl_disc(tAVCT_BCB* p_bcb, tAVCT_LCB_EVT* p_data); +void avct_bcb_bind_fail(tAVCT_BCB* p_bcb, tAVCT_LCB_EVT* p_data); +void avct_bcb_cong_ind(tAVCT_BCB* p_bcb, tAVCT_LCB_EVT* p_data); +void avct_bcb_discard_msg(tAVCT_BCB* p_bcb, tAVCT_LCB_EVT* p_data); +void avct_bcb_send_msg(tAVCT_BCB* p_bcb, tAVCT_LCB_EVT* p_data); +void avct_bcb_msg_ind(tAVCT_BCB* p_bcb, tAVCT_LCB_EVT* p_data); +void avct_bcb_free_msg_ind(tAVCT_BCB* p_bcb, tAVCT_LCB_EVT* p_data); + +void avct_bcb_dealloc(tAVCT_BCB* p_bcb, tAVCT_LCB_EVT* p_data); extern const tAVCT_BCB_ACTION avct_bcb_action[]; extern const uint8_t avct_lcb_pkt_type_len[]; /* CCB function declarations */ -extern tAVCT_CCB* avct_ccb_alloc(tAVCT_CC* p_cc); -extern void avct_ccb_dealloc(tAVCT_CCB* p_ccb, uint8_t event, uint16_t result, - const RawAddress* bd_addr); -extern uint8_t avct_ccb_to_idx(tAVCT_CCB* p_ccb); -extern tAVCT_CCB* avct_ccb_by_idx(uint8_t idx); +tAVCT_CCB* avct_ccb_alloc(tAVCT_CC* p_cc); +void avct_ccb_dealloc(tAVCT_CCB* p_ccb, uint8_t event, uint16_t result, + const RawAddress* bd_addr); +uint8_t avct_ccb_to_idx(tAVCT_CCB* p_ccb); +tAVCT_CCB* avct_ccb_by_idx(uint8_t idx); /***************************************************************************** * global data diff --git a/system/stack/avdt/avdt_int.h b/system/stack/avdt/avdt_int.h index d872573d58..acfc89d9ee 100644 --- a/system/stack/avdt/avdt_int.h +++ b/system/stack/avdt/avdt_int.h @@ -804,169 +804,160 @@ class AvdtpCb { ****************************************************************************/ /* CCB function declarations */ -extern void avdt_ccb_init(void); -extern void avdt_ccb_event(AvdtpCcb* p_ccb, uint8_t event, - tAVDT_CCB_EVT* p_data); -extern AvdtpCcb* avdt_ccb_by_bd(const RawAddress& bd_addr); -extern AvdtpCcb* avdt_ccb_alloc(const RawAddress& bd_addr); -extern AvdtpCcb* avdt_ccb_alloc_by_channel_index(const RawAddress& bd_addr, - uint8_t channel_index); -extern void avdt_ccb_dealloc(AvdtpCcb* p_ccb, tAVDT_CCB_EVT* p_data); -extern uint8_t avdt_ccb_to_idx(AvdtpCcb* p_ccb); -extern AvdtpCcb* avdt_ccb_by_idx(uint8_t idx); +void avdt_ccb_init(void); +void avdt_ccb_event(AvdtpCcb* p_ccb, uint8_t event, tAVDT_CCB_EVT* p_data); +AvdtpCcb* avdt_ccb_by_bd(const RawAddress& bd_addr); +AvdtpCcb* avdt_ccb_alloc(const RawAddress& bd_addr); +AvdtpCcb* avdt_ccb_alloc_by_channel_index(const RawAddress& bd_addr, + uint8_t channel_index); +void avdt_ccb_dealloc(AvdtpCcb* p_ccb, tAVDT_CCB_EVT* p_data); +uint8_t avdt_ccb_to_idx(AvdtpCcb* p_ccb); +AvdtpCcb* avdt_ccb_by_idx(uint8_t idx); /* CCB action functions */ -extern void avdt_ccb_chan_open(AvdtpCcb* p_ccb, tAVDT_CCB_EVT* p_data); -extern void avdt_ccb_chan_close(AvdtpCcb* p_ccb, tAVDT_CCB_EVT* p_data); -extern void avdt_ccb_chk_close(AvdtpCcb* p_ccb, tAVDT_CCB_EVT* p_data); -extern void avdt_ccb_hdl_discover_cmd(AvdtpCcb* p_ccb, tAVDT_CCB_EVT* p_data); -extern void avdt_ccb_hdl_discover_rsp(AvdtpCcb* p_ccb, tAVDT_CCB_EVT* p_data); -extern void avdt_ccb_hdl_getcap_cmd(AvdtpCcb* p_ccb, tAVDT_CCB_EVT* p_data); -extern void avdt_ccb_hdl_getcap_rsp(AvdtpCcb* p_ccb, tAVDT_CCB_EVT* p_data); -extern void avdt_ccb_hdl_start_cmd(AvdtpCcb* p_ccb, tAVDT_CCB_EVT* p_data); -extern void avdt_ccb_hdl_start_rsp(AvdtpCcb* p_ccb, tAVDT_CCB_EVT* p_data); -extern void avdt_ccb_hdl_suspend_cmd(AvdtpCcb* p_ccb, tAVDT_CCB_EVT* p_data); -extern void avdt_ccb_hdl_suspend_rsp(AvdtpCcb* p_ccb, tAVDT_CCB_EVT* p_data); -extern void avdt_ccb_snd_discover_cmd(AvdtpCcb* p_ccb, tAVDT_CCB_EVT* p_data); -extern void avdt_ccb_snd_discover_rsp(AvdtpCcb* p_ccb, tAVDT_CCB_EVT* p_data); -extern void avdt_ccb_snd_getcap_cmd(AvdtpCcb* p_ccb, tAVDT_CCB_EVT* p_data); -extern void avdt_ccb_snd_getcap_rsp(AvdtpCcb* p_ccb, tAVDT_CCB_EVT* p_data); -extern void avdt_ccb_snd_start_cmd(AvdtpCcb* p_ccb, tAVDT_CCB_EVT* p_data); -extern void avdt_ccb_snd_start_rsp(AvdtpCcb* p_ccb, tAVDT_CCB_EVT* p_data); -extern void avdt_ccb_snd_suspend_cmd(AvdtpCcb* p_ccb, tAVDT_CCB_EVT* p_data); -extern void avdt_ccb_snd_suspend_rsp(AvdtpCcb* p_ccb, tAVDT_CCB_EVT* p_data); -extern void avdt_ccb_clear_cmds(AvdtpCcb* p_ccb, tAVDT_CCB_EVT* p_data); -extern void avdt_ccb_cmd_fail(AvdtpCcb* p_ccb, tAVDT_CCB_EVT* p_data); -extern void avdt_ccb_free_cmd(AvdtpCcb* p_ccb, tAVDT_CCB_EVT* p_data); -extern void avdt_ccb_cong_state(AvdtpCcb* p_ccb, tAVDT_CCB_EVT* p_data); -extern void avdt_ccb_ret_cmd(AvdtpCcb* p_ccb, tAVDT_CCB_EVT* p_data); -extern void avdt_ccb_snd_cmd(AvdtpCcb* p_ccb, tAVDT_CCB_EVT* p_data); -extern void avdt_ccb_snd_msg(AvdtpCcb* p_ccb, tAVDT_CCB_EVT* p_data); -extern void avdt_ccb_set_reconn(AvdtpCcb* p_ccb, tAVDT_CCB_EVT* p_data); -extern void avdt_ccb_clr_reconn(AvdtpCcb* p_ccb, tAVDT_CCB_EVT* p_data); -extern void avdt_ccb_chk_reconn(AvdtpCcb* p_ccb, tAVDT_CCB_EVT* p_data); -extern void avdt_ccb_chk_timer(AvdtpCcb* p_ccb, tAVDT_CCB_EVT* p_data); -extern void avdt_ccb_set_conn(AvdtpCcb* p_ccb, tAVDT_CCB_EVT* p_data); -extern void avdt_ccb_set_disconn(AvdtpCcb* p_ccb, tAVDT_CCB_EVT* p_data); -extern void avdt_ccb_do_disconn(AvdtpCcb* p_ccb, tAVDT_CCB_EVT* p_data); -extern void avdt_ccb_ll_closed(AvdtpCcb* p_ccb, tAVDT_CCB_EVT* p_data); -extern void avdt_ccb_ll_opened(AvdtpCcb* p_ccb, tAVDT_CCB_EVT* p_data); +void avdt_ccb_chan_open(AvdtpCcb* p_ccb, tAVDT_CCB_EVT* p_data); +void avdt_ccb_chan_close(AvdtpCcb* p_ccb, tAVDT_CCB_EVT* p_data); +void avdt_ccb_chk_close(AvdtpCcb* p_ccb, tAVDT_CCB_EVT* p_data); +void avdt_ccb_hdl_discover_cmd(AvdtpCcb* p_ccb, tAVDT_CCB_EVT* p_data); +void avdt_ccb_hdl_discover_rsp(AvdtpCcb* p_ccb, tAVDT_CCB_EVT* p_data); +void avdt_ccb_hdl_getcap_cmd(AvdtpCcb* p_ccb, tAVDT_CCB_EVT* p_data); +void avdt_ccb_hdl_getcap_rsp(AvdtpCcb* p_ccb, tAVDT_CCB_EVT* p_data); +void avdt_ccb_hdl_start_cmd(AvdtpCcb* p_ccb, tAVDT_CCB_EVT* p_data); +void avdt_ccb_hdl_start_rsp(AvdtpCcb* p_ccb, tAVDT_CCB_EVT* p_data); +void avdt_ccb_hdl_suspend_cmd(AvdtpCcb* p_ccb, tAVDT_CCB_EVT* p_data); +void avdt_ccb_hdl_suspend_rsp(AvdtpCcb* p_ccb, tAVDT_CCB_EVT* p_data); +void avdt_ccb_snd_discover_cmd(AvdtpCcb* p_ccb, tAVDT_CCB_EVT* p_data); +void avdt_ccb_snd_discover_rsp(AvdtpCcb* p_ccb, tAVDT_CCB_EVT* p_data); +void avdt_ccb_snd_getcap_cmd(AvdtpCcb* p_ccb, tAVDT_CCB_EVT* p_data); +void avdt_ccb_snd_getcap_rsp(AvdtpCcb* p_ccb, tAVDT_CCB_EVT* p_data); +void avdt_ccb_snd_start_cmd(AvdtpCcb* p_ccb, tAVDT_CCB_EVT* p_data); +void avdt_ccb_snd_start_rsp(AvdtpCcb* p_ccb, tAVDT_CCB_EVT* p_data); +void avdt_ccb_snd_suspend_cmd(AvdtpCcb* p_ccb, tAVDT_CCB_EVT* p_data); +void avdt_ccb_snd_suspend_rsp(AvdtpCcb* p_ccb, tAVDT_CCB_EVT* p_data); +void avdt_ccb_clear_cmds(AvdtpCcb* p_ccb, tAVDT_CCB_EVT* p_data); +void avdt_ccb_cmd_fail(AvdtpCcb* p_ccb, tAVDT_CCB_EVT* p_data); +void avdt_ccb_free_cmd(AvdtpCcb* p_ccb, tAVDT_CCB_EVT* p_data); +void avdt_ccb_cong_state(AvdtpCcb* p_ccb, tAVDT_CCB_EVT* p_data); +void avdt_ccb_ret_cmd(AvdtpCcb* p_ccb, tAVDT_CCB_EVT* p_data); +void avdt_ccb_snd_cmd(AvdtpCcb* p_ccb, tAVDT_CCB_EVT* p_data); +void avdt_ccb_snd_msg(AvdtpCcb* p_ccb, tAVDT_CCB_EVT* p_data); +void avdt_ccb_set_reconn(AvdtpCcb* p_ccb, tAVDT_CCB_EVT* p_data); +void avdt_ccb_clr_reconn(AvdtpCcb* p_ccb, tAVDT_CCB_EVT* p_data); +void avdt_ccb_chk_reconn(AvdtpCcb* p_ccb, tAVDT_CCB_EVT* p_data); +void avdt_ccb_chk_timer(AvdtpCcb* p_ccb, tAVDT_CCB_EVT* p_data); +void avdt_ccb_set_conn(AvdtpCcb* p_ccb, tAVDT_CCB_EVT* p_data); +void avdt_ccb_set_disconn(AvdtpCcb* p_ccb, tAVDT_CCB_EVT* p_data); +void avdt_ccb_do_disconn(AvdtpCcb* p_ccb, tAVDT_CCB_EVT* p_data); +void avdt_ccb_ll_closed(AvdtpCcb* p_ccb, tAVDT_CCB_EVT* p_data); +void avdt_ccb_ll_opened(AvdtpCcb* p_ccb, tAVDT_CCB_EVT* p_data); /* SCB function prototypes */ -extern void avdt_scb_event(AvdtpScb* p_scb, uint8_t event, - tAVDT_SCB_EVT* p_data); -extern void avdt_scb_init(void); -extern AvdtpScb* avdt_scb_alloc(uint8_t peer_id, - const AvdtpStreamConfig& avdtp_stream_config); -extern void avdt_scb_dealloc(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); -extern uint8_t avdt_scb_to_hdl(AvdtpScb* p_scb); -extern AvdtpScb* avdt_scb_by_hdl(uint8_t hdl); -extern uint8_t avdt_scb_verify(AvdtpCcb* p_ccb, uint8_t state, uint8_t* p_seid, - uint16_t num_seid, uint8_t* p_err_code); -extern void avdt_scb_peer_seid_list(tAVDT_MULTI* p_multi); -extern uint32_t avdt_scb_gen_ssrc(AvdtpScb* p_scb); +void avdt_scb_event(AvdtpScb* p_scb, uint8_t event, tAVDT_SCB_EVT* p_data); +void avdt_scb_init(void); +AvdtpScb* avdt_scb_alloc(uint8_t peer_id, + const AvdtpStreamConfig& avdtp_stream_config); +void avdt_scb_dealloc(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); +uint8_t avdt_scb_to_hdl(AvdtpScb* p_scb); +AvdtpScb* avdt_scb_by_hdl(uint8_t hdl); +uint8_t avdt_scb_verify(AvdtpCcb* p_ccb, uint8_t state, uint8_t* p_seid, + uint16_t num_seid, uint8_t* p_err_code); +void avdt_scb_peer_seid_list(tAVDT_MULTI* p_multi); +uint32_t avdt_scb_gen_ssrc(AvdtpScb* p_scb); /* SCB action functions */ -extern void avdt_scb_hdl_abort_cmd(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); -extern void avdt_scb_hdl_abort_rsp(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); -extern void avdt_scb_hdl_close_cmd(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); -extern void avdt_scb_hdl_close_rsp(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); -extern void avdt_scb_hdl_getconfig_cmd(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); -extern void avdt_scb_hdl_getconfig_rsp(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); -extern void avdt_scb_hdl_open_cmd(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); -extern void avdt_scb_hdl_open_rej(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); -extern void avdt_scb_hdl_open_rsp(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); -extern void avdt_scb_hdl_pkt(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); -extern void avdt_scb_drop_pkt(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); -extern void avdt_scb_hdl_reconfig_cmd(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); -extern void avdt_scb_hdl_reconfig_rsp(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); -extern void avdt_scb_hdl_security_cmd(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); -extern void avdt_scb_hdl_security_rsp(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); -extern void avdt_scb_hdl_setconfig_cmd(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); -extern void avdt_scb_hdl_setconfig_rej(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); -extern void avdt_scb_hdl_setconfig_rsp(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); -extern void avdt_scb_hdl_start_cmd(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); -extern void avdt_scb_hdl_start_rsp(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); -extern void avdt_scb_hdl_suspend_cmd(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); -extern void avdt_scb_hdl_suspend_rsp(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); -extern void avdt_scb_snd_delay_rpt_req(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); -extern void avdt_scb_hdl_delay_rpt_cmd(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); -extern void avdt_scb_hdl_delay_rpt_rsp(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); -extern void avdt_scb_hdl_tc_close(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); -extern void avdt_scb_hdl_tc_open(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); -extern void avdt_scb_hdl_tc_close_sto(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); -extern void avdt_scb_hdl_tc_open_sto(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); -extern void avdt_scb_hdl_write_req(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); -extern void avdt_scb_snd_abort_req(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); -extern void avdt_scb_snd_abort_rsp(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); -extern void avdt_scb_snd_close_req(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); -extern void avdt_scb_snd_stream_close(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); -extern void avdt_scb_snd_close_rsp(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); -extern void avdt_scb_snd_getconfig_req(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); -extern void avdt_scb_snd_getconfig_rsp(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); -extern void avdt_scb_snd_open_req(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); -extern void avdt_scb_snd_open_rsp(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); -extern void avdt_scb_snd_reconfig_req(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); -extern void avdt_scb_snd_reconfig_rsp(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); -extern void avdt_scb_snd_security_req(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); -extern void avdt_scb_snd_security_rsp(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); -extern void avdt_scb_snd_setconfig_req(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); -extern void avdt_scb_snd_setconfig_rej(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); -extern void avdt_scb_snd_setconfig_rsp(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); -extern void avdt_scb_snd_snk_delay_rpt_req(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); -extern void avdt_scb_snd_tc_close(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); -extern void avdt_scb_cb_err(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); -extern void avdt_scb_cong_state(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); -extern void avdt_scb_rej_state(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); -extern void avdt_scb_rej_in_use(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); -extern void avdt_scb_rej_not_in_use(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); -extern void avdt_scb_set_remove(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); -extern void avdt_scb_free_pkt(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); -extern void avdt_scb_chk_snd_pkt(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); -extern void avdt_scb_clr_pkt(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); -extern void avdt_scb_transport_channel_timer(AvdtpScb* p_scb, - tAVDT_SCB_EVT* p_data); -extern void avdt_scb_clr_vars(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); +void avdt_scb_hdl_abort_cmd(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); +void avdt_scb_hdl_abort_rsp(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); +void avdt_scb_hdl_close_cmd(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); +void avdt_scb_hdl_close_rsp(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); +void avdt_scb_hdl_getconfig_cmd(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); +void avdt_scb_hdl_getconfig_rsp(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); +void avdt_scb_hdl_open_cmd(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); +void avdt_scb_hdl_open_rej(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); +void avdt_scb_hdl_open_rsp(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); +void avdt_scb_hdl_pkt(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); +void avdt_scb_drop_pkt(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); +void avdt_scb_hdl_reconfig_cmd(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); +void avdt_scb_hdl_reconfig_rsp(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); +void avdt_scb_hdl_security_cmd(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); +void avdt_scb_hdl_security_rsp(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); +void avdt_scb_hdl_setconfig_cmd(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); +void avdt_scb_hdl_setconfig_rej(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); +void avdt_scb_hdl_setconfig_rsp(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); +void avdt_scb_hdl_start_cmd(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); +void avdt_scb_hdl_start_rsp(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); +void avdt_scb_hdl_suspend_cmd(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); +void avdt_scb_hdl_suspend_rsp(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); +void avdt_scb_snd_delay_rpt_req(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); +void avdt_scb_hdl_delay_rpt_cmd(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); +void avdt_scb_hdl_delay_rpt_rsp(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); +void avdt_scb_hdl_tc_close(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); +void avdt_scb_hdl_tc_open(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); +void avdt_scb_hdl_tc_close_sto(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); +void avdt_scb_hdl_tc_open_sto(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); +void avdt_scb_hdl_write_req(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); +void avdt_scb_snd_abort_req(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); +void avdt_scb_snd_abort_rsp(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); +void avdt_scb_snd_close_req(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); +void avdt_scb_snd_stream_close(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); +void avdt_scb_snd_close_rsp(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); +void avdt_scb_snd_getconfig_req(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); +void avdt_scb_snd_getconfig_rsp(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); +void avdt_scb_snd_open_req(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); +void avdt_scb_snd_open_rsp(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); +void avdt_scb_snd_reconfig_req(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); +void avdt_scb_snd_reconfig_rsp(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); +void avdt_scb_snd_security_req(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); +void avdt_scb_snd_security_rsp(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); +void avdt_scb_snd_setconfig_req(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); +void avdt_scb_snd_setconfig_rej(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); +void avdt_scb_snd_setconfig_rsp(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); +void avdt_scb_snd_snk_delay_rpt_req(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); +void avdt_scb_snd_tc_close(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); +void avdt_scb_cb_err(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); +void avdt_scb_cong_state(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); +void avdt_scb_rej_state(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); +void avdt_scb_rej_in_use(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); +void avdt_scb_rej_not_in_use(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); +void avdt_scb_set_remove(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); +void avdt_scb_free_pkt(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); +void avdt_scb_chk_snd_pkt(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); +void avdt_scb_clr_pkt(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); +void avdt_scb_transport_channel_timer(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); +void avdt_scb_clr_vars(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); /* msg function declarations */ -extern bool avdt_msg_send(AvdtpCcb* p_ccb, BT_HDR* p_msg); -extern void avdt_msg_send_cmd(AvdtpCcb* p_ccb, void* p_scb, uint8_t sig_id, - tAVDT_MSG* p_params); -extern void avdt_msg_send_rsp(AvdtpCcb* p_ccb, uint8_t sig_id, - tAVDT_MSG* p_params); -extern void avdt_msg_send_rej(AvdtpCcb* p_ccb, uint8_t sig_id, - tAVDT_MSG* p_params); -extern void avdt_msg_send_grej(AvdtpCcb* p_ccb, uint8_t sig_id, - tAVDT_MSG* p_params); -extern void avdt_msg_ind(AvdtpCcb* p_ccb, BT_HDR* p_buf); +bool avdt_msg_send(AvdtpCcb* p_ccb, BT_HDR* p_msg); +void avdt_msg_send_cmd(AvdtpCcb* p_ccb, void* p_scb, uint8_t sig_id, + tAVDT_MSG* p_params); +void avdt_msg_send_rsp(AvdtpCcb* p_ccb, uint8_t sig_id, tAVDT_MSG* p_params); +void avdt_msg_send_rej(AvdtpCcb* p_ccb, uint8_t sig_id, tAVDT_MSG* p_params); +void avdt_msg_send_grej(AvdtpCcb* p_ccb, uint8_t sig_id, tAVDT_MSG* p_params); +void avdt_msg_ind(AvdtpCcb* p_ccb, BT_HDR* p_buf); /* adaption layer function declarations */ -extern void avdt_ad_init(void); -extern uint8_t avdt_ad_type_to_tcid(uint8_t type, AvdtpScb* p_scb); -extern AvdtpTransportChannel* avdt_ad_tc_tbl_by_st(uint8_t type, - AvdtpCcb* p_ccb, - uint8_t state); -extern AvdtpTransportChannel* avdt_ad_tc_tbl_by_lcid(uint16_t lcid); -extern AvdtpTransportChannel* avdt_ad_tc_tbl_alloc(AvdtpCcb* p_ccb); -extern uint8_t avdt_ad_tc_tbl_to_idx(AvdtpTransportChannel* p_tbl); -extern void avdt_ad_tc_close_ind(AvdtpTransportChannel* p_tbl); -extern void avdt_ad_tc_open_ind(AvdtpTransportChannel* p_tbl); -extern void avdt_ad_tc_cong_ind(AvdtpTransportChannel* p_tbl, - bool is_congested); -extern void avdt_ad_tc_data_ind(AvdtpTransportChannel* p_tbl, BT_HDR* p_buf); -extern AvdtpTransportChannel* avdt_ad_tc_tbl_by_type(uint8_t type, - AvdtpCcb* p_ccb, - AvdtpScb* p_scb); -extern uint8_t avdt_ad_write_req(uint8_t type, AvdtpCcb* p_ccb, AvdtpScb* p_scb, - BT_HDR* p_buf); -extern void avdt_ad_open_req(uint8_t type, AvdtpCcb* p_ccb, AvdtpScb* p_scb, - uint8_t role); -extern void avdt_ad_close_req(uint8_t type, AvdtpCcb* p_ccb, AvdtpScb* p_scb); - -extern void avdt_ccb_idle_ccb_timer_timeout(void* data); -extern void avdt_ccb_ret_ccb_timer_timeout(void* data); -extern void avdt_ccb_rsp_ccb_timer_timeout(void* data); -extern void avdt_scb_transport_channel_timer_timeout(void* data); +void avdt_ad_init(void); +uint8_t avdt_ad_type_to_tcid(uint8_t type, AvdtpScb* p_scb); +AvdtpTransportChannel* avdt_ad_tc_tbl_by_st(uint8_t type, AvdtpCcb* p_ccb, + uint8_t state); +AvdtpTransportChannel* avdt_ad_tc_tbl_by_lcid(uint16_t lcid); +AvdtpTransportChannel* avdt_ad_tc_tbl_alloc(AvdtpCcb* p_ccb); +uint8_t avdt_ad_tc_tbl_to_idx(AvdtpTransportChannel* p_tbl); +void avdt_ad_tc_close_ind(AvdtpTransportChannel* p_tbl); +void avdt_ad_tc_open_ind(AvdtpTransportChannel* p_tbl); +void avdt_ad_tc_cong_ind(AvdtpTransportChannel* p_tbl, bool is_congested); +void avdt_ad_tc_data_ind(AvdtpTransportChannel* p_tbl, BT_HDR* p_buf); +AvdtpTransportChannel* avdt_ad_tc_tbl_by_type(uint8_t type, AvdtpCcb* p_ccb, + AvdtpScb* p_scb); +uint8_t avdt_ad_write_req(uint8_t type, AvdtpCcb* p_ccb, AvdtpScb* p_scb, + BT_HDR* p_buf); +void avdt_ad_open_req(uint8_t type, AvdtpCcb* p_ccb, AvdtpScb* p_scb, + uint8_t role); +void avdt_ad_close_req(uint8_t type, AvdtpCcb* p_ccb, AvdtpScb* p_scb); + +void avdt_ccb_idle_ccb_timer_timeout(void* data); +void avdt_ccb_ret_ccb_timer_timeout(void* data); +void avdt_ccb_rsp_ccb_timer_timeout(void* data); +void avdt_scb_transport_channel_timer_timeout(void* data); /***************************************************************************** * macros diff --git a/system/stack/avrc/avrc_int.h b/system/stack/avrc/avrc_int.h index bc3bf04d6b..fd30965f4c 100644 --- a/system/stack/avrc/avrc_int.h +++ b/system/stack/avrc/avrc_int.h @@ -159,14 +159,14 @@ typedef struct { ******************************************************************************/ extern tAVRC_CB avrc_cb; -extern bool avrc_is_valid_pdu_id(uint8_t pdu_id); -extern bool avrc_is_valid_player_attrib_value(uint8_t attrib, uint8_t value); -extern BT_HDR* avrc_alloc_ctrl_pkt(uint8_t pdu); -extern tAVRC_STS avrc_pars_pass_thru(tAVRC_MSG_PASS* p_msg, - uint16_t* p_vendor_unique_id); -extern uint8_t avrc_opcode_from_pdu(uint8_t pdu); -extern bool avrc_is_valid_opcode(uint8_t opcode); -extern void avrc_flush_cmd_q(uint8_t handle); +bool avrc_is_valid_pdu_id(uint8_t pdu_id); +bool avrc_is_valid_player_attrib_value(uint8_t attrib, uint8_t value); +BT_HDR* avrc_alloc_ctrl_pkt(uint8_t pdu); +tAVRC_STS avrc_pars_pass_thru(tAVRC_MSG_PASS* p_msg, + uint16_t* p_vendor_unique_id); +uint8_t avrc_opcode_from_pdu(uint8_t pdu); +bool avrc_is_valid_opcode(uint8_t opcode); +void avrc_flush_cmd_q(uint8_t handle); void avrc_start_cmd_timer(uint8_t handle, uint8_t label, uint8_t msg_mask); void avrc_send_next_vendor_cmd(uint8_t handle); diff --git a/system/stack/bnep/bnep_int.h b/system/stack/bnep/bnep_int.h index df32057523..4b70863258 100644 --- a/system/stack/bnep/bnep_int.h +++ b/system/stack/bnep/bnep_int.h @@ -164,52 +164,47 @@ extern tBNEP_CB bnep_cb; /* Functions provided by bnep_main.cc */ -extern tBNEP_RESULT bnep_register_with_l2cap(void); -extern void bnep_disconnect(tBNEP_CONN* p_bcb, uint16_t reason); -extern tBNEP_CONN* bnep_conn_originate(uint8_t* p_bd_addr); -extern void bnep_conn_timer_timeout(void* data); -extern void bnep_connected(tBNEP_CONN* p_bcb); +tBNEP_RESULT bnep_register_with_l2cap(void); +void bnep_disconnect(tBNEP_CONN* p_bcb, uint16_t reason); +tBNEP_CONN* bnep_conn_originate(uint8_t* p_bd_addr); +void bnep_conn_timer_timeout(void* data); +void bnep_connected(tBNEP_CONN* p_bcb); /* Functions provided by bnep_utils.cc */ -extern tBNEP_CONN* bnepu_find_bcb_by_cid(uint16_t cid); -extern tBNEP_CONN* bnepu_find_bcb_by_bd_addr(const RawAddress& p_bda); -extern tBNEP_CONN* bnepu_allocate_bcb(const RawAddress& p_rem_bda); -extern void bnepu_release_bcb(tBNEP_CONN* p_bcb); -extern void bnepu_send_peer_our_filters(tBNEP_CONN* p_bcb); -extern void bnepu_send_peer_our_multi_filters(tBNEP_CONN* p_bcb); -extern bool bnepu_does_dest_support_prot(tBNEP_CONN* p_bcb, uint16_t protocol); -extern void bnepu_build_bnep_hdr(tBNEP_CONN* p_bcb, BT_HDR* p_buf, - uint16_t protocol, - const RawAddress* p_src_addr, - const RawAddress* p_dest_addr, bool ext_bit); -extern void test_bnepu_build_bnep_hdr(tBNEP_CONN* p_bcb, BT_HDR* p_buf, - uint16_t protocol, uint8_t* p_src_addr, - uint8_t* p_dest_addr, uint8_t type); - -extern tBNEP_CONN* bnepu_get_route_to_dest(uint8_t* p_bda); -extern void bnepu_check_send_packet(tBNEP_CONN* p_bcb, BT_HDR* p_buf); -extern void bnep_send_command_not_understood(tBNEP_CONN* p_bcb, - uint8_t cmd_code); -extern void bnepu_process_peer_filter_set(tBNEP_CONN* p_bcb, uint8_t* p_filters, - uint16_t len); -extern void bnepu_process_peer_filter_rsp(tBNEP_CONN* p_bcb, uint8_t* p_data); -extern void bnepu_process_multicast_filter_rsp(tBNEP_CONN* p_bcb, - uint8_t* p_data); -extern void bnep_send_conn_req(tBNEP_CONN* p_bcb); -extern void bnep_send_conn_responce(tBNEP_CONN* p_bcb, uint16_t resp_code); -extern void bnep_process_setup_conn_req(tBNEP_CONN* p_bcb, uint8_t* p_setup, - uint8_t len); -extern void bnep_process_setup_conn_responce(tBNEP_CONN* p_bcb, - uint8_t* p_setup); -extern uint8_t* bnep_process_control_packet(tBNEP_CONN* p_bcb, uint8_t* p, - uint16_t* len, bool is_ext); -extern void bnep_sec_check_complete(const RawAddress* bd_addr, - tBT_TRANSPORT trasnport, void* p_ref_data); -extern tBNEP_RESULT bnep_is_packet_allowed(tBNEP_CONN* p_bcb, - const RawAddress& p_dest_addr, - uint16_t protocol, - bool fw_ext_present, uint8_t* p_data, - uint16_t org_len); +tBNEP_CONN* bnepu_find_bcb_by_cid(uint16_t cid); +tBNEP_CONN* bnepu_find_bcb_by_bd_addr(const RawAddress& p_bda); +tBNEP_CONN* bnepu_allocate_bcb(const RawAddress& p_rem_bda); +void bnepu_release_bcb(tBNEP_CONN* p_bcb); +void bnepu_send_peer_our_filters(tBNEP_CONN* p_bcb); +void bnepu_send_peer_our_multi_filters(tBNEP_CONN* p_bcb); +bool bnepu_does_dest_support_prot(tBNEP_CONN* p_bcb, uint16_t protocol); +void bnepu_build_bnep_hdr(tBNEP_CONN* p_bcb, BT_HDR* p_buf, uint16_t protocol, + const RawAddress* p_src_addr, + const RawAddress* p_dest_addr, bool ext_bit); +void test_bnepu_build_bnep_hdr(tBNEP_CONN* p_bcb, BT_HDR* p_buf, + uint16_t protocol, uint8_t* p_src_addr, + uint8_t* p_dest_addr, uint8_t type); + +tBNEP_CONN* bnepu_get_route_to_dest(uint8_t* p_bda); +void bnepu_check_send_packet(tBNEP_CONN* p_bcb, BT_HDR* p_buf); +void bnep_send_command_not_understood(tBNEP_CONN* p_bcb, uint8_t cmd_code); +void bnepu_process_peer_filter_set(tBNEP_CONN* p_bcb, uint8_t* p_filters, + uint16_t len); +void bnepu_process_peer_filter_rsp(tBNEP_CONN* p_bcb, uint8_t* p_data); +void bnepu_process_multicast_filter_rsp(tBNEP_CONN* p_bcb, uint8_t* p_data); +void bnep_send_conn_req(tBNEP_CONN* p_bcb); +void bnep_send_conn_responce(tBNEP_CONN* p_bcb, uint16_t resp_code); +void bnep_process_setup_conn_req(tBNEP_CONN* p_bcb, uint8_t* p_setup, + uint8_t len); +void bnep_process_setup_conn_responce(tBNEP_CONN* p_bcb, uint8_t* p_setup); +uint8_t* bnep_process_control_packet(tBNEP_CONN* p_bcb, uint8_t* p, + uint16_t* len, bool is_ext); +void bnep_sec_check_complete(const RawAddress* bd_addr, tBT_TRANSPORT trasnport, + void* p_ref_data); +tBNEP_RESULT bnep_is_packet_allowed(tBNEP_CONN* p_bcb, + const RawAddress& p_dest_addr, + uint16_t protocol, bool fw_ext_present, + uint8_t* p_data, uint16_t org_len); #endif diff --git a/system/stack/btm/ble_advertiser_hci_interface.cc b/system/stack/btm/ble_advertiser_hci_interface.cc index 6fa077f6a2..4c4c192283 100644 --- a/system/stack/btm/ble_advertiser_hci_interface.cc +++ b/system/stack/btm/ble_advertiser_hci_interface.cc @@ -49,9 +49,9 @@ using status_cb = BleAdvertiserHciInterface::status_cb; using hci_cmd_cb = base::OnceCallback<void( uint8_t* /* return_parameters */, uint16_t /* return_parameters_length*/)>; -extern void btu_hcif_send_cmd_with_cb(const base::Location& posted_from, - uint16_t opcode, uint8_t* params, - uint8_t params_len, hci_cmd_cb cb); +void btu_hcif_send_cmd_with_cb(const base::Location& posted_from, + uint16_t opcode, uint8_t* params, + uint8_t params_len, hci_cmd_cb cb); namespace { BleAdvertiserHciInterface* instance = nullptr; diff --git a/system/stack/btm/btm_ble.cc b/system/stack/btm/btm_ble.cc index 82326086a1..67821fbc0d 100644 --- a/system/stack/btm/btm_ble.cc +++ b/system/stack/btm/btm_ble.cc @@ -55,11 +55,10 @@ extern tBTM_CB btm_cb; -extern bool btm_ble_init_pseudo_addr(tBTM_SEC_DEV_REC* p_dev_rec, - const RawAddress& new_pseudo_addr); -extern void gatt_notify_phy_updated(tGATT_STATUS status, uint16_t handle, - uint8_t tx_phy, uint8_t rx_phy); - +bool btm_ble_init_pseudo_addr(tBTM_SEC_DEV_REC* p_dev_rec, + const RawAddress& new_pseudo_addr); +void gatt_notify_phy_updated(tGATT_STATUS status, uint16_t handle, + uint8_t tx_phy, uint8_t rx_phy); #ifndef PROPERTY_BLE_PRIVACY_ENABLED #define PROPERTY_BLE_PRIVACY_ENABLED "bluetooth.core.gap.le.privacy.enabled" diff --git a/system/stack/btm/btm_ble_bgconn.h b/system/stack/btm/btm_ble_bgconn.h index 47ed329678..2f2303f5c6 100644 --- a/system/stack/btm/btm_ble_bgconn.h +++ b/system/stack/btm/btm_ble_bgconn.h @@ -20,15 +20,15 @@ /** Adds the device into acceptlist. Returns false if acceptlist is full and * device can't be added, true otherwise. */ -extern bool BTM_AcceptlistAdd(const RawAddress& address); +bool BTM_AcceptlistAdd(const RawAddress& address); /** Adds the device into acceptlist and indicates whether to using direct * connect parameters. Returns false if acceptlist is full and device can't * be added, true otherwise. */ -extern bool BTM_AcceptlistAdd(const RawAddress& address, bool is_direct); +bool BTM_AcceptlistAdd(const RawAddress& address, bool is_direct); /** Removes the device from acceptlist */ -extern void BTM_AcceptlistRemove(const RawAddress& address); +void BTM_AcceptlistRemove(const RawAddress& address); /** Clear the acceptlist, end any pending acceptlist connections */ -extern void BTM_AcceptlistClear(); +void BTM_AcceptlistClear(); diff --git a/system/stack/btm/btm_ble_gap.cc b/system/stack/btm/btm_ble_gap.cc index 1078483180..8679c170b7 100644 --- a/system/stack/btm/btm_ble_gap.cc +++ b/system/stack/btm/btm_ble_gap.cc @@ -61,14 +61,14 @@ extern tBTM_CB btm_cb; -extern void btm_inq_remote_name_timer_timeout(void* data); -extern bool btm_ble_init_pseudo_addr(tBTM_SEC_DEV_REC* p_dev_rec, - const RawAddress& new_pseudo_addr); -extern bool btm_identity_addr_to_random_pseudo(RawAddress* bd_addr, - tBLE_ADDR_TYPE* p_addr_type, - bool refresh); -extern void btm_ble_batchscan_init(void); -extern void btm_ble_adv_filter_init(void); +void btm_inq_remote_name_timer_timeout(void* data); +bool btm_ble_init_pseudo_addr(tBTM_SEC_DEV_REC* p_dev_rec, + const RawAddress& new_pseudo_addr); +bool btm_identity_addr_to_random_pseudo(RawAddress* bd_addr, + tBLE_ADDR_TYPE* p_addr_type, + bool refresh); +void btm_ble_batchscan_init(void); +void btm_ble_adv_filter_init(void); extern const tBLE_BD_ADDR convert_to_address_with_type( const RawAddress& bd_addr, const tBTM_SEC_DEV_REC* p_dev_rec); diff --git a/system/stack/btm/btm_ble_int.h b/system/stack/btm/btm_ble_int.h index aa379650c2..788fad5ccd 100644 --- a/system/stack/btm/btm_ble_int.h +++ b/system/stack/btm/btm_ble_int.h @@ -35,104 +35,96 @@ #include "types/ble_address_with_type.h" #include "types/raw_address.h" -extern void btm_ble_process_periodic_adv_sync_est_evt(uint8_t len, - const uint8_t* p); -extern void btm_ble_process_periodic_adv_pkt(uint8_t len, const uint8_t* p); -extern void btm_ble_process_periodic_adv_sync_lost_evt(uint8_t len, uint8_t* p); -extern void btm_send_hci_set_scan_params(uint8_t scan_type, uint16_t scan_int, - uint16_t scan_win, - tBLE_ADDR_TYPE addr_type_own, - uint8_t scan_filter_policy); - -extern void btm_ble_init(void); -extern void btm_ble_free(); -extern void btm_ble_connected(const RawAddress& bda, uint16_t handle, - uint8_t enc_mode, uint8_t role, - tBLE_ADDR_TYPE addr_type, bool addr_matched, - bool can_read_discoverable_characteristics); +void btm_ble_process_periodic_adv_sync_est_evt(uint8_t len, const uint8_t* p); +void btm_ble_process_periodic_adv_pkt(uint8_t len, const uint8_t* p); +void btm_ble_process_periodic_adv_sync_lost_evt(uint8_t len, uint8_t* p); +void btm_send_hci_set_scan_params(uint8_t scan_type, uint16_t scan_int, + uint16_t scan_win, + tBLE_ADDR_TYPE addr_type_own, + uint8_t scan_filter_policy); + +void btm_ble_init(void); +void btm_ble_free(); +void btm_ble_connected(const RawAddress& bda, uint16_t handle, uint8_t enc_mode, + uint8_t role, tBLE_ADDR_TYPE addr_type, + bool addr_matched, + bool can_read_discoverable_characteristics); /* LE security function from btm_sec.cc */ -extern void btm_ble_link_sec_check(const RawAddress& bd_addr, - tBTM_LE_AUTH_REQ auth_req, - tBTM_BLE_SEC_REQ_ACT* p_sec_req_act); -extern void btm_ble_ltk_request_reply(const RawAddress& bda, bool use_stk, - const Octet16& stk); -extern tBTM_STATUS btm_proc_smp_cback(tSMP_EVT event, const RawAddress& bd_addr, - const tSMP_EVT_DATA* p_data); -extern tBTM_STATUS btm_ble_set_encryption(const RawAddress& bd_addr, - tBTM_BLE_SEC_ACT sec_act, - uint8_t link_role); -extern tBTM_STATUS btm_ble_start_encrypt(const RawAddress& bda, bool use_stk, - Octet16* p_stk); -extern void btm_ble_link_encrypted(const RawAddress& bd_addr, - uint8_t encr_enable); +void btm_ble_link_sec_check(const RawAddress& bd_addr, + tBTM_LE_AUTH_REQ auth_req, + tBTM_BLE_SEC_REQ_ACT* p_sec_req_act); +void btm_ble_ltk_request_reply(const RawAddress& bda, bool use_stk, + const Octet16& stk); +tBTM_STATUS btm_proc_smp_cback(tSMP_EVT event, const RawAddress& bd_addr, + const tSMP_EVT_DATA* p_data); +tBTM_STATUS btm_ble_set_encryption(const RawAddress& bd_addr, + tBTM_BLE_SEC_ACT sec_act, uint8_t link_role); +tBTM_STATUS btm_ble_start_encrypt(const RawAddress& bda, bool use_stk, + Octet16* p_stk); +void btm_ble_link_encrypted(const RawAddress& bd_addr, uint8_t encr_enable); /* LE device management functions */ -extern void btm_ble_reset_id(void); +void btm_ble_reset_id(void); -extern bool btm_get_local_div(const RawAddress& bd_addr, uint16_t* p_div); -extern bool btm_ble_get_enc_key_type(const RawAddress& bd_addr, - uint8_t* p_key_types); +bool btm_get_local_div(const RawAddress& bd_addr, uint16_t* p_div); +bool btm_ble_get_enc_key_type(const RawAddress& bd_addr, uint8_t* p_key_types); -extern void btm_sec_save_le_key(const RawAddress& bd_addr, - tBTM_LE_KEY_TYPE key_type, - tBTM_LE_KEY_VALUE* p_keys, - bool pass_to_application); -extern void btm_ble_update_sec_key_size(const RawAddress& bd_addr, - uint8_t enc_key_size); -extern uint8_t btm_ble_read_sec_key_size(const RawAddress& bd_addr); +void btm_sec_save_le_key(const RawAddress& bd_addr, tBTM_LE_KEY_TYPE key_type, + tBTM_LE_KEY_VALUE* p_keys, bool pass_to_application); +void btm_ble_update_sec_key_size(const RawAddress& bd_addr, + uint8_t enc_key_size); +uint8_t btm_ble_read_sec_key_size(const RawAddress& bd_addr); /* acceptlist function */ -extern void btm_update_scanner_filter_policy(tBTM_BLE_SFP scan_policy); +void btm_update_scanner_filter_policy(tBTM_BLE_SFP scan_policy); /* background connection function */ -extern bool btm_ble_suspend_bg_conn(void); -extern bool btm_ble_resume_bg_conn(void); -extern void btm_ble_update_mode_operation(uint8_t link_role, - const RawAddress* bda, - tHCI_STATUS status); +bool btm_ble_suspend_bg_conn(void); +bool btm_ble_resume_bg_conn(void); +void btm_ble_update_mode_operation(uint8_t link_role, const RawAddress* bda, + tHCI_STATUS status); /* BLE address management */ -extern void btm_gen_resolvable_private_addr( +void btm_gen_resolvable_private_addr( base::Callback<void(const RawAddress& rpa)> cb); -extern tBTM_SEC_DEV_REC* btm_ble_resolve_random_addr( - const RawAddress& random_bda); -extern void btm_gen_resolve_paddr_low(const RawAddress& address); -extern uint64_t btm_get_next_private_addrress_interval_ms(); +tBTM_SEC_DEV_REC* btm_ble_resolve_random_addr(const RawAddress& random_bda); +void btm_gen_resolve_paddr_low(const RawAddress& address); +uint64_t btm_get_next_private_addrress_interval_ms(); /* privacy function */ /* BLE address mapping with CS feature */ -extern bool btm_random_pseudo_to_identity_addr( - RawAddress* random_pseudo, tBLE_ADDR_TYPE* p_identity_addr_type); -extern void btm_ble_refresh_peer_resolvable_private_addr( +bool btm_random_pseudo_to_identity_addr(RawAddress* random_pseudo, + tBLE_ADDR_TYPE* p_identity_addr_type); +void btm_ble_refresh_peer_resolvable_private_addr( const RawAddress& pseudo_bda, const RawAddress& rra, tBTM_SEC_BLE::tADDRESS_TYPE type); -extern bool btm_ble_read_resolving_list_entry(tBTM_SEC_DEV_REC* p_dev_rec); +bool btm_ble_read_resolving_list_entry(tBTM_SEC_DEV_REC* p_dev_rec); -extern bool btm_ble_addr_resolvable(const RawAddress& rpa, - tBTM_SEC_DEV_REC* p_dev_rec); +bool btm_ble_addr_resolvable(const RawAddress& rpa, + tBTM_SEC_DEV_REC* p_dev_rec); -extern void btm_ble_resolving_list_load_dev(tBTM_SEC_DEV_REC& p_dev_rec); -extern void btm_ble_resolving_list_remove_dev(tBTM_SEC_DEV_REC* p_dev_rec); -extern void btm_ble_resolving_list_init(uint8_t max_irk_list_sz); +void btm_ble_resolving_list_load_dev(tBTM_SEC_DEV_REC& p_dev_rec); +void btm_ble_resolving_list_remove_dev(tBTM_SEC_DEV_REC* p_dev_rec); +void btm_ble_resolving_list_init(uint8_t max_irk_list_sz); -extern void btm_ble_adv_init(void); -extern void btm_ble_multi_adv_cleanup(void); -extern void btm_ble_batchscan_init(void); -extern void btm_ble_adv_filter_init(void); -extern bool btm_ble_topology_check(tBTM_BLE_STATE_MASK request); -extern bool btm_ble_clear_topology_mask(tBTM_BLE_STATE_MASK request_state); -extern bool btm_ble_set_topology_mask(tBTM_BLE_STATE_MASK request_state); +void btm_ble_adv_init(void); +void btm_ble_multi_adv_cleanup(void); +void btm_ble_batchscan_init(void); +void btm_ble_adv_filter_init(void); +bool btm_ble_topology_check(tBTM_BLE_STATE_MASK request); +bool btm_ble_clear_topology_mask(tBTM_BLE_STATE_MASK request_state); +bool btm_ble_set_topology_mask(tBTM_BLE_STATE_MASK request_state); -extern void btm_ble_scanner_init(void); -extern void btm_ble_scanner_cleanup(void); +void btm_ble_scanner_init(void); +void btm_ble_scanner_cleanup(void); #if (BTM_BLE_CONFORMANCE_TESTING == TRUE) -extern void btm_ble_set_no_disc_if_pair_fail(bool disble_disc); -extern void btm_ble_set_test_mac_value(bool enable, uint8_t* p_test_mac_val); -extern void btm_ble_set_test_local_sign_cntr_value( - bool enable, uint32_t test_local_sign_cntr); -extern void btm_ble_set_keep_rfu_in_auth_req(bool keep_rfu); +void btm_ble_set_no_disc_if_pair_fail(bool disble_disc); +void btm_ble_set_test_mac_value(bool enable, uint8_t* p_test_mac_val); +void btm_ble_set_test_local_sign_cntr_value(bool enable, + uint32_t test_local_sign_cntr); +void btm_ble_set_keep_rfu_in_auth_req(bool keep_rfu); #endif #endif diff --git a/system/stack/btm/btm_ble_multi_adv.cc b/system/stack/btm/btm_ble_multi_adv.cc index 1a1efd25b6..09354421fe 100644 --- a/system/stack/btm/btm_ble_multi_adv.cc +++ b/system/stack/btm/btm_ble_multi_adv.cc @@ -46,7 +46,7 @@ using RegisterCb = using IdTxPowerStatusCb = base::Callback<void( uint8_t /* inst_id */, int8_t /* tx_power */, uint8_t /* status */)>; using SetEnableData = BleAdvertiserHciInterface::SetEnableData; -extern void btm_gen_resolvable_private_addr( +void btm_gen_resolvable_private_addr( base::Callback<void(const RawAddress& rpa)> cb); constexpr int ADV_DATA_LEN_MAX = 251; diff --git a/system/stack/btm/btm_dev.cc b/system/stack/btm/btm_dev.cc index 790e369e75..5311c2187a 100644 --- a/system/stack/btm/btm_dev.cc +++ b/system/stack/btm/btm_dev.cc @@ -44,8 +44,7 @@ #include "types/raw_address.h" extern tBTM_CB btm_cb; -extern void gatt_consolidate(const RawAddress& identity_addr, - const RawAddress& rpa); +void gatt_consolidate(const RawAddress& identity_addr, const RawAddress& rpa); namespace { @@ -147,7 +146,7 @@ void wipe_secrets_and_remove(tBTM_SEC_DEV_REC* p_dev_rec) { } /** Removes the device from acceptlist */ -extern void BTM_AcceptlistRemove(const RawAddress& address); +void BTM_AcceptlistRemove(const RawAddress& address); /** Free resources associated with the device associated with |bd_addr| address. * diff --git a/system/stack/btm/btm_devctl.cc b/system/stack/btm/btm_devctl.cc index cdf80ce515..217c11e1d1 100644 --- a/system/stack/btm/btm_devctl.cc +++ b/system/stack/btm/btm_devctl.cc @@ -51,8 +51,8 @@ extern tBTM_CB btm_cb; -extern void btm_inq_db_reset(void); -extern void btm_pm_reset(void); +void btm_inq_db_reset(void); +void btm_pm_reset(void); /******************************************************************************/ /* L O C A L D A T A D E F I N I T I O N S */ /******************************************************************************/ diff --git a/system/stack/btm/btm_inq.cc b/system/stack/btm/btm_inq.cc index 372067b41d..acd18b4688 100644 --- a/system/stack/btm/btm_inq.cc +++ b/system/stack/btm/btm_inq.cc @@ -72,15 +72,15 @@ void btm_log_history_scan_mode(uint8_t scan_mode) { extern tBTM_CB btm_cb; -extern void btm_inq_remote_name_timer_timeout(void* data); -extern tBTM_STATUS btm_ble_read_remote_name(const RawAddress& remote_bda, - tBTM_NAME_CMPL_CB* p_cb); -extern bool btm_ble_cancel_remote_name(const RawAddress& remote_bda); -extern tBTM_STATUS btm_ble_set_discoverability(uint16_t combined_mode); -extern tBTM_STATUS btm_ble_set_connectability(uint16_t combined_mode); - -extern tBTM_STATUS btm_ble_start_inquiry(uint8_t duration); -extern void btm_ble_stop_inquiry(void); +void btm_inq_remote_name_timer_timeout(void* data); +tBTM_STATUS btm_ble_read_remote_name(const RawAddress& remote_bda, + tBTM_NAME_CMPL_CB* p_cb); +bool btm_ble_cancel_remote_name(const RawAddress& remote_bda); +tBTM_STATUS btm_ble_set_discoverability(uint16_t combined_mode); +tBTM_STATUS btm_ble_set_connectability(uint16_t combined_mode); + +tBTM_STATUS btm_ble_start_inquiry(uint8_t duration); +void btm_ble_stop_inquiry(void); using bluetooth::Uuid; diff --git a/system/stack/btm/btm_sco.h b/system/stack/btm/btm_sco.h index d0c20ae0a8..c4e286c279 100644 --- a/system/stack/btm/btm_sco.h +++ b/system/stack/btm/btm_sco.h @@ -225,8 +225,8 @@ typedef struct { } tSCO_CB; -extern void btm_sco_chk_pend_rolechange(uint16_t hci_handle); -extern void btm_sco_disc_chk_pend_for_modechange(uint16_t hci_handle); +void btm_sco_chk_pend_rolechange(uint16_t hci_handle); +void btm_sco_disc_chk_pend_for_modechange(uint16_t hci_handle); /* Visible for test only */ BT_HDR* btm_sco_make_packet(std::vector<uint8_t> data, uint16_t sco_handle); diff --git a/system/stack/btm/btm_sec.cc b/system/stack/btm/btm_sec.cc index 71ce914394..ec71dac5d1 100644 --- a/system/stack/btm/btm_sec.cc +++ b/system/stack/btm/btm_sec.cc @@ -77,14 +77,14 @@ extern tBTM_CB btm_cb; BTM_SEC_LE_LINK_KEY_KNOWN | BTM_SEC_LE_LINK_KEY_AUTHED) void btm_inq_stop_on_ssp(void); -extern void btm_ble_advertiser_notify_terminated_legacy( - uint8_t status, uint16_t connection_handle); -extern bool btm_ble_init_pseudo_addr(tBTM_SEC_DEV_REC* p_dev_rec, - const RawAddress& new_pseudo_addr); -extern void bta_dm_remove_device(const RawAddress& bd_addr); -extern void bta_dm_process_remove_device(const RawAddress& bd_addr); -extern void btm_inq_clear_ssp(void); -extern void HACK_acl_check_sm4(tBTM_SEC_DEV_REC& p_dev_rec); +void btm_ble_advertiser_notify_terminated_legacy(uint8_t status, + uint16_t connection_handle); +bool btm_ble_init_pseudo_addr(tBTM_SEC_DEV_REC* p_dev_rec, + const RawAddress& new_pseudo_addr); +void bta_dm_remove_device(const RawAddress& bd_addr); +void bta_dm_process_remove_device(const RawAddress& bd_addr); +void btm_inq_clear_ssp(void); +void HACK_acl_check_sm4(tBTM_SEC_DEV_REC& p_dev_rec); /******************************************************************************* * L O C A L F U N C T I O N P R O T O T Y P E S * diff --git a/system/stack/btm/neighbor_inquiry.h b/system/stack/btm/neighbor_inquiry.h index a1828df293..d92e3f5c73 100644 --- a/system/stack/btm/neighbor_inquiry.h +++ b/system/stack/btm/neighbor_inquiry.h @@ -267,5 +267,5 @@ typedef union /* contains the inquiry filter condition */ #define BTM_INQ_RESULT_BR 0x01 #define BTM_INQ_RESULT_BLE 0x02 -extern bool btm_inq_find_bdaddr(const RawAddress& p_bda); -extern tINQ_DB_ENT* btm_inq_db_find(const RawAddress& p_bda); +bool btm_inq_find_bdaddr(const RawAddress& p_bda); +tINQ_DB_ENT* btm_inq_db_find(const RawAddress& p_bda); diff --git a/system/stack/crypto_toolbox/crypto_toolbox.h b/system/stack/crypto_toolbox/crypto_toolbox.h index 24b01586be..08a3b9015b 100644 --- a/system/stack/crypto_toolbox/crypto_toolbox.h +++ b/system/stack/crypto_toolbox/crypto_toolbox.h @@ -23,21 +23,19 @@ namespace crypto_toolbox { -extern Octet16 aes_128(const Octet16& key, const Octet16& message); -extern Octet16 aes_cmac(const Octet16& key, const uint8_t* message, - uint16_t length); -extern Octet16 f4(const uint8_t* u, const uint8_t* v, const Octet16& x, - uint8_t z); -extern void f5(const uint8_t* w, const Octet16& n1, const Octet16& n2, - uint8_t* a1, uint8_t* a2, Octet16* mac_key, Octet16* ltk); -extern Octet16 f6(const Octet16& w, const Octet16& n1, const Octet16& n2, - const Octet16& r, uint8_t* iocap, uint8_t* a1, uint8_t* a2); -extern Octet16 h6(const Octet16& w, std::array<uint8_t, 4> keyid); -extern Octet16 h7(const Octet16& salt, const Octet16& w); -extern uint32_t g2(const uint8_t* u, const uint8_t* v, const Octet16& x, - const Octet16& y); -extern Octet16 ltk_to_link_key(const Octet16& ltk, bool use_h7); -extern Octet16 link_key_to_ltk(const Octet16& link_key, bool use_h7); +Octet16 aes_128(const Octet16& key, const Octet16& message); +Octet16 aes_cmac(const Octet16& key, const uint8_t* message, uint16_t length); +Octet16 f4(const uint8_t* u, const uint8_t* v, const Octet16& x, uint8_t z); +void f5(const uint8_t* w, const Octet16& n1, const Octet16& n2, uint8_t* a1, + uint8_t* a2, Octet16* mac_key, Octet16* ltk); +Octet16 f6(const Octet16& w, const Octet16& n1, const Octet16& n2, + const Octet16& r, uint8_t* iocap, uint8_t* a1, uint8_t* a2); +Octet16 h6(const Octet16& w, std::array<uint8_t, 4> keyid); +Octet16 h7(const Octet16& salt, const Octet16& w); +uint32_t g2(const uint8_t* u, const uint8_t* v, const Octet16& x, + const Octet16& y); +Octet16 ltk_to_link_key(const Octet16& ltk, bool use_h7); +Octet16 link_key_to_ltk(const Octet16& link_key, bool use_h7); /* This function computes AES_128(key, message). |key| must be 128bit. * |message| can be at most 16 bytes long, it's length in bytes is given in diff --git a/system/stack/gap/gap_conn.cc b/system/stack/gap/gap_conn.cc index 7d1dca8fea..1fa3f6a17d 100644 --- a/system/stack/gap/gap_conn.cc +++ b/system/stack/gap/gap_conn.cc @@ -103,7 +103,7 @@ static tGAP_CCB* gap_allocate_ccb(void); static void gap_release_ccb(tGAP_CCB* p_ccb); static void gap_checks_con_flags(tGAP_CCB* p_ccb); -extern bool BTM_UseLeLink(const RawAddress& bd_addr); +bool BTM_UseLeLink(const RawAddress& bd_addr); /******************************************************************************* * @@ -1016,7 +1016,7 @@ static void gap_release_ccb(tGAP_CCB* p_ccb) { if (p_ccb->transport == BT_TRANSPORT_LE) L2CA_DeregisterLECoc(p_ccb->psm); } -extern void gap_attr_db_init(void); +void gap_attr_db_init(void); /* * This routine should not be called except once per stack invocation. diff --git a/system/stack/gatt/connection_manager.h b/system/stack/gatt/connection_manager.h index 0c407c834a..0af1679f8e 100644 --- a/system/stack/gatt/connection_manager.h +++ b/system/stack/gatt/connection_manager.h @@ -37,30 +37,29 @@ namespace connection_manager { using tAPP_ID = uint8_t; /* for background connection */ -extern bool background_connect_targeted_announcement_add( - tAPP_ID app_id, const RawAddress& address); -extern bool background_connect_add(tAPP_ID app_id, const RawAddress& address); -extern bool background_connect_remove(tAPP_ID app_id, - const RawAddress& address); -extern bool remove_unconditional(const RawAddress& address); +bool background_connect_targeted_announcement_add(tAPP_ID app_id, + const RawAddress& address); +bool background_connect_add(tAPP_ID app_id, const RawAddress& address); +bool background_connect_remove(tAPP_ID app_id, const RawAddress& address); +bool remove_unconditional(const RawAddress& address); -extern void reset(bool after_reset); +void reset(bool after_reset); -extern void on_app_deregistered(tAPP_ID app_id); -extern void on_connection_complete(const RawAddress& address); +void on_app_deregistered(tAPP_ID app_id); +void on_connection_complete(const RawAddress& address); -extern std::set<tAPP_ID> get_apps_connecting_to(const RawAddress& remote_bda); +std::set<tAPP_ID> get_apps_connecting_to(const RawAddress& remote_bda); -extern bool direct_connect_add(tAPP_ID app_id, const RawAddress& address); -extern bool direct_connect_remove(tAPP_ID app_id, const RawAddress& address); +bool direct_connect_add(tAPP_ID app_id, const RawAddress& address); +bool direct_connect_remove(tAPP_ID app_id, const RawAddress& address); -extern void dump(int fd); +void dump(int fd); /* This callback will be executed when direct connect attempt fails due to * timeout. It must be implemented by users of connection_manager */ -extern void on_connection_timed_out(uint8_t app_id, const RawAddress& address); -extern void on_connection_timed_out_from_shim(const RawAddress& address); +void on_connection_timed_out(uint8_t app_id, const RawAddress& address); +void on_connection_timed_out_from_shim(const RawAddress& address); -extern bool is_background_connection(const RawAddress& address); +bool is_background_connection(const RawAddress& address); } // namespace connection_manager diff --git a/system/stack/gatt/gatt_api.cc b/system/stack/gatt/gatt_api.cc index 4c7f5721a7..9549cff039 100644 --- a/system/stack/gatt/gatt_api.cc +++ b/system/stack/gatt/gatt_api.cc @@ -50,7 +50,7 @@ using bluetooth::Uuid; -extern bool BTM_BackgroundConnectAddressKnown(const RawAddress& address); +bool BTM_BackgroundConnectAddressKnown(const RawAddress& address); /** * Add an service handle range to the list in decending order of the start * handle. Return reference to the newly added element. diff --git a/system/stack/gatt/gatt_int.h b/system/stack/gatt/gatt_int.h index 7d131a90a6..e88942e6ac 100644 --- a/system/stack/gatt/gatt_int.h +++ b/system/stack/gatt/gatt_int.h @@ -466,246 +466,231 @@ typedef struct { extern tGATT_CB gatt_cb; #if (GATT_CONFORMANCE_TESTING == TRUE) -extern void gatt_set_err_rsp(bool enable, uint8_t req_op_code, - uint8_t err_status); +void gatt_set_err_rsp(bool enable, uint8_t req_op_code, uint8_t err_status); #endif /* from gatt_main.cc */ -extern bool gatt_disconnect(tGATT_TCB* p_tcb); -extern bool gatt_act_connect(tGATT_REG* p_reg, const RawAddress& bd_addr, - tBT_TRANSPORT transport, int8_t initiating_phys); -extern bool gatt_act_connect(tGATT_REG* p_reg, const RawAddress& bd_addr, - tBLE_ADDR_TYPE addr_type, tBT_TRANSPORT transport, - int8_t initiating_phys); -extern bool gatt_connect(const RawAddress& rem_bda, tGATT_TCB* p_tcb, - tBT_TRANSPORT transport, uint8_t initiating_phys, - tGATT_IF gatt_if); -extern bool gatt_connect(const RawAddress& rem_bda, tGATT_TCB* p_tcb, - tBLE_ADDR_TYPE addr_type, tBT_TRANSPORT transport, - uint8_t initiating_phys, tGATT_IF gatt_if); -extern void gatt_data_process(tGATT_TCB& p_tcb, uint16_t cid, BT_HDR* p_buf); -extern void gatt_update_app_use_link_flag(tGATT_IF gatt_if, tGATT_TCB* p_tcb, - bool is_add, bool check_acl_link); - -extern void gatt_profile_db_init(void); -extern void gatt_set_ch_state(tGATT_TCB* p_tcb, tGATT_CH_STATE ch_state); -extern tGATT_CH_STATE gatt_get_ch_state(tGATT_TCB* p_tcb); -extern void gatt_init_srv_chg(void); -extern void gatt_proc_srv_chg(void); -extern void gatt_send_srv_chg_ind(const RawAddress& peer_bda); -extern void gatt_chk_srv_chg(tGATTS_SRV_CHG* p_srv_chg_clt); -extern void gatt_add_a_bonded_dev_for_srv_chg(const RawAddress& bda); +bool gatt_disconnect(tGATT_TCB* p_tcb); +bool gatt_act_connect(tGATT_REG* p_reg, const RawAddress& bd_addr, + tBT_TRANSPORT transport, int8_t initiating_phys); +bool gatt_act_connect(tGATT_REG* p_reg, const RawAddress& bd_addr, + tBLE_ADDR_TYPE addr_type, tBT_TRANSPORT transport, + int8_t initiating_phys); +bool gatt_connect(const RawAddress& rem_bda, tGATT_TCB* p_tcb, + tBT_TRANSPORT transport, uint8_t initiating_phys, + tGATT_IF gatt_if); +bool gatt_connect(const RawAddress& rem_bda, tGATT_TCB* p_tcb, + tBLE_ADDR_TYPE addr_type, tBT_TRANSPORT transport, + uint8_t initiating_phys, tGATT_IF gatt_if); +void gatt_data_process(tGATT_TCB& p_tcb, uint16_t cid, BT_HDR* p_buf); +void gatt_update_app_use_link_flag(tGATT_IF gatt_if, tGATT_TCB* p_tcb, + bool is_add, bool check_acl_link); + +void gatt_profile_db_init(void); +void gatt_set_ch_state(tGATT_TCB* p_tcb, tGATT_CH_STATE ch_state); +tGATT_CH_STATE gatt_get_ch_state(tGATT_TCB* p_tcb); +void gatt_init_srv_chg(void); +void gatt_proc_srv_chg(void); +void gatt_send_srv_chg_ind(const RawAddress& peer_bda); +void gatt_chk_srv_chg(tGATTS_SRV_CHG* p_srv_chg_clt); +void gatt_add_a_bonded_dev_for_srv_chg(const RawAddress& bda); /* from gatt_attr.cc */ -extern uint16_t gatt_profile_find_conn_id_by_bd_addr(const RawAddress& bda); +uint16_t gatt_profile_find_conn_id_by_bd_addr(const RawAddress& bda); -extern bool gatt_profile_get_eatt_support(const RawAddress& remote_bda); -extern void gatt_cl_init_sr_status(tGATT_TCB& tcb); -extern bool gatt_cl_read_sr_supp_feat_req( +bool gatt_profile_get_eatt_support(const RawAddress& remote_bda); +void gatt_cl_init_sr_status(tGATT_TCB& tcb); +bool gatt_cl_read_sr_supp_feat_req( const RawAddress& peer_bda, base::OnceCallback<void(const RawAddress&, uint8_t)> cb); -extern bool gatt_sr_is_cl_multi_variable_len_notif_supported(tGATT_TCB& tcb); +bool gatt_sr_is_cl_multi_variable_len_notif_supported(tGATT_TCB& tcb); -extern bool gatt_sr_is_cl_change_aware(tGATT_TCB& tcb); -extern void gatt_sr_init_cl_status(tGATT_TCB& tcb); -extern void gatt_sr_update_cl_status(tGATT_TCB& tcb, bool chg_aware); +bool gatt_sr_is_cl_change_aware(tGATT_TCB& tcb); +void gatt_sr_init_cl_status(tGATT_TCB& tcb); +void gatt_sr_update_cl_status(tGATT_TCB& tcb, bool chg_aware); /* Functions provided by att_protocol.cc */ -extern tGATT_STATUS attp_send_cl_confirmation_msg(tGATT_TCB& tcb, uint16_t cid); -extern tGATT_STATUS attp_send_cl_msg(tGATT_TCB& tcb, tGATT_CLCB* p_clcb, - uint8_t op_code, tGATT_CL_MSG* p_msg); -extern BT_HDR* attp_build_sr_msg(tGATT_TCB& tcb, uint8_t op_code, - tGATT_SR_MSG* p_msg, uint16_t payload_size); -extern tGATT_STATUS attp_send_sr_msg(tGATT_TCB& tcb, uint16_t cid, - BT_HDR* p_msg); -extern tGATT_STATUS attp_send_msg_to_l2cap(tGATT_TCB& tcb, uint16_t cid, - BT_HDR* p_toL2CAP); +tGATT_STATUS attp_send_cl_confirmation_msg(tGATT_TCB& tcb, uint16_t cid); +tGATT_STATUS attp_send_cl_msg(tGATT_TCB& tcb, tGATT_CLCB* p_clcb, + uint8_t op_code, tGATT_CL_MSG* p_msg); +BT_HDR* attp_build_sr_msg(tGATT_TCB& tcb, uint8_t op_code, tGATT_SR_MSG* p_msg, + uint16_t payload_size); +tGATT_STATUS attp_send_sr_msg(tGATT_TCB& tcb, uint16_t cid, BT_HDR* p_msg); +tGATT_STATUS attp_send_msg_to_l2cap(tGATT_TCB& tcb, uint16_t cid, + BT_HDR* p_toL2CAP); /* utility functions */ -extern uint8_t* gatt_dbg_op_name(uint8_t op_code); -extern uint32_t gatt_add_sdp_record(const bluetooth::Uuid& uuid, - uint16_t start_hdl, uint16_t end_hdl); -extern bool gatt_parse_uuid_from_cmd(bluetooth::Uuid* p_uuid, uint16_t len, - uint8_t** p_data); -extern uint8_t gatt_build_uuid_to_stream_len(const bluetooth::Uuid& uuid); -extern uint8_t gatt_build_uuid_to_stream(uint8_t** p_dst, - const bluetooth::Uuid& uuid); -extern void gatt_sr_get_sec_info(const RawAddress& rem_bda, - tBT_TRANSPORT transport, - tGATT_SEC_FLAG* p_sec_flag, - uint8_t* p_key_size); -extern void gatt_start_rsp_timer(tGATT_CLCB* p_clcb); -extern void gatt_stop_rsp_timer(tGATT_CLCB* p_clcb); -extern void gatt_start_conf_timer(tGATT_TCB* p_tcb, uint16_t cid); -extern void gatt_stop_conf_timer(tGATT_TCB& tcb, uint16_t cid); -extern void gatt_rsp_timeout(void* data); -extern void gatt_indication_confirmation_timeout(void* data); -extern void gatt_ind_ack_timeout(void* data); -extern void gatt_start_ind_ack_timer(tGATT_TCB& tcb, uint16_t cid); -extern void gatt_stop_ind_ack_timer(tGATT_TCB* p_tcb, uint16_t cid); -extern tGATT_STATUS gatt_send_error_rsp(tGATT_TCB& tcb, uint16_t cid, - uint8_t err_code, uint8_t op_code, - uint16_t handle, bool deq); - -extern bool gatt_is_srv_chg_ind_pending(tGATT_TCB* p_tcb); -extern tGATTS_SRV_CHG* gatt_is_bda_in_the_srv_chg_clt_list( - const RawAddress& bda); - -extern bool gatt_find_the_connected_bda(uint8_t start_idx, RawAddress& bda, - uint8_t* p_found_idx, - tBT_TRANSPORT* p_transport); -extern void gatt_set_srv_chg(void); -extern void gatt_delete_dev_from_srv_chg_clt_list(const RawAddress& bd_addr); -extern void gatt_add_pending_ind(tGATT_TCB* p_tcb, tGATT_VALUE* p_ind); -extern void gatt_free_srvc_db_buffer_app_id(const bluetooth::Uuid& app_id); -extern bool gatt_cl_send_next_cmd_inq(tGATT_TCB& tcb); +uint8_t* gatt_dbg_op_name(uint8_t op_code); +uint32_t gatt_add_sdp_record(const bluetooth::Uuid& uuid, uint16_t start_hdl, + uint16_t end_hdl); +bool gatt_parse_uuid_from_cmd(bluetooth::Uuid* p_uuid, uint16_t len, + uint8_t** p_data); +uint8_t gatt_build_uuid_to_stream_len(const bluetooth::Uuid& uuid); +uint8_t gatt_build_uuid_to_stream(uint8_t** p_dst, const bluetooth::Uuid& uuid); +void gatt_sr_get_sec_info(const RawAddress& rem_bda, tBT_TRANSPORT transport, + tGATT_SEC_FLAG* p_sec_flag, uint8_t* p_key_size); +void gatt_start_rsp_timer(tGATT_CLCB* p_clcb); +void gatt_stop_rsp_timer(tGATT_CLCB* p_clcb); +void gatt_start_conf_timer(tGATT_TCB* p_tcb, uint16_t cid); +void gatt_stop_conf_timer(tGATT_TCB& tcb, uint16_t cid); +void gatt_rsp_timeout(void* data); +void gatt_indication_confirmation_timeout(void* data); +void gatt_ind_ack_timeout(void* data); +void gatt_start_ind_ack_timer(tGATT_TCB& tcb, uint16_t cid); +void gatt_stop_ind_ack_timer(tGATT_TCB* p_tcb, uint16_t cid); +tGATT_STATUS gatt_send_error_rsp(tGATT_TCB& tcb, uint16_t cid, uint8_t err_code, + uint8_t op_code, uint16_t handle, bool deq); + +bool gatt_is_srv_chg_ind_pending(tGATT_TCB* p_tcb); +tGATTS_SRV_CHG* gatt_is_bda_in_the_srv_chg_clt_list(const RawAddress& bda); + +bool gatt_find_the_connected_bda(uint8_t start_idx, RawAddress& bda, + uint8_t* p_found_idx, + tBT_TRANSPORT* p_transport); +void gatt_set_srv_chg(void); +void gatt_delete_dev_from_srv_chg_clt_list(const RawAddress& bd_addr); +void gatt_add_pending_ind(tGATT_TCB* p_tcb, tGATT_VALUE* p_ind); +void gatt_free_srvc_db_buffer_app_id(const bluetooth::Uuid& app_id); +bool gatt_cl_send_next_cmd_inq(tGATT_TCB& tcb); /* reserved handle list */ -extern std::list<tGATT_HDL_LIST_ELEM>::iterator gatt_find_hdl_buffer_by_app_id( +std::list<tGATT_HDL_LIST_ELEM>::iterator gatt_find_hdl_buffer_by_app_id( const bluetooth::Uuid& app_uuid128, bluetooth::Uuid* p_svc_uuid, uint16_t svc_inst); -extern tGATT_HDL_LIST_ELEM* gatt_find_hdl_buffer_by_handle(uint16_t handle); -extern tGATTS_SRV_CHG* gatt_add_srv_chg_clt(tGATTS_SRV_CHG* p_srv_chg); +tGATT_HDL_LIST_ELEM* gatt_find_hdl_buffer_by_handle(uint16_t handle); +tGATTS_SRV_CHG* gatt_add_srv_chg_clt(tGATTS_SRV_CHG* p_srv_chg); /* for background connection */ -extern bool gatt_auto_connect_dev_remove(tGATT_IF gatt_if, - const RawAddress& bd_addr); +bool gatt_auto_connect_dev_remove(tGATT_IF gatt_if, const RawAddress& bd_addr); /* server function */ -extern std::list<tGATT_SRV_LIST_ELEM>::iterator gatt_sr_find_i_rcb_by_handle( +std::list<tGATT_SRV_LIST_ELEM>::iterator gatt_sr_find_i_rcb_by_handle( uint16_t handle); -extern tGATT_STATUS gatt_sr_process_app_rsp(tGATT_TCB& tcb, tGATT_IF gatt_if, - uint32_t trans_id, uint8_t op_code, - tGATT_STATUS status, - tGATTS_RSP* p_msg, - tGATT_SR_CMD* sr_res_p); -extern void gatt_server_handle_client_req(tGATT_TCB& p_tcb, uint16_t cid, - uint8_t op_code, uint16_t len, - uint8_t* p_data); -extern void gatt_sr_send_req_callback(uint16_t conn_id, uint32_t trans_id, - uint8_t op_code, tGATTS_DATA* p_req_data); -extern uint32_t gatt_sr_enqueue_cmd(tGATT_TCB& tcb, uint16_t cid, - uint8_t op_code, uint16_t handle); -extern bool gatt_cancel_open(tGATT_IF gatt_if, const RawAddress& bda); -extern void gatt_notify_phy_updated(tGATT_STATUS status, uint16_t handle, - uint8_t tx_phy, uint8_t rx_phy); -extern void gatt_notify_subrate_change(uint16_t handle, uint16_t subrate_factor, - uint16_t latency, uint16_t cont_num, - uint16_t timeout, uint8_t status); +tGATT_STATUS gatt_sr_process_app_rsp(tGATT_TCB& tcb, tGATT_IF gatt_if, + uint32_t trans_id, uint8_t op_code, + tGATT_STATUS status, tGATTS_RSP* p_msg, + tGATT_SR_CMD* sr_res_p); +void gatt_server_handle_client_req(tGATT_TCB& p_tcb, uint16_t cid, + uint8_t op_code, uint16_t len, + uint8_t* p_data); +void gatt_sr_send_req_callback(uint16_t conn_id, uint32_t trans_id, + uint8_t op_code, tGATTS_DATA* p_req_data); +uint32_t gatt_sr_enqueue_cmd(tGATT_TCB& tcb, uint16_t cid, uint8_t op_code, + uint16_t handle); +bool gatt_cancel_open(tGATT_IF gatt_if, const RawAddress& bda); +void gatt_notify_phy_updated(tGATT_STATUS status, uint16_t handle, + uint8_t tx_phy, uint8_t rx_phy); +void gatt_notify_subrate_change(uint16_t handle, uint16_t subrate_factor, + uint16_t latency, uint16_t cont_num, + uint16_t timeout, uint8_t status); /* */ -extern bool gatt_tcb_is_cid_busy(tGATT_TCB& tcb, uint16_t cid); - -extern tGATT_REG* gatt_get_regcb(tGATT_IF gatt_if); -extern bool gatt_is_clcb_allocated(uint16_t conn_id); -extern tGATT_CLCB* gatt_clcb_alloc(uint16_t conn_id); - -extern bool gatt_tcb_get_cid_available_for_indication( - tGATT_TCB* p_tcb, bool eatt_support, uint16_t** indicate_handle_p, - uint16_t* cid_p); -extern bool gatt_tcb_find_indicate_handle(tGATT_TCB& tcb, uint16_t cid, - uint16_t* indicated_handle_p); -extern uint16_t gatt_tcb_get_att_cid(tGATT_TCB& tcb, bool eatt_support); -extern uint16_t gatt_tcb_get_payload_size_tx(tGATT_TCB& tcb, uint16_t cid); -extern uint16_t gatt_tcb_get_payload_size_rx(tGATT_TCB& tcb, uint16_t cid); -extern void gatt_clcb_invalidate(tGATT_TCB* p_tcb, const tGATT_CLCB* p_clcb); -extern uint16_t gatt_get_mtu(const RawAddress& bda, tBT_TRANSPORT transport); -extern bool gatt_is_pending_mtu_exchange(tGATT_TCB* p_tcb); -extern void gatt_set_conn_id_waiting_for_mtu_exchange(tGATT_TCB* p_tcb, - uint16_t conn_id); - -extern void gatt_sr_copy_prep_cnt_to_cback_cnt(tGATT_TCB& p_tcb); -extern bool gatt_sr_is_cback_cnt_zero(tGATT_TCB& p_tcb); -extern bool gatt_sr_is_prep_cnt_zero(tGATT_TCB& p_tcb); -extern void gatt_sr_reset_cback_cnt(tGATT_TCB& p_tcb, uint16_t cid); -extern void gatt_sr_reset_prep_cnt(tGATT_TCB& tcb); -extern tGATT_SR_CMD* gatt_sr_get_cmd_by_trans_id(tGATT_TCB* p_tcb, - uint32_t trans_id); -extern tGATT_SR_CMD* gatt_sr_get_cmd_by_cid(tGATT_TCB& tcb, uint16_t cid); -extern tGATT_READ_MULTI* gatt_sr_get_read_multi(tGATT_TCB& tcb, uint16_t cid); -extern void gatt_sr_update_cback_cnt(tGATT_TCB& p_tcb, uint16_t cid, - tGATT_IF gatt_if, bool is_inc, - bool is_reset_first); -extern void gatt_sr_update_prep_cnt(tGATT_TCB& tcb, tGATT_IF gatt_if, - bool is_inc, bool is_reset_first); - -extern uint8_t gatt_num_clcb_by_bd_addr(const RawAddress& bda); -extern tGATT_TCB* gatt_find_tcb_by_cid(uint16_t lcid); -extern tGATT_TCB* gatt_allocate_tcb_by_bdaddr(const RawAddress& bda, - tBT_TRANSPORT transport); -extern tGATT_TCB* gatt_get_tcb_by_idx(uint8_t tcb_idx); -extern tGATT_TCB* gatt_find_tcb_by_addr(const RawAddress& bda, - tBT_TRANSPORT transport); -extern bool gatt_send_ble_burst_data(const RawAddress& remote_bda, - BT_HDR* p_buf); +bool gatt_tcb_is_cid_busy(tGATT_TCB& tcb, uint16_t cid); + +tGATT_REG* gatt_get_regcb(tGATT_IF gatt_if); +bool gatt_is_clcb_allocated(uint16_t conn_id); +tGATT_CLCB* gatt_clcb_alloc(uint16_t conn_id); + +bool gatt_tcb_get_cid_available_for_indication(tGATT_TCB* p_tcb, + bool eatt_support, + uint16_t** indicate_handle_p, + uint16_t* cid_p); +bool gatt_tcb_find_indicate_handle(tGATT_TCB& tcb, uint16_t cid, + uint16_t* indicated_handle_p); +uint16_t gatt_tcb_get_att_cid(tGATT_TCB& tcb, bool eatt_support); +uint16_t gatt_tcb_get_payload_size_tx(tGATT_TCB& tcb, uint16_t cid); +uint16_t gatt_tcb_get_payload_size_rx(tGATT_TCB& tcb, uint16_t cid); +void gatt_clcb_invalidate(tGATT_TCB* p_tcb, const tGATT_CLCB* p_clcb); +uint16_t gatt_get_mtu(const RawAddress& bda, tBT_TRANSPORT transport); +bool gatt_is_pending_mtu_exchange(tGATT_TCB* p_tcb); +void gatt_set_conn_id_waiting_for_mtu_exchange(tGATT_TCB* p_tcb, + uint16_t conn_id); + +void gatt_sr_copy_prep_cnt_to_cback_cnt(tGATT_TCB& p_tcb); +bool gatt_sr_is_cback_cnt_zero(tGATT_TCB& p_tcb); +bool gatt_sr_is_prep_cnt_zero(tGATT_TCB& p_tcb); +void gatt_sr_reset_cback_cnt(tGATT_TCB& p_tcb, uint16_t cid); +void gatt_sr_reset_prep_cnt(tGATT_TCB& tcb); +tGATT_SR_CMD* gatt_sr_get_cmd_by_trans_id(tGATT_TCB* p_tcb, uint32_t trans_id); +tGATT_SR_CMD* gatt_sr_get_cmd_by_cid(tGATT_TCB& tcb, uint16_t cid); +tGATT_READ_MULTI* gatt_sr_get_read_multi(tGATT_TCB& tcb, uint16_t cid); +void gatt_sr_update_cback_cnt(tGATT_TCB& p_tcb, uint16_t cid, tGATT_IF gatt_if, + bool is_inc, bool is_reset_first); +void gatt_sr_update_prep_cnt(tGATT_TCB& tcb, tGATT_IF gatt_if, bool is_inc, + bool is_reset_first); + +uint8_t gatt_num_clcb_by_bd_addr(const RawAddress& bda); +tGATT_TCB* gatt_find_tcb_by_cid(uint16_t lcid); +tGATT_TCB* gatt_allocate_tcb_by_bdaddr(const RawAddress& bda, + tBT_TRANSPORT transport); +tGATT_TCB* gatt_get_tcb_by_idx(uint8_t tcb_idx); +tGATT_TCB* gatt_find_tcb_by_addr(const RawAddress& bda, + tBT_TRANSPORT transport); +bool gatt_send_ble_burst_data(const RawAddress& remote_bda, BT_HDR* p_buf); /* GATT client functions */ -extern void gatt_dequeue_sr_cmd(tGATT_TCB& tcb, uint16_t cid); -extern tGATT_STATUS gatt_send_write_msg(tGATT_TCB& p_tcb, tGATT_CLCB* p_clcb, - uint8_t op_code, uint16_t handle, - uint16_t len, uint16_t offset, - uint8_t* p_data); -extern void gatt_cleanup_upon_disc(const RawAddress& bda, - tGATT_DISCONN_REASON reason, - tBT_TRANSPORT transport); -extern void gatt_end_operation(tGATT_CLCB* p_clcb, tGATT_STATUS status, - void* p_data); - -extern void gatt_act_discovery(tGATT_CLCB* p_clcb); -extern void gatt_act_read(tGATT_CLCB* p_clcb, uint16_t offset); -extern void gatt_act_write(tGATT_CLCB* p_clcb, uint8_t sec_act); -extern tGATT_CLCB* gatt_cmd_dequeue(tGATT_TCB& tcb, uint16_t cid, - uint8_t* p_opcode); -extern void gatt_cmd_enq(tGATT_TCB& tcb, tGATT_CLCB* p_clcb, bool to_send, - uint8_t op_code, BT_HDR* p_buf); -extern void gatt_client_handle_server_rsp(tGATT_TCB& tcb, uint16_t cid, - uint8_t op_code, uint16_t len, - uint8_t* p_data); -extern void gatt_send_queue_write_cancel(tGATT_TCB& tcb, tGATT_CLCB* p_clcb, - tGATT_EXEC_FLAG flag); -extern bool gatt_is_outstanding_msg_in_att_send_queue(const tGATT_TCB& tcb); +void gatt_dequeue_sr_cmd(tGATT_TCB& tcb, uint16_t cid); +tGATT_STATUS gatt_send_write_msg(tGATT_TCB& p_tcb, tGATT_CLCB* p_clcb, + uint8_t op_code, uint16_t handle, uint16_t len, + uint16_t offset, uint8_t* p_data); +void gatt_cleanup_upon_disc(const RawAddress& bda, tGATT_DISCONN_REASON reason, + tBT_TRANSPORT transport); +void gatt_end_operation(tGATT_CLCB* p_clcb, tGATT_STATUS status, void* p_data); + +void gatt_act_discovery(tGATT_CLCB* p_clcb); +void gatt_act_read(tGATT_CLCB* p_clcb, uint16_t offset); +void gatt_act_write(tGATT_CLCB* p_clcb, uint8_t sec_act); +tGATT_CLCB* gatt_cmd_dequeue(tGATT_TCB& tcb, uint16_t cid, uint8_t* p_opcode); +void gatt_cmd_enq(tGATT_TCB& tcb, tGATT_CLCB* p_clcb, bool to_send, + uint8_t op_code, BT_HDR* p_buf); +void gatt_client_handle_server_rsp(tGATT_TCB& tcb, uint16_t cid, + uint8_t op_code, uint16_t len, + uint8_t* p_data); +void gatt_send_queue_write_cancel(tGATT_TCB& tcb, tGATT_CLCB* p_clcb, + tGATT_EXEC_FLAG flag); +bool gatt_is_outstanding_msg_in_att_send_queue(const tGATT_TCB& tcb); /* gatt_auth.cc */ -extern bool gatt_security_check_start(tGATT_CLCB* p_clcb); -extern void gatt_verify_signature(tGATT_TCB& tcb, uint16_t cid, BT_HDR* p_buf); -extern tGATT_STATUS gatt_get_link_encrypt_status(tGATT_TCB& tcb); -extern tGATT_SEC_ACTION gatt_get_sec_act(tGATT_TCB* p_tcb); -extern void gatt_set_sec_act(tGATT_TCB* p_tcb, tGATT_SEC_ACTION sec_act); +bool gatt_security_check_start(tGATT_CLCB* p_clcb); +void gatt_verify_signature(tGATT_TCB& tcb, uint16_t cid, BT_HDR* p_buf); +tGATT_STATUS gatt_get_link_encrypt_status(tGATT_TCB& tcb); +tGATT_SEC_ACTION gatt_get_sec_act(tGATT_TCB* p_tcb); +void gatt_set_sec_act(tGATT_TCB* p_tcb, tGATT_SEC_ACTION sec_act); /* gatt_db.cc */ -extern void gatts_init_service_db(tGATT_SVC_DB& db, - const bluetooth::Uuid& service, bool is_pri, - uint16_t s_hdl, uint16_t num_handle); -extern uint16_t gatts_add_included_service(tGATT_SVC_DB& db, uint16_t s_handle, - uint16_t e_handle, - const bluetooth::Uuid& service); -extern uint16_t gatts_add_characteristic(tGATT_SVC_DB& db, tGATT_PERM perm, - tGATT_CHAR_PROP property, - const bluetooth::Uuid& char_uuid); -extern uint16_t gatts_add_char_ext_prop_descr(tGATT_SVC_DB& db, - uint16_t extended_properties); -extern uint16_t gatts_add_char_descr(tGATT_SVC_DB& db, tGATT_PERM perm, - const bluetooth::Uuid& dscp_uuid); -extern tGATT_STATUS gatts_db_read_attr_value_by_type( +void gatts_init_service_db(tGATT_SVC_DB& db, const bluetooth::Uuid& service, + bool is_pri, uint16_t s_hdl, uint16_t num_handle); +uint16_t gatts_add_included_service(tGATT_SVC_DB& db, uint16_t s_handle, + uint16_t e_handle, + const bluetooth::Uuid& service); +uint16_t gatts_add_characteristic(tGATT_SVC_DB& db, tGATT_PERM perm, + tGATT_CHAR_PROP property, + const bluetooth::Uuid& char_uuid); +uint16_t gatts_add_char_ext_prop_descr(tGATT_SVC_DB& db, + uint16_t extended_properties); +uint16_t gatts_add_char_descr(tGATT_SVC_DB& db, tGATT_PERM perm, + const bluetooth::Uuid& dscp_uuid); +tGATT_STATUS gatts_db_read_attr_value_by_type( tGATT_TCB& tcb, uint16_t cid, tGATT_SVC_DB* p_db, uint8_t op_code, BT_HDR* p_rsp, uint16_t s_handle, uint16_t e_handle, const bluetooth::Uuid& type, uint16_t* p_len, tGATT_SEC_FLAG sec_flag, uint8_t key_size, uint32_t trans_id, uint16_t* p_cur_handle); -extern tGATT_STATUS gatts_read_attr_value_by_handle( +tGATT_STATUS gatts_read_attr_value_by_handle( tGATT_TCB& tcb, uint16_t cid, tGATT_SVC_DB* p_db, uint8_t op_code, uint16_t handle, uint16_t offset, uint8_t* p_value, uint16_t* p_len, uint16_t mtu, tGATT_SEC_FLAG sec_flag, uint8_t key_size, uint32_t trans_id); -extern tGATT_STATUS gatts_write_attr_perm_check( - tGATT_SVC_DB* p_db, uint8_t op_code, uint16_t handle, uint16_t offset, - uint8_t* p_data, uint16_t len, tGATT_SEC_FLAG sec_flag, uint8_t key_size); -extern tGATT_STATUS gatts_read_attr_perm_check(tGATT_SVC_DB* p_db, bool is_long, - uint16_t handle, - tGATT_SEC_FLAG sec_flag, - uint8_t key_size); -extern bluetooth::Uuid* gatts_get_service_uuid(tGATT_SVC_DB* p_db); +tGATT_STATUS gatts_write_attr_perm_check(tGATT_SVC_DB* p_db, uint8_t op_code, + uint16_t handle, uint16_t offset, + uint8_t* p_data, uint16_t len, + tGATT_SEC_FLAG sec_flag, + uint8_t key_size); +tGATT_STATUS gatts_read_attr_perm_check(tGATT_SVC_DB* p_db, bool is_long, + uint16_t handle, + tGATT_SEC_FLAG sec_flag, + uint8_t key_size); +bluetooth::Uuid* gatts_get_service_uuid(tGATT_SVC_DB* p_db); /* gatt_sr_hash.cc */ -extern Octet16 gatts_calculate_database_hash( - std::list<tGATT_SRV_LIST_ELEM>* lst_ptr); +Octet16 gatts_calculate_database_hash(std::list<tGATT_SRV_LIST_ELEM>* lst_ptr); #endif diff --git a/system/stack/gatt/gatt_utils.cc b/system/stack/gatt/gatt_utils.cc index 4c0a14fbb3..d56e09e10b 100644 --- a/system/stack/gatt/gatt_utils.cc +++ b/system/stack/gatt/gatt_utils.cc @@ -704,7 +704,7 @@ void gatt_rsp_timeout(void* data) { } } -extern void gatts_proc_srv_chg_ind_ack(tGATT_TCB tcb); +void gatts_proc_srv_chg_ind_ack(tGATT_TCB tcb); /******************************************************************************* * diff --git a/system/stack/hid/hidd_int.h b/system/stack/hid/hidd_int.h index 056a5d0b4a..b647853e72 100644 --- a/system/stack/hid/hidd_int.h +++ b/system/stack/hid/hidd_int.h @@ -69,13 +69,13 @@ typedef struct dev_ctb { bool pending_vc_unplug; } tHID_DEV_CTB; -extern tHID_STATUS hidd_conn_reg(void); -extern void hidd_conn_dereg(void); -extern tHID_STATUS hidd_conn_initiate(void); -extern tHID_STATUS hidd_conn_disconnect(void); -extern tHID_STATUS hidd_conn_send_data(uint8_t channel, uint8_t msg_type, - uint8_t param, uint8_t data, - uint16_t len, uint8_t* p_data); +tHID_STATUS hidd_conn_reg(void); +void hidd_conn_dereg(void); +tHID_STATUS hidd_conn_initiate(void); +tHID_STATUS hidd_conn_disconnect(void); +tHID_STATUS hidd_conn_send_data(uint8_t channel, uint8_t msg_type, + uint8_t param, uint8_t data, uint16_t len, + uint8_t* p_data); #ifdef __cplusplus extern "C" { diff --git a/system/stack/hid/hidh_int.h b/system/stack/hid/hidh_int.h index 92f9d7d150..ca5142b9fb 100644 --- a/system/stack/hid/hidh_int.h +++ b/system/stack/hid/hidh_int.h @@ -63,13 +63,13 @@ typedef struct host_ctb { uint8_t trace_level; } tHID_HOST_CTB; -extern tHID_STATUS hidh_conn_snd_data(uint8_t dhandle, uint8_t trans_type, - uint8_t param, uint16_t data, - uint8_t rpt_id, BT_HDR* buf); -extern tHID_STATUS hidh_conn_reg(void); -extern void hidh_conn_dereg(void); -extern tHID_STATUS hidh_conn_disconnect(uint8_t dhandle); -extern tHID_STATUS hidh_conn_initiate(uint8_t dhandle); +tHID_STATUS hidh_conn_snd_data(uint8_t dhandle, uint8_t trans_type, + uint8_t param, uint16_t data, uint8_t rpt_id, + BT_HDR* buf); +tHID_STATUS hidh_conn_reg(void); +void hidh_conn_dereg(void); +tHID_STATUS hidh_conn_disconnect(uint8_t dhandle); +tHID_STATUS hidh_conn_initiate(uint8_t dhandle); /****************************************************************************** * Main Control Block diff --git a/system/stack/include/a2dp_api.h b/system/stack/include/a2dp_api.h index c11889b8ad..d7cfa18b67 100644 --- a/system/stack/include/a2dp_api.h +++ b/system/stack/include/a2dp_api.h @@ -119,9 +119,9 @@ typedef void(tA2DP_FIND_CBACK)(bool found, tA2DP_Service* p_service, * A2DP_FAIL if function execution failed. * *****************************************************************************/ -extern tA2DP_STATUS A2DP_AddRecord(uint16_t service_uuid, char* p_service_name, - char* p_provider_name, uint16_t features, - uint32_t sdp_handle); +tA2DP_STATUS A2DP_AddRecord(uint16_t service_uuid, char* p_service_name, + char* p_provider_name, uint16_t features, + uint32_t sdp_handle); /****************************************************************************** * @@ -158,10 +158,9 @@ extern tA2DP_STATUS A2DP_AddRecord(uint16_t service_uuid, char* p_service_name, * A2DP_FAIL if function execution failed. * *****************************************************************************/ -extern tA2DP_STATUS A2DP_FindService(uint16_t service_uuid, - const RawAddress& bd_addr, - tA2DP_SDP_DB_PARAMS* p_db, - tA2DP_FIND_CBACK* p_cback); +tA2DP_STATUS A2DP_FindService(uint16_t service_uuid, const RawAddress& bd_addr, + tA2DP_SDP_DB_PARAMS* p_db, + tA2DP_FIND_CBACK* p_cback); /****************************************************************************** * @@ -172,7 +171,7 @@ extern tA2DP_STATUS A2DP_FindService(uint16_t service_uuid, * Returns The local version of AVDTP. * *****************************************************************************/ -extern uint16_t A2DP_GetAvdtpVersion(void); +uint16_t A2DP_GetAvdtpVersion(void); /****************************************************************************** * @@ -195,7 +194,7 @@ extern uint16_t A2DP_GetAvdtpVersion(void); * the input parameter is 0xff. * *****************************************************************************/ -extern uint8_t A2DP_SetTraceLevel(uint8_t new_level); +uint8_t A2DP_SetTraceLevel(uint8_t new_level); /****************************************************************************** * Function A2DP_BitsSet @@ -205,7 +204,7 @@ extern uint8_t A2DP_SetTraceLevel(uint8_t new_level); * A2DP_SET_ZERO_BIT, if all bits clear * A2DP_SET_MULTL_BIT, if multiple bits are set *****************************************************************************/ -extern uint8_t A2DP_BitsSet(uint64_t num); +uint8_t A2DP_BitsSet(uint64_t num); // Initializes the A2DP control block. void A2DP_Init(void); diff --git a/system/stack/include/acl_api.h b/system/stack/include/acl_api.h index 7696ed9ed4..87fe58345c 100644 --- a/system/stack/include/acl_api.h +++ b/system/stack/include/acl_api.h @@ -314,8 +314,7 @@ tHCI_REASON btm_get_acl_disc_reason_code(void); bool btm_is_acl_locally_initiated(void); -extern tBTM_STATUS btm_remove_acl(const RawAddress& bd_addr, - tBT_TRANSPORT transport); +tBTM_STATUS btm_remove_acl(const RawAddress& bd_addr, tBT_TRANSPORT transport); void btm_acl_device_down(void); void btm_acl_update_inquiry_status(uint8_t status); diff --git a/system/stack/include/avct_api.h b/system/stack/include/avct_api.h index aaa62c02e6..d711ff7381 100644 --- a/system/stack/include/avct_api.h +++ b/system/stack/include/avct_api.h @@ -139,7 +139,7 @@ typedef struct { * Returns void * ******************************************************************************/ -extern void AVCT_Register(); +void AVCT_Register(); /******************************************************************************* * @@ -155,7 +155,7 @@ extern void AVCT_Register(); * Returns void * ******************************************************************************/ -extern void AVCT_Deregister(void); +void AVCT_Deregister(void); /******************************************************************************* * @@ -174,8 +174,8 @@ extern void AVCT_Deregister(void); * Returns AVCT_SUCCESS if successful, otherwise error. * ******************************************************************************/ -extern uint16_t AVCT_CreateConn(uint8_t* p_handle, tAVCT_CC* p_cc, - const RawAddress& peer_addr); +uint16_t AVCT_CreateConn(uint8_t* p_handle, tAVCT_CC* p_cc, + const RawAddress& peer_addr); /******************************************************************************* * @@ -190,7 +190,7 @@ extern uint16_t AVCT_CreateConn(uint8_t* p_handle, tAVCT_CC* p_cc, * Returns AVCT_SUCCESS if successful, otherwise error. * ******************************************************************************/ -extern uint16_t AVCT_RemoveConn(uint8_t handle); +uint16_t AVCT_RemoveConn(uint8_t handle); /******************************************************************************* * @@ -209,7 +209,7 @@ extern uint16_t AVCT_RemoveConn(uint8_t handle); * Returns AVCT_SUCCESS if successful, otherwise error. * ******************************************************************************/ -extern uint16_t AVCT_CreateBrowse(uint8_t handle, uint8_t role); +uint16_t AVCT_CreateBrowse(uint8_t handle, uint8_t role); /******************************************************************************* * @@ -224,7 +224,7 @@ extern uint16_t AVCT_CreateBrowse(uint8_t handle, uint8_t role); * Returns AVCT_SUCCESS if successful, otherwise error. * ******************************************************************************/ -extern uint16_t AVCT_RemoveBrowse(uint8_t handle); +uint16_t AVCT_RemoveBrowse(uint8_t handle); /******************************************************************************* * @@ -236,7 +236,7 @@ extern uint16_t AVCT_RemoveBrowse(uint8_t handle); * Returns the peer browsing channel MTU. * ******************************************************************************/ -extern uint16_t AVCT_GetBrowseMtu(uint8_t handle); +uint16_t AVCT_GetBrowseMtu(uint8_t handle); /******************************************************************************* * @@ -248,7 +248,7 @@ extern uint16_t AVCT_GetBrowseMtu(uint8_t handle); * Returns the peer MTU size. * ******************************************************************************/ -extern uint16_t AVCT_GetPeerMtu(uint8_t handle); +uint16_t AVCT_GetPeerMtu(uint8_t handle); /******************************************************************************* * @@ -273,8 +273,7 @@ extern uint16_t AVCT_GetPeerMtu(uint8_t handle); * Returns AVCT_SUCCESS if successful, otherwise error. * ******************************************************************************/ -extern uint16_t AVCT_MsgReq(uint8_t handle, uint8_t label, uint8_t cr, - BT_HDR* p_msg); +uint16_t AVCT_MsgReq(uint8_t handle, uint8_t label, uint8_t cr, BT_HDR* p_msg); /****************************************************************************** * @@ -297,6 +296,6 @@ extern uint16_t AVCT_MsgReq(uint8_t handle, uint8_t label, uint8_t cr, * the input parameter is 0xff. * *****************************************************************************/ -extern uint8_t AVCT_SetTraceLevel(uint8_t new_level); +uint8_t AVCT_SetTraceLevel(uint8_t new_level); #endif /* AVCT_API_H */ diff --git a/system/stack/include/avdt_api.h b/system/stack/include/avdt_api.h index f051b09516..47bd80ffb0 100644 --- a/system/stack/include/avdt_api.h +++ b/system/stack/include/avdt_api.h @@ -561,7 +561,7 @@ typedef uint8_t tAVDT_DATA_OPT_MASK; * Returns void * ******************************************************************************/ -extern void AVDT_Register(AvdtpRcb* p_reg, tAVDT_CTRL_CBACK* p_cback); +void AVDT_Register(AvdtpRcb* p_reg, tAVDT_CTRL_CBACK* p_cback); /******************************************************************************* * @@ -575,7 +575,7 @@ extern void AVDT_Register(AvdtpRcb* p_reg, tAVDT_CTRL_CBACK* p_cback); * Returns void * ******************************************************************************/ -extern void AVDT_Deregister(void); +void AVDT_Deregister(void); /******************************************************************************* * @@ -587,7 +587,7 @@ extern void AVDT_Deregister(void); * Returns void. * ******************************************************************************/ -extern void AVDT_AbortReq(uint8_t handle); +void AVDT_AbortReq(uint8_t handle); /******************************************************************************* * @@ -603,8 +603,8 @@ extern void AVDT_AbortReq(uint8_t handle); * Returns AVDT_SUCCESS if successful, otherwise error. * ******************************************************************************/ -extern uint16_t AVDT_CreateStream(uint8_t peer_id, uint8_t* p_handle, - const AvdtpStreamConfig& avdtp_stream_config); +uint16_t AVDT_CreateStream(uint8_t peer_id, uint8_t* p_handle, + const AvdtpStreamConfig& avdtp_stream_config); /******************************************************************************* * @@ -620,7 +620,7 @@ extern uint16_t AVDT_CreateStream(uint8_t peer_id, uint8_t* p_handle, * Returns AVDT_SUCCESS if successful, otherwise error. * ******************************************************************************/ -extern uint16_t AVDT_RemoveStream(uint8_t handle); +uint16_t AVDT_RemoveStream(uint8_t handle); /******************************************************************************* * @@ -648,10 +648,9 @@ extern uint16_t AVDT_RemoveStream(uint8_t handle); * Returns AVDT_SUCCESS if successful, otherwise error. * ******************************************************************************/ -extern uint16_t AVDT_DiscoverReq(const RawAddress& bd_addr, - uint8_t channel_index, - tAVDT_SEP_INFO* p_sep_info, uint8_t max_seps, - tAVDT_CTRL_CBACK* p_cback); +uint16_t AVDT_DiscoverReq(const RawAddress& bd_addr, uint8_t channel_index, + tAVDT_SEP_INFO* p_sep_info, uint8_t max_seps, + tAVDT_CTRL_CBACK* p_cback); /******************************************************************************* * @@ -677,9 +676,9 @@ extern uint16_t AVDT_DiscoverReq(const RawAddress& bd_addr, * Returns AVDT_SUCCESS if successful, otherwise error. * ******************************************************************************/ -extern uint16_t AVDT_GetCapReq(const RawAddress& bd_addr, uint8_t channel_index, - uint8_t seid, AvdtpSepConfig* p_cfg, - tAVDT_CTRL_CBACK* p_cback, bool get_all_cap); +uint16_t AVDT_GetCapReq(const RawAddress& bd_addr, uint8_t channel_index, + uint8_t seid, AvdtpSepConfig* p_cfg, + tAVDT_CTRL_CBACK* p_cback, bool get_all_cap); /******************************************************************************* * @@ -692,7 +691,7 @@ extern uint16_t AVDT_GetCapReq(const RawAddress& bd_addr, uint8_t channel_index, * Returns AVDT_SUCCESS if successful, otherwise error. * ******************************************************************************/ -extern uint16_t AVDT_DelayReport(uint8_t handle, uint8_t seid, uint16_t delay); +uint16_t AVDT_DelayReport(uint8_t handle, uint8_t seid, uint16_t delay); /******************************************************************************* * @@ -708,9 +707,9 @@ extern uint16_t AVDT_DelayReport(uint8_t handle, uint8_t seid, uint16_t delay); * Returns AVDT_SUCCESS if successful, otherwise error. * ******************************************************************************/ -extern uint16_t AVDT_OpenReq(uint8_t handle, const RawAddress& bd_addr, - uint8_t channel_index, uint8_t seid, - AvdtpSepConfig* p_cfg); +uint16_t AVDT_OpenReq(uint8_t handle, const RawAddress& bd_addr, + uint8_t channel_index, uint8_t seid, + AvdtpSepConfig* p_cfg); /******************************************************************************* * @@ -724,8 +723,8 @@ extern uint16_t AVDT_OpenReq(uint8_t handle, const RawAddress& bd_addr, * Returns AVDT_SUCCESS if successful, otherwise error. * ******************************************************************************/ -extern uint16_t AVDT_ConfigRsp(uint8_t handle, uint8_t label, - uint8_t error_code, uint8_t category); +uint16_t AVDT_ConfigRsp(uint8_t handle, uint8_t label, uint8_t error_code, + uint8_t category); /******************************************************************************* * @@ -742,7 +741,7 @@ extern uint16_t AVDT_ConfigRsp(uint8_t handle, uint8_t label, * Returns AVDT_SUCCESS if successful, otherwise error. * ******************************************************************************/ -extern uint16_t AVDT_StartReq(uint8_t* p_handles, uint8_t num_handles); +uint16_t AVDT_StartReq(uint8_t* p_handles, uint8_t num_handles); /******************************************************************************* * @@ -759,7 +758,7 @@ extern uint16_t AVDT_StartReq(uint8_t* p_handles, uint8_t num_handles); * Returns AVDT_SUCCESS if successful, otherwise error. * ******************************************************************************/ -extern uint16_t AVDT_SuspendReq(uint8_t* p_handles, uint8_t num_handles); +uint16_t AVDT_SuspendReq(uint8_t* p_handles, uint8_t num_handles); /******************************************************************************* * @@ -775,7 +774,7 @@ extern uint16_t AVDT_SuspendReq(uint8_t* p_handles, uint8_t num_handles); * Returns AVDT_SUCCESS if successful, otherwise error. * ******************************************************************************/ -extern uint16_t AVDT_CloseReq(uint8_t handle); +uint16_t AVDT_CloseReq(uint8_t handle); /******************************************************************************* * @@ -794,7 +793,7 @@ extern uint16_t AVDT_CloseReq(uint8_t handle); * Returns AVDT_SUCCESS if successful, otherwise error. * ******************************************************************************/ -extern uint16_t AVDT_ReconfigReq(uint8_t handle, AvdtpSepConfig* p_cfg); +uint16_t AVDT_ReconfigReq(uint8_t handle, AvdtpSepConfig* p_cfg); /******************************************************************************* * @@ -810,7 +809,7 @@ extern uint16_t AVDT_ReconfigReq(uint8_t handle, AvdtpSepConfig* p_cfg); * Returns AVDT_SUCCESS if successful, otherwise error. * ******************************************************************************/ -extern uint16_t AVDT_SecurityReq(uint8_t handle, uint8_t* p_data, uint16_t len); +uint16_t AVDT_SecurityReq(uint8_t handle, uint8_t* p_data, uint16_t len); /******************************************************************************* * @@ -826,9 +825,8 @@ extern uint16_t AVDT_SecurityReq(uint8_t handle, uint8_t* p_data, uint16_t len); * Returns AVDT_SUCCESS if successful, otherwise error. * ******************************************************************************/ -extern uint16_t AVDT_SecurityRsp(uint8_t handle, uint8_t label, - uint8_t error_code, uint8_t* p_data, - uint16_t len); +uint16_t AVDT_SecurityRsp(uint8_t handle, uint8_t label, uint8_t error_code, + uint8_t* p_data, uint16_t len); /******************************************************************************* * @@ -866,9 +864,8 @@ extern uint16_t AVDT_SecurityRsp(uint8_t handle, uint8_t label, * Returns AVDT_SUCCESS if successful, otherwise error. * ******************************************************************************/ -extern uint16_t AVDT_WriteReqOpt(uint8_t handle, BT_HDR* p_pkt, - uint32_t time_stamp, uint8_t m_pt, - tAVDT_DATA_OPT_MASK opt); +uint16_t AVDT_WriteReqOpt(uint8_t handle, BT_HDR* p_pkt, uint32_t time_stamp, + uint8_t m_pt, tAVDT_DATA_OPT_MASK opt); /******************************************************************************* * @@ -885,9 +882,8 @@ extern uint16_t AVDT_WriteReqOpt(uint8_t handle, BT_HDR* p_pkt, * Returns AVDT_SUCCESS if successful, otherwise error. * ******************************************************************************/ -extern uint16_t AVDT_ConnectReq(const RawAddress& bd_addr, - uint8_t channel_index, - tAVDT_CTRL_CBACK* p_cback); +uint16_t AVDT_ConnectReq(const RawAddress& bd_addr, uint8_t channel_index, + tAVDT_CTRL_CBACK* p_cback); /******************************************************************************* * @@ -901,8 +897,8 @@ extern uint16_t AVDT_ConnectReq(const RawAddress& bd_addr, * Returns AVDT_SUCCESS if successful, otherwise error. * ******************************************************************************/ -extern uint16_t AVDT_DisconnectReq(const RawAddress& bd_addr, - tAVDT_CTRL_CBACK* p_cback); +uint16_t AVDT_DisconnectReq(const RawAddress& bd_addr, + tAVDT_CTRL_CBACK* p_cback); /******************************************************************************* * @@ -913,7 +909,7 @@ extern uint16_t AVDT_DisconnectReq(const RawAddress& bd_addr, * Returns CID if successful, otherwise 0. * ******************************************************************************/ -extern uint16_t AVDT_GetL2CapChannel(uint8_t handle); +uint16_t AVDT_GetL2CapChannel(uint8_t handle); /****************************************************************************** * @@ -936,7 +932,7 @@ extern uint16_t AVDT_GetL2CapChannel(uint8_t handle); * the input parameter is 0xff. * *****************************************************************************/ -extern uint8_t AVDT_SetTraceLevel(uint8_t new_level); +uint8_t AVDT_SetTraceLevel(uint8_t new_level); /** * Dump debug-related information for the Stack AVDTP module. diff --git a/system/stack/include/avdtc_api.h b/system/stack/include/avdtc_api.h index ad0337110d..b510190688 100644 --- a/system/stack/include/avdtc_api.h +++ b/system/stack/include/avdtc_api.h @@ -86,7 +86,7 @@ typedef void tAVDTC_CTRL_CBACK(uint8_t handle, const RawAddress& bd_addr, * Returns void * ******************************************************************************/ -extern void AVDTC_Init(tAVDTC_CTRL_CBACK* p_cback); +void AVDTC_Init(tAVDTC_CTRL_CBACK* p_cback); /******************************************************************************* * @@ -97,8 +97,8 @@ extern void AVDTC_Init(tAVDTC_CTRL_CBACK* p_cback); * Returns void * ******************************************************************************/ -extern void AVDTC_DiscoverRsp(const RawAddress& bd_addr, uint8_t label, - tAVDT_SEP_INFO sep_info[], uint8_t num_seps); +void AVDTC_DiscoverRsp(const RawAddress& bd_addr, uint8_t label, + tAVDT_SEP_INFO sep_info[], uint8_t num_seps); /******************************************************************************* * @@ -109,8 +109,8 @@ extern void AVDTC_DiscoverRsp(const RawAddress& bd_addr, uint8_t label, * Returns void * ******************************************************************************/ -extern void AVDTC_GetCapRsp(const RawAddress& bd_addr, uint8_t label, - AvdtpSepConfig* p_cap); +void AVDTC_GetCapRsp(const RawAddress& bd_addr, uint8_t label, + AvdtpSepConfig* p_cap); /******************************************************************************* * @@ -121,8 +121,8 @@ extern void AVDTC_GetCapRsp(const RawAddress& bd_addr, uint8_t label, * Returns void * ******************************************************************************/ -extern void AVDTC_GetAllCapRsp(const RawAddress& bd_addr, uint8_t label, - AvdtpSepConfig* p_cap); +void AVDTC_GetAllCapRsp(const RawAddress& bd_addr, uint8_t label, + AvdtpSepConfig* p_cap); /******************************************************************************* * @@ -133,7 +133,7 @@ extern void AVDTC_GetAllCapRsp(const RawAddress& bd_addr, uint8_t label, * Returns void * ******************************************************************************/ -extern void AVDTC_GetConfigReq(uint8_t handle); +void AVDTC_GetConfigReq(uint8_t handle); /******************************************************************************* * @@ -144,8 +144,7 @@ extern void AVDTC_GetConfigReq(uint8_t handle); * Returns void * ******************************************************************************/ -extern void AVDTC_GetConfigRsp(uint8_t handle, uint8_t label, - AvdtpSepConfig* p_cfg); +void AVDTC_GetConfigRsp(uint8_t handle, uint8_t label, AvdtpSepConfig* p_cfg); /******************************************************************************* * @@ -156,7 +155,7 @@ extern void AVDTC_GetConfigRsp(uint8_t handle, uint8_t label, * Returns void * ******************************************************************************/ -extern void AVDTC_OpenReq(uint8_t handle); +void AVDTC_OpenReq(uint8_t handle); /******************************************************************************* * @@ -167,7 +166,7 @@ extern void AVDTC_OpenReq(uint8_t handle); * Returns void * ******************************************************************************/ -extern void AVDTC_OpenRsp(uint8_t handle, uint8_t label); +void AVDTC_OpenRsp(uint8_t handle, uint8_t label); /******************************************************************************* * @@ -178,8 +177,7 @@ extern void AVDTC_OpenRsp(uint8_t handle, uint8_t label); * Returns void * ******************************************************************************/ -extern void AVDTC_StartRsp(uint8_t* p_handles, uint8_t num_handles, - uint8_t label); +void AVDTC_StartRsp(uint8_t* p_handles, uint8_t num_handles, uint8_t label); /******************************************************************************* * @@ -190,7 +188,7 @@ extern void AVDTC_StartRsp(uint8_t* p_handles, uint8_t num_handles, * Returns void * ******************************************************************************/ -extern void AVDTC_CloseRsp(uint8_t handle, uint8_t label); +void AVDTC_CloseRsp(uint8_t handle, uint8_t label); /******************************************************************************* * @@ -201,8 +199,7 @@ extern void AVDTC_CloseRsp(uint8_t handle, uint8_t label); * Returns void * ******************************************************************************/ -extern void AVDTC_SuspendRsp(uint8_t* p_handles, uint8_t num_handles, - uint8_t label); +void AVDTC_SuspendRsp(uint8_t* p_handles, uint8_t num_handles, uint8_t label); /******************************************************************************* * @@ -213,7 +210,7 @@ extern void AVDTC_SuspendRsp(uint8_t* p_handles, uint8_t num_handles, * Returns void * ******************************************************************************/ -extern void AVDTC_AbortReq(uint8_t handle); +void AVDTC_AbortReq(uint8_t handle); /******************************************************************************* * @@ -224,7 +221,7 @@ extern void AVDTC_AbortReq(uint8_t handle); * Returns void * ******************************************************************************/ -extern void AVDTC_AbortRsp(uint8_t handle, uint8_t label); +void AVDTC_AbortRsp(uint8_t handle, uint8_t label); /******************************************************************************* * @@ -235,7 +232,7 @@ extern void AVDTC_AbortRsp(uint8_t handle, uint8_t label); * Returns void * ******************************************************************************/ -extern void AVDTC_Rej(uint8_t handle, const RawAddress& bd_addr, uint8_t cmd, - uint8_t label, uint8_t err_code, uint8_t err_param); +void AVDTC_Rej(uint8_t handle, const RawAddress& bd_addr, uint8_t cmd, + uint8_t label, uint8_t err_code, uint8_t err_param); #endif /* AVDT_CAPI_H */ diff --git a/system/stack/include/avrc_api.h b/system/stack/include/avrc_api.h index 8f79a84640..8f5d9dd114 100644 --- a/system/stack/include/avrc_api.h +++ b/system/stack/include/avrc_api.h @@ -273,7 +273,7 @@ bool avrcp_absolute_volume_is_enabled(); * Returns The AVRCP control profile version * *****************************************************************************/ -extern uint16_t AVRC_GetControlProfileVersion(); +uint16_t AVRC_GetControlProfileVersion(); /****************************************************************************** * @@ -284,7 +284,7 @@ extern uint16_t AVRC_GetControlProfileVersion(); * Returns The AVRCP profile version * *****************************************************************************/ -extern uint16_t AVRC_GetProfileVersion(); +uint16_t AVRC_GetProfileVersion(); /****************************************************************************** * @@ -326,12 +326,10 @@ extern uint16_t AVRC_GetProfileVersion(); * record. * *****************************************************************************/ -extern uint16_t AVRC_AddRecord(uint16_t service_uuid, - const char* p_service_name, - const char* p_provider_name, uint16_t categories, - uint32_t sdp_handle, bool browse_supported, - uint16_t profile_version, - uint16_t cover_art_psm); +uint16_t AVRC_AddRecord(uint16_t service_uuid, const char* p_service_name, + const char* p_provider_name, uint16_t categories, + uint32_t sdp_handle, bool browse_supported, + uint16_t profile_version, uint16_t cover_art_psm); /******************************************************************************* * @@ -346,7 +344,7 @@ extern uint16_t AVRC_AddRecord(uint16_t service_uuid, * AVRC_FAIL otherwise * *******************************************************************************/ -extern uint16_t AVRC_RemoveRecord(uint32_t sdp_handle); +uint16_t AVRC_RemoveRecord(uint32_t sdp_handle); /****************************************************************************** * @@ -387,10 +385,9 @@ extern uint16_t AVRC_RemoveRecord(uint32_t sdp_handle); * perform the service search. * *****************************************************************************/ -extern uint16_t AVRC_FindService(uint16_t service_uuid, - const RawAddress& bd_addr, - tAVRC_SDP_DB_PARAMS* p_db, - const tAVRC_FIND_CBACK& cback); +uint16_t AVRC_FindService(uint16_t service_uuid, const RawAddress& bd_addr, + tAVRC_SDP_DB_PARAMS* p_db, + const tAVRC_FIND_CBACK& cback); /****************************************************************************** * @@ -440,8 +437,8 @@ extern uint16_t AVRC_FindService(uint16_t service_uuid, * the connection. * *****************************************************************************/ -extern uint16_t AVRC_Open(uint8_t* p_handle, tAVRC_CONN_CB* p_ccb, - const RawAddress& peer_addr); +uint16_t AVRC_Open(uint8_t* p_handle, tAVRC_CONN_CB* p_ccb, + const RawAddress& peer_addr); /****************************************************************************** * @@ -461,7 +458,7 @@ extern uint16_t AVRC_Open(uint8_t* p_handle, tAVRC_CONN_CB* p_ccb, * AVRC_BAD_HANDLE if handle is invalid. * *****************************************************************************/ -extern uint16_t AVRC_Close(uint8_t handle); +uint16_t AVRC_Close(uint8_t handle); /****************************************************************************** * @@ -477,7 +474,7 @@ extern uint16_t AVRC_Close(uint8_t handle); * the connection. * *****************************************************************************/ -extern uint16_t AVRC_OpenBrowse(uint8_t handle, uint8_t conn_role); +uint16_t AVRC_OpenBrowse(uint8_t handle, uint8_t conn_role); /****************************************************************************** * @@ -491,7 +488,7 @@ extern uint16_t AVRC_OpenBrowse(uint8_t handle, uint8_t conn_role); * AVRC_BAD_HANDLE if handle is invalid. * *****************************************************************************/ -extern uint16_t AVRC_CloseBrowse(uint8_t handle); +uint16_t AVRC_CloseBrowse(uint8_t handle); /****************************************************************************** * @@ -512,8 +509,8 @@ extern uint16_t AVRC_CloseBrowse(uint8_t handle); * AVRC_BAD_HANDLE if handle is invalid. * *****************************************************************************/ -extern uint16_t AVRC_MsgReq(uint8_t handle, uint8_t label, uint8_t ctype, - BT_HDR* p_pkt); +uint16_t AVRC_MsgReq(uint8_t handle, uint8_t label, uint8_t ctype, + BT_HDR* p_pkt); /****************************************************************************** * @@ -534,8 +531,7 @@ extern uint16_t AVRC_MsgReq(uint8_t handle, uint8_t label, uint8_t ctype, * Returns Nothing * *****************************************************************************/ -extern void AVRC_SaveControllerVersion(const RawAddress& bdaddr, - uint16_t new_version); +void AVRC_SaveControllerVersion(const RawAddress& bdaddr, uint16_t new_version); /****************************************************************************** * @@ -558,7 +554,7 @@ extern void AVRC_SaveControllerVersion(const RawAddress& bdaddr, * AVRC_BAD_HANDLE if handle is invalid. * *****************************************************************************/ -extern uint16_t AVRC_UnitCmd(uint8_t handle, uint8_t label); +uint16_t AVRC_UnitCmd(uint8_t handle, uint8_t label); /****************************************************************************** * @@ -585,7 +581,7 @@ extern uint16_t AVRC_UnitCmd(uint8_t handle, uint8_t label); * AVRC_BAD_HANDLE if handle is invalid. * *****************************************************************************/ -extern uint16_t AVRC_SubCmd(uint8_t handle, uint8_t label, uint8_t page); +uint16_t AVRC_SubCmd(uint8_t handle, uint8_t label, uint8_t page); /****************************************************************************** * @@ -610,8 +606,7 @@ extern uint16_t AVRC_SubCmd(uint8_t handle, uint8_t label, uint8_t page); * AVRC_BAD_HANDLE if handle is invalid. * *****************************************************************************/ -extern uint16_t AVRC_PassCmd(uint8_t handle, uint8_t label, - tAVRC_MSG_PASS* p_msg); +uint16_t AVRC_PassCmd(uint8_t handle, uint8_t label, tAVRC_MSG_PASS* p_msg); /****************************************************************************** * @@ -639,8 +634,7 @@ extern uint16_t AVRC_PassCmd(uint8_t handle, uint8_t label, * AVRC_BAD_HANDLE if handle is invalid. * *****************************************************************************/ -extern uint16_t AVRC_PassRsp(uint8_t handle, uint8_t label, - tAVRC_MSG_PASS* p_msg); +uint16_t AVRC_PassRsp(uint8_t handle, uint8_t label, tAVRC_MSG_PASS* p_msg); /****************************************************************************** * @@ -665,8 +659,7 @@ extern uint16_t AVRC_PassRsp(uint8_t handle, uint8_t label, * AVRC_BAD_HANDLE if handle is invalid. * *****************************************************************************/ -extern uint16_t AVRC_VendorCmd(uint8_t handle, uint8_t label, - tAVRC_MSG_VENDOR* p_msg); +uint16_t AVRC_VendorCmd(uint8_t handle, uint8_t label, tAVRC_MSG_VENDOR* p_msg); /****************************************************************************** * @@ -694,8 +687,7 @@ extern uint16_t AVRC_VendorCmd(uint8_t handle, uint8_t label, * AVRC_BAD_HANDLE if handle is invalid. * *****************************************************************************/ -extern uint16_t AVRC_VendorRsp(uint8_t handle, uint8_t label, - tAVRC_MSG_VENDOR* p_msg); +uint16_t AVRC_VendorRsp(uint8_t handle, uint8_t label, tAVRC_MSG_VENDOR* p_msg); /****************************************************************************** * @@ -718,7 +710,7 @@ extern uint16_t AVRC_VendorRsp(uint8_t handle, uint8_t label, * the input parameter is 0xff. * *****************************************************************************/ -extern uint8_t AVRC_SetTraceLevel(uint8_t new_level); +uint8_t AVRC_SetTraceLevel(uint8_t new_level); /******************************************************************************* * @@ -731,7 +723,7 @@ extern uint8_t AVRC_SetTraceLevel(uint8_t new_level); * Returns void * ******************************************************************************/ -extern void AVRC_Init(void); +void AVRC_Init(void); /******************************************************************************* * @@ -746,8 +738,7 @@ extern void AVRC_Init(void); * Otherwise, the error code defined by AVRCP 1.4 * ******************************************************************************/ -extern tAVRC_STS AVRC_Ctrl_ParsCommand(tAVRC_MSG* p_msg, - tAVRC_COMMAND* p_result); +tAVRC_STS AVRC_Ctrl_ParsCommand(tAVRC_MSG* p_msg, tAVRC_COMMAND* p_result); /******************************************************************************* * @@ -760,8 +751,8 @@ extern tAVRC_STS AVRC_Ctrl_ParsCommand(tAVRC_MSG* p_msg, * Otherwise, the error code defined by AVRCP 1.4 * ******************************************************************************/ -extern tAVRC_STS AVRC_ParsCommand(tAVRC_MSG* p_msg, tAVRC_COMMAND* p_result, - uint8_t* p_buf, uint16_t buf_len); +tAVRC_STS AVRC_ParsCommand(tAVRC_MSG* p_msg, tAVRC_COMMAND* p_result, + uint8_t* p_buf, uint16_t buf_len); /******************************************************************************* * @@ -774,8 +765,8 @@ extern tAVRC_STS AVRC_ParsCommand(tAVRC_MSG* p_msg, tAVRC_COMMAND* p_result, * Otherwise, the error code defined by AVRCP 1.4 * ******************************************************************************/ -extern tAVRC_STS AVRC_ParsResponse(tAVRC_MSG* p_msg, tAVRC_RESPONSE* p_result, - uint8_t* p_buf, uint16_t buf_len); +tAVRC_STS AVRC_ParsResponse(tAVRC_MSG* p_msg, tAVRC_RESPONSE* p_result, + uint8_t* p_buf, uint16_t buf_len); /******************************************************************************* * @@ -788,9 +779,8 @@ extern tAVRC_STS AVRC_ParsResponse(tAVRC_MSG* p_msg, tAVRC_RESPONSE* p_result, * Otherwise, the error code defined by AVRCP 1.4 * ******************************************************************************/ -extern tAVRC_STS AVRC_Ctrl_ParsResponse(tAVRC_MSG* p_msg, - tAVRC_RESPONSE* p_result, - uint8_t* p_buf, uint16_t* buf_len); +tAVRC_STS AVRC_Ctrl_ParsResponse(tAVRC_MSG* p_msg, tAVRC_RESPONSE* p_result, + uint8_t* p_buf, uint16_t* buf_len); /******************************************************************************* * @@ -803,7 +793,7 @@ extern tAVRC_STS AVRC_Ctrl_ParsResponse(tAVRC_MSG* p_msg, * Otherwise, the error code. * ******************************************************************************/ -extern tAVRC_STS AVRC_BldCommand(tAVRC_COMMAND* p_cmd, BT_HDR** pp_pkt); +tAVRC_STS AVRC_BldCommand(tAVRC_COMMAND* p_cmd, BT_HDR** pp_pkt); /******************************************************************************* * @@ -816,8 +806,8 @@ extern tAVRC_STS AVRC_BldCommand(tAVRC_COMMAND* p_cmd, BT_HDR** pp_pkt); * Otherwise, the error code. * ******************************************************************************/ -extern tAVRC_STS AVRC_BldResponse(uint8_t handle, tAVRC_RESPONSE* p_rsp, - BT_HDR** pp_pkt); +tAVRC_STS AVRC_BldResponse(uint8_t handle, tAVRC_RESPONSE* p_rsp, + BT_HDR** pp_pkt); /************************************************************************** * @@ -829,7 +819,7 @@ extern tAVRC_STS AVRC_BldResponse(uint8_t handle, tAVRC_RESPONSE* p_rsp, * * ******************************************************************************/ -extern bool AVRC_IsValidAvcType(uint8_t pdu_id, uint8_t avc_type); +bool AVRC_IsValidAvcType(uint8_t pdu_id, uint8_t avc_type); /******************************************************************************* * @@ -841,6 +831,6 @@ extern bool AVRC_IsValidAvcType(uint8_t pdu_id, uint8_t avc_type); * Returns returns true if it is valid * ******************************************************************************/ -extern bool AVRC_IsValidPlayerAttr(uint8_t attr); +bool AVRC_IsValidPlayerAttr(uint8_t attr); #endif /* AVRC_API_H */ diff --git a/system/stack/include/bnep_api.h b/system/stack/include/bnep_api.h index 4e41de2e7a..bf3f70e7dc 100644 --- a/system/stack/include/bnep_api.h +++ b/system/stack/include/bnep_api.h @@ -198,7 +198,7 @@ typedef struct { * BNEP_FAILURE if connection state callback is missing * ******************************************************************************/ -extern tBNEP_RESULT BNEP_Register(tBNEP_REGISTER* p_reg_info); +tBNEP_RESULT BNEP_Register(tBNEP_REGISTER* p_reg_info); /******************************************************************************* * @@ -213,7 +213,7 @@ extern tBNEP_RESULT BNEP_Register(tBNEP_REGISTER* p_reg_info); * Returns void * ******************************************************************************/ -extern void BNEP_Deregister(void); +void BNEP_Deregister(void); /******************************************************************************* * @@ -231,10 +231,10 @@ extern void BNEP_Deregister(void); * BNEP_NO_RESOURCES if no resources * ******************************************************************************/ -extern tBNEP_RESULT BNEP_Connect(const RawAddress& p_rem_bda, - const bluetooth::Uuid& src_uuid, - const bluetooth::Uuid& dst_uuid, - uint16_t* p_handle, uint32_t mx_chan_id); +tBNEP_RESULT BNEP_Connect(const RawAddress& p_rem_bda, + const bluetooth::Uuid& src_uuid, + const bluetooth::Uuid& dst_uuid, uint16_t* p_handle, + uint32_t mx_chan_id); /******************************************************************************* * @@ -251,7 +251,7 @@ extern tBNEP_RESULT BNEP_Connect(const RawAddress& p_rem_bda, * BNEP_WRONG_STATE if the responce is not expected * ******************************************************************************/ -extern tBNEP_RESULT BNEP_ConnectResp(uint16_t handle, tBNEP_RESULT resp); +tBNEP_RESULT BNEP_ConnectResp(uint16_t handle, tBNEP_RESULT resp); /******************************************************************************* * @@ -265,7 +265,7 @@ extern tBNEP_RESULT BNEP_ConnectResp(uint16_t handle, tBNEP_RESULT resp); * BNEP_WRONG_HANDLE if no connection is not found * ******************************************************************************/ -extern tBNEP_RESULT BNEP_Disconnect(uint16_t handle); +tBNEP_RESULT BNEP_Disconnect(uint16_t handle); /******************************************************************************* * @@ -290,11 +290,9 @@ extern tBNEP_RESULT BNEP_Disconnect(uint16_t handle); * BNEP_SUCCESS - If written successfully * ******************************************************************************/ -extern tBNEP_RESULT BNEP_WriteBuf(uint16_t handle, - const RawAddress& p_dest_addr, BT_HDR* p_buf, - uint16_t protocol, - const RawAddress* p_src_addr, - bool fw_ext_present); +tBNEP_RESULT BNEP_WriteBuf(uint16_t handle, const RawAddress& p_dest_addr, + BT_HDR* p_buf, uint16_t protocol, + const RawAddress* p_src_addr, bool fw_ext_present); /******************************************************************************* * @@ -320,10 +318,9 @@ extern tBNEP_RESULT BNEP_WriteBuf(uint16_t handle, * BNEP_SUCCESS - If written successfully * ******************************************************************************/ -extern tBNEP_RESULT BNEP_Write(uint16_t handle, const RawAddress& p_dest_addr, - uint8_t* p_data, uint16_t len, uint16_t protocol, - const RawAddress* p_src_addr, - bool fw_ext_present); +tBNEP_RESULT BNEP_Write(uint16_t handle, const RawAddress& p_dest_addr, + uint8_t* p_data, uint16_t len, uint16_t protocol, + const RawAddress* p_src_addr, bool fw_ext_present); /******************************************************************************* * @@ -344,10 +341,9 @@ extern tBNEP_RESULT BNEP_Write(uint16_t handle, const RawAddress& p_dest_addr, * BNEP_SUCCESS - if request sent successfully * ******************************************************************************/ -extern tBNEP_RESULT BNEP_SetProtocolFilters(uint16_t handle, - uint16_t num_filters, - uint16_t* p_start_array, - uint16_t* p_end_array); +tBNEP_RESULT BNEP_SetProtocolFilters(uint16_t handle, uint16_t num_filters, + uint16_t* p_start_array, + uint16_t* p_end_array); /******************************************************************************* * @@ -371,10 +367,9 @@ extern tBNEP_RESULT BNEP_SetProtocolFilters(uint16_t handle, * BNEP_SUCCESS - if request sent successfully * ******************************************************************************/ -extern tBNEP_RESULT BNEP_SetMulticastFilters(uint16_t handle, - uint16_t num_filters, - uint8_t* p_start_array, - uint8_t* p_end_array); +tBNEP_RESULT BNEP_SetMulticastFilters(uint16_t handle, uint16_t num_filters, + uint8_t* p_start_array, + uint8_t* p_end_array); /******************************************************************************* * @@ -386,7 +381,7 @@ extern tBNEP_RESULT BNEP_SetMulticastFilters(uint16_t handle, * Returns the new (current) trace level * ******************************************************************************/ -extern uint8_t BNEP_SetTraceLevel(uint8_t new_level); +uint8_t BNEP_SetTraceLevel(uint8_t new_level); /******************************************************************************* * @@ -399,6 +394,6 @@ extern uint8_t BNEP_SetTraceLevel(uint8_t new_level); * Returns void * ******************************************************************************/ -extern void BNEP_Init(void); +void BNEP_Init(void); #endif diff --git a/system/stack/include/btm_api.h b/system/stack/include/btm_api.h index d66e66b001..72f680d855 100644 --- a/system/stack/include/btm_api.h +++ b/system/stack/include/btm_api.h @@ -646,7 +646,7 @@ void BTM_SecClearSecurityFlags(const RawAddress& bd_addr); * Returns true - dev is bonded * ******************************************************************************/ -extern bool btm_sec_is_a_bonded_dev(const RawAddress& bda); +bool btm_sec_is_a_bonded_dev(const RawAddress& bda); /******************************************************************************* * @@ -663,8 +663,7 @@ extern bool btm_sec_is_a_bonded_dev(const RawAddress& bda); * BT_DEVICE_TYPE_BLE if only BLE transport is supported. * ******************************************************************************/ -extern tBT_DEVICE_TYPE BTM_GetPeerDeviceTypeFromFeatures( - const RawAddress& bd_addr); +tBT_DEVICE_TYPE BTM_GetPeerDeviceTypeFromFeatures(const RawAddress& bd_addr); /***************************************************************************** * POWER MANAGEMENT FUNCTIONS @@ -757,8 +756,7 @@ bool BTM_IsPhy2mSupported(const RawAddress& remote_bda, tBT_TRANSPORT transport) * from peer device * ******************************************************************************/ -extern void BTM_RequestPeerSCA(const RawAddress& remote_bda, - tBT_TRANSPORT transport); +void BTM_RequestPeerSCA(const RawAddress& remote_bda, tBT_TRANSPORT transport); /******************************************************************************* * @@ -770,8 +768,7 @@ extern void BTM_RequestPeerSCA(const RawAddress& remote_bda, * is not supported by peer device or ACL does not exist * ******************************************************************************/ -extern uint8_t BTM_GetPeerSCA(const RawAddress& remote_bda, - tBT_TRANSPORT transport); +uint8_t BTM_GetPeerSCA(const RawAddress& remote_bda, tBT_TRANSPORT transport); /******************************************************************************* * @@ -937,7 +934,7 @@ uint16_t BTM_GetClockOffset(const RawAddress& remote_bda); /* Read maximum data packet that can be sent over current connection */ uint16_t BTM_GetMaxPacketSize(const RawAddress& addr); -extern tBTM_STATUS BTM_BT_Quality_Report_VSE_Register( +tBTM_STATUS BTM_BT_Quality_Report_VSE_Register( bool is_register, tBTM_BT_QUALITY_REPORT_RECEIVER* p_bqr_report_receiver); uint8_t btm_ble_read_sec_key_size(const RawAddress& bd_addr); diff --git a/system/stack/include/btm_ble_api.h b/system/stack/include/btm_ble_api.h index d3ff0e4caa..dadfdaf641 100644 --- a/system/stack/include/btm_ble_api.h +++ b/system/stack/include/btm_ble_api.h @@ -57,9 +57,8 @@ void btm_ble_free(); * addr_type - LE device address type. * ******************************************************************************/ -extern void BTM_SecAddBleDevice(const RawAddress& bd_addr, - tBT_DEVICE_TYPE dev_type, - tBLE_ADDR_TYPE addr_type); +void BTM_SecAddBleDevice(const RawAddress& bd_addr, tBT_DEVICE_TYPE dev_type, + tBLE_ADDR_TYPE addr_type); /******************************************************************************* * @@ -74,17 +73,16 @@ extern void BTM_SecAddBleDevice(const RawAddress& bd_addr, * key_type - LE SMP key type. * ******************************************************************************/ -extern void BTM_SecAddBleKey(const RawAddress& bd_addr, - tBTM_LE_KEY_VALUE* p_le_key, - tBTM_LE_KEY_TYPE key_type); +void BTM_SecAddBleKey(const RawAddress& bd_addr, tBTM_LE_KEY_VALUE* p_le_key, + tBTM_LE_KEY_TYPE key_type); /** * This function is called to set scan parameters. |cb| is called with operation * status **/ -extern void BTM_BleSetScanParams(uint32_t scan_interval, uint32_t scan_window, - tBLE_SCAN_MODE scan_type, - base::Callback<void(uint8_t)> cb); +void BTM_BleSetScanParams(uint32_t scan_interval, uint32_t scan_window, + tBLE_SCAN_MODE scan_type, + base::Callback<void(uint8_t)> cb); /******************************************************************************* * @@ -97,7 +95,7 @@ extern void BTM_BleSetScanParams(uint32_t scan_interval, uint32_t scan_window, * Returns void * ******************************************************************************/ -extern void BTM_BleGetVendorCapabilities(tBTM_BLE_VSC_CB* p_cmn_vsc_cb); +void BTM_BleGetVendorCapabilities(tBTM_BLE_VSC_CB* p_cmn_vsc_cb); /******************************************************************************* * @@ -110,7 +108,7 @@ extern void BTM_BleGetVendorCapabilities(tBTM_BLE_VSC_CB* p_cmn_vsc_cb); * Returns void * ******************************************************************************/ -extern void BTM_BleGetDynamicAudioBuffer( +void BTM_BleGetDynamicAudioBuffer( tBTM_BT_DYNAMIC_AUDIO_BUFFER_CB* p_dynamic_audio_buffer_cb); /******************************************************************************* @@ -131,29 +129,30 @@ extern void BTM_BleGetDynamicAudioBuffer( * * ******************************************************************************/ -extern void BTM_BleSetStorageConfig( - uint8_t batch_scan_full_max, uint8_t batch_scan_trunc_max, - uint8_t batch_scan_notify_threshold, - base::Callback<void(uint8_t /* status */)> cb, - tBTM_BLE_SCAN_THRESHOLD_CBACK* p_thres_cback, tBTM_BLE_REF_VALUE ref_value); +void BTM_BleSetStorageConfig(uint8_t batch_scan_full_max, + uint8_t batch_scan_trunc_max, + uint8_t batch_scan_notify_threshold, + base::Callback<void(uint8_t /* status */)> cb, + tBTM_BLE_SCAN_THRESHOLD_CBACK* p_thres_cback, + tBTM_BLE_REF_VALUE ref_value); /* This function is called to enable batch scan */ -extern void BTM_BleEnableBatchScan( - tBTM_BLE_BATCH_SCAN_MODE scan_mode, uint32_t scan_interval, - uint32_t scan_window, tBTM_BLE_DISCARD_RULE discard_rule, - tBLE_ADDR_TYPE addr_type, base::Callback<void(uint8_t /* status */)> cb); +void BTM_BleEnableBatchScan(tBTM_BLE_BATCH_SCAN_MODE scan_mode, + uint32_t scan_interval, uint32_t scan_window, + tBTM_BLE_DISCARD_RULE discard_rule, + tBLE_ADDR_TYPE addr_type, + base::Callback<void(uint8_t /* status */)> cb); /* This function is called to disable batch scanning */ -extern void BTM_BleDisableBatchScan( - base::Callback<void(uint8_t /* status */)> cb); +void BTM_BleDisableBatchScan(base::Callback<void(uint8_t /* status */)> cb); /* This function is called to read batch scan reports */ -extern void BTM_BleReadScanReports(tBLE_SCAN_MODE scan_mode, - tBTM_BLE_SCAN_REP_CBACK cb); +void BTM_BleReadScanReports(tBLE_SCAN_MODE scan_mode, + tBTM_BLE_SCAN_REP_CBACK cb); /* This function is called to setup the callback for tracking */ -extern void BTM_BleTrackAdvertiser(tBTM_BLE_TRACK_ADV_CBACK* p_track_cback, - tBTM_BLE_REF_VALUE ref_value); +void BTM_BleTrackAdvertiser(tBTM_BLE_TRACK_ADV_CBACK* p_track_cback, + tBTM_BLE_REF_VALUE ref_value); /******************************************************************************* * @@ -170,9 +169,9 @@ extern void BTM_BleTrackAdvertiser(tBTM_BLE_TRACK_ADV_CBACK* p_track_cback, * Returns void * ******************************************************************************/ -extern tBTM_STATUS BTM_BleObserve(bool start, uint8_t duration, - tBTM_INQ_RESULTS_CB* p_results_cb, - tBTM_CMPL_CB* p_cmpl_cb); +tBTM_STATUS BTM_BleObserve(bool start, uint8_t duration, + tBTM_INQ_RESULTS_CB* p_results_cb, + tBTM_CMPL_CB* p_cmpl_cb); /******************************************************************************* * @@ -191,8 +190,8 @@ extern tBTM_STATUS BTM_BleObserve(bool start, uint8_t duration, * Returns void * ******************************************************************************/ -extern void BTM_BleOpportunisticObserve(bool enable, - tBTM_INQ_RESULTS_CB* p_results_cb); +void BTM_BleOpportunisticObserve(bool enable, + tBTM_INQ_RESULTS_CB* p_results_cb); /******************************************************************************* * @@ -208,17 +207,17 @@ extern void BTM_BleOpportunisticObserve(bool enable, * Returns void * ******************************************************************************/ -extern void BTM_BleTargetAnnouncementObserve(bool enable, - tBTM_INQ_RESULTS_CB* p_results_cb); +void BTM_BleTargetAnnouncementObserve(bool enable, + tBTM_INQ_RESULTS_CB* p_results_cb); /** Returns local device encryption root (ER) */ const Octet16& BTM_GetDeviceEncRoot(); /** Returns local device identity root (IR) */ -extern const Octet16& BTM_GetDeviceIDRoot(); +const Octet16& BTM_GetDeviceIDRoot(); /** Return local device DHK. */ -extern const Octet16& BTM_GetDeviceDHK(); +const Octet16& BTM_GetDeviceDHK(); /******************************************************************************* * @@ -234,7 +233,7 @@ extern const Octet16& BTM_GetDeviceDHK(); * Returns None * ******************************************************************************/ -extern void BTM_SecurityGrant(const RawAddress& bd_addr, uint8_t res); +void BTM_SecurityGrant(const RawAddress& bd_addr, uint8_t res); /******************************************************************************* * @@ -251,8 +250,8 @@ extern void BTM_SecurityGrant(const RawAddress& bd_addr, uint8_t res); * BTM_MAX_PASSKEY_VAL(999999(0xF423F)). * ******************************************************************************/ -extern void BTM_BlePasskeyReply(const RawAddress& bd_addr, uint8_t res, - uint32_t passkey); +void BTM_BlePasskeyReply(const RawAddress& bd_addr, uint8_t res, + uint32_t passkey); /******************************************************************************* * @@ -266,7 +265,7 @@ extern void BTM_BlePasskeyReply(const RawAddress& bd_addr, uint8_t res, * res - comparison result BTM_SUCCESS if success * ******************************************************************************/ -extern void BTM_BleConfirmReply(const RawAddress& bd_addr, uint8_t res); +void BTM_BleConfirmReply(const RawAddress& bd_addr, uint8_t res); /******************************************************************************* * @@ -280,8 +279,8 @@ extern void BTM_BleConfirmReply(const RawAddress& bd_addr, uint8_t res); * p_data - simple pairing Randomizer C. * ******************************************************************************/ -extern void BTM_BleOobDataReply(const RawAddress& bd_addr, uint8_t res, - uint8_t len, uint8_t* p_data); +void BTM_BleOobDataReply(const RawAddress& bd_addr, uint8_t res, uint8_t len, + uint8_t* p_data); /******************************************************************************* * @@ -296,8 +295,8 @@ extern void BTM_BleOobDataReply(const RawAddress& bd_addr, uint8_t res, * p_r - pointer to Randomizer. * ******************************************************************************/ -extern void BTM_BleSecureConnectionOobDataReply(const RawAddress& bd_addr, - uint8_t* p_c, uint8_t* p_r); +void BTM_BleSecureConnectionOobDataReply(const RawAddress& bd_addr, + uint8_t* p_c, uint8_t* p_r); /******************************************************************************* * @@ -315,8 +314,8 @@ extern void BTM_BleSecureConnectionOobDataReply(const RawAddress& bd_addr, * Returns true if signing sucessul, otherwise false. * ******************************************************************************/ -extern bool BTM_BleDataSignature(const RawAddress& bd_addr, uint8_t* p_text, - uint16_t len, BLE_SIGNATURE signature); +bool BTM_BleDataSignature(const RawAddress& bd_addr, uint8_t* p_text, + uint16_t len, BLE_SIGNATURE signature); /******************************************************************************* * @@ -333,9 +332,8 @@ extern bool BTM_BleDataSignature(const RawAddress& bd_addr, uint8_t* p_text, * Returns true if signature verified correctly; otherwise false. * ******************************************************************************/ -extern bool BTM_BleVerifySignature(const RawAddress& bd_addr, uint8_t* p_orig, - uint16_t len, uint32_t counter, - uint8_t* p_comp); +bool BTM_BleVerifySignature(const RawAddress& bd_addr, uint8_t* p_orig, + uint16_t len, uint32_t counter, uint8_t* p_comp); /******************************************************************************* * @@ -347,7 +345,7 @@ extern bool BTM_BleVerifySignature(const RawAddress& bd_addr, uint8_t* p_orig, * Returns true if connection is LE link, otherwise false. * ******************************************************************************/ -extern bool BTM_IsBleConnection(uint16_t conn_handle); +bool BTM_IsBleConnection(uint16_t conn_handle); /******************************************************************************* * @@ -358,9 +356,9 @@ extern bool BTM_IsBleConnection(uint16_t conn_handle); * Returns void * ******************************************************************************/ -extern bool BTM_ReadRemoteConnectionAddr(const RawAddress& pseudo_addr, - RawAddress& conn_addr, - tBLE_ADDR_TYPE* p_addr_type); +bool BTM_ReadRemoteConnectionAddr(const RawAddress& pseudo_addr, + RawAddress& conn_addr, + tBLE_ADDR_TYPE* p_addr_type); /******************************************************************************* * @@ -376,7 +374,7 @@ extern bool BTM_ReadRemoteConnectionAddr(const RawAddress& pseudo_addr, * Returns non2. * ******************************************************************************/ -extern void BTM_BleLoadLocalKeys(uint8_t key_type, tBTM_BLE_LOCAL_KEYS* p_key); +void BTM_BleLoadLocalKeys(uint8_t key_type, tBTM_BLE_LOCAL_KEYS* p_key); #include "stack/btm/btm_ble_bgconn.h" @@ -398,11 +396,10 @@ extern void BTM_BleLoadLocalKeys(uint8_t key_type, tBTM_BLE_LOCAL_KEYS* p_key); * Returns void * ******************************************************************************/ -extern void BTM_BleSetPrefConnParams(const RawAddress& bd_addr, - uint16_t min_conn_int, - uint16_t max_conn_int, - uint16_t peripheral_latency, - uint16_t supervision_tout); +void BTM_BleSetPrefConnParams(const RawAddress& bd_addr, uint16_t min_conn_int, + uint16_t max_conn_int, + uint16_t peripheral_latency, + uint16_t supervision_tout); /****************************************************************************** * @@ -416,8 +413,7 @@ extern void BTM_BleSetPrefConnParams(const RawAddress& bd_addr, * Returns void * ******************************************************************************/ -extern void BTM_BleReadControllerFeatures( - tBTM_BLE_CTRL_FEATURES_CBACK* p_vsc_cback); +void BTM_BleReadControllerFeatures(tBTM_BLE_CTRL_FEATURES_CBACK* p_vsc_cback); /******************************************************************************* * @@ -442,7 +438,7 @@ uint16_t BTM_BleReadDiscoverability(); * Returns BTM_BLE_NON_CONNECTABLE or BTM_BLE_CONNECTABLE * ******************************************************************************/ -extern uint16_t BTM_BleReadConnectability(); +uint16_t BTM_BleReadConnectability(); /******************************************************************************* * @@ -456,9 +452,8 @@ extern uint16_t BTM_BleReadConnectability(); * p_addr_type: output parameter to read the address type. * ******************************************************************************/ -extern void BTM_ReadDevInfo(const RawAddress& remote_bda, - tBT_DEVICE_TYPE* p_dev_type, - tBLE_ADDR_TYPE* p_addr_type); +void BTM_ReadDevInfo(const RawAddress& remote_bda, tBT_DEVICE_TYPE* p_dev_type, + tBLE_ADDR_TYPE* p_addr_type); /******************************************************************************* * @@ -470,7 +465,7 @@ extern void BTM_ReadDevInfo(const RawAddress& remote_bda, * Returns true if success; otherwise failed. * *******************************************************************************/ -extern bool BTM_GetRemoteDeviceName(const RawAddress& bda, BD_NAME bd_name); +bool BTM_GetRemoteDeviceName(const RawAddress& bda, BD_NAME bd_name); /******************************************************************************* * @@ -486,8 +481,8 @@ extern bool BTM_GetRemoteDeviceName(const RawAddress& bda, BD_NAME bd_name); * Return true if an active link is identified; false otherwise * ******************************************************************************/ -extern bool BTM_ReadConnectedTransportAddress(RawAddress* remote_bda, - tBT_TRANSPORT transport); +bool BTM_ReadConnectedTransportAddress(RawAddress* remote_bda, + tBT_TRANSPORT transport); /******************************************************************************* * @@ -501,7 +496,7 @@ extern bool BTM_ReadConnectedTransportAddress(RawAddress* remote_bda, * Returns bool privacy mode set success; otherwise failed. * ******************************************************************************/ -extern bool BTM_BleConfigPrivacy(bool enable); +bool BTM_BleConfigPrivacy(bool enable); /******************************************************************************* * @@ -512,7 +507,7 @@ extern bool BTM_BleConfigPrivacy(bool enable); * Returns Return true if local privacy is enabled else false * ******************************************************************************/ -extern bool BTM_BleLocalPrivacyEnabled(void); +bool BTM_BleLocalPrivacyEnabled(void); /******************************************************************************* * @@ -524,7 +519,7 @@ extern bool BTM_BleLocalPrivacyEnabled(void); * Returns Max multi adv instance count * ******************************************************************************/ -extern uint8_t BTM_BleMaxMultiAdvInstanceCount(); +uint8_t BTM_BleMaxMultiAdvInstanceCount(); /******************************************************************************* * @@ -535,7 +530,7 @@ extern uint8_t BTM_BleMaxMultiAdvInstanceCount(); * Returns true to use LE, false use BR/EDR. * ******************************************************************************/ -extern bool BTM_UseLeLink(const RawAddress& bd_addr); +bool BTM_UseLeLink(const RawAddress& bd_addr); /******************************************************************************* * @@ -545,7 +540,7 @@ extern bool BTM_UseLeLink(const RawAddress& bd_addr); * condition. * ******************************************************************************/ -extern void BTM_BleAdvFilterParamSetup( +void BTM_BleAdvFilterParamSetup( tBTM_BLE_SCAN_COND_OP action, tBTM_BLE_PF_FILT_INDEX filt_index, std::unique_ptr<btgatt_filt_param_setup_t> p_filt_params, tBTM_BLE_PF_PARAM_CB cb); @@ -553,11 +548,10 @@ extern void BTM_BleAdvFilterParamSetup( /** * This functions are called to configure the adv data payload filter condition */ -extern void BTM_LE_PF_set(tBTM_BLE_PF_FILT_INDEX filt_index, - std::vector<ApcfCommand> commands, - tBTM_BLE_PF_CFG_CBACK cb); -extern void BTM_LE_PF_clear(tBTM_BLE_PF_FILT_INDEX filt_index, - tBTM_BLE_PF_CFG_CBACK cb); +void BTM_LE_PF_set(tBTM_BLE_PF_FILT_INDEX filt_index, + std::vector<ApcfCommand> commands, tBTM_BLE_PF_CFG_CBACK cb); +void BTM_LE_PF_clear(tBTM_BLE_PF_FILT_INDEX filt_index, + tBTM_BLE_PF_CFG_CBACK cb); /******************************************************************************* * @@ -568,8 +562,8 @@ extern void BTM_LE_PF_clear(tBTM_BLE_PF_FILT_INDEX filt_index, * Parameters enable - true - enables APCF, false - disables APCF * ******************************************************************************/ -extern void BTM_BleEnableDisableFilterFeature( - uint8_t enable, tBTM_BLE_PF_STATUS_CBACK p_stat_cback); +void BTM_BleEnableDisableFilterFeature(uint8_t enable, + tBTM_BLE_PF_STATUS_CBACK p_stat_cback); /******************************************************************************* * @@ -582,8 +576,7 @@ extern void BTM_BleEnableDisableFilterFeature( * Returns status * ******************************************************************************/ -extern tBTM_STATUS BTM_BleGetEnergyInfo( - tBTM_BLE_ENERGY_INFO_CBACK* p_ener_cback); +tBTM_STATUS BTM_BleGetEnergyInfo(tBTM_BLE_ENERGY_INFO_CBACK* p_ener_cback); /******************************************************************************* * @@ -594,8 +587,8 @@ extern tBTM_STATUS BTM_BleGetEnergyInfo( * Returns BTM_SUCCESS if success; otherwise failed. * ******************************************************************************/ -extern tBTM_STATUS BTM_SetBleDataLength(const RawAddress& bd_addr, - uint16_t tx_pdu_length); +tBTM_STATUS BTM_SetBleDataLength(const RawAddress& bd_addr, + uint16_t tx_pdu_length); /******************************************************************************* * @@ -607,7 +600,7 @@ extern tBTM_STATUS BTM_SetBleDataLength(const RawAddress& bd_addr, * Returns BTM_SUCCESS if success; otherwise failed. * ******************************************************************************/ -extern void BTM_BleReadPhy( +void BTM_BleReadPhy( const RawAddress& bd_addr, base::Callback<void(uint8_t tx_phy, uint8_t rx_phy, uint8_t status)> cb); @@ -621,10 +614,10 @@ extern void BTM_BleReadPhy( * Returns BTM_SUCCESS if success; otherwise failed. * ******************************************************************************/ -extern void BTM_BleSetPhy(const RawAddress& bd_addr, uint8_t tx_phys, - uint8_t rx_phys, uint16_t phy_options); +void BTM_BleSetPhy(const RawAddress& bd_addr, uint8_t tx_phys, uint8_t rx_phys, + uint16_t phy_options); -extern void btm_ble_multi_adv_cleanup(void); +void btm_ble_multi_adv_cleanup(void); /******************************************************************************* * @@ -649,19 +642,20 @@ using SyncReportCb = base::Callback<void( using SyncLostCb = base::Callback<void(uint16_t /*sync_handle*/)>; using BigInfoReportCb = base::Callback<void(uint16_t /*sync_handle*/, bool /*encrypted*/)>; -extern void btm_ble_periodic_adv_sync_established( - uint8_t status, uint16_t sync_handle, uint8_t adv_sid, uint8_t address_type, - const RawAddress& addr, uint8_t phy, uint16_t interval, - uint8_t adv_clock_accuracy); -extern void btm_ble_periodic_adv_report(uint16_t sync_handle, uint8_t tx_power, - int8_t rssi, uint8_t cte_type, - uint8_t data_status, uint8_t data_len, - const uint8_t* periodic_data); -extern void btm_ble_periodic_adv_sync_lost(uint16_t sync_handle); +void btm_ble_periodic_adv_sync_established(uint8_t status, uint16_t sync_handle, + uint8_t adv_sid, + uint8_t address_type, + const RawAddress& addr, uint8_t phy, + uint16_t interval, + uint8_t adv_clock_accuracy); +void btm_ble_periodic_adv_report(uint16_t sync_handle, uint8_t tx_power, + int8_t rssi, uint8_t cte_type, + uint8_t data_status, uint8_t data_len, + const uint8_t* periodic_data); +void btm_ble_periodic_adv_sync_lost(uint16_t sync_handle); -extern void btm_ble_biginfo_adv_report_rcvd(uint8_t* param, uint16_t param_len); -extern void btm_ble_periodic_adv_sync_tx_rcvd(uint8_t* param, - uint16_t param_len); +void btm_ble_biginfo_adv_report_rcvd(uint8_t* param, uint16_t param_len); +void btm_ble_periodic_adv_sync_tx_rcvd(uint8_t* param, uint16_t param_len); /******************************************************************************* * * Function BTM_BleStartPeriodicSync @@ -677,10 +671,11 @@ extern void btm_ble_periodic_adv_sync_tx_rcvd(uint8_t* param, * Returns void * ******************************************************************************/ -extern void BTM_BleStartPeriodicSync(uint8_t adv_sid, RawAddress address, - uint16_t skip, uint16_t timeout, - StartSyncCb syncCb, SyncReportCb reportCb, - SyncLostCb lostCb, BigInfoReportCb biginfo_reportCb); +void BTM_BleStartPeriodicSync(uint8_t adv_sid, RawAddress address, + uint16_t skip, uint16_t timeout, + StartSyncCb syncCb, SyncReportCb reportCb, + SyncLostCb lostCb, + BigInfoReportCb biginfo_reportCb); /******************************************************************************* * * Function BTM_BleStopPeriodicSync @@ -694,7 +689,7 @@ extern void BTM_BleStartPeriodicSync(uint8_t adv_sid, RawAddress address, * Returns void * ******************************************************************************/ -extern void BTM_BleStopPeriodicSync(uint16_t handle); +void BTM_BleStopPeriodicSync(uint16_t handle); /******************************************************************************* * * Function BTM_BleCancelPeriodicSync @@ -708,7 +703,7 @@ extern void BTM_BleStopPeriodicSync(uint16_t handle); * Returns void * ******************************************************************************/ -extern void BTM_BleCancelPeriodicSync(uint8_t adv_sid, RawAddress address); +void BTM_BleCancelPeriodicSync(uint8_t adv_sid, RawAddress address); using SyncTransferCb = base::Callback<void(uint8_t /*status*/, RawAddress)>; @@ -725,9 +720,8 @@ using SyncTransferCb = base::Callback<void(uint8_t /*status*/, RawAddress)>; * Returns void * ******************************************************************************/ -extern void BTM_BlePeriodicSyncTransfer(RawAddress addr, uint16_t service_data, - uint16_t sync_handle, - SyncTransferCb cb); +void BTM_BlePeriodicSyncTransfer(RawAddress addr, uint16_t service_data, + uint16_t sync_handle, SyncTransferCb cb); /******************************************************************************* * * Function BTM_BlePeriodicSyncSetInfo @@ -741,8 +735,8 @@ extern void BTM_BlePeriodicSyncTransfer(RawAddress addr, uint16_t service_data, * Returns void * ******************************************************************************/ -extern void BTM_BlePeriodicSyncSetInfo(RawAddress addr, uint16_t service_data, - uint8_t adv_handle, SyncTransferCb cb); +void BTM_BlePeriodicSyncSetInfo(RawAddress addr, uint16_t service_data, + uint8_t adv_handle, SyncTransferCb cb); /******************************************************************************* * * Function BTM_BlePeriodicSyncTxParameters @@ -758,8 +752,8 @@ extern void BTM_BlePeriodicSyncSetInfo(RawAddress addr, uint16_t service_data, * Returns void * ******************************************************************************/ -extern void BTM_BlePeriodicSyncTxParameters(RawAddress addr, uint8_t mode, - uint16_t skip, uint16_t timeout, - StartSyncCb syncCb); +void BTM_BlePeriodicSyncTxParameters(RawAddress addr, uint8_t mode, + uint16_t skip, uint16_t timeout, + StartSyncCb syncCb); #endif diff --git a/system/stack/include/gap_api.h b/system/stack/include/gap_api.h index c996f56c00..a6ff04e4ed 100644 --- a/system/stack/include/gap_api.h +++ b/system/stack/include/gap_api.h @@ -122,12 +122,11 @@ typedef void(tGAP_BLE_CMPL_CBACK)(bool status, const RawAddress& addr, * GAP_INVALID_HANDLE * ******************************************************************************/ -extern uint16_t GAP_ConnOpen(const char* p_serv_name, uint8_t service_id, - bool is_server, const RawAddress* p_rem_bda, - uint16_t psm, uint16_t le_mps, - tL2CAP_CFG_INFO* p_cfg, - tL2CAP_ERTM_INFO* ertm_info, uint16_t security, - tGAP_CONN_CALLBACK* p_cb, tBT_TRANSPORT transport); +uint16_t GAP_ConnOpen(const char* p_serv_name, uint8_t service_id, + bool is_server, const RawAddress* p_rem_bda, uint16_t psm, + uint16_t le_mps, tL2CAP_CFG_INFO* p_cfg, + tL2CAP_ERTM_INFO* ertm_info, uint16_t security, + tGAP_CONN_CALLBACK* p_cb, tBT_TRANSPORT transport); /******************************************************************************* * @@ -139,7 +138,7 @@ extern uint16_t GAP_ConnOpen(const char* p_serv_name, uint8_t service_id, * GAP_ERR_BAD_HANDLE - invalid handle * ******************************************************************************/ -extern uint16_t GAP_ConnClose(uint16_t gap_handle); +uint16_t GAP_ConnClose(uint16_t gap_handle); /******************************************************************************* * @@ -154,8 +153,8 @@ extern uint16_t GAP_ConnClose(uint16_t gap_handle); * GAP_NO_DATA_AVAIL - no data available * ******************************************************************************/ -extern uint16_t GAP_ConnReadData(uint16_t gap_handle, uint8_t* p_data, - uint16_t max_len, uint16_t* p_len); +uint16_t GAP_ConnReadData(uint16_t gap_handle, uint8_t* p_data, + uint16_t max_len, uint16_t* p_len); /******************************************************************************* * @@ -168,7 +167,7 @@ extern uint16_t GAP_ConnReadData(uint16_t gap_handle, uint8_t* p_data, * * ******************************************************************************/ -extern int GAP_GetRxQueueCnt(uint16_t handle, uint32_t* p_rx_queue_count); +int GAP_GetRxQueueCnt(uint16_t handle, uint32_t* p_rx_queue_count); /******************************************************************************* * @@ -184,7 +183,7 @@ extern int GAP_GetRxQueueCnt(uint16_t handle, uint32_t* p_rx_queue_count); * GAP_CONGESTION - system is congested * ******************************************************************************/ -extern uint16_t GAP_ConnWriteData(uint16_t gap_handle, BT_HDR* msg); +uint16_t GAP_ConnWriteData(uint16_t gap_handle, BT_HDR* msg); /******************************************************************************* * @@ -197,7 +196,7 @@ extern uint16_t GAP_ConnWriteData(uint16_t gap_handle, BT_HDR* msg); * GAP_ERR_BAD_HANDLE - invalid handle * ******************************************************************************/ -extern const RawAddress* GAP_ConnGetRemoteAddr(uint16_t gap_handle); +const RawAddress* GAP_ConnGetRemoteAddr(uint16_t gap_handle); /******************************************************************************* * @@ -209,7 +208,7 @@ extern const RawAddress* GAP_ConnGetRemoteAddr(uint16_t gap_handle); * the peer * ******************************************************************************/ -extern uint16_t GAP_ConnGetRemMtuSize(uint16_t gap_handle); +uint16_t GAP_ConnGetRemMtuSize(uint16_t gap_handle); /******************************************************************************* * @@ -223,7 +222,7 @@ extern uint16_t GAP_ConnGetRemMtuSize(uint16_t gap_handle); * 0, if error * ******************************************************************************/ -extern uint16_t GAP_ConnGetL2CAPCid(uint16_t gap_handle); +uint16_t GAP_ConnGetL2CAPCid(uint16_t gap_handle); /******************************************************************************* * @@ -236,7 +235,7 @@ extern uint16_t GAP_ConnGetL2CAPCid(uint16_t gap_handle); * Returns Nothing * ******************************************************************************/ -extern void GAP_Init(void); +void GAP_Init(void); /******************************************************************************* * @@ -247,8 +246,7 @@ extern void GAP_Init(void); * Returns Nothing * ******************************************************************************/ -extern void GAP_BleAttrDBUpdate(uint16_t attr_uuid, - tGAP_BLE_ATTR_VALUE* p_value); +void GAP_BleAttrDBUpdate(uint16_t attr_uuid, tGAP_BLE_ATTR_VALUE* p_value); /******************************************************************************* * @@ -260,7 +258,7 @@ extern void GAP_BleAttrDBUpdate(uint16_t attr_uuid, * Returns true if read started, else false if GAP is busy * ******************************************************************************/ -extern bool GAP_BleReadPeerPrefConnParams(const RawAddress& peer_bda); +bool GAP_BleReadPeerPrefConnParams(const RawAddress& peer_bda); /******************************************************************************* * @@ -272,8 +270,8 @@ extern bool GAP_BleReadPeerPrefConnParams(const RawAddress& peer_bda); * Returns true if request accepted * ******************************************************************************/ -extern bool GAP_BleReadPeerDevName(const RawAddress& peer_bda, - tGAP_BLE_CMPL_CBACK* p_cback); +bool GAP_BleReadPeerDevName(const RawAddress& peer_bda, + tGAP_BLE_CMPL_CBACK* p_cback); /******************************************************************************* * @@ -284,6 +282,6 @@ extern bool GAP_BleReadPeerDevName(const RawAddress& peer_bda, * Returns true if request accepted * ******************************************************************************/ -extern bool GAP_BleCancelReadPeerDevName(const RawAddress& peer_bda); +bool GAP_BleCancelReadPeerDevName(const RawAddress& peer_bda); #endif /* GAP_API_H */ diff --git a/system/stack/include/gatt_api.h b/system/stack/include/gatt_api.h index 5a00c11d11..2e02190ca0 100644 --- a/system/stack/include/gatt_api.h +++ b/system/stack/include/gatt_api.h @@ -852,7 +852,7 @@ typedef struct { * Returns true if registered OK, else false * ******************************************************************************/ -extern bool GATTS_NVRegister(tGATT_APPL_INFO* p_cb_info); +bool GATTS_NVRegister(tGATT_APPL_INFO* p_cb_info); /******************************************************************************* * @@ -871,8 +871,8 @@ extern bool GATTS_NVRegister(tGATT_APPL_INFO* p_cb_info); * on error error status is returned. * ******************************************************************************/ -extern tGATT_STATUS GATTS_AddService(tGATT_IF gatt_if, - btgatt_db_element_t* service, int count); +tGATT_STATUS GATTS_AddService(tGATT_IF gatt_if, btgatt_db_element_t* service, + int count); /******************************************************************************* * @@ -888,8 +888,8 @@ extern tGATT_STATUS GATTS_AddService(tGATT_IF gatt_if, * Returns true if operation succeed, else false * ******************************************************************************/ -extern bool GATTS_DeleteService(tGATT_IF gatt_if, bluetooth::Uuid* p_svc_uuid, - uint16_t svc_inst); +bool GATTS_DeleteService(tGATT_IF gatt_if, bluetooth::Uuid* p_svc_uuid, + uint16_t svc_inst); /******************************************************************************* * @@ -902,7 +902,7 @@ extern bool GATTS_DeleteService(tGATT_IF gatt_if, bluetooth::Uuid* p_svc_uuid, * Returns None. * ******************************************************************************/ -extern void GATTS_StopService(uint16_t service_handle); +void GATTS_StopService(uint16_t service_handle); /******************************************************************************* * @@ -920,10 +920,8 @@ extern void GATTS_StopService(uint16_t service_handle); * code. * ******************************************************************************/ -extern tGATT_STATUS GATTS_HandleValueIndication(uint16_t conn_id, - uint16_t attr_handle, - uint16_t val_len, - uint8_t* p_val); +tGATT_STATUS GATTS_HandleValueIndication(uint16_t conn_id, uint16_t attr_handle, + uint16_t val_len, uint8_t* p_val); /******************************************************************************* * @@ -940,10 +938,9 @@ extern tGATT_STATUS GATTS_HandleValueIndication(uint16_t conn_id, * Returns GATT_SUCCESS if sucessfully sent; otherwise error code. * ******************************************************************************/ -extern tGATT_STATUS GATTS_HandleValueNotification(uint16_t conn_id, - uint16_t attr_handle, - uint16_t val_len, - uint8_t* p_val); +tGATT_STATUS GATTS_HandleValueNotification(uint16_t conn_id, + uint16_t attr_handle, + uint16_t val_len, uint8_t* p_val); /******************************************************************************* * @@ -959,8 +956,8 @@ extern tGATT_STATUS GATTS_HandleValueNotification(uint16_t conn_id, * Returns GATT_SUCCESS if sucessfully sent; otherwise error code. * ******************************************************************************/ -extern tGATT_STATUS GATTS_SendRsp(uint16_t conn_id, uint32_t trans_id, - tGATT_STATUS status, tGATTS_RSP* p_msg); +tGATT_STATUS GATTS_SendRsp(uint16_t conn_id, uint32_t trans_id, + tGATT_STATUS status, tGATTS_RSP* p_msg); /******************************************************************************/ /* GATT Profile Client Functions */ @@ -979,7 +976,7 @@ extern tGATT_STATUS GATTS_SendRsp(uint16_t conn_id, uint32_t trans_id, * Returns GATT_SUCCESS if command started successfully. * ******************************************************************************/ -extern tGATT_STATUS GATTC_ConfigureMTU(uint16_t conn_id, uint16_t mtu); +tGATT_STATUS GATTC_ConfigureMTU(uint16_t conn_id, uint16_t mtu); /******************************************************************************* * Function GATTC_UpdateUserAttMtuIfNeeded @@ -994,9 +991,8 @@ extern tGATT_STATUS GATTC_ConfigureMTU(uint16_t conn_id, uint16_t mtu); * user_mtu: user request mtu * ******************************************************************************/ -extern void GATTC_UpdateUserAttMtuIfNeeded(const RawAddress& remote_bda, - tBT_TRANSPORT transport, - uint16_t user_mtu); +void GATTC_UpdateUserAttMtuIfNeeded(const RawAddress& remote_bda, + tBT_TRANSPORT transport, uint16_t user_mtu); /****************************************************************************** * @@ -1024,11 +1020,12 @@ extern void GATTC_UpdateUserAttMtuIfNeeded(const RawAddress& remote_bda, * Exchange. Conn_id is stored for result. * ******************************************************************************/ -extern tGATTC_TryMtuRequestResult GATTC_TryMtuRequest( - const RawAddress& remote_bda, tBT_TRANSPORT transport, uint16_t conn_id, - uint16_t* current_mtu); +tGATTC_TryMtuRequestResult GATTC_TryMtuRequest(const RawAddress& remote_bda, + tBT_TRANSPORT transport, + uint16_t conn_id, + uint16_t* current_mtu); -extern std::list<uint16_t> GATTC_GetAndRemoveListOfConnIdsWaitingForMtuRequest( +std::list<uint16_t> GATTC_GetAndRemoveListOfConnIdsWaitingForMtuRequest( const RawAddress& remote_bda); /******************************************************************************* * @@ -1046,11 +1043,11 @@ extern std::list<uint16_t> GATTC_GetAndRemoveListOfConnIdsWaitingForMtuRequest( * Returns GATT_SUCCESS if command received/sent successfully. * ******************************************************************************/ -extern tGATT_STATUS GATTC_Discover(uint16_t conn_id, tGATT_DISC_TYPE disc_type, - uint16_t start_handle, uint16_t end_handle, - const bluetooth::Uuid& uuid); -extern tGATT_STATUS GATTC_Discover(uint16_t conn_id, tGATT_DISC_TYPE disc_type, - uint16_t start_handle, uint16_t end_handle); +tGATT_STATUS GATTC_Discover(uint16_t conn_id, tGATT_DISC_TYPE disc_type, + uint16_t start_handle, uint16_t end_handle, + const bluetooth::Uuid& uuid); +tGATT_STATUS GATTC_Discover(uint16_t conn_id, tGATT_DISC_TYPE disc_type, + uint16_t start_handle, uint16_t end_handle); /******************************************************************************* * @@ -1066,8 +1063,8 @@ extern tGATT_STATUS GATTC_Discover(uint16_t conn_id, tGATT_DISC_TYPE disc_type, * Returns GATT_SUCCESS if command started successfully. * ******************************************************************************/ -extern tGATT_STATUS GATTC_Read(uint16_t conn_id, tGATT_READ_TYPE type, - tGATT_READ_PARAM* p_read); +tGATT_STATUS GATTC_Read(uint16_t conn_id, tGATT_READ_TYPE type, + tGATT_READ_PARAM* p_read); /******************************************************************************* * @@ -1083,8 +1080,8 @@ extern tGATT_STATUS GATTC_Read(uint16_t conn_id, tGATT_READ_TYPE type, * Returns GATT_SUCCESS if command started successfully. * ******************************************************************************/ -extern tGATT_STATUS GATTC_Write(uint16_t conn_id, tGATT_WRITE_TYPE type, - tGATT_VALUE* p_write); +tGATT_STATUS GATTC_Write(uint16_t conn_id, tGATT_WRITE_TYPE type, + tGATT_VALUE* p_write); /******************************************************************************* * @@ -1100,7 +1097,7 @@ extern tGATT_STATUS GATTC_Write(uint16_t conn_id, tGATT_WRITE_TYPE type, * Returns GATT_SUCCESS if command started successfully. * ******************************************************************************/ -extern tGATT_STATUS GATTC_ExecuteWrite(uint16_t conn_id, bool is_execute); +tGATT_STATUS GATTC_ExecuteWrite(uint16_t conn_id, bool is_execute); /******************************************************************************* * @@ -1115,8 +1112,7 @@ extern tGATT_STATUS GATTC_ExecuteWrite(uint16_t conn_id, bool is_execute); * Returns GATT_SUCCESS if command started successfully. * ******************************************************************************/ -extern tGATT_STATUS GATTC_SendHandleValueConfirm(uint16_t conn_id, - uint16_t handle); +tGATT_STATUS GATTC_SendHandleValueConfirm(uint16_t conn_id, uint16_t handle); /******************************************************************************* * @@ -1137,8 +1133,8 @@ extern tGATT_STATUS GATTC_SendHandleValueConfirm(uint16_t conn_id, * Returns void * ******************************************************************************/ -extern void GATT_SetIdleTimeout(const RawAddress& bd_addr, uint16_t idle_tout, - tBT_TRANSPORT transport, bool is_active); +void GATT_SetIdleTimeout(const RawAddress& bd_addr, uint16_t idle_tout, + tBT_TRANSPORT transport, bool is_active); /******************************************************************************* * @@ -1155,9 +1151,9 @@ extern void GATT_SetIdleTimeout(const RawAddress& bd_addr, uint16_t idle_tout, * with GATT * ******************************************************************************/ -extern tGATT_IF GATT_Register(const bluetooth::Uuid& p_app_uuid128, - const std::string& name, tGATT_CBACK* p_cb_info, - bool eatt_support); +tGATT_IF GATT_Register(const bluetooth::Uuid& p_app_uuid128, + const std::string& name, tGATT_CBACK* p_cb_info, + bool eatt_support); /******************************************************************************* * @@ -1170,7 +1166,7 @@ extern tGATT_IF GATT_Register(const bluetooth::Uuid& p_app_uuid128, * Returns None. * ******************************************************************************/ -extern void GATT_Deregister(tGATT_IF gatt_if); +void GATT_Deregister(tGATT_IF gatt_if); /******************************************************************************* * @@ -1185,7 +1181,7 @@ extern void GATT_Deregister(tGATT_IF gatt_if); * Returns None * ******************************************************************************/ -extern void GATT_StartIf(tGATT_IF gatt_if); +void GATT_StartIf(tGATT_IF gatt_if); /******************************************************************************* * @@ -1207,18 +1203,16 @@ extern void GATT_StartIf(tGATT_IF gatt_if); * Returns true if connection started; else false * ******************************************************************************/ -extern bool GATT_Connect(tGATT_IF gatt_if, const RawAddress& bd_addr, - tBTM_BLE_CONN_TYPE connection_type, - tBT_TRANSPORT transport, bool opportunistic); -extern bool GATT_Connect(tGATT_IF gatt_if, const RawAddress& bd_addr, - tBTM_BLE_CONN_TYPE connection_type, - tBT_TRANSPORT transport, bool opportunistic, - uint8_t initiating_phys); -extern bool GATT_Connect(tGATT_IF gatt_if, const RawAddress& bd_addr, - tBLE_ADDR_TYPE addr_type, - tBTM_BLE_CONN_TYPE connection_type, - tBT_TRANSPORT transport, bool opportunistic, - uint8_t initiating_phys); +bool GATT_Connect(tGATT_IF gatt_if, const RawAddress& bd_addr, + tBTM_BLE_CONN_TYPE connection_type, tBT_TRANSPORT transport, + bool opportunistic); +bool GATT_Connect(tGATT_IF gatt_if, const RawAddress& bd_addr, + tBTM_BLE_CONN_TYPE connection_type, tBT_TRANSPORT transport, + bool opportunistic, uint8_t initiating_phys); +bool GATT_Connect(tGATT_IF gatt_if, const RawAddress& bd_addr, + tBLE_ADDR_TYPE addr_type, tBTM_BLE_CONN_TYPE connection_type, + tBT_TRANSPORT transport, bool opportunistic, + uint8_t initiating_phys); /******************************************************************************* * @@ -1237,8 +1231,8 @@ extern bool GATT_Connect(tGATT_IF gatt_if, const RawAddress& bd_addr, * Returns true if connection started; else false * ******************************************************************************/ -extern bool GATT_CancelConnect(tGATT_IF gatt_if, const RawAddress& bd_addr, - bool is_direct); +bool GATT_CancelConnect(tGATT_IF gatt_if, const RawAddress& bd_addr, + bool is_direct); /******************************************************************************* * @@ -1251,7 +1245,7 @@ extern bool GATT_CancelConnect(tGATT_IF gatt_if, const RawAddress& bd_addr, * Returns GATT_SUCCESS if disconnected. * ******************************************************************************/ -extern tGATT_STATUS GATT_Disconnect(uint16_t conn_id); +tGATT_STATUS GATT_Disconnect(uint16_t conn_id); /******************************************************************************* * @@ -1269,9 +1263,8 @@ extern tGATT_STATUS GATT_Disconnect(uint16_t conn_id); * Returns true the ligical link information is found for conn_id * ******************************************************************************/ -extern bool GATT_GetConnectionInfor(uint16_t conn_id, tGATT_IF* p_gatt_if, - RawAddress& bd_addr, - tBT_TRANSPORT* p_transport); +bool GATT_GetConnectionInfor(uint16_t conn_id, tGATT_IF* p_gatt_if, + RawAddress& bd_addr, tBT_TRANSPORT* p_transport); /******************************************************************************* * @@ -1289,10 +1282,8 @@ extern bool GATT_GetConnectionInfor(uint16_t conn_id, tGATT_IF* p_gatt_if, * Returns true the ligical link is connected * ******************************************************************************/ -extern bool GATT_GetConnIdIfConnected(tGATT_IF gatt_if, - const RawAddress& bd_addr, - uint16_t* p_conn_id, - tBT_TRANSPORT transport); +bool GATT_GetConnIdIfConnected(tGATT_IF gatt_if, const RawAddress& bd_addr, + uint16_t* p_conn_id, tBT_TRANSPORT transport); /******************************************************************************* * @@ -1303,25 +1294,25 @@ extern bool GATT_GetConnIdIfConnected(tGATT_IF gatt_if, * Returns None. * ******************************************************************************/ -extern void GATT_ConfigServiceChangeCCC(const RawAddress& remote_bda, - bool enable, tBT_TRANSPORT transport); +void GATT_ConfigServiceChangeCCC(const RawAddress& remote_bda, bool enable, + tBT_TRANSPORT transport); // Enables the GATT profile on the device. // It clears out the control blocks, and registers with L2CAP. -extern void gatt_init(void); +void gatt_init(void); // Frees resources used by the GATT profile. -extern void gatt_free(void); +void gatt_free(void); // Link encryption complete notification for all encryption process // initiated outside GATT. -extern void gatt_notify_enc_cmpl(const RawAddress& bd_addr); +void gatt_notify_enc_cmpl(const RawAddress& bd_addr); /** Reset bg device list. If called after controller reset, set |after_reset| to * true, as there is no need to wipe controller acceptlist in this case. */ -extern void gatt_reset_bgdev_list(bool after_reset); +void gatt_reset_bgdev_list(bool after_reset); // Initialize GATTS list of bonded device service change updates. -extern void gatt_load_bonded(void); +void gatt_load_bonded(void); #endif /* GATT_API_H */ diff --git a/system/stack/include/hcimsgs.h b/system/stack/include/hcimsgs.h index d3178c2015..ac9deb17e6 100644 --- a/system/stack/include/hcimsgs.h +++ b/system/stack/include/hcimsgs.h @@ -56,172 +56,160 @@ const Interface& GetInterface(); /* Disconnect */ /* Add SCO Connection */ -extern void btsnd_hcic_add_SCO_conn(uint16_t handle, uint16_t packet_types); +void btsnd_hcic_add_SCO_conn(uint16_t handle, uint16_t packet_types); /* Add SCO Connection */ /* Create Connection Cancel */ -extern void btsnd_hcic_create_conn_cancel(const RawAddress& dest); +void btsnd_hcic_create_conn_cancel(const RawAddress& dest); /* Create Connection Cancel */ /* Accept Connection Request */ -extern void btsnd_hcic_accept_conn(const RawAddress& bd_addr, uint8_t role); +void btsnd_hcic_accept_conn(const RawAddress& bd_addr, uint8_t role); /* Accept Connection Request */ /* Reject Connection Request */ -extern void btsnd_hcic_reject_conn(const RawAddress& bd_addr, uint8_t reason); +void btsnd_hcic_reject_conn(const RawAddress& bd_addr, uint8_t reason); /* Reject Connection Request */ /* Link Key Request Reply */ -extern void btsnd_hcic_link_key_req_reply(const RawAddress& bd_addr, - const LinkKey& link_key); +void btsnd_hcic_link_key_req_reply(const RawAddress& bd_addr, + const LinkKey& link_key); /* Link Key Request Reply */ /* Link Key Request Neg Reply */ -extern void btsnd_hcic_link_key_neg_reply(const RawAddress& bd_addr); +void btsnd_hcic_link_key_neg_reply(const RawAddress& bd_addr); /* Link Key Request Neg Reply */ /* PIN Code Request Reply */ -extern void btsnd_hcic_pin_code_req_reply(const RawAddress& bd_addr, - uint8_t pin_code_len, - PIN_CODE pin_code); +void btsnd_hcic_pin_code_req_reply(const RawAddress& bd_addr, + uint8_t pin_code_len, PIN_CODE pin_code); /* PIN Code Request Reply */ /* Link Key Request Neg Reply */ -extern void btsnd_hcic_pin_code_neg_reply(const RawAddress& bd_addr); +void btsnd_hcic_pin_code_neg_reply(const RawAddress& bd_addr); /* Link Key Request Neg Reply */ /* Change Connection Type */ -extern void btsnd_hcic_change_conn_type(uint16_t handle, uint16_t packet_types); +void btsnd_hcic_change_conn_type(uint16_t handle, uint16_t packet_types); /* Change Connection Type */ -extern void btsnd_hcic_auth_request( - uint16_t handle); /* Authentication Request */ +void btsnd_hcic_auth_request(uint16_t handle); /* Authentication Request */ /* Set Connection Encryption */ -extern void btsnd_hcic_set_conn_encrypt(uint16_t handle, bool enable); +void btsnd_hcic_set_conn_encrypt(uint16_t handle, bool enable); /* Set Connection Encryption */ /* Remote Name Request */ -extern void btsnd_hcic_rmt_name_req(const RawAddress& bd_addr, - uint8_t page_scan_rep_mode, - uint8_t page_scan_mode, - uint16_t clock_offset); +void btsnd_hcic_rmt_name_req(const RawAddress& bd_addr, + uint8_t page_scan_rep_mode, uint8_t page_scan_mode, + uint16_t clock_offset); /* Remote Name Request */ /* Remote Name Request Cancel */ -extern void btsnd_hcic_rmt_name_req_cancel(const RawAddress& bd_addr); +void btsnd_hcic_rmt_name_req_cancel(const RawAddress& bd_addr); /* Remote Name Request Cancel */ /* Remote Extended Features */ -extern void btsnd_hcic_rmt_ext_features(uint16_t handle, uint8_t page_num); +void btsnd_hcic_rmt_ext_features(uint16_t handle, uint8_t page_num); /* Remote Extended Features */ -extern void btsnd_hcic_rmt_ver_req( - uint16_t handle); /* Remote Version Info Request */ -extern void btsnd_hcic_read_rmt_clk_offset( - uint16_t handle); /* Remote Clock Offset */ -extern void btsnd_hcic_setup_esco_conn(uint16_t handle, - uint32_t transmit_bandwidth, - uint32_t receive_bandwidth, - uint16_t max_latency, uint16_t voice, - uint8_t retrans_effort, - uint16_t packet_types); -extern void btsnd_hcic_accept_esco_conn( - const RawAddress& bd_addr, uint32_t transmit_bandwidth, - uint32_t receive_bandwidth, uint16_t max_latency, uint16_t content_fmt, - uint8_t retrans_effort, uint16_t packet_types); - -extern void btsnd_hcic_reject_esco_conn(const RawAddress& bd_addr, - uint8_t reason); +void btsnd_hcic_rmt_ver_req(uint16_t handle); /* Remote Version Info Request */ +void btsnd_hcic_read_rmt_clk_offset(uint16_t handle); /* Remote Clock Offset */ +void btsnd_hcic_setup_esco_conn(uint16_t handle, uint32_t transmit_bandwidth, + uint32_t receive_bandwidth, + uint16_t max_latency, uint16_t voice, + uint8_t retrans_effort, uint16_t packet_types); +void btsnd_hcic_accept_esco_conn(const RawAddress& bd_addr, + uint32_t transmit_bandwidth, + uint32_t receive_bandwidth, + uint16_t max_latency, uint16_t content_fmt, + uint8_t retrans_effort, uint16_t packet_types); + +void btsnd_hcic_reject_esco_conn(const RawAddress& bd_addr, uint8_t reason); /* Hold Mode */ -extern void btsnd_hcic_hold_mode(uint16_t handle, uint16_t max_hold_period, - uint16_t min_hold_period); +void btsnd_hcic_hold_mode(uint16_t handle, uint16_t max_hold_period, + uint16_t min_hold_period); /* Hold Mode */ /* Sniff Mode */ -extern void btsnd_hcic_sniff_mode(uint16_t handle, uint16_t max_sniff_period, - uint16_t min_sniff_period, - uint16_t sniff_attempt, - uint16_t sniff_timeout); +void btsnd_hcic_sniff_mode(uint16_t handle, uint16_t max_sniff_period, + uint16_t min_sniff_period, uint16_t sniff_attempt, + uint16_t sniff_timeout); /* Sniff Mode */ -extern void btsnd_hcic_exit_sniff_mode(uint16_t handle); /* Exit Sniff Mode */ +void btsnd_hcic_exit_sniff_mode(uint16_t handle); /* Exit Sniff Mode */ /* Park Mode */ -extern void btsnd_hcic_park_mode(uint16_t handle, uint16_t beacon_max_interval, - uint16_t beacon_min_interval); +void btsnd_hcic_park_mode(uint16_t handle, uint16_t beacon_max_interval, + uint16_t beacon_min_interval); /* Park Mode */ -extern void btsnd_hcic_exit_park_mode(uint16_t handle); /* Exit Park Mode */ +void btsnd_hcic_exit_park_mode(uint16_t handle); /* Exit Park Mode */ /* Write Policy Settings */ -extern void btsnd_hcic_write_policy_set(uint16_t handle, uint16_t settings); +void btsnd_hcic_write_policy_set(uint16_t handle, uint16_t settings); /* Write Policy Settings */ /* Write Default Policy Settings */ -extern void btsnd_hcic_write_def_policy_set(uint16_t settings); +void btsnd_hcic_write_def_policy_set(uint16_t settings); /* Write Default Policy Settings */ /****************************************** * Lisbon Features ******************************************/ /* Sniff Subrating */ -extern void btsnd_hcic_sniff_sub_rate(uint16_t handle, uint16_t max_lat, - uint16_t min_remote_lat, - uint16_t min_local_lat); +void btsnd_hcic_sniff_sub_rate(uint16_t handle, uint16_t max_lat, + uint16_t min_remote_lat, uint16_t min_local_lat); /* Sniff Subrating */ /* Extended Inquiry Response */ -extern void btsnd_hcic_write_ext_inquiry_response(void* buffer, - uint8_t fec_req); +void btsnd_hcic_write_ext_inquiry_response(void* buffer, uint8_t fec_req); /* IO Capabilities Response */ -extern void btsnd_hcic_io_cap_req_reply(const RawAddress& bd_addr, - uint8_t capability, uint8_t oob_present, - uint8_t auth_req); +void btsnd_hcic_io_cap_req_reply(const RawAddress& bd_addr, uint8_t capability, + uint8_t oob_present, uint8_t auth_req); /* IO Capabilities Req Neg Reply */ -extern void btsnd_hcic_io_cap_req_neg_reply(const RawAddress& bd_addr, - uint8_t err_code); +void btsnd_hcic_io_cap_req_neg_reply(const RawAddress& bd_addr, + uint8_t err_code); /* Read Local OOB Data */ -extern void btsnd_hcic_read_local_oob_data(void); +void btsnd_hcic_read_local_oob_data(void); -extern void btsnd_hcic_user_conf_reply(const RawAddress& bd_addr, bool is_yes); +void btsnd_hcic_user_conf_reply(const RawAddress& bd_addr, bool is_yes); -extern void btsnd_hcic_user_passkey_reply(const RawAddress& bd_addr, - uint32_t value); +void btsnd_hcic_user_passkey_reply(const RawAddress& bd_addr, uint32_t value); -extern void btsnd_hcic_user_passkey_neg_reply(const RawAddress& bd_addr); +void btsnd_hcic_user_passkey_neg_reply(const RawAddress& bd_addr); /* Remote OOB Data Request Reply */ -extern void btsnd_hcic_rem_oob_reply(const RawAddress& bd_addr, - const Octet16& c, const Octet16& r); +void btsnd_hcic_rem_oob_reply(const RawAddress& bd_addr, const Octet16& c, + const Octet16& r); /* Remote OOB Data Request Negative Reply */ -extern void btsnd_hcic_rem_oob_neg_reply(const RawAddress& bd_addr); +void btsnd_hcic_rem_oob_neg_reply(const RawAddress& bd_addr); /* Read Default Erroneous Data Reporting */ -extern void btsnd_hcic_read_default_erroneous_data_rpt(void); +void btsnd_hcic_read_default_erroneous_data_rpt(void); -extern void btsnd_hcic_enhanced_flush(uint16_t handle, uint8_t packet_type); +void btsnd_hcic_enhanced_flush(uint16_t handle, uint8_t packet_type); /**** end of Simple Pairing Commands ****/ /* Delete Stored Key */ -extern void btsnd_hcic_delete_stored_key(const RawAddress& bd_addr, - bool delete_all_flag); +void btsnd_hcic_delete_stored_key(const RawAddress& bd_addr, + bool delete_all_flag); /* Delete Stored Key */ /* Change Local Name */ -extern void btsnd_hcic_change_name(BD_NAME name); +void btsnd_hcic_change_name(BD_NAME name); #define HCIC_PARAM_SIZE_READ_CMD 0 @@ -229,58 +217,52 @@ extern void btsnd_hcic_change_name(BD_NAME name); #define HCIC_PARAM_SIZE_WRITE_PARAM3 3 -extern void btsnd_hcic_write_pin_type(uint8_t type); /* Write PIN Type */ -extern void btsnd_hcic_write_auto_accept(uint8_t flag); /* Write Auto Accept */ -extern void btsnd_hcic_read_name(void); /* Read Local Name */ -extern void btsnd_hcic_write_page_tout( - uint16_t timeout); /* Write Page Timout */ -extern void btsnd_hcic_write_scan_enable(uint8_t flag); /* Write Scan Enable */ -extern void btsnd_hcic_write_pagescan_cfg( +void btsnd_hcic_write_pin_type(uint8_t type); /* Write PIN Type */ +void btsnd_hcic_write_auto_accept(uint8_t flag); /* Write Auto Accept */ +void btsnd_hcic_read_name(void); /* Read Local Name */ +void btsnd_hcic_write_page_tout(uint16_t timeout); /* Write Page Timout */ +void btsnd_hcic_write_scan_enable(uint8_t flag); /* Write Scan Enable */ +void btsnd_hcic_write_pagescan_cfg( uint16_t interval, uint16_t window); /* Write Page Scan Activity */ /* Write Page Scan Activity */ /* Write Inquiry Scan Activity */ -extern void btsnd_hcic_write_inqscan_cfg(uint16_t interval, uint16_t window); +void btsnd_hcic_write_inqscan_cfg(uint16_t interval, uint16_t window); /* Write Inquiry Scan Activity */ -extern void btsnd_hcic_write_auth_enable( +void btsnd_hcic_write_auth_enable( uint8_t flag); /* Write Authentication Enable */ -extern void btsnd_hcic_write_dev_class( - DEV_CLASS dev); /* Write Class of Device */ -extern void btsnd_hcic_write_voice_settings( - uint16_t flags); /* Write Voice Settings */ +void btsnd_hcic_write_dev_class(DEV_CLASS dev); /* Write Class of Device */ +void btsnd_hcic_write_voice_settings(uint16_t flags); /* Write Voice Settings */ -extern void btsnd_hcic_write_auto_flush_tout( +void btsnd_hcic_write_auto_flush_tout( uint16_t handle, uint16_t timeout); /* Write Retransmit Timout */ -extern void btsnd_hcic_read_tx_power(uint16_t handle, - uint8_t type); /* Read Tx Power */ +void btsnd_hcic_read_tx_power(uint16_t handle, + uint8_t type); /* Read Tx Power */ /* Write Link Supervision Timeout */ -extern void btsnd_hcic_write_link_super_tout(uint16_t handle, uint16_t timeout); +void btsnd_hcic_write_link_super_tout(uint16_t handle, uint16_t timeout); /* Write Link Supervision Timeout */ -extern void btsnd_hcic_write_cur_iac_lap( +void btsnd_hcic_write_cur_iac_lap( uint8_t num_cur_iac, LAP* const iac_lap); /* Write Current IAC LAP */ /* Write Current IAC LAP */ -extern void btsnd_hcic_read_rssi(uint16_t handle); /* Read RSSI */ +void btsnd_hcic_read_rssi(uint16_t handle); /* Read RSSI */ using ReadEncKeySizeCb = base::OnceCallback<void(uint8_t, uint16_t, uint8_t)>; -extern void btsnd_hcic_read_encryption_key_size(uint16_t handle, ReadEncKeySizeCb cb); -extern void btsnd_hcic_read_failed_contact_counter(uint16_t handle); -extern void btsnd_hcic_write_pagescan_type( - uint8_t type); /* Write Page Scan Type */ -extern void btsnd_hcic_write_inqscan_type( - uint8_t type); /* Write Inquiry Scan Type */ -extern void btsnd_hcic_write_inquiry_mode( - uint8_t type); /* Write Inquiry Mode */ +void btsnd_hcic_read_encryption_key_size(uint16_t handle, ReadEncKeySizeCb cb); +void btsnd_hcic_read_failed_contact_counter(uint16_t handle); +void btsnd_hcic_write_pagescan_type(uint8_t type); /* Write Page Scan Type */ +void btsnd_hcic_write_inqscan_type(uint8_t type); /* Write Inquiry Scan Type */ +void btsnd_hcic_write_inquiry_mode(uint8_t type); /* Write Inquiry Mode */ /* Enhanced setup SCO connection (CSA2) */ -extern void btsnd_hcic_enhanced_set_up_synchronous_connection( +void btsnd_hcic_enhanced_set_up_synchronous_connection( uint16_t conn_handle, enh_esco_params_t* p_parms); /* Enhanced accept SCO connection request (CSA2) */ -extern void btsnd_hcic_enhanced_accept_synchronous_connection( +void btsnd_hcic_enhanced_accept_synchronous_connection( const RawAddress& bd_addr, enh_esco_params_t* p_parms); #define HCI_DATA_HANDLE_MASK 0x0FFF @@ -299,9 +281,8 @@ extern void btsnd_hcic_enhanced_accept_synchronous_connection( #define HCID_GET_EVENT(u16) \ (uint8_t)(((u16) >> HCI_DATA_EVENT_OFFSET) & HCI_DATA_EVENT_MASK) -extern void btsnd_hcic_vendor_spec_cmd(void* buffer, uint16_t opcode, - uint8_t len, uint8_t* p_data, - void* p_cmd_cplt_cback); +void btsnd_hcic_vendor_spec_cmd(void* buffer, uint16_t opcode, uint8_t len, + uint8_t* p_data, void* p_cmd_cplt_cback); /******************************************************************************* * BLE Commands @@ -315,83 +296,86 @@ extern void btsnd_hcic_vendor_spec_cmd(void* buffer, uint16_t opcode, #define HCIC_PARAM_SIZE_BLE_SET_PHY 7 /* ULP HCI command */ -extern void btsnd_hcic_ble_set_local_used_feat(uint8_t feat_set[8]); +void btsnd_hcic_ble_set_local_used_feat(uint8_t feat_set[8]); -extern void btsnd_hcic_ble_set_random_addr(const RawAddress& random_addr); +void btsnd_hcic_ble_set_random_addr(const RawAddress& random_addr); -extern void btsnd_hcic_ble_write_adv_params( - uint16_t adv_int_min, uint16_t adv_int_max, uint8_t adv_type, - tBLE_ADDR_TYPE addr_type_own, tBLE_ADDR_TYPE addr_type_dir, - const RawAddress& direct_bda, uint8_t channel_map, - uint8_t adv_filter_policy); +void btsnd_hcic_ble_write_adv_params(uint16_t adv_int_min, uint16_t adv_int_max, + uint8_t adv_type, + tBLE_ADDR_TYPE addr_type_own, + tBLE_ADDR_TYPE addr_type_dir, + const RawAddress& direct_bda, + uint8_t channel_map, + uint8_t adv_filter_policy); -extern void btsnd_hcic_ble_read_adv_chnl_tx_power(void); +void btsnd_hcic_ble_read_adv_chnl_tx_power(void); -extern void btsnd_hcic_ble_set_adv_data(uint8_t data_len, uint8_t* p_data); +void btsnd_hcic_ble_set_adv_data(uint8_t data_len, uint8_t* p_data); -extern void btsnd_hcic_ble_set_scan_rsp_data(uint8_t data_len, - uint8_t* p_scan_rsp); +void btsnd_hcic_ble_set_scan_rsp_data(uint8_t data_len, uint8_t* p_scan_rsp); -extern void btsnd_hcic_ble_set_adv_enable(uint8_t adv_enable); +void btsnd_hcic_ble_set_adv_enable(uint8_t adv_enable); -extern void btsnd_hcic_ble_set_scan_params(uint8_t scan_type, uint16_t scan_int, - uint16_t scan_win, uint8_t addr_type, - uint8_t scan_filter_policy); +void btsnd_hcic_ble_set_scan_params(uint8_t scan_type, uint16_t scan_int, + uint16_t scan_win, uint8_t addr_type, + uint8_t scan_filter_policy); -extern void btsnd_hcic_ble_set_scan_enable(uint8_t scan_enable, - uint8_t duplicate); +void btsnd_hcic_ble_set_scan_enable(uint8_t scan_enable, uint8_t duplicate); -extern void btsnd_hcic_ble_create_ll_conn( - uint16_t scan_int, uint16_t scan_win, uint8_t init_filter_policy, - tBLE_ADDR_TYPE addr_type_peer, const RawAddress& bda_peer, - tBLE_ADDR_TYPE addr_type_own, uint16_t conn_int_min, uint16_t conn_int_max, - uint16_t conn_latency, uint16_t conn_timeout, uint16_t min_ce_len, - uint16_t max_ce_len); +void btsnd_hcic_ble_create_ll_conn(uint16_t scan_int, uint16_t scan_win, + uint8_t init_filter_policy, + tBLE_ADDR_TYPE addr_type_peer, + const RawAddress& bda_peer, + tBLE_ADDR_TYPE addr_type_own, + uint16_t conn_int_min, uint16_t conn_int_max, + uint16_t conn_latency, uint16_t conn_timeout, + uint16_t min_ce_len, uint16_t max_ce_len); -extern void btsnd_hcic_ble_create_conn_cancel(void); +void btsnd_hcic_ble_create_conn_cancel(void); -extern void btsnd_hcic_ble_read_acceptlist_size(void); +void btsnd_hcic_ble_read_acceptlist_size(void); -extern void btsnd_hcic_ble_upd_ll_conn_params( - uint16_t handle, uint16_t conn_int_min, uint16_t conn_int_max, - uint16_t conn_latency, uint16_t conn_timeout, uint16_t min_len, - uint16_t max_len); +void btsnd_hcic_ble_upd_ll_conn_params(uint16_t handle, uint16_t conn_int_min, + uint16_t conn_int_max, + uint16_t conn_latency, + uint16_t conn_timeout, uint16_t min_len, + uint16_t max_len); -extern void btsnd_hcic_ble_set_host_chnl_class( +void btsnd_hcic_ble_set_host_chnl_class( uint8_t chnl_map[HCIC_BLE_CHNL_MAP_SIZE]); -extern void btsnd_hcic_ble_read_chnl_map(uint16_t handle); +void btsnd_hcic_ble_read_chnl_map(uint16_t handle); -extern void btsnd_hcic_ble_read_remote_feat(uint16_t handle); +void btsnd_hcic_ble_read_remote_feat(uint16_t handle); -extern void btsnd_hcic_ble_rand(base::Callback<void(BT_OCTET8)> cb); +void btsnd_hcic_ble_rand(base::Callback<void(BT_OCTET8)> cb); -extern void btsnd_hcic_ble_start_enc(uint16_t handle, - uint8_t rand[HCIC_BLE_RAND_DI_SIZE], - uint16_t ediv, const Octet16& ltk); +void btsnd_hcic_ble_start_enc(uint16_t handle, + uint8_t rand[HCIC_BLE_RAND_DI_SIZE], + uint16_t ediv, const Octet16& ltk); -extern void btsnd_hcic_ble_ltk_req_reply(uint16_t handle, const Octet16& ltk); +void btsnd_hcic_ble_ltk_req_reply(uint16_t handle, const Octet16& ltk); -extern void btsnd_hcic_ble_ltk_req_neg_reply(uint16_t handle); +void btsnd_hcic_ble_ltk_req_neg_reply(uint16_t handle); -extern void btsnd_hcic_ble_read_supported_states(void); +void btsnd_hcic_ble_read_supported_states(void); -extern void btsnd_hcic_ble_write_host_supported(uint8_t le_host_spt, - uint8_t simul_le_host_spt); +void btsnd_hcic_ble_write_host_supported(uint8_t le_host_spt, + uint8_t simul_le_host_spt); -extern void btsnd_hcic_ble_read_host_supported(void); +void btsnd_hcic_ble_read_host_supported(void); -extern void btsnd_hcic_ble_rc_param_req_reply( - uint16_t handle, uint16_t conn_int_min, uint16_t conn_int_max, - uint16_t conn_latency, uint16_t conn_timeout, uint16_t min_ce_len, - uint16_t max_ce_len); +void btsnd_hcic_ble_rc_param_req_reply(uint16_t handle, uint16_t conn_int_min, + uint16_t conn_int_max, + uint16_t conn_latency, + uint16_t conn_timeout, + uint16_t min_ce_len, + uint16_t max_ce_len); -extern void btsnd_hcic_ble_rc_param_req_neg_reply(uint16_t handle, - uint8_t reason); +void btsnd_hcic_ble_rc_param_req_neg_reply(uint16_t handle, uint8_t reason); -extern void btsnd_hcic_ble_set_data_length(uint16_t conn_handle, - uint16_t tx_octets, - uint16_t tx_time); +void btsnd_hcic_ble_set_data_length(uint16_t conn_handle, uint16_t tx_octets, + uint16_t tx_time); struct scanning_phy_cfg { uint8_t scan_type; @@ -399,14 +383,15 @@ struct scanning_phy_cfg { uint16_t scan_win; }; -extern void btsnd_hcic_ble_set_extended_scan_params( - uint8_t own_address_type, uint8_t scanning_filter_policy, - uint8_t scanning_phys, scanning_phy_cfg* phy_cfg); +void btsnd_hcic_ble_set_extended_scan_params(uint8_t own_address_type, + uint8_t scanning_filter_policy, + uint8_t scanning_phys, + scanning_phy_cfg* phy_cfg); -extern void btsnd_hcic_ble_set_extended_scan_enable(uint8_t enable, - uint8_t filter_duplicates, - uint16_t duration, - uint16_t period); +void btsnd_hcic_ble_set_extended_scan_enable(uint8_t enable, + uint8_t filter_duplicates, + uint16_t duration, + uint16_t period); struct EXT_CONN_PHY_CFG { uint16_t scan_int; @@ -419,30 +404,29 @@ struct EXT_CONN_PHY_CFG { uint16_t max_ce_len; }; -extern void btsnd_hcic_ble_ext_create_conn(uint8_t init_filter_policy, - uint8_t addr_type_own, - uint8_t addr_type_peer, - const RawAddress& bda_peer, - uint8_t initiating_phys, - EXT_CONN_PHY_CFG* phy_cfg); +void btsnd_hcic_ble_ext_create_conn(uint8_t init_filter_policy, + uint8_t addr_type_own, + uint8_t addr_type_peer, + const RawAddress& bda_peer, + uint8_t initiating_phys, + EXT_CONN_PHY_CFG* phy_cfg); -extern void btsnd_hcic_ble_read_resolvable_addr_peer( - uint8_t addr_type_peer, const RawAddress& bda_peer); +void btsnd_hcic_ble_read_resolvable_addr_peer(uint8_t addr_type_peer, + const RawAddress& bda_peer); -extern void btsnd_hcic_ble_read_resolvable_addr_local( - uint8_t addr_type_peer, const RawAddress& bda_peer); +void btsnd_hcic_ble_read_resolvable_addr_local(uint8_t addr_type_peer, + const RawAddress& bda_peer); -extern void btsnd_hcic_ble_set_addr_resolution_enable( - uint8_t addr_resolution_enable); +void btsnd_hcic_ble_set_addr_resolution_enable(uint8_t addr_resolution_enable); -extern void btsnd_hcic_ble_set_rand_priv_addr_timeout(uint16_t rpa_timout); +void btsnd_hcic_ble_set_rand_priv_addr_timeout(uint16_t rpa_timout); -extern void btsnd_hcic_read_authenticated_payload_tout(uint16_t handle); +void btsnd_hcic_read_authenticated_payload_tout(uint16_t handle); -extern void btsnd_hcic_write_authenticated_payload_tout(uint16_t handle, - uint16_t timeout); +void btsnd_hcic_write_authenticated_payload_tout(uint16_t handle, + uint16_t timeout); -extern void btsnd_hcic_read_iso_tx_sync( +void btsnd_hcic_read_iso_tx_sync( uint16_t iso_handle, base::OnceCallback<void(uint8_t*, uint16_t)> cb); struct EXT_CIS_CFG { @@ -455,11 +439,13 @@ struct EXT_CIS_CFG { uint8_t rtn_stom; }; -extern void btsnd_hcic_set_cig_params( - uint8_t cig_id, uint32_t sdu_itv_mtos, uint32_t sdu_itv_stom, uint8_t sca, - uint8_t packing, uint8_t framing, uint16_t max_trans_lat_stom, - uint16_t max_trans_lat_mtos, uint8_t cis_cnt, const EXT_CIS_CFG* cis_cfg, - base::OnceCallback<void(uint8_t*, uint16_t)> cb); +void btsnd_hcic_set_cig_params(uint8_t cig_id, uint32_t sdu_itv_mtos, + uint32_t sdu_itv_stom, uint8_t sca, + uint8_t packing, uint8_t framing, + uint16_t max_trans_lat_stom, + uint16_t max_trans_lat_mtos, uint8_t cis_cnt, + const EXT_CIS_CFG* cis_cfg, + base::OnceCallback<void(uint8_t*, uint16_t)> cb); struct EXT_CIS_TEST_CFG { uint8_t cis_id; @@ -479,95 +465,93 @@ struct EXT_CIS_CREATE_CFG { uint16_t acl_conn_handle; }; -extern void btsnd_hcic_create_cis( - uint8_t num_cis, const EXT_CIS_CREATE_CFG* cis_create_cfg, - base::OnceCallback<void(uint8_t*, uint16_t)> cb); +void btsnd_hcic_create_cis(uint8_t num_cis, + const EXT_CIS_CREATE_CFG* cis_create_cfg, + base::OnceCallback<void(uint8_t*, uint16_t)> cb); -extern void btsnd_hcic_remove_cig( - uint8_t cig_id, base::OnceCallback<void(uint8_t*, uint16_t)> cb); +void btsnd_hcic_remove_cig(uint8_t cig_id, + base::OnceCallback<void(uint8_t*, uint16_t)> cb); -extern void btsnd_hcic_accept_cis_req(uint16_t conn_handle); +void btsnd_hcic_accept_cis_req(uint16_t conn_handle); -extern void btsnd_hcic_rej_cis_req( - uint16_t conn_handle, uint8_t reason, - base::OnceCallback<void(uint8_t*, uint16_t)> cb); +void btsnd_hcic_rej_cis_req(uint16_t conn_handle, uint8_t reason, + base::OnceCallback<void(uint8_t*, uint16_t)> cb); -extern void btsnd_hcic_req_peer_sca(uint16_t conn_handle); +void btsnd_hcic_req_peer_sca(uint16_t conn_handle); -extern void btsnd_hcic_create_big(uint8_t big_handle, uint8_t adv_handle, - uint8_t num_bis, uint32_t sdu_itv, - uint16_t max_sdu_size, uint16_t max_trans_lat, - uint8_t rtn, uint8_t phy, uint8_t packing, - uint8_t framing, uint8_t enc, - std::array<uint8_t, 16> bcst_code); +void btsnd_hcic_create_big(uint8_t big_handle, uint8_t adv_handle, + uint8_t num_bis, uint32_t sdu_itv, + uint16_t max_sdu_size, uint16_t max_trans_lat, + uint8_t rtn, uint8_t phy, uint8_t packing, + uint8_t framing, uint8_t enc, + std::array<uint8_t, 16> bcst_code); -extern void btsnd_hcic_term_big(uint8_t big_handle, uint8_t reason); +void btsnd_hcic_term_big(uint8_t big_handle, uint8_t reason); -extern void btsnd_hcic_big_term_sync( - uint8_t big_handle, base::OnceCallback<void(uint8_t*, uint16_t)> cb); +void btsnd_hcic_big_term_sync(uint8_t big_handle, + base::OnceCallback<void(uint8_t*, uint16_t)> cb); -extern void btsnd_hcic_setup_iso_data_path( +void btsnd_hcic_setup_iso_data_path( uint16_t iso_handle, uint8_t data_path_dir, uint8_t data_path_id, uint8_t codec_id_format, uint16_t codec_id_company, uint16_t codec_id_vendor, uint32_t controller_delay, std::vector<uint8_t> codec_conf, base::OnceCallback<void(uint8_t*, uint16_t)> cb); -extern void btsnd_hcic_remove_iso_data_path( +void btsnd_hcic_remove_iso_data_path( uint16_t iso_handle, uint8_t data_path_dir, base::OnceCallback<void(uint8_t*, uint16_t)> cb); -extern void btsnd_hcic_read_iso_link_quality( +void btsnd_hcic_read_iso_link_quality( uint16_t iso_handle, base::OnceCallback<void(uint8_t*, uint16_t)> cb); -extern void btsnd_hcic_ble_periodic_advertising_create_sync( +void btsnd_hcic_ble_periodic_advertising_create_sync( uint8_t options, uint8_t adv_sid, uint8_t adv_addr_type, const RawAddress& adv_addr, uint16_t skip_num, uint16_t sync_timeout, uint8_t sync_cte_type); -extern void btsnd_hcic_ble_periodic_advertising_create_sync_cancel( +void btsnd_hcic_ble_periodic_advertising_create_sync_cancel( base::OnceCallback<void(uint8_t*, uint16_t)> cb); -extern void btsnd_hcic_ble_periodic_advertising_terminate_sync( +void btsnd_hcic_ble_periodic_advertising_terminate_sync( uint16_t sync_handle, base::OnceCallback<void(uint8_t*, uint16_t)> cb); -extern void btsnd_hci_ble_add_device_to_periodic_advertiser_list( +void btsnd_hci_ble_add_device_to_periodic_advertiser_list( uint8_t adv_addr_type, const RawAddress& adv_addr, uint8_t adv_sid, base::OnceCallback<void(uint8_t*, uint16_t)> cb); -extern void btsnd_hci_ble_remove_device_from_periodic_advertiser_list( +void btsnd_hci_ble_remove_device_from_periodic_advertiser_list( uint8_t adv_addr_type, const RawAddress& adv_addr, uint8_t adv_sid, base::OnceCallback<void(uint8_t*, uint16_t)> cb); -extern void btsnd_hci_ble_clear_periodic_advertiser_list( +void btsnd_hci_ble_clear_periodic_advertiser_list( base::OnceCallback<void(uint8_t*, uint16_t)> cb); -extern void btsnd_hci_ble_read_periodic_advertiser_list_size( +void btsnd_hci_ble_read_periodic_advertiser_list_size( base::OnceCallback<void(uint8_t*, uint16_t)> cb); -extern void btsnd_hcic_ble_set_periodic_advertising_receive_enable( +void btsnd_hcic_ble_set_periodic_advertising_receive_enable( uint16_t sync_handle, bool enable, base::OnceCallback<void(uint8_t*, uint16_t)> cb); -extern void btsnd_hcic_ble_periodic_advertising_sync_transfer( +void btsnd_hcic_ble_periodic_advertising_sync_transfer( uint16_t conn_handle, uint16_t service_data, uint16_t sync_handle, base::OnceCallback<void(uint8_t*, uint16_t)> cb); -extern void btsnd_hcic_ble_periodic_advertising_set_info_transfer( +void btsnd_hcic_ble_periodic_advertising_set_info_transfer( uint16_t conn_handle, uint16_t service_data, uint8_t adv_handle, base::OnceCallback<void(uint8_t*, uint16_t)> cb); -extern void btsnd_hcic_ble_set_periodic_advertising_sync_transfer_params( +void btsnd_hcic_ble_set_periodic_advertising_sync_transfer_params( uint16_t conn_handle, uint8_t mode, uint16_t skip, uint16_t sync_timeout, uint8_t cte_type, base::OnceCallback<void(uint8_t*, uint16_t)> cb); -extern void -btsnd_hcic_ble_set_default_periodic_advertising_sync_transfer_params( +void btsnd_hcic_ble_set_default_periodic_advertising_sync_transfer_params( uint16_t conn_handle, uint8_t mode, uint16_t skip, uint16_t sync_timeout, uint8_t cte_type, base::OnceCallback<void(uint8_t*, uint16_t)> cb); -extern void btsnd_hcic_configure_data_path(uint8_t data_path_direction, - uint8_t data_path_id, - std::vector<uint8_t> vendor_config); +void btsnd_hcic_configure_data_path(uint8_t data_path_direction, + uint8_t data_path_id, + std::vector<uint8_t> vendor_config); #endif diff --git a/system/stack/include/hidd_api.h b/system/stack/include/hidd_api.h index 1abdcfce38..032db88069 100644 --- a/system/stack/include/hidd_api.h +++ b/system/stack/include/hidd_api.h @@ -70,7 +70,7 @@ extern "C" { * Returns void * ******************************************************************************/ -extern void HID_DevInit(void); +void HID_DevInit(void); /******************************************************************************* * @@ -81,7 +81,7 @@ extern void HID_DevInit(void); * Returns tHID_STATUS * ******************************************************************************/ -extern tHID_STATUS HID_DevRegister(tHID_DEV_HOST_CALLBACK* host_cback); +tHID_STATUS HID_DevRegister(tHID_DEV_HOST_CALLBACK* host_cback); /******************************************************************************* * @@ -92,7 +92,7 @@ extern tHID_STATUS HID_DevRegister(tHID_DEV_HOST_CALLBACK* host_cback); * Returns tHID_STATUS * ******************************************************************************/ -extern tHID_STATUS HID_DevDeregister(void); +tHID_STATUS HID_DevDeregister(void); /******************************************************************************* * @@ -103,10 +103,9 @@ extern tHID_STATUS HID_DevDeregister(void); * Returns tHID_STATUS * ******************************************************************************/ -extern tHID_STATUS HID_DevAddRecord(uint32_t handle, char* p_name, - char* p_description, char* p_provider, - uint16_t subclass, uint16_t desc_len, - uint8_t* p_desc_data); +tHID_STATUS HID_DevAddRecord(uint32_t handle, char* p_name, char* p_description, + char* p_provider, uint16_t subclass, + uint16_t desc_len, uint8_t* p_desc_data); /******************************************************************************* * @@ -117,8 +116,8 @@ extern tHID_STATUS HID_DevAddRecord(uint32_t handle, char* p_name, * Returns tHID_STATUS * ******************************************************************************/ -extern tHID_STATUS HID_DevSendReport(uint8_t channel, uint8_t type, uint8_t id, - uint16_t len, uint8_t* p_data); +tHID_STATUS HID_DevSendReport(uint8_t channel, uint8_t type, uint8_t id, + uint16_t len, uint8_t* p_data); /******************************************************************************* * @@ -129,7 +128,7 @@ extern tHID_STATUS HID_DevSendReport(uint8_t channel, uint8_t type, uint8_t id, * Returns tHID_STATUS * ******************************************************************************/ -extern tHID_STATUS HID_DevVirtualCableUnplug(void); +tHID_STATUS HID_DevVirtualCableUnplug(void); /******************************************************************************* * @@ -140,7 +139,7 @@ extern tHID_STATUS HID_DevVirtualCableUnplug(void); * Returns tHID_STATUS * ******************************************************************************/ -extern tHID_STATUS HID_DevPlugDevice(const RawAddress& addr); +tHID_STATUS HID_DevPlugDevice(const RawAddress& addr); /******************************************************************************* * @@ -151,7 +150,7 @@ extern tHID_STATUS HID_DevPlugDevice(const RawAddress& addr); * Returns tHID_STATUS * ******************************************************************************/ -extern tHID_STATUS HID_DevUnplugDevice(const RawAddress& addr); +tHID_STATUS HID_DevUnplugDevice(const RawAddress& addr); /******************************************************************************* * @@ -162,7 +161,7 @@ extern tHID_STATUS HID_DevUnplugDevice(const RawAddress& addr); * Returns tHID_STATUS * ******************************************************************************/ -extern tHID_STATUS HID_DevConnect(void); +tHID_STATUS HID_DevConnect(void); /******************************************************************************* * @@ -173,7 +172,7 @@ extern tHID_STATUS HID_DevConnect(void); * Returns tHID_STATUS * ******************************************************************************/ -extern tHID_STATUS HID_DevDisconnect(void); +tHID_STATUS HID_DevDisconnect(void); /******************************************************************************* * @@ -184,7 +183,7 @@ extern tHID_STATUS HID_DevDisconnect(void); * Returns tHID_STATUS * ******************************************************************************/ -extern tHID_STATUS HID_DevSetIncomingPolicy(bool allow); +tHID_STATUS HID_DevSetIncomingPolicy(bool allow); /******************************************************************************* * @@ -195,7 +194,7 @@ extern tHID_STATUS HID_DevSetIncomingPolicy(bool allow); * Returns tHID_STATUS * ******************************************************************************/ -extern tHID_STATUS HID_DevReportError(uint8_t error); +tHID_STATUS HID_DevReportError(uint8_t error); /******************************************************************************* * @@ -206,7 +205,7 @@ extern tHID_STATUS HID_DevReportError(uint8_t error); * Returns tHID_STATUS * ******************************************************************************/ -extern tHID_STATUS HID_DevGetDevice(RawAddress* addr); +tHID_STATUS HID_DevGetDevice(RawAddress* addr); /******************************************************************************* * @@ -217,9 +216,10 @@ extern tHID_STATUS HID_DevGetDevice(RawAddress* addr); * Returns tHID_STATUS * ******************************************************************************/ -extern tHID_STATUS HID_DevSetIncomingQos( - uint8_t service_type, uint32_t token_rate, uint32_t token_bucket_size, - uint32_t peak_bandwidth, uint32_t latency, uint32_t delay_variation); +tHID_STATUS HID_DevSetIncomingQos(uint8_t service_type, uint32_t token_rate, + uint32_t token_bucket_size, + uint32_t peak_bandwidth, uint32_t latency, + uint32_t delay_variation); /******************************************************************************* * @@ -230,9 +230,10 @@ extern tHID_STATUS HID_DevSetIncomingQos( * Returns tHID_STATUS * ******************************************************************************/ -extern tHID_STATUS HID_DevSetOutgoingQos( - uint8_t service_type, uint32_t token_rate, uint32_t token_bucket_size, - uint32_t peak_bandwidth, uint32_t latency, uint32_t delay_variation); +tHID_STATUS HID_DevSetOutgoingQos(uint8_t service_type, uint32_t token_rate, + uint32_t token_bucket_size, + uint32_t peak_bandwidth, uint32_t latency, + uint32_t delay_variation); /******************************************************************************* * @@ -244,7 +245,7 @@ extern tHID_STATUS HID_DevSetOutgoingQos( * Returns the new (current) trace level * ******************************************************************************/ -extern uint8_t HID_DevSetTraceLevel(uint8_t new_level); +uint8_t HID_DevSetTraceLevel(uint8_t new_level); #ifdef __cplusplus } diff --git a/system/stack/include/hidh_api.h b/system/stack/include/hidh_api.h index 2570fe69c7..1436a351aa 100644 --- a/system/stack/include/hidh_api.h +++ b/system/stack/include/hidh_api.h @@ -98,10 +98,9 @@ typedef void(tHID_HOST_DEV_CALLBACK)( * Returns tHID_STATUS * ******************************************************************************/ -extern tHID_STATUS HID_HostGetSDPRecord(const RawAddress& addr, - tSDP_DISCOVERY_DB* p_db, - uint32_t db_len, - tHID_HOST_SDP_CALLBACK* sdp_cback); +tHID_STATUS HID_HostGetSDPRecord(const RawAddress& addr, + tSDP_DISCOVERY_DB* p_db, uint32_t db_len, + tHID_HOST_SDP_CALLBACK* sdp_cback); /******************************************************************************* * @@ -112,7 +111,7 @@ extern tHID_STATUS HID_HostGetSDPRecord(const RawAddress& addr, * Returns tHID_STATUS * ******************************************************************************/ -extern tHID_STATUS HID_HostRegister(tHID_HOST_DEV_CALLBACK* dev_cback); +tHID_STATUS HID_HostRegister(tHID_HOST_DEV_CALLBACK* dev_cback); /******************************************************************************* * @@ -123,7 +122,7 @@ extern tHID_STATUS HID_HostRegister(tHID_HOST_DEV_CALLBACK* dev_cback); * Returns tHID_STATUS * ******************************************************************************/ -extern tHID_STATUS HID_HostDeregister(void); +tHID_STATUS HID_HostDeregister(void); /******************************************************************************* * @@ -134,8 +133,8 @@ extern tHID_STATUS HID_HostDeregister(void); * Returns tHID_STATUS * ******************************************************************************/ -extern tHID_STATUS HID_HostAddDev(const RawAddress& addr, uint16_t attr_mask, - uint8_t* handle); +tHID_STATUS HID_HostAddDev(const RawAddress& addr, uint16_t attr_mask, + uint8_t* handle); /******************************************************************************* * @@ -147,7 +146,7 @@ extern tHID_STATUS HID_HostAddDev(const RawAddress& addr, uint16_t attr_mask, * Returns tHID_STATUS * ******************************************************************************/ -extern tHID_STATUS HID_HostRemoveDev(uint8_t dev_handle); +tHID_STATUS HID_HostRemoveDev(uint8_t dev_handle); /******************************************************************************* * @@ -159,7 +158,7 @@ extern tHID_STATUS HID_HostRemoveDev(uint8_t dev_handle); * Returns void * ******************************************************************************/ -extern tHID_STATUS HID_HostOpenDev(uint8_t dev_handle); +tHID_STATUS HID_HostOpenDev(uint8_t dev_handle); /******************************************************************************* * @@ -170,9 +169,8 @@ extern tHID_STATUS HID_HostOpenDev(uint8_t dev_handle); * Returns void * ******************************************************************************/ -extern tHID_STATUS HID_HostWriteDev(uint8_t dev_handle, uint8_t t_type, - uint8_t param, uint16_t data, - uint8_t report_id, BT_HDR* pbuf); +tHID_STATUS HID_HostWriteDev(uint8_t dev_handle, uint8_t t_type, uint8_t param, + uint16_t data, uint8_t report_id, BT_HDR* pbuf); /******************************************************************************* * @@ -183,7 +181,7 @@ extern tHID_STATUS HID_HostWriteDev(uint8_t dev_handle, uint8_t t_type, * Returns void * ******************************************************************************/ -extern tHID_STATUS HID_HostCloseDev(uint8_t dev_handle); +tHID_STATUS HID_HostCloseDev(uint8_t dev_handle); /******************************************************************************* * Function HID_HostInit @@ -192,7 +190,7 @@ extern tHID_STATUS HID_HostCloseDev(uint8_t dev_handle); * * Returns void ******************************************************************************/ -extern void HID_HostInit(void); +void HID_HostInit(void); /******************************************************************************* * @@ -204,6 +202,6 @@ extern void HID_HostInit(void); * Returns the new (current) trace level * ******************************************************************************/ -extern uint8_t HID_HostSetTraceLevel(uint8_t new_level); +uint8_t HID_HostSetTraceLevel(uint8_t new_level); #endif /* HIDH_API_H */ diff --git a/system/stack/include/inq_hci_link_interface.h b/system/stack/include/inq_hci_link_interface.h index 7d88994520..1f56ce6c62 100644 --- a/system/stack/include/inq_hci_link_interface.h +++ b/system/stack/include/inq_hci_link_interface.h @@ -23,14 +23,14 @@ #include "types/raw_address.h" -extern void btm_process_remote_name(const RawAddress* bda, const BD_NAME name, - uint16_t evt_len, tHCI_STATUS hci_status); +void btm_process_remote_name(const RawAddress* bda, const BD_NAME name, + uint16_t evt_len, tHCI_STATUS hci_status); -extern void btm_process_inq_results(const uint8_t* p, uint8_t hci_evt_len, - uint8_t inq_res_mode); +void btm_process_inq_results(const uint8_t* p, uint8_t hci_evt_len, + uint8_t inq_res_mode); -extern void btm_process_inq_complete(tHCI_STATUS status, uint8_t mode); -extern void btm_process_cancel_complete(tHCI_STATUS status, uint8_t mode); +void btm_process_inq_complete(tHCI_STATUS status, uint8_t mode); +void btm_process_cancel_complete(tHCI_STATUS status, uint8_t mode); -extern void btm_acl_process_sca_cmpl_pkt(uint8_t len, uint8_t* data); -extern tINQ_DB_ENT* btm_inq_db_new(const RawAddress& p_bda); +void btm_acl_process_sca_cmpl_pkt(uint8_t len, uint8_t* data); +tINQ_DB_ENT* btm_inq_db_new(const RawAddress& p_bda); diff --git a/system/stack/include/l2c_api.h b/system/stack/include/l2c_api.h index 4a2eab65e4..fb6d5a1a1b 100644 --- a/system/stack/include/l2c_api.h +++ b/system/stack/include/l2c_api.h @@ -381,10 +381,10 @@ uint16_t L2CA_Register2(uint16_t psm, const tL2CAP_APPL_INFO& p_cb_info, * BTM_SetSecurityLevel(). * ******************************************************************************/ -extern uint16_t L2CA_Register(uint16_t psm, const tL2CAP_APPL_INFO& p_cb_info, - bool enable_snoop, tL2CAP_ERTM_INFO* p_ertm_info, - uint16_t my_mtu, uint16_t required_remote_mtu, - uint16_t sec_level); +uint16_t L2CA_Register(uint16_t psm, const tL2CAP_APPL_INFO& p_cb_info, + bool enable_snoop, tL2CAP_ERTM_INFO* p_ertm_info, + uint16_t my_mtu, uint16_t required_remote_mtu, + uint16_t sec_level); /******************************************************************************* * @@ -396,7 +396,7 @@ extern uint16_t L2CA_Register(uint16_t psm, const tL2CAP_APPL_INFO& p_cb_info, * Returns void * ******************************************************************************/ -extern void L2CA_Deregister(uint16_t psm); +void L2CA_Deregister(uint16_t psm); /******************************************************************************* * @@ -408,7 +408,7 @@ extern void L2CA_Deregister(uint16_t psm); * Returns LE_PSM to use if success. Otherwise returns 0. * ******************************************************************************/ -extern uint16_t L2CA_AllocateLePSM(void); +uint16_t L2CA_AllocateLePSM(void); /******************************************************************************* * @@ -419,10 +419,10 @@ extern uint16_t L2CA_AllocateLePSM(void); * Returns void * ******************************************************************************/ -extern void L2CA_FreeLePSM(uint16_t psm); +void L2CA_FreeLePSM(uint16_t psm); -extern uint16_t L2CA_ConnectReq2(uint16_t psm, const RawAddress& p_bd_addr, - uint16_t sec_level); +uint16_t L2CA_ConnectReq2(uint16_t psm, const RawAddress& p_bd_addr, + uint16_t sec_level); /******************************************************************************* * * Function L2CA_ConnectReq @@ -436,7 +436,7 @@ extern uint16_t L2CA_ConnectReq2(uint16_t psm, const RawAddress& p_bd_addr, * Returns the CID of the connection, or 0 if it failed to start * ******************************************************************************/ -extern uint16_t L2CA_ConnectReq(uint16_t psm, const RawAddress& p_bd_addr); +uint16_t L2CA_ConnectReq(uint16_t psm, const RawAddress& p_bd_addr); /******************************************************************************* * @@ -452,9 +452,8 @@ extern uint16_t L2CA_ConnectReq(uint16_t psm, const RawAddress& p_bd_addr); * and BTM_SetSecurityLevel(). * ******************************************************************************/ -extern uint16_t L2CA_RegisterLECoc(uint16_t psm, - const tL2CAP_APPL_INFO& p_cb_info, - uint16_t sec_level, tL2CAP_LE_CFG_INFO cfg); +uint16_t L2CA_RegisterLECoc(uint16_t psm, const tL2CAP_APPL_INFO& p_cb_info, + uint16_t sec_level, tL2CAP_LE_CFG_INFO cfg); /******************************************************************************* * @@ -466,7 +465,7 @@ extern uint16_t L2CA_RegisterLECoc(uint16_t psm, * Returns void * ******************************************************************************/ -extern void L2CA_DeregisterLECoc(uint16_t psm); +void L2CA_DeregisterLECoc(uint16_t psm); /******************************************************************************* * @@ -480,9 +479,8 @@ extern void L2CA_DeregisterLECoc(uint16_t psm); * Returns the CID of the connection, or 0 if it failed to start * ******************************************************************************/ -extern uint16_t L2CA_ConnectLECocReq(uint16_t psm, const RawAddress& p_bd_addr, - tL2CAP_LE_CFG_INFO* p_cfg, - uint16_t sec_level); +uint16_t L2CA_ConnectLECocReq(uint16_t psm, const RawAddress& p_bd_addr, + tL2CAP_LE_CFG_INFO* p_cfg, uint16_t sec_level); /******************************************************************************* * @@ -493,8 +491,7 @@ extern uint16_t L2CA_ConnectLECocReq(uint16_t psm, const RawAddress& p_bd_addr, * Return value: true if peer is connected * ******************************************************************************/ -extern bool L2CA_GetPeerLECocConfig(uint16_t lcid, - tL2CAP_LE_CFG_INFO* peer_cfg); +bool L2CA_GetPeerLECocConfig(uint16_t lcid, tL2CAP_LE_CFG_INFO* peer_cfg); /******************************************************************************* * @@ -518,9 +515,9 @@ uint16_t L2CA_GetPeerLECocCredit(const RawAddress& bd_addr, uint16_t lcid); * ******************************************************************************/ -extern bool L2CA_ReconfigCreditBasedConnsReq(const RawAddress& bd_addr, - std::vector<uint16_t>& lcids, - tL2CAP_LE_CFG_INFO* p_cfg); +bool L2CA_ReconfigCreditBasedConnsReq(const RawAddress& bd_addr, + std::vector<uint16_t>& lcids, + tL2CAP_LE_CFG_INFO* p_cfg); /******************************************************************************* * @@ -535,8 +532,9 @@ extern bool L2CA_ReconfigCreditBasedConnsReq(const RawAddress& bd_addr, * ******************************************************************************/ -extern std::vector<uint16_t> L2CA_ConnectCreditBasedReq( - uint16_t psm, const RawAddress& p_bd_addr, tL2CAP_LE_CFG_INFO* p_cfg); +std::vector<uint16_t> L2CA_ConnectCreditBasedReq(uint16_t psm, + const RawAddress& p_bd_addr, + tL2CAP_LE_CFG_INFO* p_cfg); /******************************************************************************* * @@ -549,10 +547,9 @@ extern std::vector<uint16_t> L2CA_ConnectCreditBasedReq( * ******************************************************************************/ -extern bool L2CA_ConnectCreditBasedRsp(const RawAddress& p_bd_addr, uint8_t id, - std::vector<uint16_t>& accepted_lcids, - uint16_t result, - tL2CAP_LE_CFG_INFO* p_cfg); +bool L2CA_ConnectCreditBasedRsp(const RawAddress& p_bd_addr, uint8_t id, + std::vector<uint16_t>& accepted_lcids, + uint16_t result, tL2CAP_LE_CFG_INFO* p_cfg); /******************************************************************************* * * Function L2CA_DisconnectReq @@ -562,9 +559,9 @@ extern bool L2CA_ConnectCreditBasedRsp(const RawAddress& p_bd_addr, uint8_t id, * Returns true if disconnect sent, else false * ******************************************************************************/ -extern bool L2CA_DisconnectReq(uint16_t cid); +bool L2CA_DisconnectReq(uint16_t cid); -extern bool L2CA_DisconnectLECocReq(uint16_t cid); +bool L2CA_DisconnectLECocReq(uint16_t cid); /******************************************************************************* * @@ -578,9 +575,9 @@ extern bool L2CA_DisconnectLECocReq(uint16_t cid); * L2CAP_DW_FAILED, if error * ******************************************************************************/ -extern uint8_t L2CA_DataWrite(uint16_t cid, BT_HDR* p_data); +uint8_t L2CA_DataWrite(uint16_t cid, BT_HDR* p_data); -extern uint8_t L2CA_LECocDataWrite(uint16_t cid, BT_HDR* p_data); +uint8_t L2CA_LECocDataWrite(uint16_t cid, BT_HDR* p_data); // Given a local channel identifier, |lcid|, this function returns the bound // remote channel identifier, |rcid|. If @@ -607,9 +604,8 @@ bool L2CA_GetRemoteCid(uint16_t lcid, uint16_t* rcid); * NOTE This timeout applies to all logical channels active on the * ACL link. ******************************************************************************/ -extern bool L2CA_SetIdleTimeoutByBdAddr(const RawAddress& bd_addr, - uint16_t timeout, - tBT_TRANSPORT transport); +bool L2CA_SetIdleTimeoutByBdAddr(const RawAddress& bd_addr, uint16_t timeout, + tBT_TRANSPORT transport); /******************************************************************************* * @@ -621,7 +617,7 @@ extern bool L2CA_SetIdleTimeoutByBdAddr(const RawAddress& bd_addr, * Returns the new (current) trace level * ******************************************************************************/ -extern uint8_t L2CA_SetTraceLevel(uint8_t trace_level); +uint8_t L2CA_SetTraceLevel(uint8_t trace_level); /******************************************************************************* * @@ -637,7 +633,7 @@ extern uint8_t L2CA_SetTraceLevel(uint8_t trace_level); * Returns Number of buffers left queued for that CID * ******************************************************************************/ -extern uint16_t L2CA_FlushChannel(uint16_t lcid, uint16_t num_to_flush); +uint16_t L2CA_FlushChannel(uint16_t lcid, uint16_t num_to_flush); /******************************************************************************* * @@ -648,8 +644,7 @@ extern uint16_t L2CA_FlushChannel(uint16_t lcid, uint16_t num_to_flush); * Returns true if a valid channel, else false * ******************************************************************************/ -extern bool L2CA_UseLatencyMode(const RawAddress& bd_addr, - bool use_latency_mode); +bool L2CA_UseLatencyMode(const RawAddress& bd_addr, bool use_latency_mode); /******************************************************************************* * @@ -662,8 +657,7 @@ extern bool L2CA_UseLatencyMode(const RawAddress& bd_addr, * Returns true if a valid channel, else false * ******************************************************************************/ -extern bool L2CA_SetAclPriority(const RawAddress& bd_addr, - tL2CAP_PRIORITY priority); +bool L2CA_SetAclPriority(const RawAddress& bd_addr, tL2CAP_PRIORITY priority); /******************************************************************************* * @@ -674,8 +668,7 @@ extern bool L2CA_SetAclPriority(const RawAddress& bd_addr, * Returns true if a valid channel, else false * ******************************************************************************/ -extern bool L2CA_SetAclLatency(const RawAddress& bd_addr, - tL2CAP_LATENCY latency); +bool L2CA_SetAclLatency(const RawAddress& bd_addr, tL2CAP_LATENCY latency); /******************************************************************************* * @@ -686,7 +679,7 @@ extern bool L2CA_SetAclLatency(const RawAddress& bd_addr, * Returns true if a valid channel, else false * ******************************************************************************/ -extern bool L2CA_SetTxPriority(uint16_t cid, tL2CAP_CHNL_PRIORITY priority); +bool L2CA_SetTxPriority(uint16_t cid, tL2CAP_CHNL_PRIORITY priority); /******************************************************************************* * @@ -698,7 +691,7 @@ extern bool L2CA_SetTxPriority(uint16_t cid, tL2CAP_CHNL_PRIORITY priority); * Returns true if CID found, else false * ******************************************************************************/ -extern bool L2CA_SetChnlFlushability(uint16_t cid, bool is_flushable); +bool L2CA_SetChnlFlushability(uint16_t cid, bool is_flushable); /******************************************************************************* * @@ -712,8 +705,8 @@ extern bool L2CA_SetChnlFlushability(uint16_t cid, bool is_flushable); * Return value: true if peer is connected * ******************************************************************************/ -extern bool L2CA_GetPeerFeatures(const RawAddress& bd_addr, - uint32_t* p_ext_feat, uint8_t* p_chnl_mask); +bool L2CA_GetPeerFeatures(const RawAddress& bd_addr, uint32_t* p_ext_feat, + uint8_t* p_chnl_mask); /******************************************************************************* * @@ -768,8 +761,8 @@ typedef struct { * Return value: true if registered OK * ******************************************************************************/ -extern bool L2CA_RegisterFixedChannel(uint16_t fixed_cid, - tL2CAP_FIXED_CHNL_REG* p_freg); +bool L2CA_RegisterFixedChannel(uint16_t fixed_cid, + tL2CAP_FIXED_CHNL_REG* p_freg); /******************************************************************************* * @@ -783,8 +776,7 @@ extern bool L2CA_RegisterFixedChannel(uint16_t fixed_cid, * Return value: true if connection started * ******************************************************************************/ -extern bool L2CA_ConnectFixedChnl(uint16_t fixed_cid, - const RawAddress& bd_addr); +bool L2CA_ConnectFixedChnl(uint16_t fixed_cid, const RawAddress& bd_addr); /******************************************************************************* * @@ -800,9 +792,8 @@ extern bool L2CA_ConnectFixedChnl(uint16_t fixed_cid, * L2CAP_DW_FAILED, if error * ******************************************************************************/ -extern uint16_t L2CA_SendFixedChnlData(uint16_t fixed_cid, - const RawAddress& rem_bda, - BT_HDR* p_buf); +uint16_t L2CA_SendFixedChnlData(uint16_t fixed_cid, const RawAddress& rem_bda, + BT_HDR* p_buf); /******************************************************************************* * @@ -817,7 +808,7 @@ extern uint16_t L2CA_SendFixedChnlData(uint16_t fixed_cid, * Return value: true if channel removed * ******************************************************************************/ -extern bool L2CA_RemoveFixedChnl(uint16_t fixed_cid, const RawAddress& rem_bda); +bool L2CA_RemoveFixedChnl(uint16_t fixed_cid, const RawAddress& rem_bda); /******************************************************************************* * @@ -836,15 +827,14 @@ extern bool L2CA_RemoveFixedChnl(uint16_t fixed_cid, const RawAddress& rem_bda); * Returns true if command succeeded, false if failed * ******************************************************************************/ -extern bool L2CA_SetLeGattTimeout(const RawAddress& rem_bda, - uint16_t idle_tout); +bool L2CA_SetLeGattTimeout(const RawAddress& rem_bda, uint16_t idle_tout); -extern bool L2CA_MarkLeLinkAsActive(const RawAddress& rem_bda); +bool L2CA_MarkLeLinkAsActive(const RawAddress& rem_bda); -extern bool L2CA_UpdateBleConnParams(const RawAddress& rem_bda, - uint16_t min_int, uint16_t max_int, - uint16_t latency, uint16_t timeout, - uint16_t min_ce_len, uint16_t max_ce_len); +bool L2CA_UpdateBleConnParams(const RawAddress& rem_bda, uint16_t min_int, + uint16_t max_int, uint16_t latency, + uint16_t timeout, uint16_t min_ce_len, + uint16_t max_ce_len); /******************************************************************************* * @@ -858,8 +848,7 @@ extern bool L2CA_UpdateBleConnParams(const RawAddress& rem_bda, * Return value: true if update started * ******************************************************************************/ -extern bool L2CA_EnableUpdateBleConnParams(const RawAddress& rem_bda, - bool enable); +bool L2CA_EnableUpdateBleConnParams(const RawAddress& rem_bda, bool enable); /******************************************************************************* * @@ -870,19 +859,17 @@ extern bool L2CA_EnableUpdateBleConnParams(const RawAddress& rem_bda, * Returns link role. * ******************************************************************************/ -extern void L2CA_Consolidate(const RawAddress& identity_addr, - const RawAddress& rpa); -extern tHCI_ROLE L2CA_GetBleConnRole(const RawAddress& bd_addr); +void L2CA_Consolidate(const RawAddress& identity_addr, const RawAddress& rpa); +tHCI_ROLE L2CA_GetBleConnRole(const RawAddress& bd_addr); -extern void L2CA_AdjustConnectionIntervals(uint16_t* min_interval, - uint16_t* max_interval, - uint16_t floor_interval); +void L2CA_AdjustConnectionIntervals(uint16_t* min_interval, + uint16_t* max_interval, + uint16_t floor_interval); /** * Check whether an ACL or LE link to the remote device is established */ -extern bool L2CA_IsLinkEstablished(const RawAddress& bd_addr, - tBT_TRANSPORT transport); +bool L2CA_IsLinkEstablished(const RawAddress& bd_addr, tBT_TRANSPORT transport); /******************************************************************************* * @@ -895,9 +882,9 @@ extern bool L2CA_IsLinkEstablished(const RawAddress& bd_addr, * Return value: void * ******************************************************************************/ -extern void L2CA_SetDefaultSubrate(uint16_t subrate_min, uint16_t subrate_max, - uint16_t max_latency, uint16_t cont_num, - uint16_t timeout); +void L2CA_SetDefaultSubrate(uint16_t subrate_min, uint16_t subrate_max, + uint16_t max_latency, uint16_t cont_num, + uint16_t timeout); /******************************************************************************* * @@ -910,9 +897,9 @@ extern void L2CA_SetDefaultSubrate(uint16_t subrate_min, uint16_t subrate_max, * Return value: true if update started * ******************************************************************************/ -extern bool L2CA_SubrateRequest(const RawAddress& rem_bda, uint16_t subrate_min, - uint16_t subrate_max, uint16_t max_latency, - uint16_t cont_num, uint16_t timeout); +bool L2CA_SubrateRequest(const RawAddress& rem_bda, uint16_t subrate_min, + uint16_t subrate_max, uint16_t max_latency, + uint16_t cont_num, uint16_t timeout); /******************************************************************************* ** @@ -928,7 +915,7 @@ extern bool L2CA_SubrateRequest(const RawAddress& rem_bda, uint16_t subrate_min, ** Returns void ** *******************************************************************************/ -extern void L2CA_SetMediaStreamChannel(uint16_t local_media_cid, bool status); +void L2CA_SetMediaStreamChannel(uint16_t local_media_cid, bool status); /******************************************************************************* ** @@ -945,7 +932,7 @@ extern void L2CA_SetMediaStreamChannel(uint16_t local_media_cid, bool status); ** Returns bool ** *******************************************************************************/ -extern bool L2CA_isMediaChannel(uint16_t handle, uint16_t channel_id, - bool is_local_cid); +bool L2CA_isMediaChannel(uint16_t handle, uint16_t channel_id, + bool is_local_cid); #endif /* L2C_API_H */ diff --git a/system/stack/include/l2cap_acl_interface.h b/system/stack/include/l2cap_acl_interface.h index 95797a85a5..c464b179ea 100644 --- a/system/stack/include/l2cap_acl_interface.h +++ b/system/stack/include/l2cap_acl_interface.h @@ -40,13 +40,13 @@ void acl_write_automatic_flush_timeout(const RawAddress& bd_addr, uint16_t flush_timeout); // ACL data received from HCI-ACL -extern void l2c_rcv_acl_data(BT_HDR* p_msg); +void l2c_rcv_acl_data(BT_HDR* p_msg); // Segments is sent to HCI-ACL -extern void l2c_link_segments_xmitted(BT_HDR* p_msg); +void l2c_link_segments_xmitted(BT_HDR* p_msg); -extern void l2c_link_hci_conn_req(const RawAddress& bd_addr); +void l2c_link_hci_conn_req(const RawAddress& bd_addr); -extern void l2cu_resubmit_pending_sec_req(const RawAddress* p_bda); +void l2cu_resubmit_pending_sec_req(const RawAddress* p_bda); -extern void l2c_packets_completed(uint16_t handle, uint16_t num_sent); +void l2c_packets_completed(uint16_t handle, uint16_t num_sent); diff --git a/system/stack/include/l2cap_controller_interface.h b/system/stack/include/l2cap_controller_interface.h index 80c75da50a..1bea9d82b5 100644 --- a/system/stack/include/l2cap_controller_interface.h +++ b/system/stack/include/l2cap_controller_interface.h @@ -20,10 +20,10 @@ #include <cstdint> // This header contains functions for Controller Module to invoke -extern void l2cu_set_non_flushable_pbf(bool is_supported); +void l2cu_set_non_flushable_pbf(bool is_supported); -extern void l2c_link_init(const uint16_t acl_buffer_count_classic); +void l2c_link_init(const uint16_t acl_buffer_count_classic); -extern void l2c_link_processs_ble_num_bufs(uint16_t num_lm_acl_bufs); +void l2c_link_processs_ble_num_bufs(uint16_t num_lm_acl_bufs); -extern void l2cu_device_reset(void); +void l2cu_device_reset(void); diff --git a/system/stack/include/l2cap_hci_link_interface.h b/system/stack/include/l2cap_hci_link_interface.h index 02b8ea8294..3b75cc63ac 100644 --- a/system/stack/include/l2cap_hci_link_interface.h +++ b/system/stack/include/l2cap_hci_link_interface.h @@ -24,41 +24,38 @@ // This header contains functions for HCI-LinkManagement to invoke -extern bool l2c_link_hci_disc_comp(uint16_t handle, tHCI_REASON reason); +bool l2c_link_hci_disc_comp(uint16_t handle, tHCI_REASON reason); -extern void l2c_link_role_changed(const RawAddress* bd_addr, uint8_t new_role, - uint8_t hci_status); +void l2c_link_role_changed(const RawAddress* bd_addr, uint8_t new_role, + uint8_t hci_status); -extern bool l2cble_conn_comp(uint16_t handle, uint8_t role, - const RawAddress& bda, tBLE_ADDR_TYPE type, - uint16_t conn_interval, uint16_t conn_latency, - uint16_t conn_timeout); +bool l2cble_conn_comp(uint16_t handle, uint8_t role, const RawAddress& bda, + tBLE_ADDR_TYPE type, uint16_t conn_interval, + uint16_t conn_latency, uint16_t conn_timeout); -extern bool l2cble_conn_comp_from_address_with_type( +bool l2cble_conn_comp_from_address_with_type( uint16_t handle, uint8_t role, const tBLE_BD_ADDR& address_with_type, uint16_t conn_interval, uint16_t conn_latency, uint16_t conn_timeout); -extern void l2cble_process_conn_update_evt(uint16_t handle, uint8_t status, - uint16_t interval, uint16_t latency, - uint16_t timeout); +void l2cble_process_conn_update_evt(uint16_t handle, uint8_t status, + uint16_t interval, uint16_t latency, + uint16_t timeout); -extern void l2cble_process_data_length_change_event(uint16_t handle, - uint16_t tx_data_len, - uint16_t rx_data_len); +void l2cble_process_data_length_change_event(uint16_t handle, + uint16_t tx_data_len, + uint16_t rx_data_len); // Notify to L2cap layer that ACL data or remote version is received -extern void l2cble_notify_le_connection(const RawAddress& bda); +void l2cble_notify_le_connection(const RawAddress& bda); void l2cble_use_preferred_conn_params(const RawAddress& bda); -extern void l2cble_process_rc_param_request_evt(uint16_t handle, - uint16_t int_min, - uint16_t int_max, - uint16_t latency, - uint16_t timeout); +void l2cble_process_rc_param_request_evt(uint16_t handle, uint16_t int_min, + uint16_t int_max, uint16_t latency, + uint16_t timeout); // Invoked when HCI mode is changed to HCI_MODE_ACTIVE or HCI_MODE_SNIFF -extern void l2c_OnHciModeChangeSendPendingPackets(RawAddress remote); +void l2c_OnHciModeChangeSendPendingPackets(RawAddress remote); // Invoked when HCI indicates to L2cap to check Security requirement -extern void l2cu_resubmit_pending_sec_req(const RawAddress* p_bda); +void l2cu_resubmit_pending_sec_req(const RawAddress* p_bda); diff --git a/system/stack/include/l2cap_security_interface.h b/system/stack/include/l2cap_security_interface.h index 4b745eddb6..c3d1476261 100644 --- a/system/stack/include/l2cap_security_interface.h +++ b/system/stack/include/l2cap_security_interface.h @@ -22,18 +22,17 @@ // This header contains functions for Security Module to invoke -extern void l2cu_update_lcb_4_bonding(const RawAddress& p_bd_addr, - bool is_bonding); +void l2cu_update_lcb_4_bonding(const RawAddress& p_bd_addr, bool is_bonding); -extern bool l2cu_start_post_bond_timer(uint16_t handle); +bool l2cu_start_post_bond_timer(uint16_t handle); -extern void l2c_pin_code_request(const RawAddress& bd_addr); +void l2c_pin_code_request(const RawAddress& bd_addr); -extern void l2cu_resubmit_pending_sec_req(const RawAddress* p_bda); +void l2cu_resubmit_pending_sec_req(const RawAddress* p_bda); // Establish ACL link to remote device for Security Manager/Pairing. // Returns BTM_CMD_STARTED if already connecting, BTM_NO_RESOURCES if can't // allocate lcb, BTM_SUCCESS if initiated the connection tBTM_STATUS l2cu_ConnectAclForSecurity(const RawAddress& bd_addr); -extern void l2cble_update_sec_act(const RawAddress& bd_addr, uint16_t sec_act); +void l2cble_update_sec_act(const RawAddress& bd_addr, uint16_t sec_act); diff --git a/system/stack/include/pan_api.h b/system/stack/include/pan_api.h index 0b091ec410..aac7cf446e 100644 --- a/system/stack/include/pan_api.h +++ b/system/stack/include/pan_api.h @@ -253,7 +253,7 @@ typedef struct { * Returns none * ******************************************************************************/ -extern void PAN_Register(tPAN_REGISTER* p_register); +void PAN_Register(tPAN_REGISTER* p_register); /******************************************************************************* * @@ -267,7 +267,7 @@ extern void PAN_Register(tPAN_REGISTER* p_register); * Returns none * ******************************************************************************/ -extern void PAN_Deregister(void); +void PAN_Deregister(void); /******************************************************************************* * @@ -293,8 +293,8 @@ extern void PAN_Deregister(void); * PAN_FAILURE - if the role is not valid * ******************************************************************************/ -extern tPAN_RESULT PAN_SetRole(uint8_t role, std::string user_name, - std::string nap_name); +tPAN_RESULT PAN_SetRole(uint8_t role, std::string user_name, + std::string nap_name); /******************************************************************************* * @@ -318,8 +318,8 @@ extern tPAN_RESULT PAN_SetRole(uint8_t role, std::string user_name, * allowed at that point of time * ******************************************************************************/ -extern tPAN_RESULT PAN_Connect(const RawAddress& rem_bda, tPAN_ROLE src_role, - tPAN_ROLE dst_role, uint16_t* handle); +tPAN_RESULT PAN_Connect(const RawAddress& rem_bda, tPAN_ROLE src_role, + tPAN_ROLE dst_role, uint16_t* handle); /******************************************************************************* * @@ -334,7 +334,7 @@ extern tPAN_RESULT PAN_Connect(const RawAddress& rem_bda, tPAN_ROLE src_role, * there is an error in disconnecting * ******************************************************************************/ -extern tPAN_RESULT PAN_Disconnect(uint16_t handle); +tPAN_RESULT PAN_Disconnect(uint16_t handle); /******************************************************************************* * @@ -359,9 +359,9 @@ extern tPAN_RESULT PAN_Disconnect(uint16_t handle); * there is an error in sending data * ******************************************************************************/ -extern tPAN_RESULT PAN_Write(uint16_t handle, const RawAddress& dst, - const RawAddress& src, uint16_t protocol, - uint8_t* p_data, uint16_t len, bool ext); +tPAN_RESULT PAN_Write(uint16_t handle, const RawAddress& dst, + const RawAddress& src, uint16_t protocol, uint8_t* p_data, + uint16_t len, bool ext); /******************************************************************************* * @@ -385,9 +385,9 @@ extern tPAN_RESULT PAN_Write(uint16_t handle, const RawAddress& dst, * there is an error in sending data * ******************************************************************************/ -extern tPAN_RESULT PAN_WriteBuf(uint16_t handle, const RawAddress& dst, - const RawAddress& src, uint16_t protocol, - BT_HDR* p_buf, bool ext); +tPAN_RESULT PAN_WriteBuf(uint16_t handle, const RawAddress& dst, + const RawAddress& src, uint16_t protocol, + BT_HDR* p_buf, bool ext); /******************************************************************************* * @@ -405,9 +405,9 @@ extern tPAN_RESULT PAN_WriteBuf(uint16_t handle, const RawAddress& dst, * PAN_FAILURE if connection not found or error in setting * ******************************************************************************/ -extern tPAN_RESULT PAN_SetProtocolFilters(uint16_t handle, uint16_t num_filters, - uint16_t* p_start_array, - uint16_t* p_end_array); +tPAN_RESULT PAN_SetProtocolFilters(uint16_t handle, uint16_t num_filters, + uint16_t* p_start_array, + uint16_t* p_end_array); /******************************************************************************* * @@ -427,10 +427,9 @@ extern tPAN_RESULT PAN_SetProtocolFilters(uint16_t handle, uint16_t num_filters, * PAN_FAILURE if connection not found or error in setting * ******************************************************************************/ -extern tPAN_RESULT PAN_SetMulticastFilters(uint16_t handle, - uint16_t num_mcast_filters, - uint8_t* p_start_array, - uint8_t* p_end_array); +tPAN_RESULT PAN_SetMulticastFilters(uint16_t handle, uint16_t num_mcast_filters, + uint8_t* p_start_array, + uint8_t* p_end_array); /******************************************************************************* * @@ -442,7 +441,7 @@ extern tPAN_RESULT PAN_SetMulticastFilters(uint16_t handle, * Returns the new (current) trace level * ******************************************************************************/ -extern uint8_t PAN_SetTraceLevel(uint8_t new_level); +uint8_t PAN_SetTraceLevel(uint8_t new_level); /******************************************************************************* * @@ -455,8 +454,8 @@ extern uint8_t PAN_SetTraceLevel(uint8_t new_level); * Returns void * ******************************************************************************/ -extern void PAN_Init(void); +void PAN_Init(void); -extern void PAN_Dumpsys(int fd); +void PAN_Dumpsys(int fd); #endif /* PAN_API_H */ diff --git a/system/stack/include/port_api.h b/system/stack/include/port_api.h index ed4733a34c..929c2eb507 100644 --- a/system/stack/include/port_api.h +++ b/system/stack/include/port_api.h @@ -184,12 +184,12 @@ typedef void(tPORT_CALLBACK)(uint32_t code, uint16_t port_handle); * (scn * 2 + 1) dlci. * ******************************************************************************/ -extern int RFCOMM_CreateConnectionWithSecurity(uint16_t uuid, uint8_t scn, - bool is_server, uint16_t mtu, - const RawAddress& bd_addr, - uint16_t* p_handle, - tPORT_CALLBACK* p_mgmt_cb, - uint16_t sec_mask); +int RFCOMM_CreateConnectionWithSecurity(uint16_t uuid, uint8_t scn, + bool is_server, uint16_t mtu, + const RawAddress& bd_addr, + uint16_t* p_handle, + tPORT_CALLBACK* p_mgmt_cb, + uint16_t sec_mask); /******************************************************************************* * @@ -200,7 +200,7 @@ extern int RFCOMM_CreateConnectionWithSecurity(uint16_t uuid, uint8_t scn, * Parameters: handle - Handle of the port returned in the Open * ******************************************************************************/ -extern int RFCOMM_RemoveConnection(uint16_t handle); +int RFCOMM_RemoveConnection(uint16_t handle); /******************************************************************************* * @@ -211,7 +211,7 @@ extern int RFCOMM_RemoveConnection(uint16_t handle); * Parameters: handle - Handle returned in the RFCOMM_CreateConnection * ******************************************************************************/ -extern int RFCOMM_RemoveServer(uint16_t handle); +int RFCOMM_RemoveServer(uint16_t handle); /******************************************************************************* * @@ -225,8 +225,7 @@ extern int RFCOMM_RemoveServer(uint16_t handle); * specified in the mask occurs. * ******************************************************************************/ -extern int PORT_SetEventCallback(uint16_t port_handle, - tPORT_CALLBACK* p_port_cb); +int PORT_SetEventCallback(uint16_t port_handle, tPORT_CALLBACK* p_port_cb); /******************************************************************************* * @@ -240,8 +239,8 @@ extern int PORT_SetEventCallback(uint16_t port_handle, ******************************************************************************/ int PORT_ClearKeepHandleFlag(uint16_t port_handle); -extern int PORT_SetDataCOCallback(uint16_t port_handle, - tPORT_DATA_CO_CALLBACK* p_port_cb); +int PORT_SetDataCOCallback(uint16_t port_handle, + tPORT_DATA_CO_CALLBACK* p_port_cb); /******************************************************************************* * * Function PORT_SetEventMask @@ -253,7 +252,7 @@ extern int PORT_SetDataCOCallback(uint16_t port_handle, * of zero disables all events. * ******************************************************************************/ -extern int PORT_SetEventMask(uint16_t port_handle, uint32_t mask); +int PORT_SetEventMask(uint16_t port_handle, uint32_t mask); /******************************************************************************* * @@ -267,8 +266,8 @@ extern int PORT_SetEventMask(uint16_t port_handle, uint32_t mask); * p_lcid - OUT L2CAP's LCID * ******************************************************************************/ -extern int PORT_CheckConnection(uint16_t handle, RawAddress* bd_addr, - uint16_t* p_lcid); +int PORT_CheckConnection(uint16_t handle, RawAddress* bd_addr, + uint16_t* p_lcid); /******************************************************************************* * @@ -281,7 +280,7 @@ extern int PORT_CheckConnection(uint16_t handle, RawAddress* bd_addr, * bd_addr - bd_addr of the peer * ******************************************************************************/ -extern bool PORT_IsOpening(RawAddress* bd_addr); +bool PORT_IsOpening(RawAddress* bd_addr); /******************************************************************************* * @@ -295,7 +294,7 @@ extern bool PORT_IsOpening(RawAddress* bd_addr); * configuration information for the connection. * ******************************************************************************/ -extern int PORT_SetState(uint16_t handle, tPORT_STATE* p_settings); +int PORT_SetState(uint16_t handle, tPORT_STATE* p_settings); /******************************************************************************* * @@ -309,7 +308,7 @@ extern int PORT_SetState(uint16_t handle, tPORT_STATE* p_settings); * configuration information is returned. * ******************************************************************************/ -extern int PORT_GetState(uint16_t handle, tPORT_STATE* p_settings); +int PORT_GetState(uint16_t handle, tPORT_STATE* p_settings); /******************************************************************************* * @@ -324,7 +323,7 @@ extern int PORT_GetState(uint16_t handle, tPORT_STATE* p_settings); * enable - enables data flow * ******************************************************************************/ -extern int PORT_FlowControl_MaxCredit(uint16_t handle, bool enable); +int PORT_FlowControl_MaxCredit(uint16_t handle, bool enable); #define PORT_DTRDSR_ON 0x01 #define PORT_CTSRTS_ON 0x02 @@ -362,8 +361,8 @@ extern int PORT_FlowControl_MaxCredit(uint16_t handle, bool enable); * p_len - Byte count received * ******************************************************************************/ -extern int PORT_ReadData(uint16_t handle, char* p_data, uint16_t max_len, - uint16_t* p_len); +int PORT_ReadData(uint16_t handle, char* p_data, uint16_t max_len, + uint16_t* p_len); /******************************************************************************* * @@ -378,8 +377,8 @@ extern int PORT_ReadData(uint16_t handle, char* p_data, uint16_t max_len, * p_len - Bytes written * ******************************************************************************/ -extern int PORT_WriteData(uint16_t handle, const char* p_data, uint16_t max_len, - uint16_t* p_len); +int PORT_WriteData(uint16_t handle, const char* p_data, uint16_t max_len, + uint16_t* p_len); /******************************************************************************* * @@ -391,7 +390,7 @@ extern int PORT_WriteData(uint16_t handle, const char* p_data, uint16_t max_len, * Parameters: handle - Handle returned in the RFCOMM_CreateConnection * ******************************************************************************/ -extern int PORT_WriteDataCO(uint16_t handle, int* p_len); +int PORT_WriteDataCO(uint16_t handle, int* p_len); /******************************************************************************* * @@ -400,7 +399,7 @@ extern int PORT_WriteDataCO(uint16_t handle, int* p_len); * Description This function is called to initialize RFCOMM layer * ******************************************************************************/ -extern void RFCOMM_Init(void); +void RFCOMM_Init(void); /******************************************************************************* * @@ -412,7 +411,7 @@ extern void RFCOMM_Init(void); * Returns the new (current) trace level * ******************************************************************************/ -extern uint8_t PORT_SetTraceLevel(uint8_t new_level); +uint8_t PORT_SetTraceLevel(uint8_t new_level); /******************************************************************************* * @@ -425,7 +424,7 @@ extern uint8_t PORT_SetTraceLevel(uint8_t new_level); * result. Note that the string returned must not be freed. * ******************************************************************************/ -extern const char* PORT_GetResultString(const uint8_t result_code); +const char* PORT_GetResultString(const uint8_t result_code); /******************************************************************************* * @@ -436,6 +435,6 @@ extern const char* PORT_GetResultString(const uint8_t result_code); * Returns the security bitmask. * ******************************************************************************/ -extern int PORT_GetSecurityMask(uint16_t handle, uint16_t* sec_mask); +int PORT_GetSecurityMask(uint16_t handle, uint16_t* sec_mask); #endif /* PORT_API_H */ diff --git a/system/stack/include/port_ext.h b/system/stack/include/port_ext.h index f48f293985..0132f3e209 100644 --- a/system/stack/include/port_ext.h +++ b/system/stack/include/port_ext.h @@ -25,6 +25,6 @@ #ifndef PORTEXT_H #define PORTEXT_H -extern void rfcomm_port_timer_timeout(void* data); -extern void rfcomm_mcb_timer_timeout(void* data); +void rfcomm_port_timer_timeout(void* data); +void rfcomm_mcb_timer_timeout(void* data); #endif diff --git a/system/stack/include/sco_hci_link_interface.h b/system/stack/include/sco_hci_link_interface.h index e764cbf5e0..cd9d8f9e6b 100644 --- a/system/stack/include/sco_hci_link_interface.h +++ b/system/stack/include/sco_hci_link_interface.h @@ -25,18 +25,16 @@ struct tBTM_ESCO_DATA; -extern bool btm_is_sco_active(uint16_t handle); -extern void btm_sco_chk_pend_unpark(tHCI_STATUS hci_status, - uint16_t hci_handle); -extern void btm_sco_conn_req(const RawAddress& bda, const DEV_CLASS& dev_class, - uint8_t link_type); -extern void btm_sco_connected(const RawAddress& bda, uint16_t hci_handle, - tBTM_ESCO_DATA* p_esco_data); -extern void btm_sco_connection_failed(tHCI_STATUS hci_status, - const RawAddress& bda, - uint16_t hci_handle, - tBTM_ESCO_DATA* p_esco_data); -extern bool btm_sco_removed(uint16_t hci_handle, tHCI_REASON reason); +bool btm_is_sco_active(uint16_t handle); +void btm_sco_chk_pend_unpark(tHCI_STATUS hci_status, uint16_t hci_handle); +void btm_sco_conn_req(const RawAddress& bda, const DEV_CLASS& dev_class, + uint8_t link_type); +void btm_sco_connected(const RawAddress& bda, uint16_t hci_handle, + tBTM_ESCO_DATA* p_esco_data); +void btm_sco_connection_failed(tHCI_STATUS hci_status, const RawAddress& bda, + uint16_t hci_handle, + tBTM_ESCO_DATA* p_esco_data); +bool btm_sco_removed(uint16_t hci_handle, tHCI_REASON reason); void btm_sco_on_disconnected(uint16_t hci_handle, tHCI_REASON reason); void btm_sco_on_esco_connect_request(const RawAddress&, diff --git a/system/stack/include/smp_api.h b/system/stack/include/smp_api.h index cf23914a24..67b488d24d 100644 --- a/system/stack/include/smp_api.h +++ b/system/stack/include/smp_api.h @@ -45,7 +45,7 @@ * Returns void * ******************************************************************************/ -extern void SMP_Init(void); +void SMP_Init(void); /******************************************************************************* * @@ -57,7 +57,7 @@ extern void SMP_Init(void); * Returns The new or current trace level * ******************************************************************************/ -extern uint8_t SMP_SetTraceLevel(uint8_t new_level); +uint8_t SMP_SetTraceLevel(uint8_t new_level); /******************************************************************************* * @@ -68,7 +68,7 @@ extern uint8_t SMP_SetTraceLevel(uint8_t new_level); * Returns void * ******************************************************************************/ -extern bool SMP_Register(tSMP_CALLBACK* p_cback); +bool SMP_Register(tSMP_CALLBACK* p_cback); /******************************************************************************* * @@ -79,9 +79,8 @@ extern bool SMP_Register(tSMP_CALLBACK* p_cback); * Returns SMP_STARTED if bond started, else otherwise exception. * ******************************************************************************/ -extern tSMP_STATUS SMP_Pair(const RawAddress& bd_addr); -extern tSMP_STATUS SMP_Pair(const RawAddress& bd_addr, - tBLE_ADDR_TYPE addr_type); +tSMP_STATUS SMP_Pair(const RawAddress& bd_addr); +tSMP_STATUS SMP_Pair(const RawAddress& bd_addr, tBLE_ADDR_TYPE addr_type); /******************************************************************************* * @@ -93,7 +92,7 @@ extern tSMP_STATUS SMP_Pair(const RawAddress& bd_addr, * failure. * ******************************************************************************/ -extern tSMP_STATUS SMP_BR_PairWith(const RawAddress& bd_addr); +tSMP_STATUS SMP_BR_PairWith(const RawAddress& bd_addr); /******************************************************************************* * @@ -104,7 +103,7 @@ extern tSMP_STATUS SMP_BR_PairWith(const RawAddress& bd_addr); * Returns true - pairing cancelled * ******************************************************************************/ -extern bool SMP_PairCancel(const RawAddress& bd_addr); +bool SMP_PairCancel(const RawAddress& bd_addr); /******************************************************************************* * @@ -120,7 +119,7 @@ extern bool SMP_PairCancel(const RawAddress& bd_addr); * Returns None * ******************************************************************************/ -extern void SMP_SecurityGrant(const RawAddress& bd_addr, tSMP_STATUS res); +void SMP_SecurityGrant(const RawAddress& bd_addr, tSMP_STATUS res); /******************************************************************************* * @@ -136,8 +135,7 @@ extern void SMP_SecurityGrant(const RawAddress& bd_addr, tSMP_STATUS res); * BTM_MAX_PASSKEY_VAL(999999(0xF423F)). * ******************************************************************************/ -extern void SMP_PasskeyReply(const RawAddress& bd_addr, uint8_t res, - uint32_t passkey); +void SMP_PasskeyReply(const RawAddress& bd_addr, uint8_t res, uint32_t passkey); /******************************************************************************* * @@ -151,7 +149,7 @@ extern void SMP_PasskeyReply(const RawAddress& bd_addr, uint8_t res, * res - comparison result SMP_SUCCESS if success * ******************************************************************************/ -extern void SMP_ConfirmReply(const RawAddress& bd_addr, uint8_t res); +void SMP_ConfirmReply(const RawAddress& bd_addr, uint8_t res); /******************************************************************************* * @@ -165,8 +163,8 @@ extern void SMP_ConfirmReply(const RawAddress& bd_addr, uint8_t res); * p_data - SM Randomizer C. * ******************************************************************************/ -extern void SMP_OobDataReply(const RawAddress& bd_addr, tSMP_STATUS res, - uint8_t len, uint8_t* p_data); +void SMP_OobDataReply(const RawAddress& bd_addr, tSMP_STATUS res, uint8_t len, + uint8_t* p_data); /******************************************************************************* * @@ -178,7 +176,7 @@ extern void SMP_OobDataReply(const RawAddress& bd_addr, tSMP_STATUS res, * Parameters: p_data - pointer to the data * ******************************************************************************/ -extern void SMP_SecureConnectionOobDataReply(uint8_t* p_data); +void SMP_SecureConnectionOobDataReply(uint8_t* p_data); /******************************************************************************* * @@ -191,7 +189,7 @@ extern void SMP_SecureConnectionOobDataReply(uint8_t* p_data); * state machine, false otherwise * ******************************************************************************/ -extern bool SMP_CrLocScOobData(); +bool SMP_CrLocScOobData(); /******************************************************************************* * @@ -200,13 +198,13 @@ extern bool SMP_CrLocScOobData(); * Description This function is called to clear out the OOB stored locally. * ******************************************************************************/ -extern void SMP_ClearLocScOobData(); +void SMP_ClearLocScOobData(); // Called when LTK request is received from controller. -extern bool smp_proc_ltk_request(const RawAddress& bda); +bool smp_proc_ltk_request(const RawAddress& bda); // Called when link is encrypted and notified to peripheral device. // Proceed to send LTK, DIV and ER to central if bonding the devices. -extern void smp_link_encrypted(const RawAddress& bda, uint8_t encr_enable); +void smp_link_encrypted(const RawAddress& bda, uint8_t encr_enable); #endif /* SMP_API_H */ diff --git a/system/stack/include/srvc_api.h b/system/stack/include/srvc_api.h index 7cc8c7f610..106c932ac2 100644 --- a/system/stack/include/srvc_api.h +++ b/system/stack/include/srvc_api.h @@ -130,7 +130,7 @@ typedef union { * application as for a central service management. * ******************************************************************************/ -extern tGATT_STATUS srvc_eng_init(void); +tGATT_STATUS srvc_eng_init(void); /***************************************************************************** * DIS Server Function @@ -143,7 +143,7 @@ extern tGATT_STATUS srvc_eng_init(void); * Description Initializa the Device Information Service Server. * ******************************************************************************/ -extern tDIS_STATUS DIS_SrInit(tDIS_ATTR_MASK dis_attr_mask); +tDIS_STATUS DIS_SrInit(tDIS_ATTR_MASK dis_attr_mask); /******************************************************************************* * * Function DIS_SrUpdate @@ -151,7 +151,7 @@ extern tDIS_STATUS DIS_SrInit(tDIS_ATTR_MASK dis_attr_mask); * Description Update the DIS server attribute values * ******************************************************************************/ -extern tDIS_STATUS DIS_SrUpdate(tDIS_ATTR_BIT dis_attr_bit, tDIS_ATTR* p_info); +tDIS_STATUS DIS_SrUpdate(tDIS_ATTR_BIT dis_attr_bit, tDIS_ATTR* p_info); /***************************************************************************** * DIS Client Function ****************************************************************************/ @@ -164,7 +164,7 @@ extern tDIS_STATUS DIS_SrUpdate(tDIS_ATTR_BIT dis_attr_bit, tDIS_ATTR* p_info); * Returns void * ******************************************************************************/ -extern bool DIS_ReadDISInfo(const RawAddress& peer_bda, - tDIS_READ_CBACK* p_cback, tDIS_ATTR_MASK mask); +bool DIS_ReadDISInfo(const RawAddress& peer_bda, tDIS_READ_CBACK* p_cback, + tDIS_ATTR_MASK mask); #endif diff --git a/system/stack/l2cap/l2c_ble.cc b/system/stack/l2cap/l2c_ble.cc index d1b3e3c83a..1d1a4c2794 100644 --- a/system/stack/l2cap/l2c_ble.cc +++ b/system/stack/l2cap/l2c_ble.cc @@ -70,9 +70,9 @@ using base::StringPrintf; static void l2cble_start_conn_update(tL2C_LCB* p_lcb); static void l2cble_start_subrate_change(tL2C_LCB* p_lcb); -extern void gatt_notify_conn_update(const RawAddress& remote, uint16_t interval, - uint16_t latency, uint16_t timeout, - tHCI_STATUS status); +void gatt_notify_conn_update(const RawAddress& remote, uint16_t interval, + uint16_t latency, uint16_t timeout, + tHCI_STATUS status); /******************************************************************************* * diff --git a/system/stack/l2cap/l2c_int.h b/system/stack/l2cap/l2c_int.h index 23651d889f..14a0a20202 100644 --- a/system/stack/l2cap/l2c_int.h +++ b/system/stack/l2cap/l2c_int.h @@ -698,203 +698,191 @@ extern tL2C_CB l2cb; *********************************** */ -extern void l2c_receive_hold_timer_timeout(void* data); -extern void l2c_ccb_timer_timeout(void* data); -extern void l2c_lcb_timer_timeout(void* data); -extern void l2c_fcrb_ack_timer_timeout(void* data); -extern uint8_t l2c_data_write(uint16_t cid, BT_HDR* p_data, uint16_t flag); - -extern tL2C_LCB* l2cu_allocate_lcb(const RawAddress& p_bd_addr, bool is_bonding, +void l2c_receive_hold_timer_timeout(void* data); +void l2c_ccb_timer_timeout(void* data); +void l2c_lcb_timer_timeout(void* data); +void l2c_fcrb_ack_timer_timeout(void* data); +uint8_t l2c_data_write(uint16_t cid, BT_HDR* p_data, uint16_t flag); + +tL2C_LCB* l2cu_allocate_lcb(const RawAddress& p_bd_addr, bool is_bonding, + tBT_TRANSPORT transport); +void l2cu_release_lcb(tL2C_LCB* p_lcb); +tL2C_LCB* l2cu_find_lcb_by_bd_addr(const RawAddress& p_bd_addr, tBT_TRANSPORT transport); -extern void l2cu_release_lcb(tL2C_LCB* p_lcb); -extern tL2C_LCB* l2cu_find_lcb_by_bd_addr(const RawAddress& p_bd_addr, - tBT_TRANSPORT transport); -extern tL2C_LCB* l2cu_find_lcb_by_handle(uint16_t handle); - -extern bool l2cu_set_acl_priority(const RawAddress& bd_addr, - tL2CAP_PRIORITY priority, - bool reset_after_rs); -extern bool l2cu_set_acl_latency(const RawAddress& bd_addr, - tL2CAP_LATENCY latency); - -extern void l2cu_enqueue_ccb(tL2C_CCB* p_ccb); -extern void l2cu_dequeue_ccb(tL2C_CCB* p_ccb); -extern void l2cu_change_pri_ccb(tL2C_CCB* p_ccb, tL2CAP_CHNL_PRIORITY priority); - -extern tL2C_CCB* l2cu_allocate_ccb(tL2C_LCB* p_lcb, uint16_t cid); -extern void l2cu_release_ccb(tL2C_CCB* p_ccb); -extern tL2C_CCB* l2cu_find_ccb_by_cid(tL2C_LCB* p_lcb, uint16_t local_cid); -extern tL2C_CCB* l2cu_find_ccb_by_remote_cid(tL2C_LCB* p_lcb, - uint16_t remote_cid); -extern bool l2c_is_cmd_rejected(uint8_t cmd_code, uint8_t id, tL2C_LCB* p_lcb); - -extern void l2cu_send_peer_cmd_reject(tL2C_LCB* p_lcb, uint16_t reason, - uint8_t rem_id, uint16_t p1, uint16_t p2); -extern void l2cu_send_peer_connect_req(tL2C_CCB* p_ccb); -extern void l2cu_send_peer_connect_rsp(tL2C_CCB* p_ccb, uint16_t result, - uint16_t status); -extern void l2cu_send_peer_config_req(tL2C_CCB* p_ccb, tL2CAP_CFG_INFO* p_cfg); -extern void l2cu_send_peer_config_rsp(tL2C_CCB* p_ccb, tL2CAP_CFG_INFO* p_cfg); -extern void l2cu_send_peer_config_rej(tL2C_CCB* p_ccb, uint8_t* p_data, - uint16_t data_len, uint16_t rej_len); -extern void l2cu_send_peer_disc_req(tL2C_CCB* p_ccb); -extern void l2cu_send_peer_disc_rsp(tL2C_LCB* p_lcb, uint8_t remote_id, - uint16_t local_cid, uint16_t remote_cid); -extern void l2cu_send_peer_echo_rsp(tL2C_LCB* p_lcb, uint8_t id, - uint8_t* p_data, uint16_t data_len); -extern void l2cu_send_peer_info_rsp(tL2C_LCB* p_lcb, uint8_t id, - uint16_t info_type); -extern void l2cu_reject_connection(tL2C_LCB* p_lcb, uint16_t remote_cid, - uint8_t rem_id, uint16_t result); -extern void l2cu_send_peer_info_req(tL2C_LCB* p_lcb, uint16_t info_type); -extern void l2cu_set_acl_hci_header(BT_HDR* p_buf, tL2C_CCB* p_ccb); -extern void l2cu_check_channel_congestion(tL2C_CCB* p_ccb); -extern void l2cu_disconnect_chnl(tL2C_CCB* p_ccb); - -extern void l2cu_send_peer_ble_par_req(tL2C_LCB* p_lcb, uint16_t min_int, - uint16_t max_int, uint16_t latency, - uint16_t timeout); -extern void l2cu_send_peer_ble_par_rsp(tL2C_LCB* p_lcb, uint16_t reason, - uint8_t rem_id); -extern void l2cu_reject_ble_connection(tL2C_CCB* p_ccb, uint8_t rem_id, - uint16_t result); -extern void l2cu_reject_credit_based_conn_req(tL2C_LCB* p_lcb, uint8_t rem_id, - uint8_t num_of_channels, - uint16_t result); -extern void l2cu_reject_ble_coc_connection(tL2C_LCB* p_lcb, uint8_t rem_id, - uint16_t result); -extern void l2cu_send_peer_ble_credit_based_conn_res(tL2C_CCB* p_ccb, - uint16_t result); -extern void l2cu_send_peer_credit_based_conn_res( - tL2C_CCB* p_ccb, std::vector<uint16_t>& accepted_lcids, uint16_t result); - -extern void l2cu_send_peer_ble_credit_based_conn_req(tL2C_CCB* p_ccb); -extern void l2cu_send_peer_credit_based_conn_req(tL2C_CCB* p_ccb); - -extern void l2cu_send_ble_reconfig_rsp(tL2C_LCB* p_lcb, uint8_t rem_id, +tL2C_LCB* l2cu_find_lcb_by_handle(uint16_t handle); + +bool l2cu_set_acl_priority(const RawAddress& bd_addr, tL2CAP_PRIORITY priority, + bool reset_after_rs); +bool l2cu_set_acl_latency(const RawAddress& bd_addr, tL2CAP_LATENCY latency); + +void l2cu_enqueue_ccb(tL2C_CCB* p_ccb); +void l2cu_dequeue_ccb(tL2C_CCB* p_ccb); +void l2cu_change_pri_ccb(tL2C_CCB* p_ccb, tL2CAP_CHNL_PRIORITY priority); + +tL2C_CCB* l2cu_allocate_ccb(tL2C_LCB* p_lcb, uint16_t cid); +void l2cu_release_ccb(tL2C_CCB* p_ccb); +tL2C_CCB* l2cu_find_ccb_by_cid(tL2C_LCB* p_lcb, uint16_t local_cid); +tL2C_CCB* l2cu_find_ccb_by_remote_cid(tL2C_LCB* p_lcb, uint16_t remote_cid); +bool l2c_is_cmd_rejected(uint8_t cmd_code, uint8_t id, tL2C_LCB* p_lcb); + +void l2cu_send_peer_cmd_reject(tL2C_LCB* p_lcb, uint16_t reason, uint8_t rem_id, + uint16_t p1, uint16_t p2); +void l2cu_send_peer_connect_req(tL2C_CCB* p_ccb); +void l2cu_send_peer_connect_rsp(tL2C_CCB* p_ccb, uint16_t result, + uint16_t status); +void l2cu_send_peer_config_req(tL2C_CCB* p_ccb, tL2CAP_CFG_INFO* p_cfg); +void l2cu_send_peer_config_rsp(tL2C_CCB* p_ccb, tL2CAP_CFG_INFO* p_cfg); +void l2cu_send_peer_config_rej(tL2C_CCB* p_ccb, uint8_t* p_data, + uint16_t data_len, uint16_t rej_len); +void l2cu_send_peer_disc_req(tL2C_CCB* p_ccb); +void l2cu_send_peer_disc_rsp(tL2C_LCB* p_lcb, uint8_t remote_id, + uint16_t local_cid, uint16_t remote_cid); +void l2cu_send_peer_echo_rsp(tL2C_LCB* p_lcb, uint8_t id, uint8_t* p_data, + uint16_t data_len); +void l2cu_send_peer_info_rsp(tL2C_LCB* p_lcb, uint8_t id, uint16_t info_type); +void l2cu_reject_connection(tL2C_LCB* p_lcb, uint16_t remote_cid, + uint8_t rem_id, uint16_t result); +void l2cu_send_peer_info_req(tL2C_LCB* p_lcb, uint16_t info_type); +void l2cu_set_acl_hci_header(BT_HDR* p_buf, tL2C_CCB* p_ccb); +void l2cu_check_channel_congestion(tL2C_CCB* p_ccb); +void l2cu_disconnect_chnl(tL2C_CCB* p_ccb); + +void l2cu_send_peer_ble_par_req(tL2C_LCB* p_lcb, uint16_t min_int, + uint16_t max_int, uint16_t latency, + uint16_t timeout); +void l2cu_send_peer_ble_par_rsp(tL2C_LCB* p_lcb, uint16_t reason, + uint8_t rem_id); +void l2cu_reject_ble_connection(tL2C_CCB* p_ccb, uint8_t rem_id, + uint16_t result); +void l2cu_reject_credit_based_conn_req(tL2C_LCB* p_lcb, uint8_t rem_id, + uint8_t num_of_channels, uint16_t result); -extern void l2cu_send_credit_based_reconfig_req(tL2C_CCB* p_ccb, - tL2CAP_LE_CFG_INFO* p_data); - -extern void l2cu_send_peer_ble_flow_control_credit(tL2C_CCB* p_ccb, - uint16_t credit_value); -extern void l2cu_send_peer_ble_credit_based_disconn_req(tL2C_CCB* p_ccb); +void l2cu_reject_ble_coc_connection(tL2C_LCB* p_lcb, uint8_t rem_id, + uint16_t result); +void l2cu_send_peer_ble_credit_based_conn_res(tL2C_CCB* p_ccb, uint16_t result); +void l2cu_send_peer_credit_based_conn_res(tL2C_CCB* p_ccb, + std::vector<uint16_t>& accepted_lcids, + uint16_t result); + +void l2cu_send_peer_ble_credit_based_conn_req(tL2C_CCB* p_ccb); +void l2cu_send_peer_credit_based_conn_req(tL2C_CCB* p_ccb); + +void l2cu_send_ble_reconfig_rsp(tL2C_LCB* p_lcb, uint8_t rem_id, + uint16_t result); +void l2cu_send_credit_based_reconfig_req(tL2C_CCB* p_ccb, + tL2CAP_LE_CFG_INFO* p_data); + +void l2cu_send_peer_ble_flow_control_credit(tL2C_CCB* p_ccb, + uint16_t credit_value); +void l2cu_send_peer_ble_credit_based_disconn_req(tL2C_CCB* p_ccb); -extern bool l2cu_initialize_fixed_ccb(tL2C_LCB* p_lcb, uint16_t fixed_cid); -extern void l2cu_no_dynamic_ccbs(tL2C_LCB* p_lcb); -extern void l2cu_process_fixed_chnl_resp(tL2C_LCB* p_lcb); -extern bool l2cu_is_ccb_active(tL2C_CCB* p_ccb); -extern uint16_t le_result_to_l2c_conn(uint16_t result); +bool l2cu_initialize_fixed_ccb(tL2C_LCB* p_lcb, uint16_t fixed_cid); +void l2cu_no_dynamic_ccbs(tL2C_LCB* p_lcb); +void l2cu_process_fixed_chnl_resp(tL2C_LCB* p_lcb); +bool l2cu_is_ccb_active(tL2C_CCB* p_ccb); +uint16_t le_result_to_l2c_conn(uint16_t result); /* Functions provided for Broadcom Aware *************************************** */ -extern tL2C_RCB* l2cu_allocate_rcb(uint16_t psm); -extern tL2C_RCB* l2cu_find_rcb_by_psm(uint16_t psm); -extern void l2cu_release_rcb(tL2C_RCB* p_rcb); -extern void l2cu_release_ble_rcb(tL2C_RCB* p_rcb); -extern tL2C_RCB* l2cu_allocate_ble_rcb(uint16_t psm); -extern tL2C_RCB* l2cu_find_ble_rcb_by_psm(uint16_t psm); +tL2C_RCB* l2cu_allocate_rcb(uint16_t psm); +tL2C_RCB* l2cu_find_rcb_by_psm(uint16_t psm); +void l2cu_release_rcb(tL2C_RCB* p_rcb); +void l2cu_release_ble_rcb(tL2C_RCB* p_rcb); +tL2C_RCB* l2cu_allocate_ble_rcb(uint16_t psm); +tL2C_RCB* l2cu_find_ble_rcb_by_psm(uint16_t psm); -extern uint8_t l2cu_process_peer_cfg_req(tL2C_CCB* p_ccb, - tL2CAP_CFG_INFO* p_cfg); -extern void l2cu_process_peer_cfg_rsp(tL2C_CCB* p_ccb, tL2CAP_CFG_INFO* p_cfg); -extern void l2cu_process_our_cfg_req(tL2C_CCB* p_ccb, tL2CAP_CFG_INFO* p_cfg); -extern void l2cu_process_our_cfg_rsp(tL2C_CCB* p_ccb, tL2CAP_CFG_INFO* p_cfg); +uint8_t l2cu_process_peer_cfg_req(tL2C_CCB* p_ccb, tL2CAP_CFG_INFO* p_cfg); +void l2cu_process_peer_cfg_rsp(tL2C_CCB* p_ccb, tL2CAP_CFG_INFO* p_cfg); +void l2cu_process_our_cfg_req(tL2C_CCB* p_ccb, tL2CAP_CFG_INFO* p_cfg); +void l2cu_process_our_cfg_rsp(tL2C_CCB* p_ccb, tL2CAP_CFG_INFO* p_cfg); -extern tL2C_LCB* l2cu_find_lcb_by_state(tL2C_LINK_STATE state); -extern bool l2cu_lcb_disconnecting(void); +tL2C_LCB* l2cu_find_lcb_by_state(tL2C_LINK_STATE state); +bool l2cu_lcb_disconnecting(void); -extern void l2cu_create_conn_br_edr(tL2C_LCB* p_lcb); -extern bool l2cu_create_conn_le(tL2C_LCB* p_lcb); -extern void l2cu_create_conn_after_switch(tL2C_LCB* p_lcb); -extern void l2cu_adjust_out_mps(tL2C_CCB* p_ccb); +void l2cu_create_conn_br_edr(tL2C_LCB* p_lcb); +bool l2cu_create_conn_le(tL2C_LCB* p_lcb); +void l2cu_create_conn_after_switch(tL2C_LCB* p_lcb); +void l2cu_adjust_out_mps(tL2C_CCB* p_ccb); /* Functions provided by l2c_link.cc *********************************** */ -extern void l2c_link_timeout(tL2C_LCB* p_lcb); -extern void l2c_info_resp_timer_timeout(void* data); -extern void l2c_link_check_send_pkts(tL2C_LCB* p_lcb, uint16_t local_cid, - BT_HDR* p_buf); -extern void l2c_link_adjust_allocation(void); - -extern void l2c_link_sec_comp(const RawAddress* p_bda, tBT_TRANSPORT trasnport, - void* p_ref_data, tBTM_STATUS status); -extern void l2c_link_sec_comp2(const RawAddress& p_bda, tBT_TRANSPORT trasnport, - void* p_ref_data, tBTM_STATUS status); -extern void l2c_link_adjust_chnl_allocation(void); +void l2c_link_timeout(tL2C_LCB* p_lcb); +void l2c_info_resp_timer_timeout(void* data); +void l2c_link_check_send_pkts(tL2C_LCB* p_lcb, uint16_t local_cid, + BT_HDR* p_buf); +void l2c_link_adjust_allocation(void); + +void l2c_link_sec_comp(const RawAddress* p_bda, tBT_TRANSPORT trasnport, + void* p_ref_data, tBTM_STATUS status); +void l2c_link_sec_comp2(const RawAddress& p_bda, tBT_TRANSPORT trasnport, + void* p_ref_data, tBTM_STATUS status); +void l2c_link_adjust_chnl_allocation(void); #if (L2CAP_CONFORMANCE_TESTING == TRUE) /* Used only for conformance testing */ -extern void l2cu_set_info_rsp_mask(uint32_t mask); +void l2cu_set_info_rsp_mask(uint32_t mask); #endif /* Functions provided by l2c_csm.cc *********************************** */ -extern void l2c_csm_execute(tL2C_CCB* p_ccb, tL2CEVT event, void* p_data); +void l2c_csm_execute(tL2C_CCB* p_ccb, tL2CEVT event, void* p_data); -extern void l2c_enqueue_peer_data(tL2C_CCB* p_ccb, BT_HDR* p_buf); +void l2c_enqueue_peer_data(tL2C_CCB* p_ccb, BT_HDR* p_buf); /* Functions provided by l2c_fcr.cc *********************************** */ -extern void l2c_fcr_cleanup(tL2C_CCB* p_ccb); -extern void l2c_fcr_proc_pdu(tL2C_CCB* p_ccb, BT_HDR* p_buf); -extern void l2c_fcr_proc_tout(tL2C_CCB* p_ccb); -extern void l2c_fcr_proc_ack_tout(tL2C_CCB* p_ccb); -extern void l2c_fcr_send_S_frame(tL2C_CCB* p_ccb, uint16_t function_code, - uint16_t pf_bit); -extern BT_HDR* l2c_fcr_clone_buf(BT_HDR* p_buf, uint16_t new_offset, - uint16_t no_of_bytes); -extern bool l2c_fcr_is_flow_controlled(tL2C_CCB* p_ccb); -extern BT_HDR* l2c_fcr_get_next_xmit_sdu_seg(tL2C_CCB* p_ccb, - uint16_t max_packet_length); -extern void l2c_fcr_start_timer(tL2C_CCB* p_ccb); -extern void l2c_lcc_proc_pdu(tL2C_CCB* p_ccb, BT_HDR* p_buf); -extern BT_HDR* l2c_lcc_get_next_xmit_sdu_seg(tL2C_CCB* p_ccb, - bool* last_piece_of_sdu); +void l2c_fcr_cleanup(tL2C_CCB* p_ccb); +void l2c_fcr_proc_pdu(tL2C_CCB* p_ccb, BT_HDR* p_buf); +void l2c_fcr_proc_tout(tL2C_CCB* p_ccb); +void l2c_fcr_proc_ack_tout(tL2C_CCB* p_ccb); +void l2c_fcr_send_S_frame(tL2C_CCB* p_ccb, uint16_t function_code, + uint16_t pf_bit); +BT_HDR* l2c_fcr_clone_buf(BT_HDR* p_buf, uint16_t new_offset, + uint16_t no_of_bytes); +bool l2c_fcr_is_flow_controlled(tL2C_CCB* p_ccb); +BT_HDR* l2c_fcr_get_next_xmit_sdu_seg(tL2C_CCB* p_ccb, + uint16_t max_packet_length); +void l2c_fcr_start_timer(tL2C_CCB* p_ccb); +void l2c_lcc_proc_pdu(tL2C_CCB* p_ccb, BT_HDR* p_buf); +BT_HDR* l2c_lcc_get_next_xmit_sdu_seg(tL2C_CCB* p_ccb, bool* last_piece_of_sdu); /* Configuration negotiation */ -extern uint8_t l2c_fcr_chk_chan_modes(tL2C_CCB* p_ccb); +uint8_t l2c_fcr_chk_chan_modes(tL2C_CCB* p_ccb); -extern void l2c_fcr_adj_our_rsp_options(tL2C_CCB* p_ccb, - tL2CAP_CFG_INFO* p_peer_cfg); -extern bool l2c_fcr_renegotiate_chan(tL2C_CCB* p_ccb, tL2CAP_CFG_INFO* p_cfg); -extern uint8_t l2c_fcr_process_peer_cfg_req(tL2C_CCB* p_ccb, - tL2CAP_CFG_INFO* p_cfg); -extern void l2c_fcr_adj_monitor_retran_timeout(tL2C_CCB* p_ccb); -extern void l2c_fcr_stop_timer(tL2C_CCB* p_ccb); +void l2c_fcr_adj_our_rsp_options(tL2C_CCB* p_ccb, tL2CAP_CFG_INFO* p_peer_cfg); +bool l2c_fcr_renegotiate_chan(tL2C_CCB* p_ccb, tL2CAP_CFG_INFO* p_cfg); +uint8_t l2c_fcr_process_peer_cfg_req(tL2C_CCB* p_ccb, tL2CAP_CFG_INFO* p_cfg); +void l2c_fcr_adj_monitor_retran_timeout(tL2C_CCB* p_ccb); +void l2c_fcr_stop_timer(tL2C_CCB* p_ccb); /* Functions provided by l2c_ble.cc *********************************** */ -extern bool l2cble_create_conn(tL2C_LCB* p_lcb); -extern void l2cble_process_sig_cmd(tL2C_LCB* p_lcb, uint8_t* p, - uint16_t pkt_len); -extern void l2c_ble_link_adjust_allocation(void); - -extern void l2cble_credit_based_conn_req(tL2C_CCB* p_ccb); -extern void l2cble_credit_based_conn_res(tL2C_CCB* p_ccb, uint16_t result); -extern void l2cble_send_peer_disc_req(tL2C_CCB* p_ccb); -extern void l2cble_send_flow_control_credit(tL2C_CCB* p_ccb, - uint16_t credit_value); -extern tL2CAP_LE_RESULT_CODE l2ble_sec_access_req(const RawAddress& bd_addr, - uint16_t psm, - bool is_originator, - tL2CAP_SEC_CBACK* p_callback, - void* p_ref_data); - -extern void l2cble_update_data_length(tL2C_LCB* p_lcb); - -extern void l2cu_process_fixed_disc_cback(tL2C_LCB* p_lcb); - -extern void l2cble_process_subrate_change_evt(uint16_t handle, uint8_t status, - uint16_t subrate_factor, - uint16_t peripheral_latency, - uint16_t cont_num, - uint16_t timeout); +bool l2cble_create_conn(tL2C_LCB* p_lcb); +void l2cble_process_sig_cmd(tL2C_LCB* p_lcb, uint8_t* p, uint16_t pkt_len); +void l2c_ble_link_adjust_allocation(void); + +void l2cble_credit_based_conn_req(tL2C_CCB* p_ccb); +void l2cble_credit_based_conn_res(tL2C_CCB* p_ccb, uint16_t result); +void l2cble_send_peer_disc_req(tL2C_CCB* p_ccb); +void l2cble_send_flow_control_credit(tL2C_CCB* p_ccb, uint16_t credit_value); +tL2CAP_LE_RESULT_CODE l2ble_sec_access_req(const RawAddress& bd_addr, + uint16_t psm, bool is_originator, + tL2CAP_SEC_CBACK* p_callback, + void* p_ref_data); + +void l2cble_update_data_length(tL2C_LCB* p_lcb); + +void l2cu_process_fixed_disc_cback(tL2C_LCB* p_lcb); + +void l2cble_process_subrate_change_evt(uint16_t handle, uint8_t status, + uint16_t subrate_factor, + uint16_t peripheral_latency, + uint16_t cont_num, uint16_t timeout); #endif diff --git a/system/stack/pan/pan_int.h b/system/stack/pan/pan_int.h index 709d5ec8d0..010de4ada1 100644 --- a/system/stack/pan/pan_int.h +++ b/system/stack/pan/pan_int.h @@ -107,31 +107,30 @@ typedef struct { extern tPAN_CB pan_cb; /******************************************************************************/ -extern void pan_register_with_bnep(void); -extern void pan_conn_ind_cb(uint16_t handle, const RawAddress& p_bda, - const bluetooth::Uuid& remote_uuid, - const bluetooth::Uuid& local_uuid, - bool is_role_change); -extern void pan_connect_state_cb(uint16_t handle, const RawAddress& rem_bda, - tBNEP_RESULT result, bool is_role_change); -extern void pan_data_buf_ind_cb(uint16_t handle, const RawAddress& src, - const RawAddress& dst, uint16_t protocol, - BT_HDR* p_buf, bool ext); -extern void pan_tx_data_flow_cb(uint16_t handle, tBNEP_RESULT event); +void pan_register_with_bnep(void); +void pan_conn_ind_cb(uint16_t handle, const RawAddress& p_bda, + const bluetooth::Uuid& remote_uuid, + const bluetooth::Uuid& local_uuid, bool is_role_change); +void pan_connect_state_cb(uint16_t handle, const RawAddress& rem_bda, + tBNEP_RESULT result, bool is_role_change); +void pan_data_buf_ind_cb(uint16_t handle, const RawAddress& src, + const RawAddress& dst, uint16_t protocol, + BT_HDR* p_buf, bool ext); +void pan_tx_data_flow_cb(uint16_t handle, tBNEP_RESULT event); void pan_proto_filt_ind_cb(uint16_t handle, bool indication, tBNEP_RESULT result, uint16_t num_filters, uint8_t* p_filters); void pan_mcast_filt_ind_cb(uint16_t handle, bool indication, tBNEP_RESULT result, uint16_t num_filters, uint8_t* p_filters); -extern uint32_t pan_register_with_sdp(uint16_t uuid, const char* p_name, - const char* p_desc); -extern tPAN_CONN* pan_allocate_pcb(const RawAddress& p_bda, uint16_t handle); -extern tPAN_CONN* pan_get_pcb_by_handle(uint16_t handle); -extern tPAN_CONN* pan_get_pcb_by_addr(const RawAddress& p_bda); -extern void pan_close_all_connections(void); -extern void pan_release_pcb(tPAN_CONN* p_pcb); -extern void pan_dump_status(void); +uint32_t pan_register_with_sdp(uint16_t uuid, const char* p_name, + const char* p_desc); +tPAN_CONN* pan_allocate_pcb(const RawAddress& p_bda, uint16_t handle); +tPAN_CONN* pan_get_pcb_by_handle(uint16_t handle); +tPAN_CONN* pan_get_pcb_by_addr(const RawAddress& p_bda); +void pan_close_all_connections(void); +void pan_release_pcb(tPAN_CONN* p_pcb); +void pan_dump_status(void); /******************************************************************************/ diff --git a/system/stack/rfcomm/port_int.h b/system/stack/rfcomm/port_int.h index 61935b13b8..b0e9fb1c7b 100644 --- a/system/stack/rfcomm/port_int.h +++ b/system/stack/rfcomm/port_int.h @@ -203,27 +203,27 @@ typedef struct { /* * Functions provided by the port_utils.cc */ -extern tPORT* port_allocate_port(uint8_t dlci, const RawAddress& bd_addr); -extern void port_set_defaults(tPORT* p_port); -extern void port_select_mtu(tPORT* p_port); -extern void port_release_port(tPORT* p_port); -extern tPORT* port_find_mcb_dlci_port(tRFC_MCB* p_mcb, uint8_t dlci); -extern tRFC_MCB* port_find_mcb(const RawAddress& bd_addr); -extern tPORT* port_find_dlci_port(uint8_t dlci); -extern tPORT* port_find_port(uint8_t dlci, const RawAddress& bd_addr); -extern uint32_t port_get_signal_changes(tPORT* p_port, uint8_t old_signals, - uint8_t signal); -extern uint32_t port_flow_control_user(tPORT* p_port); -extern void port_flow_control_peer(tPORT* p_port, bool enable, uint16_t count); +tPORT* port_allocate_port(uint8_t dlci, const RawAddress& bd_addr); +void port_set_defaults(tPORT* p_port); +void port_select_mtu(tPORT* p_port); +void port_release_port(tPORT* p_port); +tPORT* port_find_mcb_dlci_port(tRFC_MCB* p_mcb, uint8_t dlci); +tRFC_MCB* port_find_mcb(const RawAddress& bd_addr); +tPORT* port_find_dlci_port(uint8_t dlci); +tPORT* port_find_port(uint8_t dlci, const RawAddress& bd_addr); +uint32_t port_get_signal_changes(tPORT* p_port, uint8_t old_signals, + uint8_t signal); +uint32_t port_flow_control_user(tPORT* p_port); +void port_flow_control_peer(tPORT* p_port, bool enable, uint16_t count); /* * Functions provided by the port_rfc.cc */ -extern int port_open_continue(tPORT* p_port); -extern void port_start_port_open(tPORT* p_port); -extern void port_start_par_neg(tPORT* p_port); -extern void port_start_control(tPORT* p_port); -extern void port_start_close(tPORT* p_port); -extern void port_rfc_closed(tPORT* p_port, uint8_t res); +int port_open_continue(tPORT* p_port); +void port_start_port_open(tPORT* p_port); +void port_start_par_neg(tPORT* p_port); +void port_start_control(tPORT* p_port); +void port_start_close(tPORT* p_port); +void port_rfc_closed(tPORT* p_port, uint8_t res); #endif diff --git a/system/stack/rfcomm/rfc_int.h b/system/stack/rfcomm/rfc_int.h index f07485ee75..8f348b4279 100644 --- a/system/stack/rfcomm/rfc_int.h +++ b/system/stack/rfcomm/rfc_int.h @@ -50,40 +50,34 @@ #define RFCOMM_MIN_MTU 23 #define RFCOMM_MAX_MTU 32767 -extern void RFCOMM_StartReq(tRFC_MCB* p_mcb); -extern void RFCOMM_StartRsp(tRFC_MCB* p_mcb, uint16_t result); +void RFCOMM_StartReq(tRFC_MCB* p_mcb); +void RFCOMM_StartRsp(tRFC_MCB* p_mcb, uint16_t result); -extern void RFCOMM_DlcEstablishReq(tRFC_MCB* p_mcb, uint8_t dlci, uint16_t mtu); -extern void RFCOMM_DlcEstablishRsp(tRFC_MCB* p_mcb, uint8_t dlci, uint16_t mtu, - uint16_t result); +void RFCOMM_DlcEstablishReq(tRFC_MCB* p_mcb, uint8_t dlci, uint16_t mtu); +void RFCOMM_DlcEstablishRsp(tRFC_MCB* p_mcb, uint8_t dlci, uint16_t mtu, + uint16_t result); -extern void RFCOMM_DataReq(tRFC_MCB* p_mcb, uint8_t dlci, BT_HDR* p_buf); +void RFCOMM_DataReq(tRFC_MCB* p_mcb, uint8_t dlci, BT_HDR* p_buf); -extern void RFCOMM_DlcReleaseReq(tRFC_MCB* p_mcb, uint8_t dlci); +void RFCOMM_DlcReleaseReq(tRFC_MCB* p_mcb, uint8_t dlci); -extern void RFCOMM_ParameterNegotiationRequest(tRFC_MCB* p_mcb, uint8_t dlci, - uint16_t mtu); -extern void RFCOMM_ParameterNegotiationResponse(tRFC_MCB* p_mcb, uint8_t dlci, - uint16_t mtu, uint8_t cl, - uint8_t k); +void RFCOMM_ParameterNegotiationRequest(tRFC_MCB* p_mcb, uint8_t dlci, + uint16_t mtu); +void RFCOMM_ParameterNegotiationResponse(tRFC_MCB* p_mcb, uint8_t dlci, + uint16_t mtu, uint8_t cl, uint8_t k); -extern void RFCOMM_FlowReq(tRFC_MCB* p_mcb, uint8_t dlci, bool state); +void RFCOMM_FlowReq(tRFC_MCB* p_mcb, uint8_t dlci, bool state); -extern void RFCOMM_PortParameterNegotiationRequest(tRFC_MCB* p_mcb, - uint8_t dlci, - tPORT_STATE* p_pars); -extern void RFCOMM_PortParameterNegotiationResponse(tRFC_MCB* p_mcb, - uint8_t dlci, - tPORT_STATE* p_pars, - uint16_t param_mask); +void RFCOMM_PortParameterNegotiationRequest(tRFC_MCB* p_mcb, uint8_t dlci, + tPORT_STATE* p_pars); +void RFCOMM_PortParameterNegotiationResponse(tRFC_MCB* p_mcb, uint8_t dlci, + tPORT_STATE* p_pars, + uint16_t param_mask); -extern void RFCOMM_ControlReq(tRFC_MCB* p_mcb, uint8_t dlci, - tPORT_CTRL* p_pars); -extern void RFCOMM_ControlRsp(tRFC_MCB* p_mcb, uint8_t dlci, - tPORT_CTRL* p_pars); +void RFCOMM_ControlReq(tRFC_MCB* p_mcb, uint8_t dlci, tPORT_CTRL* p_pars); +void RFCOMM_ControlRsp(tRFC_MCB* p_mcb, uint8_t dlci, tPORT_CTRL* p_pars); -extern void RFCOMM_LineStatusReq(tRFC_MCB* p_mcb, uint8_t dlci, - uint8_t line_status); +void RFCOMM_LineStatusReq(tRFC_MCB* p_mcb, uint8_t dlci, uint8_t line_status); /* * Define logical struct used for sending and decoding MX frames */ @@ -198,7 +192,7 @@ extern std::unordered_map<uint16_t /* cid */, tRFC_MCB*> rfc_lcid_mcb; #else -extern uint8_t rfc_calc_fcs(uint16_t len, uint8_t* p); +uint8_t rfc_calc_fcs(uint16_t len, uint8_t* p); #define RFCOMM_SABME_FCS(p_data, cr, dlci) rfc_calc_fcs(3, p_data) #define RFCOMM_UA_FCS(p_data, cr, dlci) rfc_calc_fcs(3, p_data) @@ -208,28 +202,23 @@ extern uint8_t rfc_calc_fcs(uint16_t len, uint8_t* p); #endif -extern void rfc_mx_sm_execute(tRFC_MCB* p_mcb, tRFC_MX_EVENT event, - void* p_data); +void rfc_mx_sm_execute(tRFC_MCB* p_mcb, tRFC_MX_EVENT event, void* p_data); /* * Functions provided by the rfc_port_fsm.cc */ -extern void rfc_port_sm_execute(tPORT* p_port, tRFC_PORT_EVENT event, - void* p_data); - -extern void rfc_process_pn(tRFC_MCB* p_rfc_mcb, bool is_command, - MX_FRAME* p_frame); -extern void rfc_process_msc(tRFC_MCB* p_rfc_mcb, bool is_command, - MX_FRAME* p_frame); -extern void rfc_process_rpn(tRFC_MCB* p_rfc_mcb, bool is_command, - bool is_request, MX_FRAME* p_frame); -extern void rfc_process_rls(tRFC_MCB* p_rfc_mcb, bool is_command, - MX_FRAME* p_frame); -extern void rfc_process_nsc(tRFC_MCB* p_rfc_mcb, MX_FRAME* p_frame); -extern void rfc_process_test_rsp(tRFC_MCB* p_rfc_mcb, BT_HDR* p_buf); -extern void rfc_process_fcon(tRFC_MCB* p_rfc_mcb, bool is_command); -extern void rfc_process_fcoff(tRFC_MCB* p_rfc_mcb, bool is_command); -extern void rfc_process_l2cap_congestion(tRFC_MCB* p_mcb, bool is_congested); +void rfc_port_sm_execute(tPORT* p_port, tRFC_PORT_EVENT event, void* p_data); + +void rfc_process_pn(tRFC_MCB* p_rfc_mcb, bool is_command, MX_FRAME* p_frame); +void rfc_process_msc(tRFC_MCB* p_rfc_mcb, bool is_command, MX_FRAME* p_frame); +void rfc_process_rpn(tRFC_MCB* p_rfc_mcb, bool is_command, bool is_request, + MX_FRAME* p_frame); +void rfc_process_rls(tRFC_MCB* p_rfc_mcb, bool is_command, MX_FRAME* p_frame); +void rfc_process_nsc(tRFC_MCB* p_rfc_mcb, MX_FRAME* p_frame); +void rfc_process_test_rsp(tRFC_MCB* p_rfc_mcb, BT_HDR* p_buf); +void rfc_process_fcon(tRFC_MCB* p_rfc_mcb, bool is_command); +void rfc_process_fcoff(tRFC_MCB* p_rfc_mcb, bool is_command); +void rfc_process_l2cap_congestion(tRFC_MCB* p_mcb, bool is_congested); void rfc_on_l2cap_error(uint16_t lcid, uint16_t result); @@ -238,81 +227,79 @@ void rfc_on_l2cap_error(uint16_t lcid, uint16_t result); */ tRFC_MCB* rfc_alloc_multiplexer_channel(const RawAddress& bd_addr, bool is_initiator); -extern void rfc_release_multiplexer_channel(tRFC_MCB* p_rfc_mcb); -extern void rfc_timer_start(tRFC_MCB* p_rfc_mcb, uint16_t timeout); -extern void rfc_timer_stop(tRFC_MCB* p_rfc_mcb); -extern void rfc_port_timer_start(tPORT* p_port, uint16_t tout); -extern void rfc_port_timer_stop(tPORT* p_port); +void rfc_release_multiplexer_channel(tRFC_MCB* p_rfc_mcb); +void rfc_timer_start(tRFC_MCB* p_rfc_mcb, uint16_t timeout); +void rfc_timer_stop(tRFC_MCB* p_rfc_mcb); +void rfc_port_timer_start(tPORT* p_port, uint16_t tout); +void rfc_port_timer_stop(tPORT* p_port); bool rfc_check_fcs(uint16_t len, uint8_t* p, uint8_t received_fcs); tRFC_MCB* rfc_find_lcid_mcb(uint16_t lcid); -extern void rfc_save_lcid_mcb(tRFC_MCB* p_rfc_mcb, uint16_t lcid); -extern void rfc_check_mcb_active(tRFC_MCB* p_mcb); -extern void rfc_port_closed(tPORT* p_port); -extern void rfc_sec_check_complete(const RawAddress* bd_addr, - tBT_TRANSPORT transport, void* p_ref_data, - tBTM_STATUS res); -extern void rfc_inc_credit(tPORT* p_port, uint8_t credit); -extern void rfc_dec_credit(tPORT* p_port); -extern void rfc_check_send_cmd(tRFC_MCB* p_mcb, BT_HDR* p_buf); +void rfc_save_lcid_mcb(tRFC_MCB* p_rfc_mcb, uint16_t lcid); +void rfc_check_mcb_active(tRFC_MCB* p_mcb); +void rfc_port_closed(tPORT* p_port); +void rfc_sec_check_complete(const RawAddress* bd_addr, tBT_TRANSPORT transport, + void* p_ref_data, tBTM_STATUS res); +void rfc_inc_credit(tPORT* p_port, uint8_t credit); +void rfc_dec_credit(tPORT* p_port); +void rfc_check_send_cmd(tRFC_MCB* p_mcb, BT_HDR* p_buf); /* * Functions provided by the rfc_ts_frames.cc */ -extern void rfc_send_sabme(tRFC_MCB* p_rfc_mcb, uint8_t dlci); -extern void rfc_send_ua(tRFC_MCB* p_rfc_mcb, uint8_t dlci); -extern void rfc_send_dm(tRFC_MCB* p_rfc_mcb, uint8_t dlci, bool pf); -extern void rfc_send_disc(tRFC_MCB* p_rfc_mcb, uint8_t dlci); -extern void rfc_send_pn(tRFC_MCB* p_mcb, uint8_t dlci, bool is_command, - uint16_t mtu, uint8_t cl, uint8_t k); -extern void rfc_send_test(tRFC_MCB* p_rfc_mcb, bool is_command, BT_HDR* p_buf); -extern void rfc_send_msc(tRFC_MCB* p_mcb, uint8_t dlci, bool is_command, - tPORT_CTRL* p_pars); -extern void rfc_send_rls(tRFC_MCB* p_mcb, uint8_t dlci, bool is_command, - uint8_t status); -extern void rfc_send_rpn(tRFC_MCB* p_mcb, uint8_t dlci, bool is_command, - tPORT_STATE* p_pars, uint16_t mask); -extern void rfc_send_fcon(tRFC_MCB* p_mcb, bool is_command); -extern void rfc_send_fcoff(tRFC_MCB* p_mcb, bool is_command); -extern void rfc_send_buf_uih(tRFC_MCB* p_rfc_mcb, uint8_t dlci, BT_HDR* p_buf); -extern void rfc_send_credit(tRFC_MCB* p_mcb, uint8_t dlci, uint8_t credit); -extern void rfc_process_mx_message(tRFC_MCB* p_rfc_mcb, BT_HDR* p_buf); -extern tRFC_EVENT rfc_parse_data(tRFC_MCB* p_rfc_mcb, MX_FRAME* p_frame, - BT_HDR* p_buf); +void rfc_send_sabme(tRFC_MCB* p_rfc_mcb, uint8_t dlci); +void rfc_send_ua(tRFC_MCB* p_rfc_mcb, uint8_t dlci); +void rfc_send_dm(tRFC_MCB* p_rfc_mcb, uint8_t dlci, bool pf); +void rfc_send_disc(tRFC_MCB* p_rfc_mcb, uint8_t dlci); +void rfc_send_pn(tRFC_MCB* p_mcb, uint8_t dlci, bool is_command, uint16_t mtu, + uint8_t cl, uint8_t k); +void rfc_send_test(tRFC_MCB* p_rfc_mcb, bool is_command, BT_HDR* p_buf); +void rfc_send_msc(tRFC_MCB* p_mcb, uint8_t dlci, bool is_command, + tPORT_CTRL* p_pars); +void rfc_send_rls(tRFC_MCB* p_mcb, uint8_t dlci, bool is_command, + uint8_t status); +void rfc_send_rpn(tRFC_MCB* p_mcb, uint8_t dlci, bool is_command, + tPORT_STATE* p_pars, uint16_t mask); +void rfc_send_fcon(tRFC_MCB* p_mcb, bool is_command); +void rfc_send_fcoff(tRFC_MCB* p_mcb, bool is_command); +void rfc_send_buf_uih(tRFC_MCB* p_rfc_mcb, uint8_t dlci, BT_HDR* p_buf); +void rfc_send_credit(tRFC_MCB* p_mcb, uint8_t dlci, uint8_t credit); +void rfc_process_mx_message(tRFC_MCB* p_rfc_mcb, BT_HDR* p_buf); +tRFC_EVENT rfc_parse_data(tRFC_MCB* p_rfc_mcb, MX_FRAME* p_frame, + BT_HDR* p_buf); /* Call back functions from RFCOMM */ -extern void rfcomm_l2cap_if_init(void); +void rfcomm_l2cap_if_init(void); -extern void PORT_StartInd(tRFC_MCB* p_mcb); -extern void PORT_StartCnf(tRFC_MCB* p_mcb, uint16_t result); +void PORT_StartInd(tRFC_MCB* p_mcb); +void PORT_StartCnf(tRFC_MCB* p_mcb, uint16_t result); -extern void PORT_CloseInd(tRFC_MCB* p_mcb); -extern void Port_TimeOutCloseMux(tRFC_MCB* p_mcb); +void PORT_CloseInd(tRFC_MCB* p_mcb); +void Port_TimeOutCloseMux(tRFC_MCB* p_mcb); -extern void PORT_DlcEstablishInd(tRFC_MCB* p_mcb, uint8_t dlci, uint16_t mtu); -extern void PORT_DlcEstablishCnf(tRFC_MCB* p_mcb, uint8_t dlci, uint16_t mtu, - uint16_t result); +void PORT_DlcEstablishInd(tRFC_MCB* p_mcb, uint8_t dlci, uint16_t mtu); +void PORT_DlcEstablishCnf(tRFC_MCB* p_mcb, uint8_t dlci, uint16_t mtu, + uint16_t result); -extern void PORT_DataInd(tRFC_MCB* p_mcb, uint8_t dlci, BT_HDR* p_buf); +void PORT_DataInd(tRFC_MCB* p_mcb, uint8_t dlci, BT_HDR* p_buf); -extern void PORT_DlcReleaseInd(tRFC_MCB* p_mcb, uint8_t dlci); +void PORT_DlcReleaseInd(tRFC_MCB* p_mcb, uint8_t dlci); -extern void PORT_ParNegInd(tRFC_MCB* p_mcb, uint8_t dlci, uint16_t mtu, - uint8_t cl, uint8_t k); -extern void PORT_ParNegCnf(tRFC_MCB* p_mcb, uint8_t dlci, uint16_t mtu, - uint8_t cl, uint8_t k); +void PORT_ParNegInd(tRFC_MCB* p_mcb, uint8_t dlci, uint16_t mtu, uint8_t cl, + uint8_t k); +void PORT_ParNegCnf(tRFC_MCB* p_mcb, uint8_t dlci, uint16_t mtu, uint8_t cl, + uint8_t k); -extern void PORT_FlowInd(tRFC_MCB* p_mcb, uint8_t dlci, bool fc); +void PORT_FlowInd(tRFC_MCB* p_mcb, uint8_t dlci, bool fc); -extern void PORT_PortNegInd(tRFC_MCB* p_mcb, uint8_t dlci, tPORT_STATE* p_pars, - uint16_t param_mask); -extern void PORT_PortNegCnf(tRFC_MCB* p_mcb, uint8_t dlci, tPORT_STATE* p_pars, - uint16_t result); +void PORT_PortNegInd(tRFC_MCB* p_mcb, uint8_t dlci, tPORT_STATE* p_pars, + uint16_t param_mask); +void PORT_PortNegCnf(tRFC_MCB* p_mcb, uint8_t dlci, tPORT_STATE* p_pars, + uint16_t result); -extern void PORT_ControlInd(tRFC_MCB* p_mcb, uint8_t dlci, tPORT_CTRL* p_pars); -extern void PORT_ControlCnf(tRFC_MCB* p_mcb, uint8_t dlci, tPORT_CTRL* p_pars); +void PORT_ControlInd(tRFC_MCB* p_mcb, uint8_t dlci, tPORT_CTRL* p_pars); +void PORT_ControlCnf(tRFC_MCB* p_mcb, uint8_t dlci, tPORT_CTRL* p_pars); -extern void PORT_LineStatusInd(tRFC_MCB* p_mcb, uint8_t dlci, - uint8_t line_status); +void PORT_LineStatusInd(tRFC_MCB* p_mcb, uint8_t dlci, uint8_t line_status); #endif diff --git a/system/stack/sdp/sdpint.h b/system/stack/sdp/sdpint.h index a4f7fcc599..6f657708ea 100644 --- a/system/stack/sdp/sdpint.h +++ b/system/stack/sdp/sdpint.h @@ -253,96 +253,94 @@ typedef struct { extern tSDP_CB sdp_cb; /* Functions provided by sdp_main.cc */ -extern void sdp_init(void); -extern void sdp_free(void); -extern void sdp_disconnect(tCONN_CB* p_ccb, tSDP_REASON reason); +void sdp_init(void); +void sdp_free(void); +void sdp_disconnect(tCONN_CB* p_ccb, tSDP_REASON reason); -extern void sdp_conn_timer_timeout(void* data); +void sdp_conn_timer_timeout(void* data); -extern tCONN_CB* sdp_conn_originate(const RawAddress& p_bd_addr); +tCONN_CB* sdp_conn_originate(const RawAddress& p_bd_addr); /* Functions provided by sdp_utils.cc */ -extern void sdpu_log_attribute_metrics(const RawAddress& bda, - tSDP_DISCOVERY_DB* p_db); -extern tCONN_CB* sdpu_find_ccb_by_cid(uint16_t cid); -extern tCONN_CB* sdpu_find_ccb_by_db(const tSDP_DISCOVERY_DB* p_db); -extern tCONN_CB* sdpu_allocate_ccb(void); -extern void sdpu_release_ccb(tCONN_CB& p_ccb); - -extern uint8_t* sdpu_build_attrib_seq(uint8_t* p_out, uint16_t* p_attr, - uint16_t num_attrs); -extern uint8_t* sdpu_build_attrib_entry(uint8_t* p_out, - const tSDP_ATTRIBUTE* p_attr); -extern void sdpu_build_n_send_error(tCONN_CB* p_ccb, uint16_t trans_num, - uint16_t error_code, char* p_error_text); - -extern uint8_t* sdpu_extract_attr_seq(uint8_t* p, uint16_t param_len, - tSDP_ATTR_SEQ* p_seq); -extern uint8_t* sdpu_extract_uid_seq(uint8_t* p, uint16_t param_len, - tSDP_UUID_SEQ* p_seq); - -extern uint8_t* sdpu_get_len_from_type(uint8_t* p, uint8_t* p_end, uint8_t type, - uint32_t* p_len); -extern bool sdpu_is_base_uuid(uint8_t* p_uuid); -extern bool sdpu_compare_uuid_arrays(const uint8_t* p_uuid1, uint32_t len1, - const uint8_t* p_uuid2, uint16_t len2); -extern bool sdpu_compare_uuid_with_attr(const bluetooth::Uuid& uuid, - tSDP_DISC_ATTR* p_attr); - -extern void sdpu_sort_attr_list(uint16_t num_attr, tSDP_DISCOVERY_DB* p_db); -extern uint16_t sdpu_get_list_len(tSDP_UUID_SEQ* uid_seq, - tSDP_ATTR_SEQ* attr_seq); -extern uint16_t sdpu_get_attrib_seq_len(const tSDP_RECORD* p_rec, - const tSDP_ATTR_SEQ* attr_seq); -extern uint16_t sdpu_get_attrib_entry_len(const tSDP_ATTRIBUTE* p_attr); -extern uint8_t* sdpu_build_partial_attrib_entry(uint8_t* p_out, - const tSDP_ATTRIBUTE* p_attr, - uint16_t len, uint16_t* offset); -extern bool SDP_AddAttributeToRecord(tSDP_RECORD* p_rec, uint16_t attr_id, - uint8_t attr_type, uint32_t attr_len, - uint8_t* p_val); -extern bool SDP_AddProfileDescriptorListToRecord(tSDP_RECORD* p_rec, - uint16_t profile_uuid, - uint16_t version); -extern bool SDP_DeleteAttributeFromRecord(tSDP_RECORD* p_rec, uint16_t attr_id); -extern uint16_t sdpu_is_avrcp_profile_description_list( - const tSDP_ATTRIBUTE* p_attr); -extern bool sdpu_is_service_id_avrc_target(const tSDP_ATTRIBUTE* p_attr); -extern bool spdu_is_avrcp_version_valid(const uint16_t version); -extern void sdpu_set_avrc_target_version(const tSDP_ATTRIBUTE* p_attr, - const RawAddress* bdaddr); -extern void sdpu_set_avrc_target_features(const tSDP_ATTRIBUTE* p_attr, - const RawAddress* bdaddr, - uint16_t profile_version); -extern uint16_t sdpu_get_active_ccb_cid(const RawAddress& remote_bd_addr); -extern bool sdpu_process_pend_ccb_same_cid(tCONN_CB& ccb); -extern bool sdpu_process_pend_ccb_new_cid(tCONN_CB& ccb); -extern void sdpu_clear_pend_ccb(tCONN_CB& ccb); -extern void sdpu_callback(tCONN_CB& ccb, tSDP_REASON reason); +void sdpu_log_attribute_metrics(const RawAddress& bda, tSDP_DISCOVERY_DB* p_db); +tCONN_CB* sdpu_find_ccb_by_cid(uint16_t cid); +tCONN_CB* sdpu_find_ccb_by_db(const tSDP_DISCOVERY_DB* p_db); +tCONN_CB* sdpu_allocate_ccb(void); +void sdpu_release_ccb(tCONN_CB& p_ccb); + +uint8_t* sdpu_build_attrib_seq(uint8_t* p_out, uint16_t* p_attr, + uint16_t num_attrs); +uint8_t* sdpu_build_attrib_entry(uint8_t* p_out, const tSDP_ATTRIBUTE* p_attr); +void sdpu_build_n_send_error(tCONN_CB* p_ccb, uint16_t trans_num, + uint16_t error_code, char* p_error_text); + +uint8_t* sdpu_extract_attr_seq(uint8_t* p, uint16_t param_len, + tSDP_ATTR_SEQ* p_seq); +uint8_t* sdpu_extract_uid_seq(uint8_t* p, uint16_t param_len, + tSDP_UUID_SEQ* p_seq); + +uint8_t* sdpu_get_len_from_type(uint8_t* p, uint8_t* p_end, uint8_t type, + uint32_t* p_len); +bool sdpu_is_base_uuid(uint8_t* p_uuid); +bool sdpu_compare_uuid_arrays(const uint8_t* p_uuid1, uint32_t len1, + const uint8_t* p_uuid2, uint16_t len2); +bool sdpu_compare_uuid_with_attr(const bluetooth::Uuid& uuid, + tSDP_DISC_ATTR* p_attr); + +void sdpu_sort_attr_list(uint16_t num_attr, tSDP_DISCOVERY_DB* p_db); +uint16_t sdpu_get_list_len(tSDP_UUID_SEQ* uid_seq, tSDP_ATTR_SEQ* attr_seq); +uint16_t sdpu_get_attrib_seq_len(const tSDP_RECORD* p_rec, + const tSDP_ATTR_SEQ* attr_seq); +uint16_t sdpu_get_attrib_entry_len(const tSDP_ATTRIBUTE* p_attr); +uint8_t* sdpu_build_partial_attrib_entry(uint8_t* p_out, + const tSDP_ATTRIBUTE* p_attr, + uint16_t len, uint16_t* offset); +bool SDP_AddAttributeToRecord(tSDP_RECORD* p_rec, uint16_t attr_id, + uint8_t attr_type, uint32_t attr_len, + uint8_t* p_val); +bool SDP_AddProfileDescriptorListToRecord(tSDP_RECORD* p_rec, + uint16_t profile_uuid, + uint16_t version); +bool SDP_DeleteAttributeFromRecord(tSDP_RECORD* p_rec, uint16_t attr_id); +uint16_t sdpu_is_avrcp_profile_description_list(const tSDP_ATTRIBUTE* p_attr); +bool sdpu_is_service_id_avrc_target(const tSDP_ATTRIBUTE* p_attr); +bool spdu_is_avrcp_version_valid(const uint16_t version); +void sdpu_set_avrc_target_version(const tSDP_ATTRIBUTE* p_attr, + const RawAddress* bdaddr); +void sdpu_set_avrc_target_features(const tSDP_ATTRIBUTE* p_attr, + const RawAddress* bdaddr, + uint16_t profile_version); +uint16_t sdpu_get_active_ccb_cid(const RawAddress& remote_bd_addr); +bool sdpu_process_pend_ccb_same_cid(tCONN_CB& ccb); +bool sdpu_process_pend_ccb_new_cid(tCONN_CB& ccb); +void sdpu_clear_pend_ccb(tCONN_CB& ccb); +void sdpu_callback(tCONN_CB& ccb, tSDP_REASON reason); /* Functions provided by sdp_db.cc */ -extern const tSDP_RECORD* sdp_db_service_search(const tSDP_RECORD* p_rec, - const tSDP_UUID_SEQ* p_seq); -extern tSDP_RECORD* sdp_db_find_record(uint32_t handle); -extern const tSDP_ATTRIBUTE* sdp_db_find_attr_in_rec(const tSDP_RECORD* p_rec, - uint16_t start_attr, - uint16_t end_attr); +const tSDP_RECORD* sdp_db_service_search(const tSDP_RECORD* p_rec, + const tSDP_UUID_SEQ* p_seq); +tSDP_RECORD* sdp_db_find_record(uint32_t handle); +const tSDP_ATTRIBUTE* sdp_db_find_attr_in_rec(const tSDP_RECORD* p_rec, + uint16_t start_attr, + uint16_t end_attr); /* Functions provided by sdp_server.cc */ -extern void sdp_server_handle_client_req(tCONN_CB* p_ccb, BT_HDR* p_msg); +void sdp_server_handle_client_req(tCONN_CB* p_ccb, BT_HDR* p_msg); /* Functions provided by sdp_discovery.cc */ -extern void sdp_disc_connected(tCONN_CB* p_ccb); -extern void sdp_disc_server_rsp(tCONN_CB* p_ccb, BT_HDR* p_msg); - -extern void update_pce_entry_to_interop_database(RawAddress remote_addr); -extern bool is_sdp_pbap_pce_disabled(RawAddress remote_addr); -extern void sdp_save_local_pse_record_attributes( - int32_t rfcomm_channel_number, int32_t l2cap_psm, int32_t profile_version, - uint32_t supported_features, uint32_t supported_repositories); +void sdp_disc_connected(tCONN_CB* p_ccb); +void sdp_disc_server_rsp(tCONN_CB* p_ccb, BT_HDR* p_msg); + +void update_pce_entry_to_interop_database(RawAddress remote_addr); +bool is_sdp_pbap_pce_disabled(RawAddress remote_addr); +void sdp_save_local_pse_record_attributes(int32_t rfcomm_channel_number, + int32_t l2cap_psm, + int32_t profile_version, + uint32_t supported_features, + uint32_t supported_repositories); #endif diff --git a/system/stack/smp/crypto_toolbox.h b/system/stack/smp/crypto_toolbox.h index d3fceff9be..96f84ee502 100644 --- a/system/stack/smp/crypto_toolbox.h +++ b/system/stack/smp/crypto_toolbox.h @@ -22,18 +22,15 @@ * * Example of usage is avaliable in cryptographic_toolbox_test.cc */ -extern Octet16 smp_calculate_f4(uint8_t* u, uint8_t* v, const Octet16& x, - uint8_t z); -extern uint32_t smp_calculate_g2(uint8_t* u, uint8_t* v, const Octet16& x, - const Octet16& y); -extern void smp_calculate_f5(uint8_t* w, const Octet16& n1, const Octet16& n2, - uint8_t* a1, uint8_t* a2, Octet16* mac_key, - Octet16* ltk); -extern Octet16 smp_calculate_f6(const Octet16& w, const Octet16& n1, - const Octet16& n2, const Octet16& r, - uint8_t* iocap, uint8_t* a1, uint8_t* a2); -extern Octet16 smp_calculate_h6(const Octet16& w, std::array<uint8_t, 4> keyid); -extern Octet16 smp_calculate_h7(const Octet16& salt, const Octet16& w); -extern Octet16 smp_calculate_ltk_to_link_key(const Octet16& ltk, bool use_h7); -extern Octet16 smp_calculate_link_key_to_ltk(const Octet16& link_key, - bool use_h7); +Octet16 smp_calculate_f4(uint8_t* u, uint8_t* v, const Octet16& x, uint8_t z); +uint32_t smp_calculate_g2(uint8_t* u, uint8_t* v, const Octet16& x, + const Octet16& y); +void smp_calculate_f5(uint8_t* w, const Octet16& n1, const Octet16& n2, + uint8_t* a1, uint8_t* a2, Octet16* mac_key, Octet16* ltk); +Octet16 smp_calculate_f6(const Octet16& w, const Octet16& n1, const Octet16& n2, + const Octet16& r, uint8_t* iocap, uint8_t* a1, + uint8_t* a2); +Octet16 smp_calculate_h6(const Octet16& w, std::array<uint8_t, 4> keyid); +Octet16 smp_calculate_h7(const Octet16& salt, const Octet16& w); +Octet16 smp_calculate_ltk_to_link_key(const Octet16& ltk, bool use_h7); +Octet16 smp_calculate_link_key_to_ltk(const Octet16& link_key, bool use_h7); diff --git a/system/stack/smp/smp_int.h b/system/stack/smp/smp_int.h index 5e731806de..1cf316ef30 100644 --- a/system/stack/smp/smp_int.h +++ b/system/stack/smp/smp_int.h @@ -318,165 +318,149 @@ typedef void (*tSMP_ACT)(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); extern tSMP_CB smp_cb; /* Functions provided by att_main.cc */ -extern void smp_init(void); +void smp_init(void); /* smp main */ -extern bool smp_sm_event(tSMP_CB* p_cb, tSMP_EVENT event, - tSMP_INT_DATA* p_data); +bool smp_sm_event(tSMP_CB* p_cb, tSMP_EVENT event, tSMP_INT_DATA* p_data); -extern tSMP_STATE smp_get_state(void); -extern void smp_set_state(tSMP_STATE state); +tSMP_STATE smp_get_state(void); +void smp_set_state(tSMP_STATE state); /* smp_br_main */ -extern void smp_br_state_machine_event(tSMP_CB* p_cb, tSMP_BR_EVENT event, - tSMP_INT_DATA* p_data); -extern tSMP_BR_STATE smp_get_br_state(void); -extern void smp_set_br_state(tSMP_BR_STATE state); +void smp_br_state_machine_event(tSMP_CB* p_cb, tSMP_BR_EVENT event, + tSMP_INT_DATA* p_data); +tSMP_BR_STATE smp_get_br_state(void); +void smp_set_br_state(tSMP_BR_STATE state); /* smp_act.cc */ -extern void smp_send_pair_req(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); -extern void smp_send_confirm(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); -extern void smp_send_pair_fail(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); -extern void smp_send_rand(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); -extern void smp_send_pair_public_key(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); -extern void smp_send_commitment(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); -extern void smp_send_dhkey_check(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); -extern void smp_send_keypress_notification(tSMP_CB* p_cb, +void smp_send_pair_req(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); +void smp_send_confirm(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); +void smp_send_pair_fail(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); +void smp_send_rand(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); +void smp_send_pair_public_key(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); +void smp_send_commitment(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); +void smp_send_dhkey_check(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); +void smp_send_keypress_notification(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); +void smp_proc_pair_fail(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); +void smp_proc_confirm(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); +void smp_proc_rand(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); +void smp_process_pairing_public_key(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); +void smp_proc_enc_info(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); +void smp_proc_central_id(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); +void smp_proc_id_info(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); +void smp_proc_id_addr(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); +void smp_proc_sec_grant(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); +void smp_proc_sec_req(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); +void smp_proc_sl_key(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); +void smp_start_enc(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); +void smp_enc_cmpl(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); +void smp_proc_discard(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); +void smp_pairing_cmpl(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); +void smp_decide_association_model(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); +void smp_send_app_cback(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); +void smp_proc_compare(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); +void smp_check_auth_req(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); +void smp_process_io_response(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); +void smp_send_id_info(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); +void smp_send_enc_info(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); +void smp_send_csrk_info(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); +void smp_send_ltk_reply(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); +void smp_proc_pair_cmd(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); +void smp_pair_terminate(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); +void smp_idle_terminate(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); +void smp_send_pair_rsp(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); +void smp_key_distribution(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); +void smp_proc_srk_info(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); +void smp_generate_csrk(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); +void smp_key_pick_key(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); +void smp_both_have_public_keys(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); +void smp_start_secure_connection_phase1(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); +void smp_process_local_nonce(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); +void smp_process_pairing_commitment(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); +void smp_process_peer_nonce(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); +void smp_process_dhkey_check(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); +void smp_match_dhkey_checks(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); +void smp_process_keypress_notification(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); +void smp_move_to_secure_connections_phase2(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); -extern void smp_proc_pair_fail(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); -extern void smp_proc_confirm(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); -extern void smp_proc_rand(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); -extern void smp_process_pairing_public_key(tSMP_CB* p_cb, - tSMP_INT_DATA* p_data); -extern void smp_proc_enc_info(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); -extern void smp_proc_central_id(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); -extern void smp_proc_id_info(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); -extern void smp_proc_id_addr(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); -extern void smp_proc_sec_grant(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); -extern void smp_proc_sec_req(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); -extern void smp_proc_sl_key(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); -extern void smp_start_enc(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); -extern void smp_enc_cmpl(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); -extern void smp_proc_discard(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); -extern void smp_pairing_cmpl(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); -extern void smp_decide_association_model(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); -extern void smp_send_app_cback(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); -extern void smp_proc_compare(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); -extern void smp_check_auth_req(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); -extern void smp_process_io_response(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); -extern void smp_send_id_info(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); -extern void smp_send_enc_info(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); -extern void smp_send_csrk_info(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); -extern void smp_send_ltk_reply(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); -extern void smp_proc_pair_cmd(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); -extern void smp_pair_terminate(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); -extern void smp_idle_terminate(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); -extern void smp_send_pair_rsp(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); -extern void smp_key_distribution(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); -extern void smp_proc_srk_info(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); -extern void smp_generate_csrk(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); -extern void smp_key_pick_key(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); -extern void smp_both_have_public_keys(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); -extern void smp_start_secure_connection_phase1(tSMP_CB* p_cb, - tSMP_INT_DATA* p_data); -extern void smp_process_local_nonce(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); -extern void smp_process_pairing_commitment(tSMP_CB* p_cb, - tSMP_INT_DATA* p_data); -extern void smp_process_peer_nonce(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); -extern void smp_process_dhkey_check(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); -extern void smp_match_dhkey_checks(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); -extern void smp_process_keypress_notification(tSMP_CB* p_cb, - tSMP_INT_DATA* p_data); -extern void smp_move_to_secure_connections_phase2(tSMP_CB* p_cb, - tSMP_INT_DATA* p_data); -extern void smp_phase_2_dhkey_checks_are_present(tSMP_CB* p_cb, - tSMP_INT_DATA* p_data); -extern void smp_wait_for_both_public_keys(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); -extern void smp_start_passkey_verification(tSMP_CB* p_cb, - tSMP_INT_DATA* p_data); -extern void smp_process_secure_connection_oob_data(tSMP_CB* p_cb, - tSMP_INT_DATA* p_data); -extern void smp_process_secure_connection_long_term_key(void); -extern void smp_set_local_oob_keys(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); -extern void smp_set_local_oob_random_commitment(tSMP_CB* p_cb, - tSMP_INT_DATA* p_data); -extern void smp_set_derive_link_key(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); -extern void smp_derive_link_key_from_long_term_key(tSMP_CB* p_cb, - tSMP_INT_DATA* p_data); -extern void smp_br_process_pairing_command(tSMP_CB* p_cb, - tSMP_INT_DATA* p_data); -extern void smp_br_process_security_grant(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); -extern void smp_br_process_peripheral_keys_response(tSMP_CB* p_cb, - tSMP_INT_DATA* p_data); -extern void smp_br_send_pair_response(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); -extern void smp_br_check_authorization_request(tSMP_CB* p_cb, - tSMP_INT_DATA* p_data); -extern void smp_br_select_next_key(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); -extern void smp_br_process_link_key(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); -extern void smp_key_distribution_by_transport(tSMP_CB* p_cb, - tSMP_INT_DATA* p_data); -extern void smp_br_pairing_complete(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); +void smp_phase_2_dhkey_checks_are_present(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); +void smp_wait_for_both_public_keys(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); +void smp_start_passkey_verification(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); +void smp_process_secure_connection_oob_data(tSMP_CB* p_cb, + tSMP_INT_DATA* p_data); +void smp_process_secure_connection_long_term_key(void); +void smp_set_local_oob_keys(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); +void smp_set_local_oob_random_commitment(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); +void smp_set_derive_link_key(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); +void smp_derive_link_key_from_long_term_key(tSMP_CB* p_cb, + tSMP_INT_DATA* p_data); +void smp_br_process_pairing_command(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); +void smp_br_process_security_grant(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); +void smp_br_process_peripheral_keys_response(tSMP_CB* p_cb, + tSMP_INT_DATA* p_data); +void smp_br_send_pair_response(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); +void smp_br_check_authorization_request(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); +void smp_br_select_next_key(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); +void smp_br_process_link_key(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); +void smp_key_distribution_by_transport(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); +void smp_br_pairing_complete(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); /* smp_l2c */ -extern void smp_l2cap_if_init(void); -extern void smp_data_ind(const RawAddress& bd_addr, BT_HDR* p_buf); +void smp_l2cap_if_init(void); +void smp_data_ind(const RawAddress& bd_addr, BT_HDR* p_buf); /* smp_util.cc */ -extern void smp_log_metrics(const RawAddress& bd_addr, bool is_outgoing, - const uint8_t* p_buf, size_t buf_len, - bool is_over_br); -extern bool smp_send_cmd(uint8_t cmd_code, tSMP_CB* p_cb); -extern void smp_cb_cleanup(tSMP_CB* p_cb); -extern void smp_reset_control_value(tSMP_CB* p_cb); -extern void smp_proc_pairing_cmpl(tSMP_CB* p_cb); -extern void smp_convert_string_to_tk(Octet16* tk, uint32_t passkey); -extern void smp_mask_enc_key(uint8_t loc_enc_size, Octet16* p_data); -extern void smp_rsp_timeout(void* data); -extern void smp_delayed_auth_complete_timeout(void* data); -extern bool smp_command_has_invalid_length(tSMP_CB* p_cb); -extern bool smp_command_has_invalid_parameters(tSMP_CB* p_cb); -extern void smp_reject_unexpected_pairing_command(const RawAddress& bd_addr); -extern tSMP_ASSO_MODEL smp_select_association_model(tSMP_CB* p_cb); -extern uint8_t smp_calculate_random_input(uint8_t* random, uint8_t round); -extern void smp_collect_local_io_capabilities(uint8_t* iocap, tSMP_CB* p_cb); -extern void smp_collect_peer_io_capabilities(uint8_t* iocap, tSMP_CB* p_cb); -extern void smp_collect_local_ble_address(uint8_t* le_addr, tSMP_CB* p_cb); -extern void smp_collect_peer_ble_address(uint8_t* le_addr, tSMP_CB* p_cb); -extern bool smp_check_commitment(tSMP_CB* p_cb); -extern void smp_save_secure_connections_long_term_key(tSMP_CB* p_cb); -extern void smp_calculate_f5_mackey_and_long_term_key(tSMP_CB* p_cb); -extern void smp_remove_fixed_channel(tSMP_CB* p_cb); -extern bool smp_request_oob_data(tSMP_CB* p_cb); +void smp_log_metrics(const RawAddress& bd_addr, bool is_outgoing, + const uint8_t* p_buf, size_t buf_len, bool is_over_br); +bool smp_send_cmd(uint8_t cmd_code, tSMP_CB* p_cb); +void smp_cb_cleanup(tSMP_CB* p_cb); +void smp_reset_control_value(tSMP_CB* p_cb); +void smp_proc_pairing_cmpl(tSMP_CB* p_cb); +void smp_convert_string_to_tk(Octet16* tk, uint32_t passkey); +void smp_mask_enc_key(uint8_t loc_enc_size, Octet16* p_data); +void smp_rsp_timeout(void* data); +void smp_delayed_auth_complete_timeout(void* data); +bool smp_command_has_invalid_length(tSMP_CB* p_cb); +bool smp_command_has_invalid_parameters(tSMP_CB* p_cb); +void smp_reject_unexpected_pairing_command(const RawAddress& bd_addr); +tSMP_ASSO_MODEL smp_select_association_model(tSMP_CB* p_cb); +uint8_t smp_calculate_random_input(uint8_t* random, uint8_t round); +void smp_collect_local_io_capabilities(uint8_t* iocap, tSMP_CB* p_cb); +void smp_collect_peer_io_capabilities(uint8_t* iocap, tSMP_CB* p_cb); +void smp_collect_local_ble_address(uint8_t* le_addr, tSMP_CB* p_cb); +void smp_collect_peer_ble_address(uint8_t* le_addr, tSMP_CB* p_cb); +bool smp_check_commitment(tSMP_CB* p_cb); +void smp_save_secure_connections_long_term_key(tSMP_CB* p_cb); +void smp_calculate_f5_mackey_and_long_term_key(tSMP_CB* p_cb); +void smp_remove_fixed_channel(tSMP_CB* p_cb); +bool smp_request_oob_data(tSMP_CB* p_cb); /* smp_keys.cc */ -extern void smp_generate_srand_mrand_confirm(tSMP_CB* p_cb, - tSMP_INT_DATA* p_data); -extern void smp_generate_compare(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); -extern void smp_generate_stk(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); -extern void smp_generate_ltk(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); -extern void smp_generate_passkey(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); -extern void smp_generate_rand_cont(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); -extern void smp_create_private_key(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); -extern void smp_use_oob_private_key(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); -extern void smp_compute_dhkey(tSMP_CB* p_cb); -extern void smp_calculate_local_commitment(tSMP_CB* p_cb); -extern Octet16 smp_calculate_peer_commitment(tSMP_CB* p_cb); -extern void smp_calculate_numeric_comparison_display_number( - tSMP_CB* p_cb, tSMP_INT_DATA* p_data); -extern void smp_calculate_local_dhkey_check(tSMP_CB* p_cb, - tSMP_INT_DATA* p_data); -extern void smp_calculate_peer_dhkey_check(tSMP_CB* p_cb, - tSMP_INT_DATA* p_data); -extern void smp_start_nonce_generation(tSMP_CB* p_cb); -extern bool smp_calculate_link_key_from_long_term_key(tSMP_CB* p_cb); -extern bool smp_calculate_long_term_key_from_link_key(tSMP_CB* p_cb); - -extern void print128(const Octet16& x, const uint8_t* key_name); -extern void smp_xor_128(Octet16* a, const Octet16& b); +void smp_generate_srand_mrand_confirm(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); +void smp_generate_compare(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); +void smp_generate_stk(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); +void smp_generate_ltk(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); +void smp_generate_passkey(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); +void smp_generate_rand_cont(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); +void smp_create_private_key(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); +void smp_use_oob_private_key(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); +void smp_compute_dhkey(tSMP_CB* p_cb); +void smp_calculate_local_commitment(tSMP_CB* p_cb); +Octet16 smp_calculate_peer_commitment(tSMP_CB* p_cb); +void smp_calculate_numeric_comparison_display_number(tSMP_CB* p_cb, + tSMP_INT_DATA* p_data); +void smp_calculate_local_dhkey_check(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); +void smp_calculate_peer_dhkey_check(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); +void smp_start_nonce_generation(tSMP_CB* p_cb); +bool smp_calculate_link_key_from_long_term_key(tSMP_CB* p_cb); +bool smp_calculate_long_term_key_from_link_key(tSMP_CB* p_cb); + +void print128(const Octet16& x, const uint8_t* key_name); +void smp_xor_128(Octet16* a, const Octet16& b); /* Save the p_cb->sc_oob_data.loc_oob_data for later, since the p_cb gets * cleaned up */ -extern void smp_save_local_oob_data(tSMP_CB* p_cb); -extern void smp_clear_local_oob_data(); -extern bool smp_has_local_oob_data(); +void smp_save_local_oob_data(tSMP_CB* p_cb); +void smp_clear_local_oob_data(); +bool smp_has_local_oob_data(); #endif /* SMP_INT_H */ diff --git a/system/stack/srvc/srvc_dis_int.h b/system/stack/srvc/srvc_dis_int.h index 422f649828..fb3703e87f 100644 --- a/system/stack/srvc/srvc_dis_int.h +++ b/system/stack/srvc/srvc_dis_int.h @@ -53,14 +53,13 @@ typedef struct { /* Global GATT data */ extern tDIS_CB dis_cb; -extern bool dis_valid_handle_range(uint16_t handle); -extern uint8_t dis_read_attr_value(uint8_t clcb_idx, uint16_t handle, - tGATT_VALUE* p_value, bool is_long, - tGATT_STATUS* p_status); -extern uint8_t dis_write_attr_value(tGATT_WRITE_REQ* p_data, - tGATT_STATUS* p_status); +bool dis_valid_handle_range(uint16_t handle); +uint8_t dis_read_attr_value(uint8_t clcb_idx, uint16_t handle, + tGATT_VALUE* p_value, bool is_long, + tGATT_STATUS* p_status); +uint8_t dis_write_attr_value(tGATT_WRITE_REQ* p_data, tGATT_STATUS* p_status); -extern void dis_c_cmpl_cback(tSRVC_CLCB* p_clcb, tGATTC_OPTYPE op, - tGATT_STATUS status, tGATT_CL_COMPLETE* p_data); +void dis_c_cmpl_cback(tSRVC_CLCB* p_clcb, tGATTC_OPTYPE op, tGATT_STATUS status, + tGATT_CL_COMPLETE* p_data); #endif diff --git a/system/stack/srvc/srvc_eng_int.h b/system/stack/srvc/srvc_eng_int.h index b8cc79eb59..d42a0405c5 100644 --- a/system/stack/srvc/srvc_eng_int.h +++ b/system/stack/srvc/srvc_eng_int.h @@ -57,9 +57,8 @@ typedef struct { /* Global GATT data */ extern tSRVC_ENG_CB srvc_eng_cb; -extern tSRVC_CLCB* srvc_eng_find_clcb_by_conn_id(uint16_t conn_id); +tSRVC_CLCB* srvc_eng_find_clcb_by_conn_id(uint16_t conn_id); -extern void srvc_eng_release_channel(uint16_t conn_id); -extern bool srvc_eng_request_channel(const RawAddress& remote_bda, - uint8_t srvc_id); +void srvc_eng_release_channel(uint16_t conn_id); +bool srvc_eng_request_channel(const RawAddress& remote_bda, uint8_t srvc_id); #endif diff --git a/system/stack/test/a2dp/a2dp_aac_unittest.cc b/system/stack/test/a2dp/a2dp_aac_unittest.cc index a66cf2f1be..47d8a10bfd 100644 --- a/system/stack/test/a2dp/a2dp_aac_unittest.cc +++ b/system/stack/test/a2dp/a2dp_aac_unittest.cc @@ -40,7 +40,7 @@ #include "test_util.h" #include "wav_reader.h" -extern void allocation_tracker_uninit(void); +void allocation_tracker_uninit(void); namespace { constexpr uint32_t kAacReadSize = 1024 * 2 * 2; constexpr uint32_t kA2dpTickUs = 23 * 1000; diff --git a/system/stack/test/a2dp/a2dp_opus_unittest.cc b/system/stack/test/a2dp/a2dp_opus_unittest.cc index b4e84d2899..42cbc931fb 100644 --- a/system/stack/test/a2dp/a2dp_opus_unittest.cc +++ b/system/stack/test/a2dp/a2dp_opus_unittest.cc @@ -38,7 +38,7 @@ #include "test_util.h" #include "wav_reader.h" -extern void allocation_tracker_uninit(void); +void allocation_tracker_uninit(void); namespace { constexpr uint32_t kA2dpTickUs = 23 * 1000; constexpr char kWavFile[] = "test/a2dp/raw_data/pcm1644s.wav"; diff --git a/system/stack/test/a2dp/a2dp_sbc_unittest.cc b/system/stack/test/a2dp/a2dp_sbc_unittest.cc index 48c6a7ab84..e0ab90131c 100644 --- a/system/stack/test/a2dp/a2dp_sbc_unittest.cc +++ b/system/stack/test/a2dp/a2dp_sbc_unittest.cc @@ -37,7 +37,7 @@ #include "test_util.h" #include "wav_reader.h" -extern void allocation_tracker_uninit(void); +void allocation_tracker_uninit(void); namespace { constexpr uint32_t kSbcReadSize = 512; constexpr uint32_t kA2dpTickUs = 23 * 1000; diff --git a/system/stack/test/a2dp/a2dp_vendor_ldac_decoder_test.cc b/system/stack/test/a2dp/a2dp_vendor_ldac_decoder_test.cc index 894fdd3fb0..5d1a30385a 100644 --- a/system/stack/test/a2dp/a2dp_vendor_ldac_decoder_test.cc +++ b/system/stack/test/a2dp/a2dp_vendor_ldac_decoder_test.cc @@ -27,7 +27,7 @@ #include "stack/include/bt_hdr.h" #include "stack/include/ldacBT_bco_for_fluoride.h" -extern void allocation_tracker_uninit(void); +void allocation_tracker_uninit(void); namespace { uint8_t* Data(BT_HDR* packet) { return packet->data + packet->offset; } diff --git a/system/stack/test/a2dp/a2dp_vendor_ldac_unittest.cc b/system/stack/test/a2dp/a2dp_vendor_ldac_unittest.cc index 3852ff11b9..7e27783815 100644 --- a/system/stack/test/a2dp/a2dp_vendor_ldac_unittest.cc +++ b/system/stack/test/a2dp/a2dp_vendor_ldac_unittest.cc @@ -30,7 +30,7 @@ #include "test_util.h" #include "wav_reader.h" -extern void allocation_tracker_uninit(void); +void allocation_tracker_uninit(void); namespace { constexpr uint32_t kA2dpTickUs = 23 * 1000; constexpr char kWavFile[] = "test/a2dp/raw_data/pcm1644s.wav"; diff --git a/system/stack/test/ble_advertiser_test.cc b/system/stack/test/ble_advertiser_test.cc index eaeaca0ebd..a0ae0182ed 100644 --- a/system/stack/test/ble_advertiser_test.cc +++ b/system/stack/test/ble_advertiser_test.cc @@ -1134,9 +1134,9 @@ TEST_F(BleAdvertisingManagerTest, test_cleanup_during_execution) { ::testing::Mock::VerifyAndClearExpectations(hci_mock.get()); } -extern void testRecomputeTimeout1(); -extern void testRecomputeTimeout2(); -extern void testRecomputeTimeout3(); +void testRecomputeTimeout1(); +void testRecomputeTimeout2(); +void testRecomputeTimeout3(); TEST_F(BleAdvertisingManagerTest, test_recompute_timeout) { testRecomputeTimeout1(); diff --git a/system/stack/test/crypto_toolbox_test.cc b/system/stack/test/crypto_toolbox_test.cc index ab12a76f8d..3c7eb0b017 100644 --- a/system/stack/test/crypto_toolbox_test.cc +++ b/system/stack/test/crypto_toolbox_test.cc @@ -337,7 +337,7 @@ TEST(CryptoToolboxTest, bt_spec_example_d_8_test) { EXPECT_EQ(expected_aes_cmac, aes_cmac); } -extern Octet16 smp_calculate_ltk_to_link_key(const Octet16& ltk, bool use_h7); +Octet16 smp_calculate_ltk_to_link_key(const Octet16& ltk, bool use_h7); // BT Spec 5.0 | Vol 3, Part H D.9 TEST(CryptoToolboxTest, bt_spec_example_d_9_test) { diff --git a/system/stack/test/gatt/gatt_sr_test.cc b/system/stack/test/gatt/gatt_sr_test.cc index 287d8043fd..7614ce2208 100644 --- a/system/stack/test/gatt/gatt_sr_test.cc +++ b/system/stack/test/gatt/gatt_sr_test.cc @@ -144,7 +144,7 @@ void gatt_sr_update_cl_status(tGATT_TCB& p_tcb, bool chg_aware) { /** * Test class to test selected functionality in stack/gatt/gatt_sr.cc */ -extern void allocation_tracker_uninit(void); +void allocation_tracker_uninit(void); namespace { uint16_t kHandle = 1; bt_gatt_db_attribute_type_t kGattCharacteristicType = BTGATT_DB_CHARACTERISTIC; diff --git a/system/stack/test/stack_smp_test.cc b/system/stack/test/stack_smp_test.cc index d516248ad8..bf44284234 100644 --- a/system/stack/test/stack_smp_test.cc +++ b/system/stack/test/stack_smp_test.cc @@ -133,14 +133,12 @@ const stack_config_t* stack_config_get_interface(void) { * MSB on the right. */ -extern Octet16 smp_gen_p1_4_confirm(tSMP_CB* p_cb, - tBLE_ADDR_TYPE remote_bd_addr_type); +Octet16 smp_gen_p1_4_confirm(tSMP_CB* p_cb, tBLE_ADDR_TYPE remote_bd_addr_type); -extern Octet16 smp_gen_p2_4_confirm(tSMP_CB* p_cb, - const RawAddress& remote_bda); +Octet16 smp_gen_p2_4_confirm(tSMP_CB* p_cb, const RawAddress& remote_bda); -extern tSMP_STATUS smp_calculate_comfirm(tSMP_CB* p_cb, const Octet16& rand, - Octet16* output); +tSMP_STATUS smp_calculate_comfirm(tSMP_CB* p_cb, const Octet16& rand, + Octet16* output); namespace testing { diff --git a/system/udrv/ulinux/uipc.cc b/system/udrv/ulinux/uipc.cc index 3f7f5a2aaa..c56e49a857 100644 --- a/system/udrv/ulinux/uipc.cc +++ b/system/udrv/ulinux/uipc.cc @@ -677,8 +677,8 @@ uint32_t UIPC_Read(tUIPC_STATE& uipc, tUIPC_CH_ID ch_id, uint8_t* p_buf, * ******************************************************************************/ -extern bool UIPC_Ioctl(tUIPC_STATE& uipc, tUIPC_CH_ID ch_id, uint32_t request, - void* param) { +bool UIPC_Ioctl(tUIPC_STATE& uipc, tUIPC_CH_ID ch_id, uint32_t request, + void* param) { LOG_DEBUG("#### UIPC_Ioctl : ch_id %d, request %d ####", ch_id, request); std::lock_guard<std::recursive_mutex> lock(uipc.mutex); |