Remove dead timer code from btu (a3c7ad4b) · Commits · e / os / android_packages_modules_Bluetooth

system/stack/btu/btu_task.c

+0 −78

Original line number	Diff line number	Diff line
		@@ -790,84 +790,6 @@ void process_quick_timer_evt(TIMER_LIST_Q *p_tlq)



		void btu_register_timer (TIMER_LIST_ENT *p_tle, UINT16 type, UINT32 timeout, tBTU_TIMER_CALLBACK timer_cb)
		{
		UINT8 i = 0;
		INT8 first = -1;
		for (; i < BTU_MAX_REG_TIMER; i++)
		{
		if (btu_cb.timer_reg[i].p_tle == NULL && first < 0)
		first = i;
		if (btu_cb.timer_reg[i].p_tle == p_tle)
		{
		btu_cb.timer_reg[i].timer_cb = timer_cb;
		btu_start_timer(p_tle, type, timeout);
		first = -1;
		break;
		}
		}

		if (first >= 0 && first < BTU_MAX_REG_TIMER)
		{
		btu_cb.timer_reg[first].timer_cb = timer_cb;
		btu_cb.timer_reg[first].p_tle = p_tle;
		btu_start_timer(p_tle, type, timeout);
		}

		}


		void btu_deregister_timer(TIMER_LIST_ENT *p_tle)
		{
		UINT8 i = 0;

		for (; i < BTU_MAX_REG_TIMER; i++)
		{
		if (btu_cb.timer_reg[i].p_tle == p_tle)
		{
		btu_stop_timer(p_tle);
		btu_cb.timer_reg[i].timer_cb = NULL;
		btu_cb.timer_reg[i].p_tle = NULL;
		break;
		}
		}
		}

		void btu_register_event_range (UINT16 start, tBTU_EVENT_CALLBACK event_cb)
		{
		UINT8 i = 0;
		INT8 first = -1;

		for (; i < BTU_MAX_REG_EVENT; i++)
		{
		if (btu_cb.event_reg[i].event_cb == NULL && first < 0)
		first = i;

		if (btu_cb.event_reg[i].event_range == start)
		{
		btu_cb.event_reg[i].event_cb = event_cb;

		if (!event_cb)
		btu_cb.event_reg[i].event_range = 0;

		first = -1;
		}
		}

		/* if not deregistering && an empty index was found in range, register */
		if (event_cb && first >= 0 && first < BTU_MAX_REG_EVENT)
		{
		btu_cb.event_reg[first].event_range = start;
		btu_cb.event_reg[first].event_cb = event_cb;
		}
		}


		void btu_deregister_event_range (UINT16 range)
		{
		btu_register_event_range(range, NULL);
		}

		#if (defined(HCILP_INCLUDED) && HCILP_INCLUDED == TRUE)
		/*******************************************************************************
		**

system/stack/include/btu.h

+0 −5

Original line number	Diff line number	Diff line
		@@ -271,13 +271,8 @@ BTU_API extern const BD_ADDR BT_BD_ANY;
		*/
		BTU_API extern void btu_start_timer (TIMER_LIST_ENT *p_tle, UINT16 type, UINT32 timeout);
		BTU_API extern void btu_stop_timer (TIMER_LIST_ENT *p_tle);
		BTU_API extern void btu_register_timer (TIMER_LIST_ENT *p_tle, UINT16 type, UINT32 timeout, tBTU_TIMER_CALLBACK timer_cb);
		BTU_API extern void btu_deregister_timer(TIMER_LIST_ENT *p_tle);
		BTU_API extern UINT32 btu_remaining_time (TIMER_LIST_ENT *p_tle);


		BTU_API extern void btu_register_event_range (UINT16 range, tBTU_EVENT_CALLBACK event_cb);
		BTU_API extern void btu_deregister_event_range (UINT16 range);
		BTU_API extern void btu_uipc_rx_cback(BT_HDR *p_msg);

		BTU_API extern void btu_hcif_flush_cmd_queue(void);