summaryrefslogtreecommitdiffstats
path: root/stack/bnep
diff options
context:
space:
mode:
Diffstat (limited to 'stack/bnep')
-rw-r--r--stack/bnep/bnep_api.c16
-rw-r--r--stack/bnep/bnep_main.c46
-rw-r--r--stack/bnep/bnep_utils.c108
3 files changed, 85 insertions, 85 deletions
diff --git a/stack/bnep/bnep_api.c b/stack/bnep/bnep_api.c
index fbbf1799a..b1d8c7c2d 100644
--- a/stack/bnep/bnep_api.c
+++ b/stack/bnep/bnep_api.c
@@ -140,7 +140,7 @@ tBNEP_RESULT BNEP_Connect (BD_ADDR p_rem_bda,
UINT16 cid;
tBNEP_CONN *p_bcb = bnepu_find_bcb_by_bd_addr (p_rem_bda);
- BNEP_TRACE_API6 ("BNEP_Connect() BDA: %02x-%02x-%02x-%02x-%02x-%02x",
+ BNEP_TRACE_API ("BNEP_Connect() BDA: %02x-%02x-%02x-%02x-%02x-%02x",
p_rem_bda[0], p_rem_bda[1], p_rem_bda[2],
p_rem_bda[3], p_rem_bda[4], p_rem_bda[5]);
@@ -181,7 +181,7 @@ tBNEP_RESULT BNEP_Connect (BD_ADDR p_rem_bda,
/* Transition to the next appropriate state, waiting for connection confirm. */
p_bcb->con_state = BNEP_STATE_SEC_CHECKING;
- BNEP_TRACE_API1 ("BNEP initiating security procedures for src uuid 0x%x",
+ BNEP_TRACE_API ("BNEP initiating security procedures for src uuid 0x%x",
p_bcb->src_uuid.uu.uuid16);
#if (defined (BNEP_DO_AUTH_FOR_ROLE_SWITCH) && BNEP_DO_AUTH_FOR_ROLE_SWITCH == TRUE)
@@ -206,7 +206,7 @@ tBNEP_RESULT BNEP_Connect (BD_ADDR p_rem_bda,
}
else
{
- BNEP_TRACE_ERROR0 ("BNEP - Originate failed");
+ BNEP_TRACE_ERROR ("BNEP - Originate failed");
if (bnep_cb.p_conn_state_cb)
(*bnep_cb.p_conn_state_cb) (p_bcb->handle, p_bcb->rem_bda, BNEP_CONN_FAILED, FALSE);
bnepu_release_bcb (p_bcb);
@@ -251,7 +251,7 @@ tBNEP_RESULT BNEP_ConnectResp (UINT16 handle, tBNEP_RESULT resp)
(!(p_bcb->con_flags & BNEP_FLAGS_SETUP_RCVD)))
return (BNEP_WRONG_STATE);
- BNEP_TRACE_API2 ("BNEP_ConnectResp() for handle %d, responce %d", handle, resp);
+ BNEP_TRACE_API ("BNEP_ConnectResp() for handle %d, responce %d", handle, resp);
/* Form appropriate responce based on profile responce */
if (resp == BNEP_CONN_FAILED_SRC_UUID) resp_code = BNEP_SETUP_INVALID_SRC_UUID;
@@ -327,7 +327,7 @@ tBNEP_RESULT BNEP_Disconnect (UINT16 handle)
if (p_bcb->con_state == BNEP_STATE_IDLE)
return (BNEP_WRONG_HANDLE);
- BNEP_TRACE_API1 ("BNEP_Disconnect() for handle %d", handle);
+ BNEP_TRACE_API ("BNEP_Disconnect() for handle %d", handle);
L2CA_DisconnectReq (p_bcb->l2cap_cid);
@@ -378,7 +378,7 @@ tBNEP_RESULT BNEP_WriteBuf (UINT16 handle,
/* Check MTU size */
if (p_buf->len > BNEP_MTU_SIZE)
{
- BNEP_TRACE_ERROR2 ("BNEP_Write() length %d exceeded MTU %d", p_buf->len, BNEP_MTU_SIZE);
+ BNEP_TRACE_ERROR ("BNEP_Write() length %d exceeded MTU %d", p_buf->len, BNEP_MTU_SIZE);
GKI_freebuf (p_buf);
return (BNEP_MTU_EXCEDED);
}
@@ -485,7 +485,7 @@ tBNEP_RESULT BNEP_Write (UINT16 handle,
/* Check MTU size. Consider the possibility of having extension headers */
if (len > BNEP_MTU_SIZE)
{
- BNEP_TRACE_ERROR2 ("BNEP_Write() length %d exceeded MTU %d", len, BNEP_MTU_SIZE);
+ BNEP_TRACE_ERROR ("BNEP_Write() length %d exceeded MTU %d", len, BNEP_MTU_SIZE);
return (BNEP_MTU_EXCEDED);
}
@@ -544,7 +544,7 @@ tBNEP_RESULT BNEP_Write (UINT16 handle,
/* Get a buffer to copy teh data into */
if ((p_buf = (BT_HDR *)GKI_getpoolbuf (BNEP_POOL_ID)) == NULL)
{
- BNEP_TRACE_ERROR0 ("BNEP_Write() not able to get buffer");
+ BNEP_TRACE_ERROR ("BNEP_Write() not able to get buffer");
return (BNEP_NO_RESOURCES);
}
diff --git a/stack/bnep/bnep_main.c b/stack/bnep/bnep_main.c
index 45d3b1493..62fa31635 100644
--- a/stack/bnep/bnep_main.c
+++ b/stack/bnep/bnep_main.c
@@ -99,7 +99,7 @@ tBNEP_RESULT bnep_register_with_l2cap (void)
/* Now, register with L2CAP */
if (!L2CA_Register (BT_PSM_BNEP, &bnep_cb.reg_info))
{
- BNEP_TRACE_ERROR0 ("BNEP - Registration failed");
+ BNEP_TRACE_ERROR ("BNEP - Registration failed");
return BNEP_SECURITY_FAIL;
}
@@ -147,7 +147,7 @@ static void bnep_connect_ind (BD_ADDR bd_addr, UINT16 l2cap_cid, UINT16 psm, UI
/* Start timer waiting for config setup */
btu_start_timer (&p_bcb->conn_tle, BTU_TTYPE_BNEP, BNEP_CONN_TIMEOUT);
- BNEP_TRACE_EVENT1("BNEP - Rcvd L2CAP conn ind, CID: 0x%x", p_bcb->l2cap_cid);
+ BNEP_TRACE_EVENT("BNEP - Rcvd L2CAP conn ind, CID: 0x%x", p_bcb->l2cap_cid);
}
@@ -170,7 +170,7 @@ static void bnep_connect_cfm (UINT16 l2cap_cid, UINT16 result)
/* Find CCB based on CID */
if ((bcb = bnepu_find_bcb_by_cid (l2cap_cid)) == NULL)
{
- BNEP_TRACE_WARNING1 ("BNEP - Rcvd conn cnf for unknown CID 0x%x", l2cap_cid);
+ BNEP_TRACE_WARNING ("BNEP - Rcvd conn cnf for unknown CID 0x%x", l2cap_cid);
return;
}
@@ -186,11 +186,11 @@ static void bnep_connect_cfm (UINT16 l2cap_cid, UINT16 result)
/* Start timer waiting for config results */
btu_start_timer (&bcb->conn_tle, BTU_TTYPE_BNEP, BNEP_CONN_TIMEOUT);
- BNEP_TRACE_EVENT1 ("BNEP - got conn cnf, sent cfg req, CID: 0x%x", bcb->l2cap_cid);
+ BNEP_TRACE_EVENT ("BNEP - got conn cnf, sent cfg req, CID: 0x%x", bcb->l2cap_cid);
}
else
{
- BNEP_TRACE_WARNING2 ("BNEP - Rcvd conn cnf with error: 0x%x CID 0x%x", result, bcb->l2cap_cid);
+ BNEP_TRACE_WARNING ("BNEP - Rcvd conn cnf with error: 0x%x CID 0x%x", result, bcb->l2cap_cid);
/* Tell the upper layer, if he has a callback */
if (bnep_cb.p_conn_state_cb &&
@@ -221,11 +221,11 @@ static void bnep_config_ind (UINT16 l2cap_cid, tL2CAP_CFG_INFO *p_cfg)
/* Find CCB based on CID */
if ((p_bcb = bnepu_find_bcb_by_cid (l2cap_cid)) == NULL)
{
- BNEP_TRACE_WARNING1 ("BNEP - Rcvd L2CAP cfg ind, unknown CID: 0x%x", l2cap_cid);
+ BNEP_TRACE_WARNING ("BNEP - Rcvd L2CAP cfg ind, unknown CID: 0x%x", l2cap_cid);
return;
}
- BNEP_TRACE_EVENT1 ("BNEP - Rcvd cfg ind, CID: 0x%x", l2cap_cid);
+ BNEP_TRACE_EVENT ("BNEP - Rcvd cfg ind, CID: 0x%x", l2cap_cid);
/* Remember the remote MTU size */
if ((!p_cfg->mtu_present) || (p_cfg->mtu < BNEP_MIN_MTU_SIZE))
@@ -253,7 +253,7 @@ static void bnep_config_ind (UINT16 l2cap_cid, tL2CAP_CFG_INFO *p_cfg)
if (result != L2CAP_CFG_OK)
{
- BNEP_TRACE_EVENT2 ("BNEP - Rcvd cfg ind with bad MTU %d, CID: 0x%x", mtu, l2cap_cid);
+ BNEP_TRACE_EVENT ("BNEP - Rcvd cfg ind with bad MTU %d, CID: 0x%x", mtu, l2cap_cid);
return;
}
@@ -291,12 +291,12 @@ static void bnep_config_cfm (UINT16 l2cap_cid, tL2CAP_CFG_INFO *p_cfg)
{
tBNEP_CONN *p_bcb;
- BNEP_TRACE_EVENT2 ("BNEP - Rcvd cfg cfm, CID: 0x%x Result: %d", l2cap_cid, p_cfg->result);
+ BNEP_TRACE_EVENT ("BNEP - Rcvd cfg cfm, CID: 0x%x Result: %d", l2cap_cid, p_cfg->result);
/* Find CCB based on CID */
if ((p_bcb = bnepu_find_bcb_by_cid (l2cap_cid)) == NULL)
{
- BNEP_TRACE_WARNING1 ("BNEP - Rcvd L2CAP cfg ind, unknown CID: 0x%x", l2cap_cid);
+ BNEP_TRACE_WARNING ("BNEP - Rcvd L2CAP cfg ind, unknown CID: 0x%x", l2cap_cid);
return;
}
@@ -356,11 +356,11 @@ static void bnep_disconnect_ind (UINT16 l2cap_cid, BOOLEAN ack_needed)
/* Find CCB based on CID */
if ((p_bcb = bnepu_find_bcb_by_cid (l2cap_cid)) == NULL)
{
- BNEP_TRACE_WARNING1 ("BNEP - Rcvd L2CAP disc, unknown CID: 0x%x", l2cap_cid);
+ BNEP_TRACE_WARNING ("BNEP - Rcvd L2CAP disc, unknown CID: 0x%x", l2cap_cid);
return;
}
- BNEP_TRACE_EVENT1 ("BNEP - Rcvd L2CAP disc, CID: 0x%x", l2cap_cid);
+ BNEP_TRACE_EVENT ("BNEP - Rcvd L2CAP disc, CID: 0x%x", l2cap_cid);
/* Tell the user if he has a callback */
if (p_bcb->con_state == BNEP_STATE_CONNECTED)
@@ -391,7 +391,7 @@ static void bnep_disconnect_ind (UINT16 l2cap_cid, BOOLEAN ack_needed)
*******************************************************************************/
static void bnep_disconnect_cfm (UINT16 l2cap_cid, UINT16 result)
{
- BNEP_TRACE_EVENT2 ("BNEP - Rcvd L2CAP disc cfm, CID: 0x%x, Result 0x%x", l2cap_cid, result);
+ BNEP_TRACE_EVENT ("BNEP - Rcvd L2CAP disc cfm, CID: 0x%x, Result 0x%x", l2cap_cid, result);
}
@@ -411,7 +411,7 @@ static void bnep_congestion_ind (UINT16 l2cap_cid, BOOLEAN is_congested)
/* Find BCB based on CID */
if ((p_bcb = bnepu_find_bcb_by_cid (l2cap_cid)) == NULL)
{
- BNEP_TRACE_WARNING1 ("BNEP - Rcvd L2CAP cong, unknown CID: 0x%x", l2cap_cid);
+ BNEP_TRACE_WARNING ("BNEP - Rcvd L2CAP cong, unknown CID: 0x%x", l2cap_cid);
return;
}
@@ -476,7 +476,7 @@ static void bnep_data_ind (UINT16 l2cap_cid, BT_HDR *p_buf)
/* Find CCB based on CID */
if ((p_bcb = bnepu_find_bcb_by_cid (l2cap_cid)) == NULL)
{
- BNEP_TRACE_WARNING1 ("BNEP - Rcvd L2CAP data, unknown CID: 0x%x", l2cap_cid);
+ BNEP_TRACE_WARNING ("BNEP - Rcvd L2CAP data, unknown CID: 0x%x", l2cap_cid);
GKI_freebuf (p_buf);
return;
}
@@ -487,7 +487,7 @@ static void bnep_data_ind (UINT16 l2cap_cid, BT_HDR *p_buf)
type &= 0x7f;
if ((rem_len <= bnep_frame_hdr_sizes[type]) || (rem_len > BNEP_MTU_SIZE))
{
- BNEP_TRACE_EVENT2 ("BNEP - rcvd frame, bad len: %d type: 0x%02x", p_buf->len, type);
+ BNEP_TRACE_EVENT ("BNEP - rcvd frame, bad len: %d type: 0x%02x", p_buf->len, type);
GKI_freebuf (p_buf);
return;
}
@@ -498,7 +498,7 @@ static void bnep_data_ind (UINT16 l2cap_cid, BT_HDR *p_buf)
(!(p_bcb->con_flags & BNEP_FLAGS_CONN_COMPLETED)) &&
(type != BNEP_FRAME_CONTROL))
{
- BNEP_TRACE_WARNING2 ("BNEP - Ignored L2CAP data while in state: %d, CID: 0x%x",
+ BNEP_TRACE_WARNING ("BNEP - Ignored L2CAP data while in state: %d, CID: 0x%x",
p_bcb->con_state, l2cap_cid);
if (extension_present)
@@ -537,12 +537,12 @@ static void bnep_data_ind (UINT16 l2cap_cid, BT_HDR *p_buf)
if (type > BNEP_FRAME_COMPRESSED_ETHERNET_DEST_ONLY)
{
- BNEP_TRACE_EVENT1 ("BNEP - rcvd frame, unknown type: 0x%02x", type);
+ BNEP_TRACE_EVENT ("BNEP - rcvd frame, unknown type: 0x%02x", type);
GKI_freebuf (p_buf);
return;
}
- BNEP_TRACE_DEBUG3 ("BNEP - rcv frame, type: %d len: %d Ext: %d", type, p_buf->len, extension_present);
+ BNEP_TRACE_DEBUG ("BNEP - rcv frame, type: %d len: %d Ext: %d", type, p_buf->len, extension_present);
/* Initialize addresses to 'not supplied' */
p_src_addr = p_dst_addr = NULL;
@@ -622,7 +622,7 @@ static void bnep_data_ind (UINT16 l2cap_cid, BT_HDR *p_buf)
/* if unknown extension present stop processing */
if (ext_type)
{
- BNEP_TRACE_EVENT1 ("Data extension type 0x%x found", ext_type);
+ BNEP_TRACE_EVENT ("Data extension type 0x%x found", ext_type);
break;
}
@@ -689,12 +689,12 @@ void bnep_process_timeout (TIMER_LIST_ENT *p_tle)
p_bcb = (tBNEP_CONN *)p_tle->param;
- BNEP_TRACE_EVENT4 ("BNEP - CCB timeout in state: %d CID: 0x%x flags %x, re_transmit %d",
+ BNEP_TRACE_EVENT ("BNEP - CCB timeout in state: %d CID: 0x%x flags %x, re_transmit %d",
p_bcb->con_state, p_bcb->l2cap_cid, p_bcb->con_flags, p_bcb->re_transmits);
if (p_bcb->con_state == BNEP_STATE_CONN_SETUP)
{
- BNEP_TRACE_EVENT2 ("BNEP - CCB timeout in state: %d CID: 0x%x",
+ BNEP_TRACE_EVENT ("BNEP - CCB timeout in state: %d CID: 0x%x",
p_bcb->con_state, p_bcb->l2cap_cid);
if (!(p_bcb->con_flags & BNEP_FLAGS_IS_ORIG))
@@ -723,7 +723,7 @@ void bnep_process_timeout (TIMER_LIST_ENT *p_tle)
}
else if (p_bcb->con_state != BNEP_STATE_CONNECTED)
{
- BNEP_TRACE_EVENT2 ("BNEP - CCB timeout in state: %d CID: 0x%x",
+ BNEP_TRACE_EVENT ("BNEP - CCB timeout in state: %d CID: 0x%x",
p_bcb->con_state, p_bcb->l2cap_cid);
L2CA_DisconnectReq (p_bcb->l2cap_cid);
diff --git a/stack/bnep/bnep_utils.c b/stack/bnep/bnep_utils.c
index faf808b29..92061d010 100644
--- a/stack/bnep/bnep_utils.c
+++ b/stack/bnep/bnep_utils.c
@@ -173,10 +173,10 @@ void bnep_send_conn_req (tBNEP_CONN *p_bcb)
BT_HDR *p_buf;
UINT8 *p, *p_start;
- BNEP_TRACE_DEBUG1 ("BNEP sending setup req with dst uuid %x", p_bcb->dst_uuid.uu.uuid16);
+ BNEP_TRACE_DEBUG ("BNEP sending setup req with dst uuid %x", p_bcb->dst_uuid.uu.uuid16);
if ((p_buf = (BT_HDR *)GKI_getpoolbuf (BNEP_POOL_ID)) == NULL)
{
- BNEP_TRACE_ERROR0 ("BNEP - not able to send connection request");
+ BNEP_TRACE_ERROR ("BNEP - not able to send connection request");
return;
}
@@ -231,10 +231,10 @@ void bnep_send_conn_responce (tBNEP_CONN *p_bcb, UINT16 resp_code)
BT_HDR *p_buf;
UINT8 *p;
- BNEP_TRACE_EVENT1 ("BNEP - bnep_send_conn_responce for CID: 0x%x", p_bcb->l2cap_cid);
+ BNEP_TRACE_EVENT ("BNEP - bnep_send_conn_responce for CID: 0x%x", p_bcb->l2cap_cid);
if ((p_buf = (BT_HDR *)GKI_getpoolbuf (BNEP_POOL_ID)) == NULL)
{
- BNEP_TRACE_ERROR0 ("BNEP - not able to send connection response");
+ BNEP_TRACE_ERROR ("BNEP - not able to send connection response");
return;
}
@@ -272,11 +272,11 @@ void bnepu_send_peer_our_filters (tBNEP_CONN *p_bcb)
UINT8 *p;
UINT16 xx;
- BNEP_TRACE_DEBUG0 ("BNEP sending peer our filters");
+ BNEP_TRACE_DEBUG ("BNEP sending peer our filters");
if ((p_buf = (BT_HDR *)GKI_getpoolbuf (BNEP_POOL_ID)) == NULL)
{
- BNEP_TRACE_ERROR0 ("BNEP - no buffer send filters");
+ BNEP_TRACE_ERROR ("BNEP - no buffer send filters");
return;
}
@@ -324,11 +324,11 @@ void bnepu_send_peer_our_multi_filters (tBNEP_CONN *p_bcb)
UINT8 *p;
UINT16 xx;
- BNEP_TRACE_DEBUG0 ("BNEP sending peer our multicast filters");
+ BNEP_TRACE_DEBUG ("BNEP sending peer our multicast filters");
if ((p_buf = (BT_HDR *)GKI_getpoolbuf (BNEP_POOL_ID)) == NULL)
{
- BNEP_TRACE_ERROR0 ("BNEP - no buffer to send multicast filters");
+ BNEP_TRACE_ERROR ("BNEP - no buffer to send multicast filters");
return;
}
@@ -376,10 +376,10 @@ void bnepu_send_peer_filter_rsp (tBNEP_CONN *p_bcb, UINT16 response_code)
BT_HDR *p_buf;
UINT8 *p;
- BNEP_TRACE_DEBUG0 ("BNEP sending filter response");
+ BNEP_TRACE_DEBUG ("BNEP sending filter response");
if ((p_buf = (BT_HDR *)GKI_getpoolbuf (BNEP_POOL_ID)) == NULL)
{
- BNEP_TRACE_ERROR0 ("BNEP - no buffer filter rsp");
+ BNEP_TRACE_ERROR ("BNEP - no buffer filter rsp");
return;
}
@@ -414,10 +414,10 @@ void bnep_send_command_not_understood (tBNEP_CONN *p_bcb, UINT8 cmd_code)
BT_HDR *p_buf;
UINT8 *p;
- BNEP_TRACE_EVENT2 ("BNEP - bnep_send_command_not_understood for CID: 0x%x, cmd 0x%x", p_bcb->l2cap_cid, cmd_code);
+ BNEP_TRACE_EVENT ("BNEP - bnep_send_command_not_understood for CID: 0x%x, cmd 0x%x", p_bcb->l2cap_cid, cmd_code);
if ((p_buf = (BT_HDR *)GKI_getpoolbuf (BNEP_POOL_ID)) == NULL)
{
- BNEP_TRACE_ERROR0 ("BNEP - not able to send connection response");
+ BNEP_TRACE_ERROR ("BNEP - not able to send connection response");
return;
}
@@ -452,12 +452,12 @@ void bnep_send_command_not_understood (tBNEP_CONN *p_bcb, UINT8 cmd_code)
*******************************************************************************/
void bnepu_check_send_packet (tBNEP_CONN *p_bcb, BT_HDR *p_buf)
{
- BNEP_TRACE_EVENT1 ("BNEP - bnepu_check_send_packet for CID: 0x%x", p_bcb->l2cap_cid);
+ BNEP_TRACE_EVENT ("BNEP - bnepu_check_send_packet for CID: 0x%x", p_bcb->l2cap_cid);
if (p_bcb->con_flags & BNEP_FLAGS_L2CAP_CONGESTED)
{
if (p_bcb->xmit_q.count >= BNEP_MAX_XMITQ_DEPTH)
{
- BNEP_TRACE_EVENT1 ("BNEP - congested, dropping buf, CID: 0x%x", p_bcb->l2cap_cid);
+ BNEP_TRACE_EVENT ("BNEP - congested, dropping buf, CID: 0x%x", p_bcb->l2cap_cid);
GKI_freebuf (p_buf);
}
@@ -584,13 +584,13 @@ static UINT8 *bnepu_init_hdr (BT_HDR *p_buf, UINT16 hdr_len, UINT8 pkt_type)
*******************************************************************************/
void bnep_process_setup_conn_req (tBNEP_CONN *p_bcb, UINT8 *p_setup, UINT8 len)
{
- BNEP_TRACE_EVENT1 ("BNEP - bnep_process_setup_conn_req for CID: 0x%x", p_bcb->l2cap_cid);
+ BNEP_TRACE_EVENT ("BNEP - bnep_process_setup_conn_req for CID: 0x%x", p_bcb->l2cap_cid);
if (p_bcb->con_state != BNEP_STATE_CONN_SETUP &&
p_bcb->con_state != BNEP_STATE_SEC_CHECKING &&
p_bcb->con_state != BNEP_STATE_CONNECTED)
{
- BNEP_TRACE_ERROR1 ("BNEP - setup request in bad state %d", p_bcb->con_state);
+ BNEP_TRACE_ERROR ("BNEP - setup request in bad state %d", p_bcb->con_state);
bnep_send_conn_responce (p_bcb, BNEP_SETUP_CONN_NOT_ALLOWED);
return;
}
@@ -598,7 +598,7 @@ void bnep_process_setup_conn_req (tBNEP_CONN *p_bcb, UINT8 *p_setup, UINT8 len)
/* Check if we already initiated security check or if waiting for user responce */
if (p_bcb->con_flags & BNEP_FLAGS_SETUP_RCVD)
{
- BNEP_TRACE_EVENT0 ("BNEP - Duplicate Setup message received while doing security check");
+ BNEP_TRACE_EVENT ("BNEP - Duplicate Setup message received while doing security check");
return;
}
@@ -607,7 +607,7 @@ void bnep_process_setup_conn_req (tBNEP_CONN *p_bcb, UINT8 *p_setup, UINT8 len)
(!(p_bcb->con_flags & BNEP_FLAGS_SETUP_RCVD)) &&
(p_bcb->con_flags & BNEP_FLAGS_IS_ORIG))
{
- BNEP_TRACE_ERROR1 ("BNEP - setup request when we are originator", p_bcb->con_state);
+ BNEP_TRACE_ERROR ("BNEP - setup request when we are originator", p_bcb->con_state);
bnep_send_conn_responce (p_bcb, BNEP_SETUP_CONN_NOT_ALLOWED);
return;
}
@@ -651,7 +651,7 @@ void bnep_process_setup_conn_req (tBNEP_CONN *p_bcb, UINT8 *p_setup, UINT8 len)
#endif
else
{
- BNEP_TRACE_ERROR1 ("BNEP - Bad UID len %d in ConnReq", p_bcb->dst_uuid.len);
+ BNEP_TRACE_ERROR ("BNEP - Bad UID len %d in ConnReq", p_bcb->dst_uuid.len);
bnep_send_conn_responce (p_bcb, BNEP_SETUP_INVALID_UUID_SIZE);
return;
}
@@ -659,7 +659,7 @@ void bnep_process_setup_conn_req (tBNEP_CONN *p_bcb, UINT8 *p_setup, UINT8 len)
p_bcb->con_state = BNEP_STATE_SEC_CHECKING;
p_bcb->con_flags |= BNEP_FLAGS_SETUP_RCVD;
- BNEP_TRACE_EVENT1 ("BNEP initiating security check for incoming call for uuid 0x%x", p_bcb->src_uuid.uu.uuid16);
+ BNEP_TRACE_EVENT ("BNEP initiating security check for incoming call for uuid 0x%x", p_bcb->src_uuid.uu.uuid16);
#if (!defined (BNEP_DO_AUTH_FOR_ROLE_SWITCH) || BNEP_DO_AUTH_FOR_ROLE_SWITCH == FALSE)
if (p_bcb->con_flags & BNEP_FLAGS_CONN_COMPLETED)
bnep_sec_check_complete (p_bcb->rem_bda, p_bcb, BTM_SUCCESS);
@@ -689,19 +689,19 @@ void bnep_process_setup_conn_responce (tBNEP_CONN *p_bcb, UINT8 *p_setup)
tBNEP_RESULT resp;
UINT16 resp_code;
- BNEP_TRACE_DEBUG0 ("BNEP received setup responce");
+ BNEP_TRACE_DEBUG ("BNEP received setup responce");
/* The state should be either SETUP or CONNECTED */
if (p_bcb->con_state != BNEP_STATE_CONN_SETUP)
{
/* Should we disconnect ? */
- BNEP_TRACE_ERROR1 ("BNEP - setup response in bad state %d", p_bcb->con_state);
+ BNEP_TRACE_ERROR ("BNEP - setup response in bad state %d", p_bcb->con_state);
return;
}
/* Check if we are the originator */
if (!(p_bcb->con_flags & BNEP_FLAGS_IS_ORIG))
{
- BNEP_TRACE_ERROR1 ("BNEP - setup response when we are not originator", p_bcb->con_state);
+ BNEP_TRACE_ERROR ("BNEP - setup response when we are not originator", p_bcb->con_state);
return;
}
@@ -732,7 +732,7 @@ void bnep_process_setup_conn_responce (tBNEP_CONN *p_bcb, UINT8 *p_setup)
{
if (p_bcb->con_flags & BNEP_FLAGS_CONN_COMPLETED)
{
- BNEP_TRACE_EVENT1 ("BNEP - role change response is %d", resp_code);
+ BNEP_TRACE_EVENT ("BNEP - role change response is %d", resp_code);
/* Restore the earlier BNEP status */
p_bcb->con_state = BNEP_STATE_CONNECTED;
@@ -752,7 +752,7 @@ void bnep_process_setup_conn_responce (tBNEP_CONN *p_bcb, UINT8 *p_setup)
}
else
{
- BNEP_TRACE_ERROR1 ("BNEP - setup response %d is not OK", resp_code);
+ BNEP_TRACE_ERROR ("BNEP - setup response %d is not OK", resp_code);
L2CA_DisconnectReq (p_bcb->l2cap_cid);
@@ -796,12 +796,12 @@ UINT8 *bnep_process_control_packet (tBNEP_CONN *p_bcb, UINT8 *p, UINT16 *rem_len
control_type = *p++;
*rem_len = *rem_len - 1;
- BNEP_TRACE_EVENT3 ("BNEP processing control packet rem_len %d, is_ext %d, ctrl_type %d", *rem_len, is_ext, control_type);
+ BNEP_TRACE_EVENT ("BNEP processing control packet rem_len %d, is_ext %d, ctrl_type %d", *rem_len, is_ext, control_type);
switch (control_type)
{
case BNEP_CONTROL_COMMAND_NOT_UNDERSTOOD:
- BNEP_TRACE_ERROR1 ("BNEP Received Cmd not understood for ctl pkt type: %d", *p);
+ BNEP_TRACE_ERROR ("BNEP Received Cmd not understood for ctl pkt type: %d", *p);
p++;
*rem_len = *rem_len - 1;
break;
@@ -811,7 +811,7 @@ UINT8 *bnep_process_control_packet (tBNEP_CONN *p_bcb, UINT8 *p, UINT16 *rem_len
if (*rem_len < ((2 * len) + 1))
{
bad_pkt = TRUE;
- BNEP_TRACE_ERROR0 ("BNEP Received Setup message with bad length");
+ BNEP_TRACE_ERROR ("BNEP Received Setup message with bad length");
break;
}
if (!is_ext)
@@ -832,7 +832,7 @@ UINT8 *bnep_process_control_packet (tBNEP_CONN *p_bcb, UINT8 *p, UINT16 *rem_len
if (*rem_len < (len + 2))
{
bad_pkt = TRUE;
- BNEP_TRACE_ERROR0 ("BNEP Received Filter set message with bad length");
+ BNEP_TRACE_ERROR ("BNEP Received Filter set message with bad length");
break;
}
bnepu_process_peer_filter_set (p_bcb, p, len);
@@ -851,7 +851,7 @@ UINT8 *bnep_process_control_packet (tBNEP_CONN *p_bcb, UINT8 *p, UINT16 *rem_len
if (*rem_len < (len + 2))
{
bad_pkt = TRUE;
- BNEP_TRACE_ERROR0 ("BNEP Received Multicast Filter Set message with bad length");
+ BNEP_TRACE_ERROR ("BNEP Received Multicast Filter Set message with bad length");
break;
}
bnepu_process_peer_multicast_filter_set (p_bcb, p, len);
@@ -866,7 +866,7 @@ UINT8 *bnep_process_control_packet (tBNEP_CONN *p_bcb, UINT8 *p, UINT16 *rem_len
break;
default :
- BNEP_TRACE_ERROR1 ("BNEP - bad ctl pkt type: %d", control_type);
+ BNEP_TRACE_ERROR ("BNEP - bad ctl pkt type: %d", control_type);
bnep_send_command_not_understood (p_bcb, control_type);
if (is_ext)
{
@@ -878,7 +878,7 @@ UINT8 *bnep_process_control_packet (tBNEP_CONN *p_bcb, UINT8 *p, UINT16 *rem_len
if (bad_pkt)
{
- BNEP_TRACE_ERROR1 ("BNEP - bad ctl pkt length: %d", *rem_len);
+ BNEP_TRACE_ERROR ("BNEP - bad ctl pkt length: %d", *rem_len);
*rem_len = 0;
return NULL;
}
@@ -909,15 +909,15 @@ void bnepu_process_peer_filter_set (tBNEP_CONN *p_bcb, UINT8 *p_filters, UINT16
if ((p_bcb->con_state != BNEP_STATE_CONNECTED) &&
(!(p_bcb->con_flags & BNEP_FLAGS_CONN_COMPLETED)))
{
- BNEP_TRACE_DEBUG0 ("BNEP received filter set from peer when there is no connection");
+ BNEP_TRACE_DEBUG ("BNEP received filter set from peer when there is no connection");
return;
}
- BNEP_TRACE_DEBUG0 ("BNEP received filter set from peer");
+ BNEP_TRACE_DEBUG ("BNEP received filter set from peer");
/* Check for length not a multiple of 4 */
if (len & 3)
{
- BNEP_TRACE_EVENT1 ("BNEP - bad filter len: %d", len);
+ BNEP_TRACE_EVENT ("BNEP - bad filter len: %d", len);
bnepu_send_peer_filter_rsp (p_bcb, BNEP_FILTER_CRL_BAD_RANGE);
return;
}
@@ -986,19 +986,19 @@ void bnepu_process_peer_filter_rsp (tBNEP_CONN *p_bcb, UINT8 *p_data)
UINT16 resp_code;
tBNEP_RESULT result;
- BNEP_TRACE_DEBUG0 ("BNEP received filter responce");
+ BNEP_TRACE_DEBUG ("BNEP received filter responce");
/* The state should be CONNECTED */
if ((p_bcb->con_state != BNEP_STATE_CONNECTED) &&
(!(p_bcb->con_flags & BNEP_FLAGS_CONN_COMPLETED)))
{
- BNEP_TRACE_ERROR1 ("BNEP - filter response in bad state %d", p_bcb->con_state);
+ BNEP_TRACE_ERROR ("BNEP - filter response in bad state %d", p_bcb->con_state);
return;
}
/* Check if we are the originator */
if (!(p_bcb->con_flags & BNEP_FLAGS_FILTER_RESP_PEND))
{
- BNEP_TRACE_ERROR0 ("BNEP - filter response when not expecting");
+ BNEP_TRACE_ERROR ("BNEP - filter response when not expecting");
return;
}
@@ -1038,19 +1038,19 @@ void bnepu_process_multicast_filter_rsp (tBNEP_CONN *p_bcb, UINT8 *p_data)
UINT16 resp_code;
tBNEP_RESULT result;
- BNEP_TRACE_DEBUG0 ("BNEP received multicast filter responce");
+ BNEP_TRACE_DEBUG ("BNEP received multicast filter responce");
/* The state should be CONNECTED */
if ((p_bcb->con_state != BNEP_STATE_CONNECTED) &&
(!(p_bcb->con_flags & BNEP_FLAGS_CONN_COMPLETED)))
{
- BNEP_TRACE_ERROR1 ("BNEP - multicast filter response in bad state %d", p_bcb->con_state);
+ BNEP_TRACE_ERROR ("BNEP - multicast filter response in bad state %d", p_bcb->con_state);
return;
}
/* Check if we are the originator */
if (!(p_bcb->con_flags & BNEP_FLAGS_MULTI_RESP_PEND))
{
- BNEP_TRACE_ERROR0 ("BNEP - multicast filter response when not expecting");
+ BNEP_TRACE_ERROR ("BNEP - multicast filter response when not expecting");
return;
}
@@ -1095,20 +1095,20 @@ void bnepu_process_peer_multicast_filter_set (tBNEP_CONN *p_bcb, UINT8 *p_filter
if ((p_bcb->con_state != BNEP_STATE_CONNECTED) &&
(!(p_bcb->con_flags & BNEP_FLAGS_CONN_COMPLETED)))
{
- BNEP_TRACE_DEBUG0 ("BNEP received multicast filter set from peer when there is no connection");
+ BNEP_TRACE_DEBUG ("BNEP received multicast filter set from peer when there is no connection");
return;
}
if (len % 12)
{
- BNEP_TRACE_EVENT1 ("BNEP - bad filter len: %d", len);
+ BNEP_TRACE_EVENT ("BNEP - bad filter len: %d", len);
bnepu_send_peer_multicast_filter_rsp (p_bcb, BNEP_FILTER_CRL_BAD_RANGE);
return;
}
if (len > (BNEP_MAX_MULTI_FILTERS * 2 * BD_ADDR_LEN))
{
- BNEP_TRACE_EVENT0 ("BNEP - Too many filters");
+ BNEP_TRACE_EVENT ("BNEP - Too many filters");
bnepu_send_peer_multicast_filter_rsp (p_bcb, BNEP_FILTER_CRL_MAX_REACHED);
return;
}
@@ -1149,7 +1149,7 @@ void bnepu_process_peer_multicast_filter_set (tBNEP_CONN *p_bcb, UINT8 *p_filter
}
}
- BNEP_TRACE_EVENT1 ("BNEP multicast filters %d", p_bcb->rcvd_mcast_filters);
+ BNEP_TRACE_EVENT ("BNEP multicast filters %d", p_bcb->rcvd_mcast_filters);
bnepu_send_peer_multicast_filter_rsp (p_bcb, resp_code);
if (bnep_cb.p_mfilter_ind_cb)
@@ -1174,10 +1174,10 @@ void bnepu_send_peer_multicast_filter_rsp (tBNEP_CONN *p_bcb, UINT16 response_co
BT_HDR *p_buf;
UINT8 *p;
- BNEP_TRACE_DEBUG1 ("BNEP sending multicast filter response %d", response_code);
+ BNEP_TRACE_DEBUG ("BNEP sending multicast filter response %d", response_code);
if ((p_buf = (BT_HDR *)GKI_getpoolbuf (BNEP_POOL_ID)) == NULL)
{
- BNEP_TRACE_ERROR0 ("BNEP - no buffer filter rsp");
+ BNEP_TRACE_ERROR ("BNEP - no buffer filter rsp");
return;
}
@@ -1218,7 +1218,7 @@ void bnep_sec_check_complete (BD_ADDR bd_addr, tBT_TRANSPORT trasnport,
UNUSED(bd_addr);
UNUSED(trasnport);
- BNEP_TRACE_EVENT1 ("BNEP security callback returned result %d", result);
+ BNEP_TRACE_EVENT ("BNEP security callback returned result %d", result);
if (p_bcb->con_flags & BNEP_FLAGS_CONN_COMPLETED)
is_role_change = TRUE;
else
@@ -1227,7 +1227,7 @@ void bnep_sec_check_complete (BD_ADDR bd_addr, tBT_TRANSPORT trasnport,
/* check if the port is still waiting for security to complete */
if (p_bcb->con_state != BNEP_STATE_SEC_CHECKING)
{
- BNEP_TRACE_ERROR1 ("BNEP Connection in wrong state %d when security is completed", p_bcb->con_state);
+ BNEP_TRACE_ERROR ("BNEP Connection in wrong state %d when security is completed", p_bcb->con_state);
return;
}
@@ -1353,7 +1353,7 @@ tBNEP_RESULT bnep_is_packet_allowed (tBNEP_CONN *p_bcb,
if (i == p_bcb->rcvd_num_filters)
{
- BNEP_TRACE_DEBUG1 ("Ignoring protocol 0x%x in BNEP data write", proto);
+ BNEP_TRACE_DEBUG ("Ignoring protocol 0x%x in BNEP data write", proto);
return BNEP_IGNORE_CMD;
}
}
@@ -1384,7 +1384,7 @@ tBNEP_RESULT bnep_is_packet_allowed (tBNEP_CONN *p_bcb,
*/
if ((p_bcb->rcvd_mcast_filters == 0xFFFF) || (i == p_bcb->rcvd_mcast_filters))
{
- BNEP_TRACE_DEBUG6 ("Ignoring multicast address %x.%x.%x.%x.%x.%x in BNEP data write",
+ BNEP_TRACE_DEBUG ("Ignoring multicast address %x.%x.%x.%x.%x.%x in BNEP data write",
p_dest_addr[0], p_dest_addr[1], p_dest_addr[2],
p_dest_addr[3], p_dest_addr[4], p_dest_addr[5]);
return BNEP_IGNORE_CMD;
@@ -1444,10 +1444,10 @@ void bnep_dump_status (void)
char buff[200];
tBNEP_CONN *p_bcb;
- BNEP_TRACE_DEBUG6 ("BNEP my BD Addr %x.%x.%x.%x.%x.%x",
+ BNEP_TRACE_DEBUG ("BNEP my BD Addr %x.%x.%x.%x.%x.%x",
bnep_cb.my_bda[0], bnep_cb.my_bda[1], bnep_cb.my_bda[2],
bnep_cb.my_bda[3], bnep_cb.my_bda[4], bnep_cb.my_bda[5]);
- BNEP_TRACE_DEBUG3 ("profile registered %d, trace %d, got_my_bd_addr %d",
+ BNEP_TRACE_DEBUG ("profile registered %d, trace %d, got_my_bd_addr %d",
bnep_cb.profile_registered, bnep_cb.trace_level, bnep_cb.got_my_bd_addr);
for (i = 0, p_bcb = bnep_cb.bcb; i < BNEP_MAX_CONNECTIONS; i++, p_bcb++)
@@ -1459,7 +1459,7 @@ void bnep_dump_status (void)
p_bcb->rem_bda[0], p_bcb->rem_bda[1], p_bcb->rem_bda[2],
p_bcb->rem_bda[3], p_bcb->rem_bda[4], p_bcb->rem_bda[5]);
- BNEP_TRACE_DEBUG0 (buff);
+ BNEP_TRACE_DEBUG (buff);
}
#endif
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-18 10:52:45 +0000