Merge "Cleanups needed to make clang happy" (6a4ac0fd) · Commits · e / os / android_packages_modules_Bluetooth

Android.mk

+1 −1

Original line number	Diff line number	Diff line
		LOCAL_PATH := $(call my-dir)

		bdroid_CFLAGS := -Wno-unused-parameter
		bdroid_CFLAGS := -Wno-unused-parameter -Wno-missing-field-initializers

		# Setup bdroid local make variables for handling configuration
		ifneq ($(BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR),)

gki/common/gki_buffer.c

+0 −67

Original line number	Diff line number	Diff line
		@@ -22,9 +22,6 @@
		#error Number of pools out of range (16 Max)!
		#endif

		static void gki_add_to_pool_list(UINT8 pool_id);
		static void gki_remove_from_pool_list(UINT8 pool_id);

		/*******************************************************************************
		**
		** Function gki_init_free_queue
		@@ -1016,70 +1013,6 @@ BOOLEAN GKI_queue_is_empty(BUFFER_Q *p_q)
		return ((BOOLEAN) (p_q->count == 0));
		}

		/*******************************************************************************
		**
		** Function gki_add_to_pool_list
		**
		** Description Adds pool to the pool list which is arranged in the
		** order of size
		**
		** Returns void
		**
		*******************************************************************************/
		static void gki_add_to_pool_list(UINT8 pool_id)
		{

		INT32 i, j;
		tGKI_COM_CB *p_cb = &gki_cb.com;

		/* Find the position where the specified pool should be inserted into the list */
		for(i=0; i < p_cb->curr_total_no_of_pools; i++)
		{

		if(p_cb->freeq[pool_id].size <= p_cb->freeq[ p_cb->pool_list[i] ].size)
		break;
		}

		/* Insert the new buffer pool ID into the list of pools */
		for(j = p_cb->curr_total_no_of_pools; j > i; j--)
		{
		p_cb->pool_list[j] = p_cb->pool_list[j-1];
		}

		p_cb->pool_list[i] = pool_id;

		return;
		}

		/*******************************************************************************
		**
		** Function gki_remove_from_pool_list
		**
		** Description Removes pool from the pool list. Called when a pool is deleted
		**
		** Returns void
		**
		*******************************************************************************/
		static void gki_remove_from_pool_list(UINT8 pool_id)
		{
		tGKI_COM_CB *p_cb = &gki_cb.com;
		UINT8 i;

		for(i=0; i < p_cb->curr_total_no_of_pools; i++)
		{
		if(pool_id == p_cb->pool_list[i])
		break;
		}

		while (i < (p_cb->curr_total_no_of_pools - 1))
		{
		p_cb->pool_list[i] = p_cb->pool_list[i+1];
		i++;
		}

		return;
		}

		/*******************************************************************************
		**
		** Function GKI_igetpoolbuf

gki/common/gki_time.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -698,8 +698,6 @@ void GKI_add_to_timer_list (TIMER_LIST_Q p_timer_listq, TIMER_LIST_ENT p_tle)
		*******************************************************************************/
		BOOLEAN GKI_remove_from_timer_list (TIMER_LIST_Q p_timer_listq, TIMER_LIST_ENT p_tle)
		{
		UINT8 tt;

		/* Verify that the entry is valid */
		if (p_tle == NULL \|\| p_timer_listq->p_first == NULL)
		return FALSE;

gki/ulinux/gki_ulinux.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -355,8 +355,6 @@ UINT32 GKI_get_os_tick_count(void)
		*******************************************************************************/
		UINT8 GKI_create_task (TASKPTR task_entry, UINT8 task_id, INT8 taskname, UINT16 stack, UINT16 stacksize)
		{
		UINT16 i;
		UINT8 *p;
		struct sched_param param;
		int policy, ret = 0;
		pthread_attr_t attr1;
		@@ -1038,7 +1036,6 @@ void GKI_disable (void)
		void GKI_exception (UINT16 code, char *msg)
		{
		UINT8 task_id;
		int i = 0;

		ALOGE( "GKI_exception(): Task State Table");

system/bta/av/bta_av_aact.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -1116,7 +1116,6 @@ void bta_av_config_ind (tBTA_AV_SCB p_scb, tBTA_AV_DATA p_data)
		tAVDT_CFG *p_evt_cfg = &p_data->str_msg.cfg;
		UINT8 psc_mask = (p_evt_cfg->psc_mask \| p_scb->cfg.psc_mask);
		UINT8 local_sep; /* sep type of local handle on which connection was received */
		UINT8 count = 0;
		tBTA_AV_STR_MSG p_msg = (tBTA_AV_STR_MSG )p_data;
		UNUSED(p_data);