Replaced osi_getbuf()/osi_freebuf() with osi_malloc()/osi_free() (102cfe4e) · Commits · e / os / android_packages_modules_Bluetooth

system/bta/ag/bta_ag_api.c

+10 −10

Original line number	Original line	Diff line number	Diff line
	@@ -72,7 +72,7 @@ tBTA_STATUS BTA_AgEnable(tBTA_AG_PARSE_MODE parse_mode, tBTA_AG_CBACK *p_cback)
	/* register with BTA system manager */		/* register with BTA system manager */
	bta_sys_register(BTA_ID_AG, &bta_ag_reg);		bta_sys_register(BTA_ID_AG, &bta_ag_reg);

	if ((p_buf = (tBTA_AG_API_ENABLE *) osi_getbuf(sizeof(tBTA_AG_API_ENABLE))) != NULL)		if ((p_buf = (tBTA_AG_API_ENABLE *) osi_malloc(sizeof(tBTA_AG_API_ENABLE))) != NULL)
	{		{
	p_buf->hdr.event = BTA_AG_API_ENABLE_EVT;		p_buf->hdr.event = BTA_AG_API_ENABLE_EVT;
	p_buf->parse_mode = parse_mode;		p_buf->parse_mode = parse_mode;
	@@ -98,7 +98,7 @@ void BTA_AgDisable(void)
	{		{
	BT_HDR *p_buf;		BT_HDR *p_buf;

	if ((p_buf = (BT_HDR *) osi_getbuf(sizeof(BT_HDR))) != NULL)		if ((p_buf = (BT_HDR *) osi_malloc(sizeof(BT_HDR))) != NULL)
	{		{
	p_buf->event = BTA_AG_API_DISABLE_EVT;		p_buf->event = BTA_AG_API_DISABLE_EVT;
	bta_sys_sendmsg(p_buf);		bta_sys_sendmsg(p_buf);
	@@ -121,7 +121,7 @@ void BTA_AgRegister(tBTA_SERVICE_MASK services, tBTA_SEC sec_mask,tBTA_AG_FEAT f
	tBTA_AG_API_REGISTER *p_buf;		tBTA_AG_API_REGISTER *p_buf;
	int i;		int i;

	if ((p_buf = (tBTA_AG_API_REGISTER *) osi_getbuf(sizeof(tBTA_AG_API_REGISTER))) != NULL)		if ((p_buf = (tBTA_AG_API_REGISTER *) osi_malloc(sizeof(tBTA_AG_API_REGISTER))) != NULL)
	{		{
	p_buf->hdr.event = BTA_AG_API_REGISTER_EVT;		p_buf->hdr.event = BTA_AG_API_REGISTER_EVT;
	p_buf->features = features;		p_buf->features = features;
	@@ -153,7 +153,7 @@ void BTA_AgDeregister(UINT16 handle)
	{		{
	BT_HDR *p_buf;		BT_HDR *p_buf;

	if ((p_buf = (BT_HDR *) osi_getbuf(sizeof(BT_HDR))) != NULL)		if ((p_buf = (BT_HDR *) osi_malloc(sizeof(BT_HDR))) != NULL)
	{		{
	p_buf->event = BTA_AG_API_DEREGISTER_EVT;		p_buf->event = BTA_AG_API_DEREGISTER_EVT;
	p_buf->layer_specific = handle;		p_buf->layer_specific = handle;
	@@ -178,7 +178,7 @@ void BTA_AgOpen(UINT16 handle, BD_ADDR bd_addr, tBTA_SEC sec_mask, tBTA_SERVICE_
	{		{
	tBTA_AG_API_OPEN *p_buf;		tBTA_AG_API_OPEN *p_buf;

	if ((p_buf = (tBTA_AG_API_OPEN *) osi_getbuf(sizeof(tBTA_AG_API_OPEN))) != NULL)		if ((p_buf = (tBTA_AG_API_OPEN *) osi_malloc(sizeof(tBTA_AG_API_OPEN))) != NULL)
	{		{
	p_buf->hdr.event = BTA_AG_API_OPEN_EVT;		p_buf->hdr.event = BTA_AG_API_OPEN_EVT;
	p_buf->hdr.layer_specific = handle;		p_buf->hdr.layer_specific = handle;
	@@ -204,7 +204,7 @@ void BTA_AgClose(UINT16 handle)
	{		{
	BT_HDR *p_buf;		BT_HDR *p_buf;

	if ((p_buf = (BT_HDR *) osi_getbuf(sizeof(BT_HDR))) != NULL)		if ((p_buf = (BT_HDR *) osi_malloc(sizeof(BT_HDR))) != NULL)
	{		{
	p_buf->event = BTA_AG_API_CLOSE_EVT;		p_buf->event = BTA_AG_API_CLOSE_EVT;
	p_buf->layer_specific = handle;		p_buf->layer_specific = handle;
	@@ -227,7 +227,7 @@ void BTA_AgAudioOpen(UINT16 handle)
	{		{
	BT_HDR *p_buf;		BT_HDR *p_buf;

	if ((p_buf = (BT_HDR *) osi_getbuf(sizeof(BT_HDR))) != NULL)		if ((p_buf = (BT_HDR *) osi_malloc(sizeof(BT_HDR))) != NULL)
	{		{
	p_buf->event = BTA_AG_API_AUDIO_OPEN_EVT;		p_buf->event = BTA_AG_API_AUDIO_OPEN_EVT;
	p_buf->layer_specific = handle;		p_buf->layer_specific = handle;
	@@ -250,7 +250,7 @@ void BTA_AgAudioClose(UINT16 handle)
	{		{
	BT_HDR *p_buf;		BT_HDR *p_buf;

	if ((p_buf = (BT_HDR *) osi_getbuf(sizeof(BT_HDR))) != NULL)		if ((p_buf = (BT_HDR *) osi_malloc(sizeof(BT_HDR))) != NULL)
	{		{
	p_buf->event = BTA_AG_API_AUDIO_CLOSE_EVT;		p_buf->event = BTA_AG_API_AUDIO_CLOSE_EVT;
	p_buf->layer_specific = handle;		p_buf->layer_specific = handle;
	@@ -275,7 +275,7 @@ void BTA_AgResult(UINT16 handle, tBTA_AG_RES result, tBTA_AG_RES_DATA *p_data)
	{		{
	tBTA_AG_API_RESULT *p_buf;		tBTA_AG_API_RESULT *p_buf;

	if ((p_buf = (tBTA_AG_API_RESULT *) osi_getbuf(sizeof(tBTA_AG_API_RESULT))) != NULL)		if ((p_buf = (tBTA_AG_API_RESULT *) osi_malloc(sizeof(tBTA_AG_API_RESULT))) != NULL)
	{		{
	p_buf->hdr.event = BTA_AG_API_RESULT_EVT;		p_buf->hdr.event = BTA_AG_API_RESULT_EVT;
	p_buf->hdr.layer_specific = handle;		p_buf->hdr.layer_specific = handle;
	@@ -304,7 +304,7 @@ void BTA_AgSetCodec(UINT16 handle, tBTA_AG_PEER_CODEC codec)
	{		{
	tBTA_AG_API_SETCODEC *p_buf;		tBTA_AG_API_SETCODEC *p_buf;

	if ((p_buf = (tBTA_AG_API_SETCODEC *) osi_getbuf(sizeof(tBTA_AG_API_SETCODEC))) != NULL)		if ((p_buf = (tBTA_AG_API_SETCODEC *) osi_malloc(sizeof(tBTA_AG_API_SETCODEC))) != NULL)
	{		{
	p_buf->hdr.event = BTA_AG_API_SETCODEC_EVT;		p_buf->hdr.event = BTA_AG_API_SETCODEC_EVT;
	p_buf->hdr.layer_specific = handle;		p_buf->hdr.layer_specific = handle;

system/bta/ag/bta_ag_at.c

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -61,7 +61,7 @@ void bta_ag_at_init(tBTA_AG_AT_CB *p_cb)
	******************************************************************************/		******************************************************************************/
	void bta_ag_at_reinit(tBTA_AG_AT_CB *p_cb)		void bta_ag_at_reinit(tBTA_AG_AT_CB *p_cb)
	{		{
	osi_freebuf_and_reset((void **)&p_cb->p_cmd_buf);		osi_free_and_reset((void **)&p_cb->p_cmd_buf);
	p_cb->cmd_pos = 0;		p_cb->cmd_pos = 0;
	}		}

	@@ -189,9 +189,9 @@ void bta_ag_at_parse(tBTA_AG_AT_CB p_cb, char p_buf, UINT16 len)

	if (p_cb->p_cmd_buf == NULL)		if (p_cb->p_cmd_buf == NULL)
	{		{
	if ((p_cb->p_cmd_buf = (char *) osi_getbuf(p_cb->cmd_max_len)) == NULL)		if ((p_cb->p_cmd_buf = (char *) osi_malloc(p_cb->cmd_max_len)) == NULL)
	{		{
	APPL_TRACE_ERROR("%s: osi_getbuf() failed allocation", __func__);		APPL_TRACE_ERROR("%s: osi_malloc() failed allocation", __func__);
	return;		return;
	}		}
	p_cb->cmd_pos = 0;		p_cb->cmd_pos = 0;

system/bta/ag/bta_ag_ci.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -54,7 +54,7 @@ void bta_ag_ci_rx_write(UINT16 handle, char *p_data, UINT16 len)
	if (len_remaining < len)		if (len_remaining < len)
	len = len_remaining;		len = len_remaining;

	if ((p_buf = (tBTA_AG_CI_RX_WRITE *) osi_getbuf((UINT16)(sizeof(tBTA_AG_CI_RX_WRITE) + len + 1))) != NULL)		if ((p_buf = (tBTA_AG_CI_RX_WRITE *) osi_malloc(sizeof(tBTA_AG_CI_RX_WRITE) + len + 1)) != NULL)
	{		{
	p_buf->hdr.event = BTA_AG_CI_RX_WRITE_EVT;		p_buf->hdr.event = BTA_AG_CI_RX_WRITE_EVT;
	p_buf->hdr.layer_specific = handle;		p_buf->hdr.layer_specific = handle;
	@@ -89,7 +89,7 @@ void bta_ag_ci_slc_ready(UINT16 handle)
	{		{
	tBTA_AG_DATA *p_buf;		tBTA_AG_DATA *p_buf;

	if ((p_buf = (tBTA_AG_DATA *)osi_getbuf(sizeof(tBTA_AG_DATA))) != NULL)		if ((p_buf = (tBTA_AG_DATA *)osi_malloc(sizeof(tBTA_AG_DATA))) != NULL)
	{		{
	p_buf->hdr.event = BTA_AG_CI_SLC_READY_EVT;		p_buf->hdr.event = BTA_AG_CI_SLC_READY_EVT;
	p_buf->hdr.layer_specific = handle;		p_buf->hdr.layer_specific = handle;

system/bta/ag/bta_ag_rfc.c

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -101,7 +101,7 @@ static void bta_ag_port_cback(UINT32 code, UINT16 port_handle, UINT16 handle)
	return;		return;
	}		}

	if ((p_buf = (BT_HDR *) osi_getbuf(sizeof(BT_HDR))) != NULL)		if ((p_buf = (BT_HDR *) osi_malloc(sizeof(BT_HDR))) != NULL)
	{		{
	p_buf->event = BTA_AG_RFC_DATA_EVT;		p_buf->event = BTA_AG_RFC_DATA_EVT;
	p_buf->layer_specific = handle;		p_buf->layer_specific = handle;
	@@ -174,7 +174,7 @@ static void bta_ag_mgmt_cback(UINT32 code, UINT16 port_handle, UINT16 handle)
	event = BTA_AG_RFC_SRV_CLOSE_EVT;		event = BTA_AG_RFC_SRV_CLOSE_EVT;
	}		}

	if ((p_buf = (tBTA_AG_RFC *) osi_getbuf(sizeof(tBTA_AG_RFC))) != NULL)		if ((p_buf = (tBTA_AG_RFC *) osi_malloc(sizeof(tBTA_AG_RFC))) != NULL)
	{		{
	p_buf->hdr.event = event;		p_buf->hdr.event = event;
	p_buf->hdr.layer_specific = handle;		p_buf->hdr.layer_specific = handle;
	@@ -414,7 +414,7 @@ void bta_ag_rfc_do_close(tBTA_AG_SCB p_scb, tBTA_AG_DATA p_data)
	/* Close API was called while AG is in Opening state. */		/* Close API was called while AG is in Opening state. */
	/* Need to trigger the state machine to send callback to the app */		/* Need to trigger the state machine to send callback to the app */
	/* and move back to INIT state. */		/* and move back to INIT state. */
	if ((p_buf = (tBTA_AG_RFC *) osi_getbuf(sizeof(tBTA_AG_RFC))) != NULL)		if ((p_buf = (tBTA_AG_RFC *) osi_malloc(sizeof(tBTA_AG_RFC))) != NULL)
	{		{
	p_buf->hdr.event = BTA_AG_RFC_CLOSE_EVT;		p_buf->hdr.event = BTA_AG_RFC_CLOSE_EVT;
	p_buf->hdr.layer_specific = bta_ag_scb_to_idx(p_scb);		p_buf->hdr.layer_specific = bta_ag_scb_to_idx(p_scb);

system/bta/ag/bta_ag_sco.c

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -175,7 +175,7 @@ static void bta_ag_sco_conn_cback(UINT16 sco_idx)

	if (handle != 0)		if (handle != 0)
	{		{
	if ((p_buf = (BT_HDR *) osi_getbuf(sizeof(BT_HDR))) != NULL)		if ((p_buf = (BT_HDR *) osi_malloc(sizeof(BT_HDR))) != NULL)
	{		{
	p_buf->event = BTA_AG_SCO_OPEN_EVT;		p_buf->event = BTA_AG_SCO_OPEN_EVT;
	p_buf->layer_specific = handle;		p_buf->layer_specific = handle;
	@@ -261,7 +261,7 @@ static void bta_ag_sco_disc_cback(UINT16 sco_idx)
	bta_ag_cb.sco.p_curr_scb->inuse_codec = BTA_AG_CODEC_NONE;		bta_ag_cb.sco.p_curr_scb->inuse_codec = BTA_AG_CODEC_NONE;
	#endif		#endif

	if ((p_buf = (BT_HDR *) osi_getbuf(sizeof(BT_HDR))) != NULL)		if ((p_buf = (BT_HDR *) osi_malloc(sizeof(BT_HDR))) != NULL)
	{		{
	p_buf->event = BTA_AG_SCO_CLOSE_EVT;		p_buf->event = BTA_AG_SCO_CLOSE_EVT;
	p_buf->layer_specific = handle;		p_buf->layer_specific = handle;
	@@ -744,7 +744,7 @@ static void bta_ag_sco_event(tBTA_AG_SCB *p_scb, UINT8 event)
	if (p_sco->state == BTA_AG_SCO_OPEN_ST)		if (p_sco->state == BTA_AG_SCO_OPEN_ST)
	BTM_WriteScoData(p_sco->p_curr_scb->sco_idx, p_buf);		BTM_WriteScoData(p_sco->p_curr_scb->sco_idx, p_buf);
	else		else
	osi_freebuf(p_buf);		osi_free(p_buf);
	}		}
	else		else
	break;		break;