Merge "legacy: Const-ify various btu_" am: 01868691ad am: 90641534a9 am: 8e57af98a2 (39dc5f84) · Commits · e / os / android_packages_modules_Bluetooth

system/stack/btu/btu_hcif.cc

+25 −22

Original line number	Original line	Diff line number	Diff line
	@@ -73,11 +73,12 @@ void acl_disconnect_from_handle(uint16_t handle, tHCI_STATUS reason,
	/******************************************************************************/		/******************************************************************************/
	static void btu_hcif_inquiry_comp_evt(uint8_t* p);		static void btu_hcif_inquiry_comp_evt(uint8_t* p);

	static void btu_hcif_connection_comp_evt(uint8_t* p, uint8_t evt_len);		static void btu_hcif_connection_comp_evt(const uint8_t* p, uint8_t evt_len);
	static void btu_hcif_connection_request_evt(uint8_t* p);		static void btu_hcif_connection_request_evt(const uint8_t* p);
	static void btu_hcif_disconnection_comp_evt(uint8_t* p);		static void btu_hcif_disconnection_comp_evt(uint8_t* p);
	static void btu_hcif_authentication_comp_evt(uint8_t* p);		static void btu_hcif_authentication_comp_evt(uint8_t* p);
	static void btu_hcif_rmt_name_request_comp_evt(uint8_t* p, uint16_t evt_len);		static void btu_hcif_rmt_name_request_comp_evt(const uint8_t* p,
			uint16_t evt_len);
	static void btu_hcif_encryption_change_evt(uint8_t* p);		static void btu_hcif_encryption_change_evt(uint8_t* p);
	static void btu_hcif_read_rmt_ext_features_comp_evt(uint8_t* p,		static void btu_hcif_read_rmt_ext_features_comp_evt(uint8_t* p,
	uint8_t evt_len);		uint8_t evt_len);
	@@ -85,15 +86,15 @@ static void btu_hcif_command_complete_evt(BT_HDR* response, void* context);
	static void btu_hcif_command_status_evt(uint8_t status, BT_HDR* command,		static void btu_hcif_command_status_evt(uint8_t status, BT_HDR* command,
	void* context);		void* context);
	static void btu_hcif_hardware_error_evt(uint8_t* p);		static void btu_hcif_hardware_error_evt(uint8_t* p);
	static void btu_hcif_role_change_evt(uint8_t* p);		static void btu_hcif_role_change_evt(const uint8_t* p);
	static void btu_hcif_mode_change_evt(uint8_t* p);		static void btu_hcif_mode_change_evt(uint8_t* p);
	static void btu_hcif_link_key_notification_evt(uint8_t* p);		static void btu_hcif_link_key_notification_evt(const uint8_t* p);
	static void btu_hcif_read_clock_off_comp_evt(uint8_t* p);		static void btu_hcif_read_clock_off_comp_evt(uint8_t* p);
	static void btu_hcif_esco_connection_comp_evt(uint8_t* p);		static void btu_hcif_esco_connection_comp_evt(const uint8_t* p);
	static void btu_hcif_esco_connection_chg_evt(uint8_t* p);		static void btu_hcif_esco_connection_chg_evt(uint8_t* p);

	/* Simple Pairing Events */		/* Simple Pairing Events */
	static void btu_hcif_io_cap_request_evt(uint8_t* p);		static void btu_hcif_io_cap_request_evt(const uint8_t* p);

	static void btu_ble_ll_conn_param_upd_evt(uint8_t* p, uint16_t evt_len);		static void btu_ble_ll_conn_param_upd_evt(uint8_t* p, uint16_t evt_len);
	static void btu_ble_proc_ltk_req(uint8_t* p);		static void btu_ble_proc_ltk_req(uint8_t* p);
	@@ -106,7 +107,7 @@ static void btu_ble_rc_param_req_evt(uint8_t* p);
	* @param evt_code event code		* @param evt_code event code
	* @param p_event pointer to event parameter, skipping paremter length		* @param p_event pointer to event parameter, skipping paremter length
	*/		*/
	void btu_hcif_log_event_metrics(uint8_t evt_code, uint8_t* p_event) {		void btu_hcif_log_event_metrics(uint8_t evt_code, const uint8_t* p_event) {
	uint32_t cmd = android::bluetooth::hci::CMD_UNKNOWN;		uint32_t cmd = android::bluetooth::hci::CMD_UNKNOWN;
	uint16_t status = android::bluetooth::hci::STATUS_UNKNOWN;		uint16_t status = android::bluetooth::hci::STATUS_UNKNOWN;
	uint16_t reason = android::bluetooth::hci::STATUS_UNKNOWN;		uint16_t reason = android::bluetooth::hci::STATUS_UNKNOWN;
	@@ -259,7 +260,8 @@ void btu_hcif_log_event_metrics(uint8_t evt_code, uint8_t* p_event) {
	* Returns void		* Returns void
	*		*
	******************************************************************************/		******************************************************************************/
	void btu_hcif_process_event(UNUSED_ATTR uint8_t controller_id, BT_HDR* p_msg) {		void btu_hcif_process_event(UNUSED_ATTR uint8_t controller_id,
			const BT_HDR* p_msg) {
	uint8_t* p = (uint8_t*)(p_msg + 1) + p_msg->offset;		uint8_t* p = (uint8_t*)(p_msg + 1) + p_msg->offset;
	uint8_t hci_evt_code, hci_evt_len;		uint8_t hci_evt_code, hci_evt_len;
	uint8_t ble_sub_code;		uint8_t ble_sub_code;
	@@ -467,7 +469,7 @@ void btu_hcif_process_event(UNUSED_ATTR uint8_t controller_id, BT_HDR* p_msg) {
	}		}
	}		}

	static void btu_hcif_log_command_metrics(uint16_t opcode, uint8_t* p_cmd,		static void btu_hcif_log_command_metrics(uint16_t opcode, const uint8_t* p_cmd,
	uint16_t cmd_status,		uint16_t cmd_status,
	bool is_cmd_status) {		bool is_cmd_status) {
	static uint16_t kUnknownBleEvt = android::bluetooth::hci::BLE_EVT_UNKNOWN;		static uint16_t kUnknownBleEvt = android::bluetooth::hci::BLE_EVT_UNKNOWN;
	@@ -720,11 +722,11 @@ static void btu_hcif_log_command_metrics(uint16_t opcode, uint8_t* p_cmd,
	* Returns void		* Returns void
	*		*
	******************************************************************************/		******************************************************************************/
	void btu_hcif_send_cmd(UNUSED_ATTR uint8_t controller_id, BT_HDR* p_buf) {		void btu_hcif_send_cmd(UNUSED_ATTR uint8_t controller_id, const BT_HDR* p_buf) {
	if (!p_buf) return;		if (!p_buf) return;

	uint16_t opcode;		uint16_t opcode;
	uint8_t* stream = p_buf->data + p_buf->offset;		const uint8_t* stream = p_buf->data + p_buf->offset;
	void* vsc_callback = NULL;		void* vsc_callback = NULL;

	STREAM_TO_UINT16(opcode, stream);		STREAM_TO_UINT16(opcode, stream);
	@@ -770,8 +772,8 @@ void cmd_with_cb_data_cleanup(cmd_with_cb_data* cb_wrapper) {
	* @param p_return_params pointer to returned parameter after parameter length		* @param p_return_params pointer to returned parameter after parameter length
	* field		* field
	*/		*/
	static void btu_hcif_log_command_complete_metrics(uint16_t opcode,		static void btu_hcif_log_command_complete_metrics(
	uint8_t* p_return_params) {		uint16_t opcode, const uint8_t* p_return_params) {
	uint16_t status = android::bluetooth::hci::STATUS_UNKNOWN;		uint16_t status = android::bluetooth::hci::STATUS_UNKNOWN;
	uint16_t reason = android::bluetooth::hci::STATUS_UNKNOWN;		uint16_t reason = android::bluetooth::hci::STATUS_UNKNOWN;
	uint16_t hci_event = android::bluetooth::hci::EVT_COMMAND_COMPLETE;		uint16_t hci_event = android::bluetooth::hci::EVT_COMMAND_COMPLETE;
	@@ -954,7 +956,7 @@ static void btu_hcif_inquiry_comp_evt(uint8_t* p) {
	* Returns void		* Returns void
	*		*
	******************************************************************************/		******************************************************************************/
	static void btu_hcif_connection_comp_evt(uint8_t* p, uint8_t evt_len) {		static void btu_hcif_connection_comp_evt(const uint8_t* p, uint8_t evt_len) {
	uint8_t status;		uint8_t status;
	uint16_t handle;		uint16_t handle;
	RawAddress bda;		RawAddress bda;
	@@ -1003,7 +1005,7 @@ static void btu_hcif_connection_comp_evt(uint8_t* p, uint8_t evt_len) {
	* Returns void		* Returns void
	*		*
	******************************************************************************/		******************************************************************************/
	static void btu_hcif_connection_request_evt(uint8_t* p) {		static void btu_hcif_connection_request_evt(const uint8_t* p) {
	RawAddress bda;		RawAddress bda;
	DEV_CLASS dc;		DEV_CLASS dc;
	uint8_t link_type;		uint8_t link_type;
	@@ -1071,7 +1073,8 @@ static void btu_hcif_authentication_comp_evt(uint8_t* p) {
	* Returns void		* Returns void
	*		*
	******************************************************************************/		******************************************************************************/
	static void btu_hcif_rmt_name_request_comp_evt(uint8_t* p, uint16_t evt_len) {		static void btu_hcif_rmt_name_request_comp_evt(const uint8_t* p,
			uint16_t evt_len) {
	uint8_t status;		uint8_t status;
	RawAddress bd_addr;		RawAddress bd_addr;

	@@ -1191,7 +1194,7 @@ static void btu_hcif_read_rmt_ext_features_comp_evt(uint8_t* p,
	* Returns void		* Returns void
	*		*
	******************************************************************************/		******************************************************************************/
	static void btu_hcif_esco_connection_comp_evt(uint8_t* p) {		static void btu_hcif_esco_connection_comp_evt(const uint8_t* p) {
	tBTM_ESCO_DATA data;		tBTM_ESCO_DATA data;
	uint16_t handle;		uint16_t handle;
	RawAddress bda;		RawAddress bda;
	@@ -1399,7 +1402,7 @@ static void btu_hcif_command_complete_evt(BT_HDR* response, void* context) {
	*		*
	******************************************************************************/		******************************************************************************/
	static void btu_hcif_hdl_command_status(uint16_t opcode, uint8_t status,		static void btu_hcif_hdl_command_status(uint16_t opcode, uint8_t status,
	uint8_t* p_cmd,		const uint8_t* p_cmd,
	void* p_vsc_status_cback) {		void* p_vsc_status_cback) {
	CHECK_NE(p_cmd, nullptr) << "Null command for opcode 0x" << loghex(opcode);		CHECK_NE(p_cmd, nullptr) << "Null command for opcode 0x" << loghex(opcode);
	p_cmd++; // Skip parameter total length		p_cmd++; // Skip parameter total length
	@@ -1559,7 +1562,7 @@ static void btu_hcif_hardware_error_evt(uint8_t* p) {
	* Returns void		* Returns void
	*		*
	******************************************************************************/		******************************************************************************/
	static void btu_hcif_role_change_evt(uint8_t* p) {		static void btu_hcif_role_change_evt(const uint8_t* p) {
	uint8_t status;		uint8_t status;
	RawAddress bda;		RawAddress bda;
	uint8_t role;		uint8_t role;
	@@ -1610,7 +1613,7 @@ static void btu_hcif_mode_change_evt(uint8_t* p) {
	* Returns void		* Returns void
	*		*
	******************************************************************************/		******************************************************************************/
	static void btu_hcif_link_key_notification_evt(uint8_t* p) {		static void btu_hcif_link_key_notification_evt(const uint8_t* p) {
	RawAddress bda;		RawAddress bda;
	Octet16 key;		Octet16 key;
	uint8_t key_type;		uint8_t key_type;
	@@ -1662,7 +1665,7 @@ static void btu_hcif_read_clock_off_comp_evt(uint8_t* p) {
	* Returns void		* Returns void
	*		*
	******************************************************************************/		******************************************************************************/
	static void btu_hcif_io_cap_request_evt(uint8_t* p) {		static void btu_hcif_io_cap_request_evt(const uint8_t* p) {
	RawAddress bda;		RawAddress bda;
	STREAM_TO_BDADDR(bda, p);		STREAM_TO_BDADDR(bda, p);
	btm_io_capabilities_req(bda);		btm_io_capabilities_req(bda);

system/stack/include/btu.h

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -37,6 +37,7 @@
	#include "common/message_loop_thread.h"		#include "common/message_loop_thread.h"
	#include "include/hardware/bluetooth.h"		#include "include/hardware/bluetooth.h"
	#include "osi/include/alarm.h"		#include "osi/include/alarm.h"
			#include "osi/include/osi.h" // UNUSED_ATTR
	#include "stack/include/bt_hdr.h"		#include "stack/include/bt_hdr.h"

	/* Global BTU data */		/* Global BTU data */
	@@ -45,8 +46,9 @@ extern uint8_t btu_trace_level;
	/* Functions provided by btu_hcif.cc		/* Functions provided by btu_hcif.cc
	***********************************		***********************************
	*/		*/
	void btu_hcif_process_event(uint8_t controller_id, BT_HDR* p_buf);		void btu_hcif_process_event(UNUSED_ATTR uint8_t controller_id,
	void btu_hcif_send_cmd(uint8_t controller_id, BT_HDR* p_msg);		const BT_HDR* p_buf);
			void btu_hcif_send_cmd(UNUSED_ATTR uint8_t controller_id, const BT_HDR* p_msg);
	void btu_hcif_send_cmd_with_cb(const base::Location& posted_from,		void btu_hcif_send_cmd_with_cb(const base::Location& posted_from,
	uint16_t opcode, uint8_t* params,		uint16_t opcode, uint8_t* params,
	uint8_t params_len,		uint8_t params_len,

system/test/mock/mock_legacy_hci_iterface.cc

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -18,7 +18,6 @@
	#include <string>		#include <string>

	extern std::map<std::string, int> mock_function_count_map;		extern std::map<std::string, int> mock_function_count_map;
	#define UNUSED_ATTR

	#include <base/callback.h>		#include <base/callback.h>
	#include <stddef.h>		#include <stddef.h>

system/test/mock/mock_stack_btu_hcif.cc

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -50,7 +50,7 @@ void btu_hcif_log_event_metrics(uint8_t evt_code, uint8_t* p_event) {
	void btu_hcif_process_event(UNUSED_ATTR uint8_t controller_id, BT_HDR* p_msg) {		void btu_hcif_process_event(UNUSED_ATTR uint8_t controller_id, BT_HDR* p_msg) {
	mock_function_count_map[__func__]++;		mock_function_count_map[__func__]++;
	}		}
	void btu_hcif_send_cmd(UNUSED_ATTR uint8_t controller_id, BT_HDR* p_buf) {		void btu_hcif_send_cmd(UNUSED_ATTR uint8_t controller_id, const BT_HDR* p_buf) {
	mock_function_count_map[__func__]++;		mock_function_count_map[__func__]++;
	}		}
	void btu_hcif_send_cmd_with_cb(const base::Location& posted_from,		void btu_hcif_send_cmd_with_cb(const base::Location& posted_from,