Eliminate unused argument to dealloc. (65fb4570) · Commits · e / os / android_packages_modules_Bluetooth

system/hci/include/bt_hci_lib.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -115,7 +115,7 @@ typedef void (*lpm_result_cb)(bt_hc_lpm_request_result_t result);
		typedef char* (*alloc_mem_cb)(int size);

		/* datapath buffer deallocation callback (callout) */
		typedef int (dealloc_mem_cb)(TRANSAC transac, char p_buf);
		typedef void (*dealloc_mem_cb)(TRANSAC transac);

		/* transmit result callback */
		typedef int (tx_result_cb)(TRANSAC transac, char p_buf, bt_hc_transmit_result_t result);

system/hci/src/hci_h4.c

+6 −8

Original line number	Diff line number	Diff line
		@@ -217,7 +217,7 @@ void get_acl_data_length_cback(void *p_mem)
		if ((status = hci_h4_send_int_cmd(HCI_LE_READ_BUFFER_SIZE, p_buf, \
		get_acl_data_length_cback)) == FALSE)
		{
		bt_hc_cbacks->dealloc((TRANSAC) p_buf, (char *) (p_buf + 1));
		bt_hc_cbacks->dealloc(p_buf);
		bt_hc_cbacks->postload_cb(NULL, BT_HC_POSTLOAD_SUCCESS);
		}
		}
		@@ -228,7 +228,7 @@ void get_acl_data_length_cback(void *p_mem)

		if (bt_hc_cbacks)
		{
		bt_hc_cbacks->dealloc((TRANSAC) p_buf, (char *) (p_buf + 1));
		bt_hc_cbacks->dealloc(p_buf);
		ALOGE("vendor lib postload completed");
		bt_hc_cbacks->postload_cb(NULL, BT_HC_POSTLOAD_SUCCESS);
		}
		@@ -284,8 +284,7 @@ uint8_t internal_event_intercept(void)
		// Release the p_rcv_msg buffer.
		if (bt_hc_cbacks)
		{
		bt_hc_cbacks->dealloc((TRANSAC) p_cb->p_rcv_msg, \
		(char *) (p_cb->p_rcv_msg + 1));
		bt_hc_cbacks->dealloc(p_cb->p_rcv_msg);
		}
		}
		p_cb->int_cmd_rd_idx = ((p_cb->int_cmd_rd_idx+1) & \
		@@ -378,8 +377,7 @@ static HC_BT_HDR *acl_rx_frame_buffer_alloc (void)

		if (bt_hc_cbacks)
		{
		bt_hc_cbacks->dealloc((TRANSAC) p_return_buf, \
		(char *) (p_return_buf + 1));
		bt_hc_cbacks->dealloc(p_return_buf);
		}
		p_return_buf = NULL;
		}
		@@ -715,7 +713,7 @@ void hci_h4_send_msg(HC_BT_HDR *p_msg)
		(p_msg->layer_specific == lay_spec))
		{
		/* dealloc buffer of internal command */
		bt_hc_cbacks->dealloc((TRANSAC) p_msg, (char *) (p_msg + 1));
		bt_hc_cbacks->dealloc(p_msg);
		}
		else
		{
		@@ -1038,7 +1036,7 @@ void hci_h4_get_acl_data_length(void)
		if ((ret = hci_h4_send_int_cmd(HCI_READ_BUFFER_SIZE, p_buf, \
		get_acl_data_length_cback)) == FALSE)
		{
		bt_hc_cbacks->dealloc((TRANSAC) p_buf, (char *) (p_buf + 1));
		bt_hc_cbacks->dealloc(p_buf);
		}
		else
		return;

system/hci/src/hci_mct.c

+6 −8

Original line number	Diff line number	Diff line
		@@ -201,7 +201,7 @@ void get_acl_data_length_cback(void *p_mem)
		if ((status = hci_mct_send_int_cmd(HCI_LE_READ_BUFFER_SIZE, p_buf, \
		get_acl_data_length_cback)) == FALSE)
		{
		bt_hc_cbacks->dealloc((TRANSAC) p_buf, (char *) (p_buf + 1));
		bt_hc_cbacks->dealloc(p_buf);
		bt_hc_cbacks->postload_cb(NULL, BT_HC_POSTLOAD_SUCCESS);
		}
		}
		@@ -212,7 +212,7 @@ void get_acl_data_length_cback(void *p_mem)

		if (bt_hc_cbacks)
		{
		bt_hc_cbacks->dealloc((TRANSAC) p_buf, (char *) (p_buf + 1));
		bt_hc_cbacks->dealloc(p_buf);
		ALOGE("hci lib postload completed");
		bt_hc_cbacks->postload_cb(NULL, BT_HC_POSTLOAD_SUCCESS);
		}
		@@ -274,8 +274,7 @@ uint8_t internal_event_intercept(void)
		// Release the p_rcv_msg buffer.
		if (bt_hc_cbacks)
		{
		bt_hc_cbacks->dealloc((TRANSAC) p_cb->rcv_evt.p_rcv_msg, \
		(char *) (p_cb->rcv_evt.p_rcv_msg + 1));
		bt_hc_cbacks->dealloc(p_cb->rcv_evt.p_rcv_msg);
		}
		}
		p_cb->int_cmd_rd_idx = ((p_cb->int_cmd_rd_idx+1) & \
		@@ -374,8 +373,7 @@ static HC_BT_HDR *acl_rx_frame_buffer_alloc (void)

		if (bt_hc_cbacks)
		{
		bt_hc_cbacks->dealloc((TRANSAC) p_return_buf, \
		(char *) (p_return_buf + 1));
		bt_hc_cbacks->dealloc(p_return_buf);
		}
		p_return_buf = NULL;
		}
		@@ -690,7 +688,7 @@ void hci_mct_send_msg(HC_BT_HDR *p_msg)
		(p_msg->layer_specific == lay_spec))
		{
		/* dealloc buffer of internal command */
		bt_hc_cbacks->dealloc((TRANSAC) p_msg, (char *) (p_msg + 1));
		bt_hc_cbacks->dealloc(p_msg);
		}
		else
		{
		@@ -1141,7 +1139,7 @@ void hci_mct_get_acl_data_length(void)
		if ((ret = hci_mct_send_int_cmd(HCI_READ_BUFFER_SIZE, p_buf, \
		get_acl_data_length_cback)) == FALSE)
		{
		bt_hc_cbacks->dealloc((TRANSAC) p_buf, (char *) (p_buf + 1));
		bt_hc_cbacks->dealloc(p_buf);
		}
		else
		return;

system/hci/src/userial.c

+3 −4

Original line number	Diff line number	Diff line
		@@ -257,7 +257,7 @@ static void userial_read_thread(void arg)
		ALOGW("select_read return size <=0:%d, exiting userial_read_thread",\
		rx_length);
		/* if we get here, we should have a buffer */
		bt_hc_cbacks->dealloc((TRANSAC) p_buf, (char *) (p_buf + 1));
		bt_hc_cbacks->dealloc(p_buf);
		/* negative value means exit thread */
		break;
		}
		@@ -353,8 +353,7 @@ uint16_t userial_read(uint16_t msg_id, uint8_t *p_buffer, uint16_t len)
		if(userial_cb.p_rx_hdr->len == 0)
		{
		if (bt_hc_cbacks)
		bt_hc_cbacks->dealloc((TRANSAC) userial_cb.p_rx_hdr, \
		(char *) (userial_cb.p_rx_hdr+1));
		bt_hc_cbacks->dealloc(userial_cb.p_rx_hdr);

		userial_cb.p_rx_hdr = NULL;
		}
		@@ -409,7 +408,7 @@ void userial_close(void) {
		// TODO: use list data structure and clean this up.
		void *buf;
		while ((buf = utils_dequeue(&userial_cb.rx_q)) != NULL)
		bt_hc_cbacks->dealloc(buf, (char ) ((HC_BT_HDR )buf + 1));
		bt_hc_cbacks->dealloc(buf);

		userial_cb.fd = -1;
		}

system/hci/src/vendor.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -144,7 +144,7 @@ static void *buffer_alloc(int size) {
		// \|buffer_alloc\|.
		static void buffer_free(void *buffer) {
		assert(bt_hc_cbacks != NULL);
		bt_hc_cbacks->dealloc(buffer, (char *)buffer + sizeof(HC_BT_HDR));
		bt_hc_cbacks->dealloc(buffer);
		}

		// Called back from vendor library when it wants to send an HCI command.