From 92c997f304cd62c72b66715d4726ee7040caf6f3 Mon Sep 17 00:00:00 2001 From: "Mike J. Chen" Date: Fri, 31 Jan 2014 18:07:48 -0800 Subject: [PATCH] Fix a number of unused parameter warnings in static functions Since functions were static, just changed them to not take the unused parameters. Change-Id: I2f39684d84b1785d60167e617bc5fa79aeac4dda Signed-off-by: Mike J. Chen --- stack/btu/btu_hcif.c | 318 +++++++++++++++++++++++++-------------------------- 1 file changed, 159 insertions(+), 159 deletions(-) diff --git a/stack/btu/btu_hcif.c b/stack/btu/btu_hcif.c index bd7c9ff2f..0081850c7 100644 --- a/stack/btu/btu_hcif.c +++ b/stack/btu/btu_hcif.c @@ -60,64 +60,64 @@ static int num_hci_cmds_timed_out; /********************************************************************************/ /* L O C A L F U N C T I O N P R O T O T Y P E S */ /********************************************************************************/ -static void btu_hcif_inquiry_comp_evt (UINT8 *p, UINT16 evt_len); -static void btu_hcif_inquiry_result_evt (UINT8 *p, UINT16 evt_len); -static void btu_hcif_inquiry_rssi_result_evt (UINT8 *p, UINT16 evt_len); +static void btu_hcif_inquiry_comp_evt (UINT8 *p); +static void btu_hcif_inquiry_result_evt (UINT8 *p); +static void btu_hcif_inquiry_rssi_result_evt (UINT8 *p); #if (BTM_EIR_CLIENT_INCLUDED == TRUE) -static void btu_hcif_extended_inquiry_result_evt (UINT8 *p, UINT16 evt_len); +static void btu_hcif_extended_inquiry_result_evt (UINT8 *p); #endif -static void btu_hcif_connection_comp_evt (UINT8 *p, UINT16 evt_len); -static void btu_hcif_connection_request_evt (UINT8 *p, UINT16 evt_len); -static void btu_hcif_disconnection_comp_evt (UINT8 *p, UINT16 evt_len); -static void btu_hcif_authentication_comp_evt (UINT8 *p, UINT16 evt_len); +static void btu_hcif_connection_comp_evt (UINT8 *p); +static void btu_hcif_connection_request_evt (UINT8 *p); +static void btu_hcif_disconnection_comp_evt (UINT8 *p); +static void btu_hcif_authentication_comp_evt (UINT8 *p); static void btu_hcif_rmt_name_request_comp_evt (UINT8 *p, UINT16 evt_len); -static void btu_hcif_encryption_change_evt (UINT8 *p, UINT16 evt_len); -static void btu_hcif_change_conn_link_key_evt (UINT8 *p, UINT16 evt_len); -static void btu_hcif_master_link_key_comp_evt (UINT8 *p, UINT16 evt_len); -static void btu_hcif_read_rmt_features_comp_evt (UINT8 *p, UINT16 evt_len); -static void btu_hcif_read_rmt_ext_features_comp_evt (UINT8 *p, UINT16 evt_len); -static void btu_hcif_read_rmt_version_comp_evt (UINT8 *p, UINT16 evt_len); -static void btu_hcif_qos_setup_comp_evt (UINT8 *p, UINT16 evt_len); +static void btu_hcif_encryption_change_evt (UINT8 *p); +static void btu_hcif_change_conn_link_key_evt (UINT8 *p); +static void btu_hcif_master_link_key_comp_evt (UINT8 *p); +static void btu_hcif_read_rmt_features_comp_evt (UINT8 *p); +static void btu_hcif_read_rmt_ext_features_comp_evt (UINT8 *p); +static void btu_hcif_read_rmt_version_comp_evt (UINT8 *p); +static void btu_hcif_qos_setup_comp_evt (UINT8 *p); static void btu_hcif_command_complete_evt (UINT8 controller_id, UINT8 *p, UINT16 evt_len); -static void btu_hcif_command_status_evt (UINT8 controller_id, UINT8 *p, UINT16 evt_len); -static void btu_hcif_hardware_error_evt (UINT8 *p, UINT16 evt_len); -static void btu_hcif_flush_occured_evt (UINT8 *p, UINT16 evt_len); -static void btu_hcif_role_change_evt (UINT8 *p, UINT16 evt_len); -static void btu_hcif_num_compl_data_pkts_evt (UINT8 *p, UINT16 evt_len); -static void btu_hcif_mode_change_evt (UINT8 *p, UINT16 evt_len); -static void btu_hcif_return_link_keys_evt (UINT8 *p, UINT16 evt_len); -static void btu_hcif_pin_code_request_evt (UINT8 *p, UINT16 evt_len); -static void btu_hcif_link_key_request_evt (UINT8 *p, UINT16 evt_len); -static void btu_hcif_link_key_notification_evt (UINT8 *p, UINT16 evt_len); -static void btu_hcif_loopback_command_evt (UINT8 *p, UINT16 evt_len); -static void btu_hcif_data_buf_overflow_evt (UINT8 *p, UINT16 evt_len); -static void btu_hcif_max_slots_changed_evt (UINT8 *p, UINT16 evt_len); -static void btu_hcif_read_clock_off_comp_evt (UINT8 *p, UINT16 evt_len); -static void btu_hcif_conn_pkt_type_change_evt (UINT8 *p, UINT16 evt_len); -static void btu_hcif_qos_violation_evt (UINT8 *p, UINT16 evt_len); -static void btu_hcif_page_scan_mode_change_evt (UINT8 *p, UINT16 evt_len); -static void btu_hcif_page_scan_rep_mode_chng_evt (UINT8 *p, UINT16 evt_len); -static void btu_hcif_esco_connection_comp_evt(UINT8 *p, UINT16 evt_len); -static void btu_hcif_esco_connection_chg_evt(UINT8 *p, UINT16 evt_len); +static void btu_hcif_command_status_evt (UINT8 controller_id, UINT8 *p); +static void btu_hcif_hardware_error_evt (UINT8 *p); +static void btu_hcif_flush_occured_evt (void); +static void btu_hcif_role_change_evt (UINT8 *p); +static void btu_hcif_num_compl_data_pkts_evt (UINT8 *p); +static void btu_hcif_mode_change_evt (UINT8 *p); +static void btu_hcif_return_link_keys_evt (UINT8 *p); +static void btu_hcif_pin_code_request_evt (UINT8 *p); +static void btu_hcif_link_key_request_evt (UINT8 *p); +static void btu_hcif_link_key_notification_evt (UINT8 *p); +static void btu_hcif_loopback_command_evt (void); +static void btu_hcif_data_buf_overflow_evt (void); +static void btu_hcif_max_slots_changed_evt (void); +static void btu_hcif_read_clock_off_comp_evt (UINT8 *p); +static void btu_hcif_conn_pkt_type_change_evt (void); +static void btu_hcif_qos_violation_evt (UINT8 *p); +static void btu_hcif_page_scan_mode_change_evt (void); +static void btu_hcif_page_scan_rep_mode_chng_evt (void); +static void btu_hcif_esco_connection_comp_evt(UINT8 *p); +static void btu_hcif_esco_connection_chg_evt(UINT8 *p); /* Simple Pairing Events */ -static void btu_hcif_host_support_evt (UINT8 *p, UINT16 evt_len); -static void btu_hcif_io_cap_request_evt (UINT8 *p, UINT16 evt_len); -static void btu_hcif_io_cap_response_evt (UINT8 *p, UINT16 evt_len); -static void btu_hcif_user_conf_request_evt (UINT8 *p, UINT16 evt_len); -static void btu_hcif_user_passkey_request_evt (UINT8 *p, UINT16 evt_len); -static void btu_hcif_user_passkey_notif_evt (UINT8 *p, UINT16 evt_len); -static void btu_hcif_keypress_notif_evt (UINT8 *p, UINT16 evt_len); -static void btu_hcif_link_super_tout_evt (UINT8 *p, UINT16 evt_len); +static void btu_hcif_host_support_evt (UINT8 *p); +static void btu_hcif_io_cap_request_evt (UINT8 *p); +static void btu_hcif_io_cap_response_evt (UINT8 *p); +static void btu_hcif_user_conf_request_evt (UINT8 *p); +static void btu_hcif_user_passkey_request_evt (UINT8 *p); +static void btu_hcif_user_passkey_notif_evt (UINT8 *p); +static void btu_hcif_keypress_notif_evt (UINT8 *p); +static void btu_hcif_link_super_tout_evt (UINT8 *p); #if BTM_OOB_INCLUDED == TRUE -static void btu_hcif_rem_oob_request_evt (UINT8 *p, UINT16 evt_len); +static void btu_hcif_rem_oob_request_evt (UINT8 *p); #endif -static void btu_hcif_simple_pair_complete_evt (UINT8 *p, UINT16 evt_len); +static void btu_hcif_simple_pair_complete_evt (UINT8 *p); #if L2CAP_NON_FLUSHABLE_PB_INCLUDED == TRUE -static void btu_hcif_enhanced_flush_complete_evt (UINT8 *p, UINT16 evt_len); +static void btu_hcif_enhanced_flush_complete_evt (void); #endif #if (BTM_SSR_INCLUDED == TRUE) @@ -131,11 +131,11 @@ extern void hidd_pm_proc_mode_change( UINT8 hci_status, UINT8 mode, UINT16 inter #if BLE_INCLUDED == TRUE static void btu_ble_ll_conn_complete_evt (UINT8 *p, UINT16 evt_len); -static void btu_ble_process_adv_pkt (UINT8 *p, UINT16 evt_len); -static void btu_ble_read_remote_feat_evt (UINT8 *p, UINT16 evt_len); -static void btu_ble_ll_conn_param_upd_evt (UINT8 *p, UINT16 evt_len); -static void btu_ble_proc_ltk_req (UINT8 *p, UINT16 evt_len); -static void btu_hcif_encyption_key_refresh_cmpl_evt (UINT8 *p, UINT16 evt_len); +static void btu_ble_process_adv_pkt (UINT8 *p); +static void btu_ble_read_remote_feat_evt (UINT8 *p); +static void btu_ble_ll_conn_param_upd_evt (UINT8 *p); +static void btu_ble_proc_ltk_req (UINT8 *p); +static void btu_hcif_encryption_key_refresh_cmpl_evt (UINT8 *p); #endif /******************************************************************************* ** @@ -237,122 +237,122 @@ void btu_hcif_process_event (UINT8 controller_id, BT_HDR *p_msg) switch (hci_evt_code) { case HCI_INQUIRY_COMP_EVT: - btu_hcif_inquiry_comp_evt (p, hci_evt_len); + btu_hcif_inquiry_comp_evt (p); break; case HCI_INQUIRY_RESULT_EVT: - btu_hcif_inquiry_result_evt (p, hci_evt_len); + btu_hcif_inquiry_result_evt (p); break; case HCI_INQUIRY_RSSI_RESULT_EVT: - btu_hcif_inquiry_rssi_result_evt (p, hci_evt_len); + btu_hcif_inquiry_rssi_result_evt (p); break; #if (BTM_EIR_CLIENT_INCLUDED == TRUE) case HCI_EXTENDED_INQUIRY_RESULT_EVT: - btu_hcif_extended_inquiry_result_evt (p, hci_evt_len); + btu_hcif_extended_inquiry_result_evt (p); break; #endif case HCI_CONNECTION_COMP_EVT: - btu_hcif_connection_comp_evt (p, hci_evt_len); + btu_hcif_connection_comp_evt (p); break; case HCI_CONNECTION_REQUEST_EVT: - btu_hcif_connection_request_evt (p, hci_evt_len); + btu_hcif_connection_request_evt (p); break; case HCI_DISCONNECTION_COMP_EVT: - btu_hcif_disconnection_comp_evt (p, hci_evt_len); + btu_hcif_disconnection_comp_evt (p); break; case HCI_AUTHENTICATION_COMP_EVT: - btu_hcif_authentication_comp_evt (p, hci_evt_len); + btu_hcif_authentication_comp_evt (p); break; case HCI_RMT_NAME_REQUEST_COMP_EVT: btu_hcif_rmt_name_request_comp_evt (p, hci_evt_len); break; case HCI_ENCRYPTION_CHANGE_EVT: - btu_hcif_encryption_change_evt (p, hci_evt_len); + btu_hcif_encryption_change_evt (p); break; #if BLE_INCLUDED == TRUE case HCI_ENCRYPTION_KEY_REFRESH_COMP_EVT: - btu_hcif_encyption_key_refresh_cmpl_evt(p, hci_evt_len); + btu_hcif_encryption_key_refresh_cmpl_evt(p); break; #endif case HCI_CHANGE_CONN_LINK_KEY_EVT: - btu_hcif_change_conn_link_key_evt (p, hci_evt_len); + btu_hcif_change_conn_link_key_evt (p); break; case HCI_MASTER_LINK_KEY_COMP_EVT: - btu_hcif_master_link_key_comp_evt (p, hci_evt_len); + btu_hcif_master_link_key_comp_evt (p); break; case HCI_READ_RMT_FEATURES_COMP_EVT: - btu_hcif_read_rmt_features_comp_evt (p, hci_evt_len); + btu_hcif_read_rmt_features_comp_evt (p); break; case HCI_READ_RMT_EXT_FEATURES_COMP_EVT: - btu_hcif_read_rmt_ext_features_comp_evt (p, hci_evt_len); + btu_hcif_read_rmt_ext_features_comp_evt (p); break; case HCI_READ_RMT_VERSION_COMP_EVT: - btu_hcif_read_rmt_version_comp_evt (p, hci_evt_len); + btu_hcif_read_rmt_version_comp_evt (p); break; case HCI_QOS_SETUP_COMP_EVT: - btu_hcif_qos_setup_comp_evt (p, hci_evt_len); + btu_hcif_qos_setup_comp_evt (p); break; case HCI_COMMAND_COMPLETE_EVT: btu_hcif_command_complete_evt (controller_id, p, hci_evt_len); break; case HCI_COMMAND_STATUS_EVT: - btu_hcif_command_status_evt (controller_id, p, hci_evt_len); + btu_hcif_command_status_evt (controller_id, p); break; case HCI_HARDWARE_ERROR_EVT: - btu_hcif_hardware_error_evt (p, hci_evt_len); + btu_hcif_hardware_error_evt (p); break; case HCI_FLUSH_OCCURED_EVT: - btu_hcif_flush_occured_evt (p, hci_evt_len); + btu_hcif_flush_occured_evt (); break; case HCI_ROLE_CHANGE_EVT: - btu_hcif_role_change_evt (p, hci_evt_len); + btu_hcif_role_change_evt (p); break; case HCI_NUM_COMPL_DATA_PKTS_EVT: - btu_hcif_num_compl_data_pkts_evt (p, hci_evt_len); + btu_hcif_num_compl_data_pkts_evt (p); break; case HCI_MODE_CHANGE_EVT: - btu_hcif_mode_change_evt (p, hci_evt_len); + btu_hcif_mode_change_evt (p); break; case HCI_RETURN_LINK_KEYS_EVT: - btu_hcif_return_link_keys_evt (p, hci_evt_len); + btu_hcif_return_link_keys_evt (p); break; case HCI_PIN_CODE_REQUEST_EVT: - btu_hcif_pin_code_request_evt (p, hci_evt_len); + btu_hcif_pin_code_request_evt (p); break; case HCI_LINK_KEY_REQUEST_EVT: - btu_hcif_link_key_request_evt (p, hci_evt_len); + btu_hcif_link_key_request_evt (p); break; case HCI_LINK_KEY_NOTIFICATION_EVT: - btu_hcif_link_key_notification_evt (p, hci_evt_len); + btu_hcif_link_key_notification_evt (p); break; case HCI_LOOPBACK_COMMAND_EVT: - btu_hcif_loopback_command_evt (p, hci_evt_len); + btu_hcif_loopback_command_evt (); break; case HCI_DATA_BUF_OVERFLOW_EVT: - btu_hcif_data_buf_overflow_evt (p, hci_evt_len); + btu_hcif_data_buf_overflow_evt (); break; case HCI_MAX_SLOTS_CHANGED_EVT: - btu_hcif_max_slots_changed_evt (p, hci_evt_len); + btu_hcif_max_slots_changed_evt (); break; case HCI_READ_CLOCK_OFF_COMP_EVT: - btu_hcif_read_clock_off_comp_evt (p, hci_evt_len); + btu_hcif_read_clock_off_comp_evt (p); break; case HCI_CONN_PKT_TYPE_CHANGE_EVT: - btu_hcif_conn_pkt_type_change_evt (p, hci_evt_len); + btu_hcif_conn_pkt_type_change_evt (); break; case HCI_QOS_VIOLATION_EVT: - btu_hcif_qos_violation_evt (p, hci_evt_len); + btu_hcif_qos_violation_evt (p); break; case HCI_PAGE_SCAN_MODE_CHANGE_EVT: - btu_hcif_page_scan_mode_change_evt (p, hci_evt_len); + btu_hcif_page_scan_mode_change_evt (); break; case HCI_PAGE_SCAN_REP_MODE_CHNG_EVT: - btu_hcif_page_scan_rep_mode_chng_evt (p, hci_evt_len); + btu_hcif_page_scan_rep_mode_chng_evt (); break; case HCI_ESCO_CONNECTION_COMP_EVT: - btu_hcif_esco_connection_comp_evt (p, hci_evt_len); + btu_hcif_esco_connection_comp_evt (p); break; case HCI_ESCO_CONNECTION_CHANGED_EVT: - btu_hcif_esco_connection_chg_evt (p, hci_evt_len); + btu_hcif_esco_connection_chg_evt (p); break; #if (BTM_SSR_INCLUDED == TRUE) case HCI_SNIFF_SUB_RATE_EVT: @@ -360,40 +360,40 @@ void btu_hcif_process_event (UINT8 controller_id, BT_HDR *p_msg) break; #endif /* BTM_SSR_INCLUDED == TRUE */ case HCI_RMT_HOST_SUP_FEAT_NOTIFY_EVT: - btu_hcif_host_support_evt (p, hci_evt_len); + btu_hcif_host_support_evt (p); break; case HCI_IO_CAPABILITY_REQUEST_EVT: - btu_hcif_io_cap_request_evt (p, hci_evt_len); + btu_hcif_io_cap_request_evt (p); break; case HCI_IO_CAPABILITY_RESPONSE_EVT: - btu_hcif_io_cap_response_evt (p, hci_evt_len); + btu_hcif_io_cap_response_evt (p); break; case HCI_USER_CONFIRMATION_REQUEST_EVT: - btu_hcif_user_conf_request_evt (p, hci_evt_len); + btu_hcif_user_conf_request_evt (p); break; case HCI_USER_PASSKEY_REQUEST_EVT: - btu_hcif_user_passkey_request_evt (p, hci_evt_len); + btu_hcif_user_passkey_request_evt (p); break; #if BTM_OOB_INCLUDED == TRUE case HCI_REMOTE_OOB_DATA_REQUEST_EVT: - btu_hcif_rem_oob_request_evt (p, hci_evt_len); + btu_hcif_rem_oob_request_evt (p); break; #endif case HCI_SIMPLE_PAIRING_COMPLETE_EVT: - btu_hcif_simple_pair_complete_evt (p, hci_evt_len); + btu_hcif_simple_pair_complete_evt (p); break; case HCI_USER_PASSKEY_NOTIFY_EVT: - btu_hcif_user_passkey_notif_evt (p, hci_evt_len); + btu_hcif_user_passkey_notif_evt (p); break; case HCI_KEYPRESS_NOTIFY_EVT: - btu_hcif_keypress_notif_evt (p, hci_evt_len); + btu_hcif_keypress_notif_evt (p); break; case HCI_LINK_SUPER_TOUT_CHANGED_EVT: - btu_hcif_link_super_tout_evt (p, hci_evt_len); + btu_hcif_link_super_tout_evt (p); break; #if L2CAP_NON_FLUSHABLE_PB_INCLUDED == TRUE case HCI_ENHANCED_FLUSH_COMPLETE_EVT: - btu_hcif_enhanced_flush_complete_evt (p, hci_evt_len); + btu_hcif_enhanced_flush_complete_evt (); break; #endif @@ -407,19 +407,19 @@ void btu_hcif_process_event (UINT8 controller_id, BT_HDR *p_msg) switch (ble_sub_code) { case HCI_BLE_ADV_PKT_RPT_EVT: /* result of inquiry */ - btu_ble_process_adv_pkt(p, hci_evt_len); + btu_ble_process_adv_pkt(p); break; case HCI_BLE_CONN_COMPLETE_EVT: btu_ble_ll_conn_complete_evt(p, hci_evt_len); break; case HCI_BLE_LL_CONN_PARAM_UPD_EVT: - btu_ble_ll_conn_param_upd_evt(p, hci_evt_len); + btu_ble_ll_conn_param_upd_evt(p); break; case HCI_BLE_READ_REMOTE_FEAT_CMPL_EVT: - btu_ble_read_remote_feat_evt(p, hci_evt_len); + btu_ble_read_remote_feat_evt(p); break; case HCI_BLE_LTK_REQ_EVT: /* received only at slave device */ - btu_ble_proc_ltk_req(p, hci_evt_len); + btu_ble_proc_ltk_req(p); break; } break; @@ -560,7 +560,7 @@ void btu_hcif_send_host_rdy_for_data(void) ** Returns void ** *******************************************************************************/ -static void btu_hcif_inquiry_comp_evt (UINT8 *p, UINT16 evt_len) +static void btu_hcif_inquiry_comp_evt (UINT8 *p) { UINT8 status; @@ -580,7 +580,7 @@ static void btu_hcif_inquiry_comp_evt (UINT8 *p, UINT16 evt_len) ** Returns void ** *******************************************************************************/ -static void btu_hcif_inquiry_result_evt (UINT8 *p, UINT16 evt_len) +static void btu_hcif_inquiry_result_evt (UINT8 *p) { /* Store results in the cache */ btm_process_inq_results (p, BTM_INQ_RESULT_STANDARD); @@ -595,7 +595,7 @@ static void btu_hcif_inquiry_result_evt (UINT8 *p, UINT16 evt_len) ** Returns void ** *******************************************************************************/ -static void btu_hcif_inquiry_rssi_result_evt (UINT8 *p, UINT16 evt_len) +static void btu_hcif_inquiry_rssi_result_evt (UINT8 *p) { /* Store results in the cache */ btm_process_inq_results (p, BTM_INQ_RESULT_WITH_RSSI); @@ -611,7 +611,7 @@ static void btu_hcif_inquiry_rssi_result_evt (UINT8 *p, UINT16 evt_len) ** *******************************************************************************/ #if (BTM_EIR_CLIENT_INCLUDED == TRUE) -static void btu_hcif_extended_inquiry_result_evt (UINT8 *p, UINT16 evt_len) +static void btu_hcif_extended_inquiry_result_evt (UINT8 *p) { /* Store results in the cache */ btm_process_inq_results (p, BTM_INQ_RESULT_EXTENDED); @@ -627,7 +627,7 @@ static void btu_hcif_extended_inquiry_result_evt (UINT8 *p, UINT16 evt_len) ** Returns void ** *******************************************************************************/ -static void btu_hcif_connection_comp_evt (UINT8 *p, UINT16 evt_len) +static void btu_hcif_connection_comp_evt (UINT8 *p) { UINT8 status; UINT16 handle; @@ -673,7 +673,7 @@ static void btu_hcif_connection_comp_evt (UINT8 *p, UINT16 evt_len) ** Returns void ** *******************************************************************************/ -static void btu_hcif_connection_request_evt (UINT8 *p, UINT16 evt_len) +static void btu_hcif_connection_request_evt (UINT8 *p) { BD_ADDR bda; DEV_CLASS dc; @@ -707,7 +707,7 @@ static void btu_hcif_connection_request_evt (UINT8 *p, UINT16 evt_len) ** Returns void ** *******************************************************************************/ -static void btu_hcif_disconnection_comp_evt (UINT8 *p, UINT16 evt_len) +static void btu_hcif_disconnection_comp_evt (UINT8 *p) { UINT8 status; UINT16 handle; @@ -740,7 +740,7 @@ static void btu_hcif_disconnection_comp_evt (UINT8 *p, UINT16 evt_len) ** Returns void ** *******************************************************************************/ -static void btu_hcif_authentication_comp_evt (UINT8 *p, UINT16 evt_len) +static void btu_hcif_authentication_comp_evt (UINT8 *p) { UINT8 status; UINT16 handle; @@ -786,7 +786,7 @@ static void btu_hcif_rmt_name_request_comp_evt (UINT8 *p, UINT16 evt_len) ** Returns void ** *******************************************************************************/ -static void btu_hcif_encryption_change_evt (UINT8 *p, UINT16 evt_len) +static void btu_hcif_encryption_change_evt (UINT8 *p) { UINT8 status; UINT16 handle; @@ -810,7 +810,7 @@ static void btu_hcif_encryption_change_evt (UINT8 *p, UINT16 evt_len) ** Returns void ** *******************************************************************************/ -static void btu_hcif_change_conn_link_key_evt (UINT8 *p, UINT16 evt_len) +static void btu_hcif_change_conn_link_key_evt (UINT8 *p) { UINT8 status; UINT16 handle; @@ -831,7 +831,7 @@ static void btu_hcif_change_conn_link_key_evt (UINT8 *p, UINT16 evt_len) ** Returns void ** *******************************************************************************/ -static void btu_hcif_master_link_key_comp_evt (UINT8 *p, UINT16 evt_len) +static void btu_hcif_master_link_key_comp_evt (UINT8 *p) { UINT8 status; UINT16 handle; @@ -854,7 +854,7 @@ static void btu_hcif_master_link_key_comp_evt (UINT8 *p, UINT16 evt_len) ** Returns void ** *******************************************************************************/ -static void btu_hcif_read_rmt_features_comp_evt (UINT8 *p, UINT16 evt_len) +static void btu_hcif_read_rmt_features_comp_evt (UINT8 *p) { btm_read_remote_features_complete(p); } @@ -868,7 +868,7 @@ static void btu_hcif_read_rmt_features_comp_evt (UINT8 *p, UINT16 evt_len) ** Returns void ** *******************************************************************************/ -static void btu_hcif_read_rmt_ext_features_comp_evt (UINT8 *p, UINT16 evt_len) +static void btu_hcif_read_rmt_ext_features_comp_evt (UINT8 *p) { UINT8 *p_cur = p; UINT8 status; @@ -894,7 +894,7 @@ static void btu_hcif_read_rmt_ext_features_comp_evt (UINT8 *p, UINT16 evt_len) ** Returns void ** *******************************************************************************/ -static void btu_hcif_read_rmt_version_comp_evt (UINT8 *p, UINT16 evt_len) +static void btu_hcif_read_rmt_version_comp_evt (UINT8 *p) { btm_read_remote_version_complete (p); } @@ -909,7 +909,7 @@ static void btu_hcif_read_rmt_version_comp_evt (UINT8 *p, UINT16 evt_len) ** Returns void ** *******************************************************************************/ -static void btu_hcif_qos_setup_comp_evt (UINT8 *p, UINT16 evt_len) +static void btu_hcif_qos_setup_comp_evt (UINT8 *p) { UINT8 status; UINT16 handle; @@ -937,7 +937,7 @@ static void btu_hcif_qos_setup_comp_evt (UINT8 *p, UINT16 evt_len) ** Returns void ** *******************************************************************************/ -static void btu_hcif_esco_connection_comp_evt (UINT8 *p, UINT16 evt_len) +static void btu_hcif_esco_connection_comp_evt (UINT8 *p) { #if BTM_SCO_INCLUDED == TRUE tBTM_ESCO_DATA data; @@ -971,7 +971,7 @@ static void btu_hcif_esco_connection_comp_evt (UINT8 *p, UINT16 evt_len) ** Returns void ** *******************************************************************************/ -static void btu_hcif_esco_connection_chg_evt (UINT8 *p, UINT16 evt_len) +static void btu_hcif_esco_connection_chg_evt (UINT8 *p) { #if BTM_SCO_INCLUDED == TRUE UINT16 handle; @@ -1004,7 +1004,7 @@ static void btu_hcif_esco_connection_chg_evt (UINT8 *p, UINT16 evt_len) ** *******************************************************************************/ static void btu_hcif_hdl_command_complete (UINT16 opcode, UINT8 *p, UINT16 evt_len, - void *p_cplt_cback, UINT8 ctr_id) + void *p_cplt_cback) { switch (opcode) { @@ -1242,7 +1242,7 @@ static void btu_hcif_command_complete_evt (UINT8 controller_id, UINT8 *p, UINT16 } /* handle event */ - btu_hcif_hdl_command_complete (cc_opcode, p, evt_len, p_cplt_cback, controller_id); + btu_hcif_hdl_command_complete (cc_opcode, p, evt_len, p_cplt_cback); /* see if we can send more commands */ btu_hcif_send_cmd (controller_id, NULL); @@ -1259,7 +1259,7 @@ static void btu_hcif_command_complete_evt (UINT8 controller_id, UINT8 *p, UINT16 ** *******************************************************************************/ static void btu_hcif_hdl_command_status (UINT16 opcode, UINT8 status, UINT8 *p_cmd, - void *p_vsc_status_cback, UINT8 controller_id) + void *p_vsc_status_cback) { BD_ADDR bd_addr; UINT16 handle; @@ -1424,7 +1424,7 @@ static void btu_hcif_hdl_command_status (UINT16 opcode, UINT8 status, UINT8 *p_c ** Returns void ** *******************************************************************************/ -static void btu_hcif_command_status_evt (UINT8 controller_id, UINT8 *p, UINT16 evt_len) +static void btu_hcif_command_status_evt (UINT8 controller_id, UINT8 *p) { tHCI_CMD_CB * p_hci_cmd_cb = &(btu_cb.hci_cmd_cb[controller_id]); UINT8 status; @@ -1495,7 +1495,7 @@ static void btu_hcif_command_status_evt (UINT8 controller_id, UINT8 *p, UINT16 e } /* handle command */ - btu_hcif_hdl_command_status (opcode, status, p_data, p_vsc_status_cback, controller_id); + btu_hcif_hdl_command_status (opcode, status, p_data, p_vsc_status_cback); /* free stored command */ if (p_cmd != NULL) @@ -1621,7 +1621,7 @@ void btu_hcif_cmd_timeout (UINT8 controller_id) case HCI_SETUP_ESCO_CONNECTION: #endif /* fake a command status */ - btu_hcif_hdl_command_status (opcode, HCI_ERR_UNSPECIFIED, p, NULL, controller_id); + btu_hcif_hdl_command_status (opcode, HCI_ERR_UNSPECIFIED, p, NULL); break; default: @@ -1643,7 +1643,7 @@ void btu_hcif_cmd_timeout (UINT8 controller_id) /* fake a command complete; first create a fake event */ event = HCI_ERR_UNSPECIFIED; - btu_hcif_hdl_command_complete (opcode, (UINT8 *)&event, 1, p_cplt_cback, controller_id); + btu_hcif_hdl_command_complete (opcode, (UINT8 *)&event, 1, p_cplt_cback); break; } @@ -1683,7 +1683,7 @@ void btu_hcif_cmd_timeout (UINT8 controller_id) ** Returns void ** *******************************************************************************/ -static void btu_hcif_hardware_error_evt (UINT8 *p, UINT16 evt_len) +static void btu_hcif_hardware_error_evt (UINT8 *p) { BT_TRACE_1 (TRACE_LAYER_HCI, TRACE_TYPE_ERROR, "Ctlr H/w error event - code:0x%x", *p); @@ -1705,7 +1705,7 @@ static void btu_hcif_hardware_error_evt (UINT8 *p, UINT16 evt_len) ** Returns void ** *******************************************************************************/ -static void btu_hcif_flush_occured_evt (UINT8 *p, UINT16 evt_len) +static void btu_hcif_flush_occured_evt (void) { } @@ -1719,7 +1719,7 @@ static void btu_hcif_flush_occured_evt (UINT8 *p, UINT16 evt_len) ** Returns void ** *******************************************************************************/ -static void btu_hcif_role_change_evt (UINT8 *p, UINT16 evt_len) +static void btu_hcif_role_change_evt (UINT8 *p) { UINT8 status; BD_ADDR bda; @@ -1743,7 +1743,7 @@ static void btu_hcif_role_change_evt (UINT8 *p, UINT16 evt_len) ** Returns void ** *******************************************************************************/ -static void btu_hcif_num_compl_data_pkts_evt (UINT8 *p, UINT16 evt_len) +static void btu_hcif_num_compl_data_pkts_evt (UINT8 *p) { /* Process for L2CAP and SCO */ l2c_link_process_num_completed_pkts (p); @@ -1761,7 +1761,7 @@ static void btu_hcif_num_compl_data_pkts_evt (UINT8 *p, UINT16 evt_len) ** Returns void ** *******************************************************************************/ -static void btu_hcif_mode_change_evt (UINT8 *p, UINT16 evt_len) +static void btu_hcif_mode_change_evt (UINT8 *p) { UINT8 status; UINT16 handle; @@ -1816,7 +1816,7 @@ static void btu_hcif_ssr_evt (UINT8 *p, UINT16 evt_len) ** *******************************************************************************/ -static void btu_hcif_return_link_keys_evt (UINT8 *p, UINT16 evt_len) +static void btu_hcif_return_link_keys_evt (UINT8 *p) { UINT8 num_keys; tBTM_RETURN_LINK_KEYS_EVT *result; @@ -1846,7 +1846,7 @@ static void btu_hcif_return_link_keys_evt (UINT8 *p, UINT16 evt_len) ** Returns void ** *******************************************************************************/ -static void btu_hcif_pin_code_request_evt (UINT8 *p, UINT16 evt_len) +static void btu_hcif_pin_code_request_evt (UINT8 *p) { BD_ADDR bda; @@ -1869,7 +1869,7 @@ static void btu_hcif_pin_code_request_evt (UINT8 *p, UINT16 evt_len) ** Returns void ** *******************************************************************************/ -static void btu_hcif_link_key_request_evt (UINT8 *p, UINT16 evt_len) +static void btu_hcif_link_key_request_evt (UINT8 *p) { BD_ADDR bda; @@ -1887,7 +1887,7 @@ static void btu_hcif_link_key_request_evt (UINT8 *p, UINT16 evt_len) ** Returns void ** *******************************************************************************/ -static void btu_hcif_link_key_notification_evt (UINT8 *p, UINT16 evt_len) +static void btu_hcif_link_key_notification_evt (UINT8 *p) { BD_ADDR bda; LINK_KEY key; @@ -1910,7 +1910,7 @@ static void btu_hcif_link_key_notification_evt (UINT8 *p, UINT16 evt_len) ** Returns void ** *******************************************************************************/ -static void btu_hcif_loopback_command_evt (UINT8 *p, UINT16 evt_len) +static void btu_hcif_loopback_command_evt (void) { } @@ -1924,7 +1924,7 @@ static void btu_hcif_loopback_command_evt (UINT8 *p, UINT16 evt_len) ** Returns void ** *******************************************************************************/ -static void btu_hcif_data_buf_overflow_evt (UINT8 *p, UINT16 evt_len) +static void btu_hcif_data_buf_overflow_evt (void) { } @@ -1938,7 +1938,7 @@ static void btu_hcif_data_buf_overflow_evt (UINT8 *p, UINT16 evt_len) ** Returns void ** *******************************************************************************/ -static void btu_hcif_max_slots_changed_evt (UINT8 *p, UINT16 evt_len) +static void btu_hcif_max_slots_changed_evt (void) { } @@ -1952,7 +1952,7 @@ static void btu_hcif_max_slots_changed_evt (UINT8 *p, UINT16 evt_len) ** Returns void ** *******************************************************************************/ -static void btu_hcif_read_clock_off_comp_evt (UINT8 *p, UINT16 evt_len) +static void btu_hcif_read_clock_off_comp_evt (UINT8 *p) { UINT8 status; UINT16 handle; @@ -1983,7 +1983,7 @@ static void btu_hcif_read_clock_off_comp_evt (UINT8 *p, UINT16 evt_len) ** Returns void ** *******************************************************************************/ -static void btu_hcif_conn_pkt_type_change_evt (UINT8 *p, UINT16 evt_len) +static void btu_hcif_conn_pkt_type_change_evt (void) { } @@ -1997,7 +1997,7 @@ static void btu_hcif_conn_pkt_type_change_evt (UINT8 *p, UINT16 evt_len) ** Returns void ** *******************************************************************************/ -static void btu_hcif_qos_violation_evt (UINT8 *p, UINT16 evt_len) +static void btu_hcif_qos_violation_evt (UINT8 *p) { UINT16 handle; @@ -2019,7 +2019,7 @@ static void btu_hcif_qos_violation_evt (UINT8 *p, UINT16 evt_len) ** Returns void ** *******************************************************************************/ -static void btu_hcif_page_scan_mode_change_evt (UINT8 *p, UINT16 evt_len) +static void btu_hcif_page_scan_mode_change_evt (void) { } @@ -2033,7 +2033,7 @@ static void btu_hcif_page_scan_mode_change_evt (UINT8 *p, UINT16 evt_len) ** Returns void ** *******************************************************************************/ -static void btu_hcif_page_scan_rep_mode_chng_evt (UINT8 *p, UINT16 evt_len) +static void btu_hcif_page_scan_rep_mode_chng_evt (void) { } @@ -2050,7 +2050,7 @@ static void btu_hcif_page_scan_rep_mode_chng_evt (UINT8 *p, UINT16 evt_len) ** Returns void ** *******************************************************************************/ -static void btu_hcif_host_support_evt (UINT8 *p, UINT16 evt_len) +static void btu_hcif_host_support_evt (UINT8 *p) { btm_sec_rmt_host_support_feat_evt(p); } @@ -2064,7 +2064,7 @@ static void btu_hcif_host_support_evt (UINT8 *p, UINT16 evt_len) ** Returns void ** *******************************************************************************/ -static void btu_hcif_io_cap_request_evt (UINT8 *p, UINT16 evt_len) +static void btu_hcif_io_cap_request_evt (UINT8 *p) { btm_io_capabilities_req(p); } @@ -2079,7 +2079,7 @@ static void btu_hcif_io_cap_request_evt (UINT8 *p, UINT16 evt_len) ** Returns void ** *******************************************************************************/ -static void btu_hcif_io_cap_response_evt (UINT8 *p, UINT16 evt_len) +static void btu_hcif_io_cap_response_evt (UINT8 *p) { btm_io_capabilities_rsp(p); } @@ -2094,7 +2094,7 @@ static void btu_hcif_io_cap_response_evt (UINT8 *p, UINT16 evt_len) ** Returns void ** *******************************************************************************/ -static void btu_hcif_user_conf_request_evt (UINT8 *p, UINT16 evt_len) +static void btu_hcif_user_conf_request_evt (UINT8 *p) { btm_proc_sp_req_evt(BTM_SP_CFM_REQ_EVT, p); } @@ -2109,7 +2109,7 @@ static void btu_hcif_user_conf_request_evt (UINT8 *p, UINT16 evt_len) ** Returns void ** *******************************************************************************/ -static void btu_hcif_user_passkey_request_evt (UINT8 *p, UINT16 evt_len) +static void btu_hcif_user_passkey_request_evt (UINT8 *p) { btm_proc_sp_req_evt(BTM_SP_KEY_REQ_EVT, p); } @@ -2123,7 +2123,7 @@ static void btu_hcif_user_passkey_request_evt (UINT8 *p, UINT16 evt_len) ** Returns void ** *******************************************************************************/ -static void btu_hcif_user_passkey_notif_evt (UINT8 *p, UINT16 evt_len) +static void btu_hcif_user_passkey_notif_evt (UINT8 *p) { btm_proc_sp_req_evt(BTM_SP_KEY_NOTIF_EVT, p); } @@ -2137,7 +2137,7 @@ static void btu_hcif_user_passkey_notif_evt (UINT8 *p, UINT16 evt_len) ** Returns void ** *******************************************************************************/ -static void btu_hcif_keypress_notif_evt (UINT8 *p, UINT16 evt_len) +static void btu_hcif_keypress_notif_evt (UINT8 *p) { btm_keypress_notif_evt(p); } @@ -2151,7 +2151,7 @@ static void btu_hcif_keypress_notif_evt (UINT8 *p, UINT16 evt_len) ** Returns void ** *******************************************************************************/ -static void btu_hcif_link_super_tout_evt (UINT8 *p, UINT16 evt_len) +static void btu_hcif_link_super_tout_evt (UINT8 *p) { UINT16 handle, timeout; STREAM_TO_UINT16 (handle, p); @@ -2170,7 +2170,7 @@ static void btu_hcif_link_super_tout_evt (UINT8 *p, UINT16 evt_len) ** *******************************************************************************/ #if BTM_OOB_INCLUDED == TRUE -static void btu_hcif_rem_oob_request_evt (UINT8 *p, UINT16 evt_len) +static void btu_hcif_rem_oob_request_evt (UINT8 *p) { btm_rem_oob_req(p); } @@ -2185,7 +2185,7 @@ static void btu_hcif_rem_oob_request_evt (UINT8 *p, UINT16 evt_len) ** Returns void ** *******************************************************************************/ -static void btu_hcif_simple_pair_complete_evt (UINT8 *p, UINT16 evt_len) +static void btu_hcif_simple_pair_complete_evt (UINT8 *p) { btm_simple_pair_complete(p); } @@ -2224,7 +2224,7 @@ void btu_hcif_flush_cmd_queue(void) ** *******************************************************************************/ #if L2CAP_NON_FLUSHABLE_PB_INCLUDED == TRUE -static void btu_hcif_enhanced_flush_complete_evt (UINT8 *p, UINT16 evt_len) +static void btu_hcif_enhanced_flush_complete_evt (void) { /* This is empty until an upper layer cares about returning event */ } @@ -2238,7 +2238,7 @@ static void btu_hcif_enhanced_flush_complete_evt (UINT8 *p, UINT16 evt_len) ** BLE Events ***********************************************/ #if (defined BLE_INCLUDED) && (BLE_INCLUDED == TRUE) -static void btu_hcif_encyption_key_refresh_cmpl_evt (UINT8 *p, UINT16 evt_len) +static void btu_hcif_encryption_key_refresh_cmpl_evt (UINT8 *p) { UINT8 status; UINT8 enc_enable = 0; @@ -2252,7 +2252,7 @@ static void btu_hcif_encyption_key_refresh_cmpl_evt (UINT8 *p, UINT16 evt_len) btm_sec_encrypt_change (handle, status, enc_enable); } -static void btu_ble_process_adv_pkt (UINT8 *p, UINT16 evt_len) +static void btu_ble_process_adv_pkt (UINT8 *p) { BT_TRACE_0 (TRACE_LAYER_HCI, TRACE_TYPE_EVENT, "btu_ble_process_adv_pkt"); @@ -2264,7 +2264,7 @@ static void btu_ble_ll_conn_complete_evt ( UINT8 *p, UINT16 evt_len) btm_ble_conn_complete(p, evt_len); } -static void btu_ble_ll_conn_param_upd_evt (UINT8 *p, UINT16 evt_len) +static void btu_ble_ll_conn_param_upd_evt (UINT8 *p) { /* LE connection update has completed successfully as a master. */ /* We can enable the update request if the result is a success. */ @@ -2278,12 +2278,12 @@ static void btu_ble_ll_conn_param_upd_evt (UINT8 *p, UINT16 evt_len) L2CA_HandleConnUpdateEvent(handle, status); } -static void btu_ble_read_remote_feat_evt (UINT8 *p, UINT16 evt_len) +static void btu_ble_read_remote_feat_evt (UINT8 *p) { btm_ble_read_remote_features_complete(p); } -static void btu_ble_proc_ltk_req (UINT8 *p, UINT16 evt_len) +static void btu_ble_proc_ltk_req (UINT8 *p) { UINT16 ediv, handle; UINT8 *pp; -- 2.11.0