bta: use standard types (0c2ae571) · Commits · e / os / android_packages_modules_Bluetooth

system/bta/ag/bta_ag_act.c

+25 −25

Original line number	Original line	Diff line number	Diff line
	@@ -44,13 +44,13 @@ extern void bta_dm_pm_active(BD_ADDR peer_addr);
	/* maximum AT command length */		/* maximum AT command length */
	#define BTA_AG_CMD_MAX 512		#define BTA_AG_CMD_MAX 512

	const UINT16 bta_ag_uuid[BTA_AG_NUM_IDX] =		const uint16_t bta_ag_uuid[BTA_AG_NUM_IDX] =
	{		{
	UUID_SERVCLASS_HEADSET_AUDIO_GATEWAY,		UUID_SERVCLASS_HEADSET_AUDIO_GATEWAY,
	UUID_SERVCLASS_AG_HANDSFREE		UUID_SERVCLASS_AG_HANDSFREE
	};		};

	const UINT8 bta_ag_sec_id[BTA_AG_NUM_IDX] =		const uint8_t bta_ag_sec_id[BTA_AG_NUM_IDX] =
	{		{
	BTM_SEC_SERVICE_HEADSET_AG,		BTM_SEC_SERVICE_HEADSET_AG,
	BTM_SEC_SERVICE_AG_HANDSFREE		BTM_SEC_SERVICE_AG_HANDSFREE
	@@ -68,8 +68,8 @@ const tBTA_SERVICE_MASK bta_ag_svc_mask[BTA_AG_NUM_IDX] =
	BTA_HFP_SERVICE_MASK		BTA_HFP_SERVICE_MASK
	};		};

	typedef void (tBTA_AG_ATCMD_CBACK)(tBTA_AG_SCB p_scb, UINT16 cmd, UINT8 arg_type,		typedef void (tBTA_AG_ATCMD_CBACK)(tBTA_AG_SCB p_scb, uint16_t cmd, uint8_t arg_type,
	char *p_arg, INT16 int_arg);		char *p_arg, int16_t int_arg);

	const tBTA_AG_ATCMD_CBACK bta_ag_at_cback_tbl[BTA_AG_NUM_IDX] =		const tBTA_AG_ATCMD_CBACK bta_ag_at_cback_tbl[BTA_AG_NUM_IDX] =
	{		{
	@@ -157,7 +157,7 @@ void bta_ag_register(tBTA_AG_SCB p_scb, tBTA_AG_DATA p_data)
	void bta_ag_deregister(tBTA_AG_SCB p_scb, tBTA_AG_DATA p_data)		void bta_ag_deregister(tBTA_AG_SCB p_scb, tBTA_AG_DATA p_data)
	{		{
	/* set dealloc */		/* set dealloc */
	p_scb->dealloc = TRUE;		p_scb->dealloc = true;

	/* remove sdp records */		/* remove sdp records */
	bta_ag_del_records(p_scb, p_data);		bta_ag_del_records(p_scb, p_data);
	@@ -182,7 +182,7 @@ void bta_ag_deregister(tBTA_AG_SCB p_scb, tBTA_AG_DATA p_data)
	void bta_ag_start_dereg(tBTA_AG_SCB p_scb, tBTA_AG_DATA p_data)		void bta_ag_start_dereg(tBTA_AG_SCB p_scb, tBTA_AG_DATA p_data)
	{		{
	/* set dealloc */		/* set dealloc */
	p_scb->dealloc = TRUE;		p_scb->dealloc = true;

	/* remove sdp records */		/* remove sdp records */
	bta_ag_del_records(p_scb, p_data);		bta_ag_del_records(p_scb, p_data);
	@@ -242,7 +242,7 @@ void bta_ag_start_open(tBTA_AG_SCB p_scb, tBTA_AG_DATA p_data)
	*******************************************************************************/		*******************************************************************************/
	void bta_ag_disc_int_res(tBTA_AG_SCB p_scb, tBTA_AG_DATA p_data)		void bta_ag_disc_int_res(tBTA_AG_SCB p_scb, tBTA_AG_DATA p_data)
	{		{
	UINT16 event = BTA_AG_DISC_FAIL_EVT;		uint16_t event = BTA_AG_DISC_FAIL_EVT;

	APPL_TRACE_DEBUG ("bta_ag_disc_int_res: Status: %d", p_data->disc_result.status);		APPL_TRACE_DEBUG ("bta_ag_disc_int_res: Status: %d", p_data->disc_result.status);

	@@ -387,7 +387,7 @@ void bta_ag_rfc_fail(tBTA_AG_SCB p_scb, tBTA_AG_DATA p_data)
	p_scb->sco_codec = BTA_AG_CODEC_CVSD;		p_scb->sco_codec = BTA_AG_CODEC_CVSD;
	#endif		#endif
	p_scb->role = 0;		p_scb->role = 0;
	p_scb->svc_conn = FALSE;		p_scb->svc_conn = false;
	p_scb->hsp_version = HSP_VERSION_1_2;		p_scb->hsp_version = HSP_VERSION_1_2;
	/Clear the BD address/		/Clear the BD address/
	bdcpy(p_scb->peer_addr, bd_addr_null);		bdcpy(p_scb->peer_addr, bd_addr_null);
	@@ -423,13 +423,13 @@ void bta_ag_rfc_close(tBTA_AG_SCB p_scb, tBTA_AG_DATA p_data)
	p_scb->peer_codecs = BTA_AG_CODEC_CVSD;		p_scb->peer_codecs = BTA_AG_CODEC_CVSD;
	p_scb->sco_codec = BTA_AG_CODEC_CVSD;		p_scb->sco_codec = BTA_AG_CODEC_CVSD;
	/* Clear these flags upon SLC teardown */		/* Clear these flags upon SLC teardown */
	p_scb->codec_updated = FALSE;		p_scb->codec_updated = false;
	p_scb->codec_fallback = FALSE;		p_scb->codec_fallback = false;
	p_scb->codec_msbc_settings = BTA_AG_SCO_MSBC_SETTINGS_T2;		p_scb->codec_msbc_settings = BTA_AG_SCO_MSBC_SETTINGS_T2;
	#endif		#endif
	p_scb->role = 0;		p_scb->role = 0;
	p_scb->post_sco = BTA_AG_POST_SCO_NONE;		p_scb->post_sco = BTA_AG_POST_SCO_NONE;
	p_scb->svc_conn = FALSE;		p_scb->svc_conn = false;
	p_scb->hsp_version = HSP_VERSION_1_2;		p_scb->hsp_version = HSP_VERSION_1_2;
	bta_ag_at_reinit(&p_scb->at_cb);		bta_ag_at_reinit(&p_scb->at_cb);

	@@ -452,7 +452,7 @@ void bta_ag_rfc_close(tBTA_AG_SCB p_scb, tBTA_AG_DATA p_data)
	(bta_ag_cb.p_cback)(BTA_AG_CLOSE_EVT, (tBTA_AG ) &close);		(bta_ag_cb.p_cback)(BTA_AG_CLOSE_EVT, (tBTA_AG ) &close);

	/* if not deregistering (deallocating) reopen registered servers */		/* if not deregistering (deallocating) reopen registered servers */
	if (p_scb->dealloc == FALSE)		if (p_scb->dealloc == false)
	{		{
	/* Clear peer bd_addr so instance can be reused */		/* Clear peer bd_addr so instance can be reused */
	bdcpy(p_scb->peer_addr, bd_addr_null);		bdcpy(p_scb->peer_addr, bd_addr_null);
	@@ -505,10 +505,10 @@ void bta_ag_rfc_close(tBTA_AG_SCB p_scb, tBTA_AG_DATA p_data)
	void bta_ag_rfc_open(tBTA_AG_SCB p_scb, tBTA_AG_DATA p_data)		void bta_ag_rfc_open(tBTA_AG_SCB p_scb, tBTA_AG_DATA p_data)
	{		{
	/* initialize AT feature variables */		/* initialize AT feature variables */
	p_scb->clip_enabled = FALSE;		p_scb->clip_enabled = false;
	p_scb->ccwa_enabled = FALSE;		p_scb->ccwa_enabled = false;
	p_scb->cmer_enabled = FALSE;		p_scb->cmer_enabled = false;
	p_scb->cmee_enabled = FALSE;		p_scb->cmee_enabled = false;
	p_scb->inband_enabled = ((p_scb->features & BTA_AG_FEAT_INBAND) == BTA_AG_FEAT_INBAND);		p_scb->inband_enabled = ((p_scb->features & BTA_AG_FEAT_INBAND) == BTA_AG_FEAT_INBAND);

	/* set up AT command interpreter */		/* set up AT command interpreter */
	@@ -548,7 +548,7 @@ void bta_ag_rfc_open(tBTA_AG_SCB p_scb, tBTA_AG_DATA p_data)
	*******************************************************************************/		*******************************************************************************/
	void bta_ag_rfc_acp_open(tBTA_AG_SCB p_scb, tBTA_AG_DATA p_data)		void bta_ag_rfc_acp_open(tBTA_AG_SCB p_scb, tBTA_AG_DATA p_data)
	{		{
	UINT16 lcid;		uint16_t lcid;
	int i;		int i;
	tBTA_AG_SCB ag_scb, other_scb;		tBTA_AG_SCB ag_scb, other_scb;
	BD_ADDR dev_addr;		BD_ADDR dev_addr;
	@@ -640,7 +640,7 @@ void bta_ag_rfc_acp_open(tBTA_AG_SCB p_scb, tBTA_AG_DATA p_data)
	*******************************************************************************/		*******************************************************************************/
	void bta_ag_rfc_data(tBTA_AG_SCB p_scb, tBTA_AG_DATA p_data)		void bta_ag_rfc_data(tBTA_AG_SCB p_scb, tBTA_AG_DATA p_data)
	{		{
	UINT16 len;		uint16_t len;
	char buf[BTA_AG_RFC_READ_MAX];		char buf[BTA_AG_RFC_READ_MAX];
	UNUSED(p_data);		UNUSED(p_data);

	@@ -817,7 +817,7 @@ void bta_ag_svc_conn_open(tBTA_AG_SCB p_scb, tBTA_AG_DATA p_data)
	if (!p_scb->svc_conn)		if (!p_scb->svc_conn)
	{		{
	/* set state variable */		/* set state variable */
	p_scb->svc_conn = TRUE;		p_scb->svc_conn = true;

	/* Clear AT+BIA mask from previous SLC if any. */		/* Clear AT+BIA mask from previous SLC if any. */
	p_scb->bia_masked_out = 0;		p_scb->bia_masked_out = 0;
	@@ -854,7 +854,7 @@ void bta_ag_svc_conn_open(tBTA_AG_SCB p_scb, tBTA_AG_DATA p_data)
	*******************************************************************************/		*******************************************************************************/
	void bta_ag_ci_rx_data(tBTA_AG_SCB p_scb, tBTA_AG_DATA p_data)		void bta_ag_ci_rx_data(tBTA_AG_SCB p_scb, tBTA_AG_DATA p_data)
	{		{
	UINT16 len;		uint16_t len;
	tBTA_AG_CI_RX_WRITE p_rx_write_msg = (tBTA_AG_CI_RX_WRITE )p_data;		tBTA_AG_CI_RX_WRITE p_rx_write_msg = (tBTA_AG_CI_RX_WRITE )p_data;
	char p_data_area = (char )(p_rx_write_msg+1); /* Point to data area after header */		char p_data_area = (char )(p_rx_write_msg+1); /* Point to data area after header */

	@@ -927,7 +927,7 @@ void bta_ag_setcodec(tBTA_AG_SCB p_scb, tBTA_AG_DATA p_data)
	(codec_type == BTA_AG_CODEC_CVSD))		(codec_type == BTA_AG_CODEC_CVSD))
	{		{
	p_scb->sco_codec = codec_type;		p_scb->sco_codec = codec_type;
	p_scb->codec_updated = TRUE;		p_scb->codec_updated = true;
	val.num = codec_type;		val.num = codec_type;
	val.hdr.status = BTA_AG_SUCCESS;		val.hdr.status = BTA_AG_SUCCESS;
	APPL_TRACE_DEBUG("bta_ag_setcodec: Updated codec type %d", codec_type);		APPL_TRACE_DEBUG("bta_ag_setcodec: Updated codec type %d", codec_type);

system/bta/ag/bta_ag_api.c

+8 −8

Original line number	Original line	Diff line number	Diff line
	@@ -108,7 +108,7 @@ void BTA_AgDisable(void)
	**		**
	*******************************************************************************/		*******************************************************************************/
	void BTA_AgRegister(tBTA_SERVICE_MASK services, tBTA_SEC sec_mask,tBTA_AG_FEAT features,		void BTA_AgRegister(tBTA_SERVICE_MASK services, tBTA_SEC sec_mask,tBTA_AG_FEAT features,
	const char * p_service_names[], UINT8 app_id)		const char * p_service_names[], uint8_t app_id)
	{		{
	tBTA_AG_API_REGISTER *p_buf =		tBTA_AG_API_REGISTER *p_buf =
	(tBTA_AG_API_REGISTER *)osi_malloc(sizeof(tBTA_AG_API_REGISTER));		(tBTA_AG_API_REGISTER *)osi_malloc(sizeof(tBTA_AG_API_REGISTER));
	@@ -138,7 +138,7 @@ void BTA_AgRegister(tBTA_SERVICE_MASK services, tBTA_SEC sec_mask,tBTA_AG_FEAT f
	** Returns void		** Returns void
	**		**
	*******************************************************************************/		*******************************************************************************/
	void BTA_AgDeregister(UINT16 handle)		void BTA_AgDeregister(uint16_t handle)
	{		{
	BT_HDR p_buf = (BT_HDR )osi_malloc(sizeof(BT_HDR));		BT_HDR p_buf = (BT_HDR )osi_malloc(sizeof(BT_HDR));

	@@ -161,7 +161,7 @@ void BTA_AgDeregister(UINT16 handle)
	** Returns void		** Returns void
	**		**
	*******************************************************************************/		*******************************************************************************/
	void BTA_AgOpen(UINT16 handle, BD_ADDR bd_addr, tBTA_SEC sec_mask, tBTA_SERVICE_MASK services)		void BTA_AgOpen(uint16_t handle, BD_ADDR bd_addr, tBTA_SEC sec_mask, tBTA_SERVICE_MASK services)
	{		{
	tBTA_AG_API_OPEN *p_buf =		tBTA_AG_API_OPEN *p_buf =
	(tBTA_AG_API_OPEN *)osi_malloc(sizeof(tBTA_AG_API_OPEN));		(tBTA_AG_API_OPEN *)osi_malloc(sizeof(tBTA_AG_API_OPEN));
	@@ -186,7 +186,7 @@ void BTA_AgOpen(UINT16 handle, BD_ADDR bd_addr, tBTA_SEC sec_mask, tBTA_SERVICE_
	** Returns void		** Returns void
	**		**
	*******************************************************************************/		*******************************************************************************/
	void BTA_AgClose(UINT16 handle)		void BTA_AgClose(uint16_t handle)
	{		{
	BT_HDR p_buf = (BT_HDR )osi_malloc(sizeof(BT_HDR));		BT_HDR p_buf = (BT_HDR )osi_malloc(sizeof(BT_HDR));

	@@ -207,7 +207,7 @@ void BTA_AgClose(UINT16 handle)
	** Returns void		** Returns void
	**		**
	*******************************************************************************/		*******************************************************************************/
	void BTA_AgAudioOpen(UINT16 handle)		void BTA_AgAudioOpen(uint16_t handle)
	{		{
	BT_HDR p_buf = (BT_HDR )osi_malloc(sizeof(BT_HDR));		BT_HDR p_buf = (BT_HDR )osi_malloc(sizeof(BT_HDR));

	@@ -228,7 +228,7 @@ void BTA_AgAudioOpen(UINT16 handle)
	** Returns void		** Returns void
	**		**
	*******************************************************************************/		*******************************************************************************/
	void BTA_AgAudioClose(UINT16 handle)		void BTA_AgAudioClose(uint16_t handle)
	{		{
	BT_HDR p_buf = (BT_HDR )osi_malloc(sizeof(BT_HDR));		BT_HDR p_buf = (BT_HDR )osi_malloc(sizeof(BT_HDR));

	@@ -250,7 +250,7 @@ void BTA_AgAudioClose(UINT16 handle)
	** Returns void		** Returns void
	**		**
	*******************************************************************************/		*******************************************************************************/
	void BTA_AgResult(UINT16 handle, tBTA_AG_RES result, tBTA_AG_RES_DATA *p_data)		void BTA_AgResult(uint16_t handle, tBTA_AG_RES result, tBTA_AG_RES_DATA *p_data)
	{		{
	tBTA_AG_API_RESULT *p_buf =		tBTA_AG_API_RESULT *p_buf =
	(tBTA_AG_API_RESULT *)osi_malloc(sizeof(tBTA_AG_API_RESULT));		(tBTA_AG_API_RESULT *)osi_malloc(sizeof(tBTA_AG_API_RESULT));
	@@ -276,7 +276,7 @@ void BTA_AgResult(UINT16 handle, tBTA_AG_RES result, tBTA_AG_RES_DATA *p_data)
	** Returns void		** Returns void
	**		**
	*******************************************************************************/		*******************************************************************************/
	void BTA_AgSetCodec(UINT16 handle, tBTA_AG_PEER_CODEC codec)		void BTA_AgSetCodec(uint16_t handle, tBTA_AG_PEER_CODEC codec)
	{		{
	tBTA_AG_API_SETCODEC *p_buf =		tBTA_AG_API_SETCODEC *p_buf =
	(tBTA_AG_API_SETCODEC *)osi_malloc(sizeof(tBTA_AG_API_SETCODEC));		(tBTA_AG_API_SETCODEC *)osi_malloc(sizeof(tBTA_AG_API_SETCODEC));

system/bta/ag/bta_ag_at.c

+10 −10

Original line number	Original line	Diff line number	Diff line
	@@ -79,10 +79,10 @@ void bta_ag_at_reinit(tBTA_AG_AT_CB *p_cb)
	******************************************************************************/		******************************************************************************/
	void bta_ag_process_at(tBTA_AG_AT_CB *p_cb)		void bta_ag_process_at(tBTA_AG_AT_CB *p_cb)
	{		{
	UINT16 idx;		uint16_t idx;
	UINT8 arg_type;		uint8_t arg_type;
	char *p_arg;		char *p_arg;
	INT16 int_arg = 0;		int16_t int_arg = 0;
	/* loop through at command table looking for match */		/* loop through at command table looking for match */
	for (idx = 0; p_cb->p_at_tbl[idx].p_cmd[0] != 0; idx++)		for (idx = 0; p_cb->p_at_tbl[idx].p_cmd[0] != 0; idx++)
	{		{
	@@ -140,11 +140,11 @@ void bta_ag_process_at(tBTA_AG_AT_CB *p_cb)
	p_cb->p_at_tbl[idx].fmt == BTA_AG_AT_INT)		p_cb->p_at_tbl[idx].fmt == BTA_AG_AT_INT)
	{		{
	int_arg = utl_str2int(p_arg);		int_arg = utl_str2int(p_arg);
	if (int_arg < (INT16) p_cb->p_at_tbl[idx].min \|\|		if (int_arg < (int16_t) p_cb->p_at_tbl[idx].min \|\|
	int_arg > (INT16) p_cb->p_at_tbl[idx].max)		int_arg > (int16_t) p_cb->p_at_tbl[idx].max)
	{		{
	/* arg out of range; error */		/* arg out of range; error */
	(*p_cb->p_err_cback)(p_cb->p_user, FALSE, NULL);		(*p_cb->p_err_cback)(p_cb->p_user, false, NULL);
	}		}
	else		else
	{		{
	@@ -160,13 +160,13 @@ void bta_ag_process_at(tBTA_AG_AT_CB *p_cb)
	/* else error */		/* else error */
	else		else
	{		{
	(*p_cb->p_err_cback)(p_cb->p_user, FALSE, NULL);		(*p_cb->p_err_cback)(p_cb->p_user, false, NULL);
	}		}
	}		}
	/* else no match call error callback */		/* else no match call error callback */
	else		else
	{		{
	(*p_cb->p_err_cback)(p_cb->p_user, TRUE, p_cb->p_cmd_buf);		(*p_cb->p_err_cback)(p_cb->p_user, true, p_cb->p_cmd_buf);
	}		}
	}		}

	@@ -182,7 +182,7 @@ void bta_ag_process_at(tBTA_AG_AT_CB *p_cb)
	** Returns void		** Returns void
	**		**
	******************************************************************************/		******************************************************************************/
	void bta_ag_at_parse(tBTA_AG_AT_CB p_cb, char p_buf, UINT16 len)		void bta_ag_at_parse(tBTA_AG_AT_CB p_cb, char p_buf, uint16_t len)
	{		{
	int i = 0;		int i = 0;
	char* p_save;		char* p_save;
	@@ -223,7 +223,7 @@ void bta_ag_at_parse(tBTA_AG_AT_CB p_cb, char p_buf, UINT16 len)
	else if( p_cb->p_cmd_buf[p_cb->cmd_pos] == 0x1A \|\| p_cb->p_cmd_buf[p_cb->cmd_pos] == 0x1B )		else if( p_cb->p_cmd_buf[p_cb->cmd_pos] == 0x1A \|\| p_cb->p_cmd_buf[p_cb->cmd_pos] == 0x1B )
	{		{
	p_cb->p_cmd_buf[++p_cb->cmd_pos] = 0;		p_cb->p_cmd_buf[++p_cb->cmd_pos] = 0;
	(*p_cb->p_err_cback)(p_cb->p_user, TRUE, p_cb->p_cmd_buf);		(*p_cb->p_err_cback)(p_cb->p_user, true, p_cb->p_cmd_buf);
	p_cb->cmd_pos = 0;		p_cb->cmd_pos = 0;
	}		}
	else		else

system/bta/ag/bta_ag_at.h

+11 −11

Original line number	Original line	Diff line number	Diff line
	@@ -47,18 +47,18 @@
	typedef struct		typedef struct
	{		{
	const char p_cmd; / AT command string */		const char p_cmd; / AT command string */
	UINT8 arg_type; /* allowable argument type syntax */		uint8_t arg_type; /* allowable argument type syntax */
	UINT8 fmt; /* whether arg is int or string */		uint8_t fmt; /* whether arg is int or string */
	UINT8 min; /* minimum value for int arg */		uint8_t min; /* minimum value for int arg */
	INT16 max; /* maximum value for int arg */		int16_t max; /* maximum value for int arg */
	} tBTA_AG_AT_CMD;		} tBTA_AG_AT_CMD;

	/* callback function executed when command is parsed */		/* callback function executed when command is parsed */
	typedef void (tBTA_AG_AT_CMD_CBACK)(void *p_user, UINT16 cmd, UINT8 arg_type,		typedef void (tBTA_AG_AT_CMD_CBACK)(void *p_user, uint16_t cmd, uint8_t arg_type,
	char *p_arg, INT16 int_arg);		char *p_arg, int16_t int_arg);

	/* callback function executed to send "ERROR" result code */		/* callback function executed to send "ERROR" result code */
	typedef void (tBTA_AG_AT_ERR_CBACK)(void p_user, BOOLEAN unknown, char p_arg);		typedef void (tBTA_AG_AT_ERR_CBACK)(void p_user, bool unknown, char p_arg);

	/* AT command parsing control block */		/* AT command parsing control block */
	typedef struct		typedef struct
	@@ -68,9 +68,9 @@ typedef struct
	tBTA_AG_AT_ERR_CBACK p_err_cback; / error callback */		tBTA_AG_AT_ERR_CBACK p_err_cback; / error callback */
	void p_user; / user-defined data */		void p_user; / user-defined data */
	char p_cmd_buf; / temp parsing buffer */		char p_cmd_buf; / temp parsing buffer */
	UINT16 cmd_pos; /* position in temp buffer */		uint16_t cmd_pos; /* position in temp buffer */
	UINT16 cmd_max_len; /* length of temp buffer to allocate */		uint16_t cmd_max_len; /* length of temp buffer to allocate */
	UINT8 state; /* parsing state */		uint8_t state; /* parsing state */
	} tBTA_AG_AT_CB;		} tBTA_AG_AT_CB;

	/*****************************************************************************		/*****************************************************************************
	@@ -115,7 +115,7 @@ extern void bta_ag_at_reinit(tBTA_AG_AT_CB *p_cb);
	** Returns void		** Returns void
	**		**
	*****************************************************************************/		*****************************************************************************/
	extern void bta_ag_at_parse(tBTA_AG_AT_CB p_cb, char p_buf, UINT16 len);		extern void bta_ag_at_parse(tBTA_AG_AT_CB p_cb, char p_buf, uint16_t len);

	#endif /* BTA_AG_AT_H */		#endif /* BTA_AG_AT_H */

system/bta/ag/bta_ag_ci.c

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -40,9 +40,9 @@
	** Returns void		** Returns void
	**		**
	******************************************************************************/		******************************************************************************/
	void bta_ag_ci_rx_write(UINT16 handle, char *p_data, UINT16 len)		void bta_ag_ci_rx_write(uint16_t handle, char *p_data, uint16_t len)
	{		{
	UINT16 len_remaining = len;		uint16_t len_remaining = len;
	char *p_data_area;		char *p_data_area;

	if (len > (RFCOMM_DATA_BUF_SIZE - sizeof(tBTA_AG_CI_RX_WRITE) - 1))		if (len > (RFCOMM_DATA_BUF_SIZE - sizeof(tBTA_AG_CI_RX_WRITE) - 1))
	@@ -79,7 +79,7 @@ void bta_ag_ci_rx_write(UINT16 handle, char *p_data, UINT16 len)
	** Returns void		** Returns void
	**		**
	******************************************************************************/		******************************************************************************/
	void bta_ag_ci_slc_ready(UINT16 handle)		void bta_ag_ci_slc_ready(uint16_t handle)
	{		{
	tBTA_AG_DATA p_buf = (tBTA_AG_DATA )osi_malloc(sizeof(tBTA_AG_DATA));		tBTA_AG_DATA p_buf = (tBTA_AG_DATA )osi_malloc(sizeof(tBTA_AG_DATA));