Merge "Replace period_ms_t with uint64_t" (dfebf34e) · Commits · e / os / android_packages_modules_Bluetooth

system/bta/dm/bta_dm_pm.cc

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -273,7 +273,7 @@ static void bta_dm_pm_stop_timer_by_srvc_id(const RawAddress& peer_addr,
	*		*
	******************************************************************************/		******************************************************************************/
	static void bta_dm_pm_start_timer(tBTA_PM_TIMER* p_timer, uint8_t timer_idx,		static void bta_dm_pm_start_timer(tBTA_PM_TIMER* p_timer, uint8_t timer_idx,
	period_ms_t timeout_ms, uint8_t srvc_id,		uint64_t timeout_ms, uint8_t srvc_id,
	uint8_t pm_action) {		uint8_t pm_action) {
	std::unique_lock<std::recursive_mutex> schedule_lock(pm_timer_schedule_mutex);		std::unique_lock<std::recursive_mutex> schedule_lock(pm_timer_schedule_mutex);
	std::unique_lock<std::recursive_mutex> state_lock(pm_timer_state_mutex);		std::unique_lock<std::recursive_mutex> state_lock(pm_timer_state_mutex);
	@@ -501,7 +501,7 @@ static void bta_dm_pm_set_mode(const RawAddress& peer_addr,
	tBTA_DM_PM_ACTION pm_request,		tBTA_DM_PM_ACTION pm_request,
	tBTA_DM_PM_REQ pm_req) {		tBTA_DM_PM_REQ pm_req) {
	tBTA_DM_PM_ACTION pm_action = BTA_DM_PM_NO_ACTION;		tBTA_DM_PM_ACTION pm_action = BTA_DM_PM_NO_ACTION;
	period_ms_t timeout_ms = 0;		uint64_t timeout_ms = 0;
	uint8_t i, j;		uint8_t i, j;
	tBTA_DM_PM_ACTION failed_pm = 0;		tBTA_DM_PM_ACTION failed_pm = 0;
	tBTA_DM_PEER_DEVICE* p_peer_device = NULL;		tBTA_DM_PEER_DEVICE* p_peer_device = NULL;
	@@ -514,7 +514,7 @@ static void bta_dm_pm_set_mode(const RawAddress& peer_addr,
	tBTA_DM_SRVCS* p_srvcs = NULL;		tBTA_DM_SRVCS* p_srvcs = NULL;
	bool timer_started = false;		bool timer_started = false;
	uint8_t timer_idx, available_timer = BTA_DM_PM_MODE_TIMER_MAX;		uint8_t timer_idx, available_timer = BTA_DM_PM_MODE_TIMER_MAX;
	period_ms_t remaining_ms = 0;		uint64_t remaining_ms = 0;

	if (!bta_dm_cb.device_list.count) return;		if (!bta_dm_cb.device_list.count) return;

system/bta/sys/bta_sys.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -222,7 +222,7 @@ extern void bta_sys_deregister(uint8_t id);
	extern bool bta_sys_is_register(uint8_t id);		extern bool bta_sys_is_register(uint8_t id);
	extern uint16_t bta_sys_get_sys_features(void);		extern uint16_t bta_sys_get_sys_features(void);
	extern void bta_sys_sendmsg(void* p_msg);		extern void bta_sys_sendmsg(void* p_msg);
	extern void bta_sys_start_timer(alarm_t* alarm, period_ms_t interval,		extern void bta_sys_start_timer(alarm_t* alarm, uint64_t interval_ms,
	uint16_t event, uint16_t layer_specific);		uint16_t event, uint16_t layer_specific);
	extern void bta_sys_disable(tBTA_SYS_HW_MODULE module);		extern void bta_sys_disable(tBTA_SYS_HW_MODULE module);

system/bta/sys/bta_sys_main.cc

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -546,14 +546,14 @@ void bta_sys_sendmsg(void* p_msg) {
	* Returns void		* Returns void
	*		*
	******************************************************************************/		******************************************************************************/
	void bta_sys_start_timer(alarm_t* alarm, period_ms_t interval, uint16_t event,		void bta_sys_start_timer(alarm_t* alarm, uint64_t interval_ms, uint16_t event,
	uint16_t layer_specific) {		uint16_t layer_specific) {
	BT_HDR* p_buf = (BT_HDR*)osi_malloc(sizeof(BT_HDR));		BT_HDR* p_buf = (BT_HDR*)osi_malloc(sizeof(BT_HDR));

	p_buf->event = event;		p_buf->event = event;
	p_buf->layer_specific = layer_specific;		p_buf->layer_specific = layer_specific;

	alarm_set_on_mloop(alarm, interval, bta_sys_sendmsg, p_buf);		alarm_set_on_mloop(alarm, interval_ms, bta_sys_sendmsg, p_buf);
	}		}

	/*******************************************************************************		/*******************************************************************************

system/btif/src/btif_a2dp_source.cc

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -212,7 +212,7 @@ class BtifA2dpSource {
	bool tx_flush; /* Discards any outgoing data when true */		bool tx_flush; /* Discards any outgoing data when true */
	alarm_t* media_alarm;		alarm_t* media_alarm;
	const tA2DP_ENCODER_INTERFACE* encoder_interface;		const tA2DP_ENCODER_INTERFACE* encoder_interface;
	period_ms_t encoder_interval_ms; /* Local copy of the encoder interval */		uint64_t encoder_interval_ms; /* Local copy of the encoder interval */
	BtifMediaStats stats;		BtifMediaStats stats;
	BtifMediaStats accumulated_stats;		BtifMediaStats accumulated_stats;

system/btif/src/btif_av.cc

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -218,7 +218,7 @@ class BtifAvPeer {
	kFlagPendingStart = 0x4,		kFlagPendingStart = 0x4,
	kFlagPendingStop = 0x8,		kFlagPendingStop = 0x8,
	};		};
	static constexpr period_ms_t kTimeoutAvOpenOnRcMs = 2 * 1000; // 2s		static constexpr uint64_t kTimeoutAvOpenOnRcMs = 2 * 1000; // 2s

	BtifAvPeer(const RawAddress& peer_address, uint8_t peer_sep,		BtifAvPeer(const RawAddress& peer_address, uint8_t peer_sep,
	tBTA_AV_HNDL bta_handle, uint8_t peer_id);		tBTA_AV_HNDL bta_handle, uint8_t peer_id);