Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 75a13e1e authored by Henri Chataing's avatar Henri Chataing Committed by Gerrit Code Review
Browse files

Merge "Remove extern specifiers from function prototype declarations"

parents 2f62400e 4e3bbe9a

system/audio_hearing_aid_hw/include/audio_hearing_aid_hw.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

system/bta/ag/bta_ag_at.h

+3 −3
Original line number Diff line number Diff line
@@ -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 */

system/bta/ag/bta_ag_int.h

+80 −90
Original line number Diff line number Diff line
@@ -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,

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);

extern void bta_ag_api_result(uint16_t handle, tBTA_AG_RES result,

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,

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);

extern void bta_ag_sm_execute_by_handle(uint16_t handle, uint16_t event,

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,

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_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 */

system/bta/av/bta_av_int.h

+109 −112

File changed.

Preview size limit exceeded, changes collapsed.

system/bta/dm/bta_dm_act.cc

+1 −1
Original line number Diff line number Diff line
@@ -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