summaryrefslogtreecommitdiffstats
path: root/stack/smp
diff options
context:
space:
mode:
Diffstat (limited to 'stack/smp')
-rw-r--r--stack/smp/smp_act.c130
-rw-r--r--stack/smp/smp_api.c24
-rw-r--r--stack/smp/smp_cmac.c36
-rw-r--r--stack/smp/smp_keys.c90
-rw-r--r--stack/smp/smp_l2c.c14
-rw-r--r--stack/smp/smp_main.c14
-rw-r--r--stack/smp/smp_utils.c58
7 files changed, 183 insertions, 183 deletions
diff --git a/stack/smp/smp_act.c b/stack/smp/smp_act.c
index 7543eb7c6..1f1eb6e61 100644
--- a/stack/smp/smp_act.c
+++ b/stack/smp/smp_act.c
@@ -58,8 +58,8 @@ const tSMP_ACT smp_distribute_act [] =
*******************************************************************************/
static void smp_update_key_mask (tSMP_CB *p_cb, UINT8 key_type, BOOLEAN recv)
{
- SMP_TRACE_DEBUG0 ("smp_update_key_mask ");
- SMP_TRACE_DEBUG4("before update role=%d recv=%d loc_i_key = %02x, loc_r_key = %02x", p_cb->role, recv, p_cb->loc_i_key, p_cb->loc_r_key);
+ SMP_TRACE_DEBUG ("smp_update_key_mask ");
+ SMP_TRACE_DEBUG("before update role=%d recv=%d loc_i_key = %02x, loc_r_key = %02x", p_cb->role, recv, p_cb->loc_i_key, p_cb->loc_r_key);
if (p_cb->role == HCI_ROLE_SLAVE)
{
if (recv)
@@ -75,7 +75,7 @@ static void smp_update_key_mask (tSMP_CB *p_cb, UINT8 key_type, BOOLEAN recv)
p_cb->loc_i_key &= ~key_type;
}
- SMP_TRACE_DEBUG2("updated loc_i_key = %02x, loc_r_key = %02x", p_cb->loc_i_key, p_cb->loc_r_key);
+ SMP_TRACE_DEBUG("updated loc_i_key = %02x, loc_r_key = %02x", p_cb->loc_i_key, p_cb->loc_r_key);
}
/*******************************************************************************
** Function smp_io_cap_req
@@ -87,7 +87,7 @@ void smp_send_app_cback(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
tSMP_STATUS callback_rc;
UNUSED(p_data);
- SMP_TRACE_DEBUG1 ("smp_send_app_cback p_cb->cb_evt=%d", p_cb->cb_evt );
+ SMP_TRACE_DEBUG ("smp_send_app_cback p_cb->cb_evt=%d", p_cb->cb_evt );
if (p_cb->p_callback && p_cb->cb_evt != 0)
{
if (p_cb->cb_evt == SMP_IO_CAP_REQ_EVT)
@@ -99,11 +99,11 @@ void smp_send_app_cback(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
cb_data.io_req.init_keys = p_cb->loc_i_key ;
cb_data.io_req.resp_keys = p_cb->loc_r_key ;
- SMP_TRACE_WARNING1( "io_cap = %d",cb_data.io_req.io_cap);
+ SMP_TRACE_WARNING( "io_cap = %d",cb_data.io_req.io_cap);
}
callback_rc = (*p_cb->p_callback)(p_cb->cb_evt, p_cb->pairing_bda, &cb_data);
- SMP_TRACE_DEBUG2 ("callback_rc=%d p_cb->cb_evt=%d",callback_rc, p_cb->cb_evt );
+ SMP_TRACE_DEBUG ("callback_rc=%d p_cb->cb_evt=%d",callback_rc, p_cb->cb_evt );
if (callback_rc == SMP_SUCCESS && p_cb->cb_evt == SMP_IO_CAP_REQ_EVT)
{
@@ -121,7 +121,7 @@ void smp_send_app_cback(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
p_cb->loc_i_key = cb_data.io_req.init_keys;
p_cb->loc_r_key = cb_data.io_req.resp_keys;
- SMP_TRACE_WARNING2( "new io_cap = %d p_cb->loc_enc_size = %d",p_cb->loc_io_caps, p_cb->loc_enc_size);
+ SMP_TRACE_WARNING( "new io_cap = %d p_cb->loc_enc_size = %d",p_cb->loc_io_caps, p_cb->loc_enc_size);
smp_sm_event(p_cb, SMP_IO_RSP_EVT, NULL);
}
@@ -132,7 +132,7 @@ void smp_send_app_cback(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
p_cb->discard_sec_req = FALSE;
smp_sm_event(p_cb, SMP_DISCARD_SEC_REQ_EVT, NULL);
}
- SMP_TRACE_DEBUG0 ("smp_send_app_cback return");
+ SMP_TRACE_DEBUG ("smp_send_app_cback return");
}
/*******************************************************************************
** Function smp_send_pair_fail
@@ -143,7 +143,7 @@ void smp_send_pair_fail(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
p_cb->status = *(UINT8 *)p_data;
p_cb->failure = *(UINT8 *)p_data;
- SMP_TRACE_DEBUG2 ("smp_send_pair_fail status=%d failure=%d ",p_cb->status, p_cb->failure);
+ SMP_TRACE_DEBUG ("smp_send_pair_fail status=%d failure=%d ",p_cb->status, p_cb->failure);
if (p_cb->status <= SMP_REPEATED_ATTEMPTS && p_cb->status != SMP_SUCCESS)
{
@@ -160,7 +160,7 @@ void smp_send_pair_req(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
tBTM_SEC_DEV_REC *p_dev_rec = btm_find_dev (p_cb->pairing_bda);
UNUSED(p_data);
- SMP_TRACE_DEBUG0 ("smp_send_pair_req ");
+ SMP_TRACE_DEBUG ("smp_send_pair_req ");
#if BLE_INCLUDED == TRUE
/* Disable L2CAP connection parameter updates while bonding since
@@ -169,7 +169,7 @@ void smp_send_pair_req(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
get enabled again once service discovery completes. */
if (L2CA_EnableUpdateBleConnParams(p_cb->pairing_bda, FALSE) == FALSE)
{
- SMP_TRACE_ERROR0 ("smp pair failed...!");
+ SMP_TRACE_ERROR ("smp pair failed...!");
return;
}
#endif
@@ -189,7 +189,7 @@ void smp_send_pair_rsp(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
{
UNUSED(p_data);
- SMP_TRACE_DEBUG0 ("smp_send_pair_rsp ");
+ SMP_TRACE_DEBUG ("smp_send_pair_rsp ");
p_cb->loc_i_key &= p_cb->peer_i_key;
p_cb->loc_r_key &= p_cb->peer_r_key;
@@ -208,7 +208,7 @@ void smp_send_confirm(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
{
UNUSED(p_data);
- SMP_TRACE_DEBUG0 ("smp_send_confirm ");
+ SMP_TRACE_DEBUG ("smp_send_confirm ");
smp_send_cmd(SMP_OPCODE_CONFIRM, p_cb);
}
/*******************************************************************************
@@ -219,12 +219,12 @@ void smp_send_init(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
{
UNUSED(p_data);
- SMP_TRACE_DEBUG0 ("smp_send_init ");
+ SMP_TRACE_DEBUG ("smp_send_init ");
#if SMP_CONFORMANCE_TESTING == TRUE
if (p_cb->enable_test_rand_val)
{
- SMP_TRACE_DEBUG0 ("Use rand value from script");
+ SMP_TRACE_DEBUG ("Use rand value from script");
memcpy(p_cb->rand, p_cb->test_rand, BT_OCTET16_LEN);
}
#endif
@@ -240,7 +240,7 @@ void smp_send_enc_info(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
tBTM_LE_LENC_KEYS le_key;
UNUSED(p_data);
- SMP_TRACE_DEBUG1 ("smp_send_enc_info p_cb->loc_enc_size = %d", p_cb->loc_enc_size);
+ SMP_TRACE_DEBUG ("smp_send_enc_info p_cb->loc_enc_size = %d", p_cb->loc_enc_size);
smp_update_key_mask (p_cb, SMP_SEC_KEY_TYPE_ENC, FALSE);
smp_send_cmd(SMP_OPCODE_ENCRYPT_INFO, p_cb);
@@ -252,7 +252,7 @@ void smp_send_enc_info(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
le_key.sec_level = p_cb->sec_level;
btm_sec_save_le_key(p_cb->pairing_bda, BTM_LE_KEY_LENC, (tBTM_LE_KEY_VALUE *)&le_key, TRUE);
- SMP_TRACE_WARNING0( "smp_send_enc_info");
+ SMP_TRACE_WARNING( "smp_send_enc_info");
smp_key_distribution(p_cb, NULL);
}
@@ -264,13 +264,13 @@ void smp_send_id_info(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
{
UNUSED(p_data);
- SMP_TRACE_DEBUG0 ("smp_send_id_info ");
+ SMP_TRACE_DEBUG ("smp_send_id_info ");
smp_update_key_mask (p_cb, SMP_SEC_KEY_TYPE_ID, FALSE);
smp_send_cmd(SMP_OPCODE_IDENTITY_INFO, p_cb);
smp_send_cmd(SMP_OPCODE_ID_ADDR, p_cb);
- SMP_TRACE_WARNING0( "smp_send_id_info");
+ SMP_TRACE_WARNING( "smp_send_id_info");
smp_key_distribution(p_cb, NULL);
}
@@ -283,7 +283,7 @@ void smp_send_csrk_info(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
tBTM_LE_KEY_VALUE key;
UNUSED(p_data);
- SMP_TRACE_DEBUG0 ("smp_send_csrk_info ");
+ SMP_TRACE_DEBUG ("smp_send_csrk_info ");
smp_update_key_mask (p_cb, SMP_SEC_KEY_TYPE_CSRK, FALSE);
if (smp_send_cmd(SMP_OPCODE_SIGN_INFO, p_cb))
@@ -303,7 +303,7 @@ void smp_send_csrk_info(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
*******************************************************************************/
void smp_send_ltk_reply(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
{
- SMP_TRACE_DEBUG0 ("smp_send_ltk_reply ");
+ SMP_TRACE_DEBUG ("smp_send_ltk_reply ");
/* send stk as LTK response */
btm_ble_ltk_request_reply(p_cb->pairing_bda, TRUE, p_data->key.p_data);
}
@@ -317,24 +317,24 @@ void smp_proc_sec_req(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
tBTM_BLE_SEC_REQ_ACT sec_req_act;
- SMP_TRACE_DEBUG1 ("smp_proc_sec_req auth_req=0x%x",auth_req);
+ SMP_TRACE_DEBUG ("smp_proc_sec_req auth_req=0x%x",auth_req);
p_cb->cb_evt = 0;
btm_ble_link_sec_check(p_cb->pairing_bda, auth_req, &sec_req_act);
- SMP_TRACE_DEBUG1 ("smp_proc_sec_req sec_req_act=0x%x",sec_req_act);
+ SMP_TRACE_DEBUG ("smp_proc_sec_req sec_req_act=0x%x",sec_req_act);
switch (sec_req_act)
{
case BTM_BLE_SEC_REQ_ACT_ENCRYPT:
- SMP_TRACE_DEBUG0 ("smp_proc_sec_req BTM_BLE_SEC_REQ_ACT_ENCRYPT");
+ SMP_TRACE_DEBUG ("smp_proc_sec_req BTM_BLE_SEC_REQ_ACT_ENCRYPT");
smp_sm_event(p_cb, SMP_ENC_REQ_EVT, NULL);
break;
case BTM_BLE_SEC_REQ_ACT_PAIR:
/* initialize local i/r key to be default keys */
- SMP_TRACE_DEBUG0 ("smp_proc_sec_req BTM_BLE_SEC_REQ_ACT_PAIR");
+ SMP_TRACE_DEBUG ("smp_proc_sec_req BTM_BLE_SEC_REQ_ACT_PAIR");
p_cb->peer_auth_req = auth_req;
p_cb->loc_r_key = p_cb->loc_i_key = SMP_SEC_DEFAULT_KEY ;
p_cb->cb_evt = SMP_SEC_REQUEST_EVT;
@@ -356,7 +356,7 @@ void smp_proc_sec_req(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
void smp_proc_sec_grant(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
{
UINT8 res= *(UINT8 *)p_data;
- SMP_TRACE_DEBUG0 ("smp_proc_sec_grant ");
+ SMP_TRACE_DEBUG ("smp_proc_sec_grant ");
if (res != SMP_SUCCESS)
{
smp_sm_event(p_cb, SMP_AUTH_CMPL_EVT, p_data);
@@ -373,7 +373,7 @@ void smp_proc_sec_grant(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
*******************************************************************************/
void smp_proc_pair_fail(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
{
- SMP_TRACE_DEBUG0 ("smp_proc_pair_fail ");
+ SMP_TRACE_DEBUG ("smp_proc_pair_fail ");
p_cb->status = *(UINT8 *)p_data;
}
/*******************************************************************************
@@ -386,7 +386,7 @@ void smp_proc_pair_cmd(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
UINT8 reason = SMP_ENC_KEY_SIZE;
tBTM_SEC_DEV_REC *p_dev_rec = btm_find_dev (p_cb->pairing_bda);
- SMP_TRACE_DEBUG0 ("smp_proc_pair_cmd ");
+ SMP_TRACE_DEBUG ("smp_proc_pair_cmd ");
/* erase all keys if it is slave proc pairing req*/
if (p_dev_rec && (p_cb->role == HCI_ROLE_SLAVE))
btm_sec_clear_ble_keys(p_dev_rec);
@@ -403,7 +403,7 @@ void smp_proc_pair_cmd(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
#if SMP_CONFORMANCE_TESTING == TRUE
if (p_cb->enable_test_pair_fail)
{
- SMP_TRACE_DEBUG0 ("Forced pair fair");
+ SMP_TRACE_DEBUG ("Forced pair fair");
if (p_cb->peer_enc_size < SMP_MIN_ENC_KEY_SIZE)
{
smp_sm_event(p_cb, SMP_AUTH_CMPL_EVT, &reason);
@@ -445,7 +445,7 @@ void smp_proc_confirm(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
{
UINT8 *p = (UINT8 *)p_data;
- SMP_TRACE_DEBUG0 ("smp_proc_confirm ");
+ SMP_TRACE_DEBUG ("smp_proc_confirm ");
if (p != NULL)
{
/* save the SConfirm for comparison later */
@@ -462,7 +462,7 @@ void smp_proc_confirm(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
void smp_proc_init(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
{
UINT8 *p = (UINT8 *)p_data;
- SMP_TRACE_DEBUG0 ("smp_proc_init ");
+ SMP_TRACE_DEBUG ("smp_proc_init ");
/* save the SRand for comparison */
STREAM_TO_ARRAY(p_cb->rrand, p, BT_OCTET16_LEN);
@@ -475,7 +475,7 @@ void smp_proc_enc_info(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
{
UINT8 *p = (UINT8 *)p_data;
- SMP_TRACE_DEBUG0 ("smp_proc_enc_info ");
+ SMP_TRACE_DEBUG ("smp_proc_enc_info ");
STREAM_TO_ARRAY(p_cb->ltk, p, BT_OCTET16_LEN);
smp_key_distribution(p_cb, NULL);
@@ -489,7 +489,7 @@ void smp_proc_master_id(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
UINT8 *p = (UINT8 *)p_data;
tBTM_LE_PENC_KEYS le_key;
- SMP_TRACE_DEBUG0 (" smp_proc_master_id");
+ SMP_TRACE_DEBUG (" smp_proc_master_id");
smp_update_key_mask (p_cb, SMP_SEC_KEY_TYPE_ENC, TRUE);
STREAM_TO_UINT16(le_key.ediv, p);
@@ -511,7 +511,7 @@ void smp_proc_id_info(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
{
UINT8 *p = (UINT8 *)p_data;
- SMP_TRACE_DEBUG0 ("smp_proc_id_info ");
+ SMP_TRACE_DEBUG ("smp_proc_id_info ");
STREAM_TO_ARRAY (p_cb->tk, p, BT_OCTET16_LEN); /* reuse TK for IRK */
smp_key_distribution(p_cb, NULL);
@@ -525,7 +525,7 @@ void smp_proc_id_addr(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
UINT8 *p = (UINT8 *)p_data;
tBTM_LE_PID_KEYS pid_key;
- SMP_TRACE_DEBUG0 ("smp_proc_id_addr ");
+ SMP_TRACE_DEBUG ("smp_proc_id_addr ");
smp_update_key_mask (p_cb, SMP_SEC_KEY_TYPE_ID, TRUE);
STREAM_TO_UINT8(pid_key.addr_type, p);
@@ -545,7 +545,7 @@ void smp_proc_srk_info(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
{
tBTM_LE_PCSRK_KEYS le_key;
- SMP_TRACE_DEBUG0 ("smp_proc_srk_info ");
+ SMP_TRACE_DEBUG ("smp_proc_srk_info ");
smp_update_key_mask (p_cb, SMP_SEC_KEY_TYPE_CSRK, TRUE);
/* save CSRK to security record */
@@ -565,7 +565,7 @@ void smp_proc_compare(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
{
UINT8 reason;
- SMP_TRACE_DEBUG0 ("smp_proc_compare ");
+ SMP_TRACE_DEBUG ("smp_proc_compare ");
if (
#if SMP_CONFORMANCE_TESTING == TRUE
p_cb->skip_test_compare_check ||
@@ -602,7 +602,7 @@ void smp_proc_sl_key(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
{
UINT8 key_type = p_data->key.key_type;
- SMP_TRACE_DEBUG0 ("smp_proc_sl_keysmp_proc_sl_key ");
+ SMP_TRACE_DEBUG ("smp_proc_sl_keysmp_proc_sl_key ");
if (key_type == SMP_KEY_TYPE_TK)
{
smp_generate_confirm(p_cb, NULL);
@@ -625,7 +625,7 @@ void smp_start_enc(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
tBTM_STATUS cmd;
UINT8 reason = SMP_ENC_FAIL;
- SMP_TRACE_DEBUG0 ("smp_start_enc ");
+ SMP_TRACE_DEBUG ("smp_start_enc ");
if (p_data != NULL)
cmd = btm_ble_start_encrypt(p_cb->pairing_bda, TRUE, p_data->key.p_data);
else
@@ -644,7 +644,7 @@ void smp_proc_discard(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
{
UNUSED(p_data);
- SMP_TRACE_DEBUG0 ("smp_proc_discard ");
+ SMP_TRACE_DEBUG ("smp_proc_discard ");
smp_reset_control_value(p_cb);
}
/*******************************************************************************
@@ -655,7 +655,7 @@ void smp_proc_release_delay(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
{
UNUSED(p_data);
- SMP_TRACE_DEBUG0 ("smp_proc_release_delay ");
+ SMP_TRACE_DEBUG ("smp_proc_release_delay ");
btu_stop_timer (&p_cb->rsp_timer_ent);
btu_start_timer (&p_cb->rsp_timer_ent, BTU_TTYPE_SMP_PAIRING_CMD,
SMP_WAIT_FOR_REL_DELAY_TOUT);
@@ -669,7 +669,7 @@ void smp_proc_release_delay_tout(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
{
UNUSED(p_data);
- SMP_TRACE_DEBUG0 ("smp_proc_release_delay_tout ");
+ SMP_TRACE_DEBUG ("smp_proc_release_delay_tout ");
btu_stop_timer (&p_cb->rsp_timer_ent);
smp_proc_pairing_cmpl(p_cb);
}
@@ -684,7 +684,7 @@ void smp_enc_cmpl(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
UINT8 enc_enable = *(UINT8 *)p_data;
UINT8 reason = enc_enable ? SMP_SUCCESS : SMP_ENC_FAIL;
- SMP_TRACE_DEBUG0 ("smp_enc_cmpl ");
+ SMP_TRACE_DEBUG ("smp_enc_cmpl ");
smp_sm_event(p_cb, SMP_AUTH_CMPL_EVT, &reason);
}
@@ -698,7 +698,7 @@ void smp_check_auth_req(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
UINT8 enc_enable = *(UINT8 *)p_data;
UINT8 reason = enc_enable ? SMP_SUCCESS : SMP_ENC_FAIL;
- SMP_TRACE_DEBUG3 ("smp_check_auth_req enc_enable=%d i_keys=0x%x r_keys=0x%x (i-initiator r-responder)",
+ SMP_TRACE_DEBUG ("smp_check_auth_req enc_enable=%d i_keys=0x%x r_keys=0x%x (i-initiator r-responder)",
enc_enable, p_cb->loc_i_key, p_cb->loc_r_key);
if (enc_enable == 1)
{
@@ -734,14 +734,14 @@ void smp_key_pick_key(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
UINT8 key_to_dist = (p_cb->role == HCI_ROLE_SLAVE) ? p_cb->loc_r_key : p_cb->loc_i_key;
UINT8 i = 0;
- SMP_TRACE_DEBUG1 ("smp_key_pick_key key_to_dist=0x%x", key_to_dist);
+ SMP_TRACE_DEBUG ("smp_key_pick_key key_to_dist=0x%x", key_to_dist);
while (i < MAX_KEY_DISTRIBUTION_TYPES)
{
- SMP_TRACE_DEBUG2("key to send = %02x, i = %d", key_to_dist, i);
+ SMP_TRACE_DEBUG("key to send = %02x, i = %d", key_to_dist, i);
if (key_to_dist & (1 << i))
{
- SMP_TRACE_DEBUG1 ("smp_distribute_act[%d]", i);
+ SMP_TRACE_DEBUG ("smp_distribute_act[%d]", i);
(* smp_distribute_act[i])(p_cb, p_data);
break;
}
@@ -755,7 +755,7 @@ void smp_key_pick_key(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
void smp_key_distribution(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
{
UINT8 reason = SMP_SUCCESS;
- SMP_TRACE_DEBUG3 ("smp_key_distribution role=%d (0-master) r_keys=0x%x i_keys=0x%x",
+ SMP_TRACE_DEBUG ("smp_key_distribution role=%d (0-master) r_keys=0x%x i_keys=0x%x",
p_cb->role, p_cb->loc_r_key, p_cb->loc_i_key);
if (p_cb->role == HCI_ROLE_SLAVE||
@@ -786,7 +786,7 @@ void smp_decide_asso_model(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
tSMP_INT_DATA *p = NULL;
UNUSED(p_data);
- SMP_TRACE_DEBUG3 ("smp_decide_asso_model p_cb->peer_io_caps = %d p_cb->loc_io_caps = %d \
+ SMP_TRACE_DEBUG ("smp_decide_asso_model p_cb->peer_io_caps = %d p_cb->loc_io_caps = %d \
p_cb->peer_auth_req = %02x",
p_cb->peer_io_caps, p_cb->loc_io_caps, p_cb->peer_auth_req);
@@ -812,13 +812,13 @@ void smp_decide_asso_model(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
}
}
- SMP_TRACE_DEBUG1("Association Model = %d", model);
+ SMP_TRACE_DEBUG("Association Model = %d", model);
if (model == SMP_MODEL_OOB)
{
- SMP_TRACE_ERROR0("Association Model = SMP_MODEL_OOB");
+ SMP_TRACE_ERROR("Association Model = SMP_MODEL_OOB");
p_cb->sec_level = SMP_SEC_AUTHENTICATED;
- SMP_TRACE_EVENT1 ("p_cb->sec_level =%d (SMP_SEC_AUTHENTICATED) ", p_cb->sec_level );
+ SMP_TRACE_EVENT ("p_cb->sec_level =%d (SMP_SEC_AUTHENTICATED) ", p_cb->sec_level );
p_cb->cb_evt = SMP_OOB_REQ_EVT;
int_evt = SMP_TK_REQ_EVT;
@@ -826,7 +826,7 @@ void smp_decide_asso_model(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
else if (model == SMP_MODEL_PASSKEY)
{
p_cb->sec_level = SMP_SEC_AUTHENTICATED;
- SMP_TRACE_EVENT1 ("p_cb->sec_level =%d (SMP_SEC_AUTHENTICATED) ", p_cb->sec_level );
+ SMP_TRACE_EVENT ("p_cb->sec_level =%d (SMP_SEC_AUTHENTICATED) ", p_cb->sec_level );
p_cb->cb_evt = SMP_PASSKEY_REQ_EVT;
int_evt = SMP_TK_REQ_EVT;
@@ -835,7 +835,7 @@ void smp_decide_asso_model(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
{
p_cb->sec_level = SMP_SEC_AUTHENTICATED;
- SMP_TRACE_DEBUG0("Need to generate Passkey");
+ SMP_TRACE_DEBUG("Need to generate Passkey");
/* generate passkey and notify application */
smp_generate_passkey(p_cb, NULL);
}
@@ -845,7 +845,7 @@ void smp_decide_asso_model(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
((p_cb->peer_auth_req & SMP_AUTH_YN_BIT) != 0) &&
((p_cb->loc_auth_req & SMP_AUTH_YN_BIT) == 0))
{
- SMP_TRACE_ERROR0("IO capability does not meet authentication requirement");
+ SMP_TRACE_ERROR("IO capability does not meet authentication requirement");
failure = SMP_PAIR_AUTH_FAIL;
p = (tSMP_INT_DATA *)&failure;
int_evt = SMP_AUTH_CMPL_EVT;
@@ -853,7 +853,7 @@ void smp_decide_asso_model(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
else
{
p_cb->sec_level = SMP_SEC_UNAUTHENTICATE;
- SMP_TRACE_EVENT1 ("p_cb->sec_level =%d (SMP_SEC_UNAUTHENTICATE) ", p_cb->sec_level );
+ SMP_TRACE_EVENT ("p_cb->sec_level =%d (SMP_SEC_UNAUTHENTICATE) ", p_cb->sec_level );
key.key_type = SMP_KEY_TYPE_TK;
key.p_data = p_cb->tk;
@@ -866,12 +866,12 @@ void smp_decide_asso_model(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
}
else if (model == SMP_MODEL_MAX)
{
- SMP_TRACE_ERROR0("Association Model = SMP_MODEL_MAX (failed)");
+ SMP_TRACE_ERROR("Association Model = SMP_MODEL_MAX (failed)");
p = (tSMP_INT_DATA *)&failure;
int_evt = SMP_AUTH_CMPL_EVT;
}
- SMP_TRACE_EVENT1 ("sec_level=%d ", p_cb->sec_level );
+ SMP_TRACE_EVENT ("sec_level=%d ", p_cb->sec_level );
if (int_evt)
smp_sm_event(p_cb, int_evt, p);
}
@@ -884,7 +884,7 @@ void smp_proc_io_rsp(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
{
UNUSED(p_data);
- SMP_TRACE_DEBUG0 ("smp_proc_io_rsp ");
+ SMP_TRACE_DEBUG ("smp_proc_io_rsp ");
if (p_cb->flags & SMP_PAIR_FLAGS_WE_STARTED_DD)
{
smp_set_state(SMP_ST_SEC_REQ_PENDING);
@@ -903,7 +903,7 @@ void smp_proc_io_rsp(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
void smp_pairing_cmpl(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
{
- SMP_TRACE_DEBUG0 ("smp_pairing_cmpl ");
+ SMP_TRACE_DEBUG ("smp_pairing_cmpl ");
(void)L2CA_EnableUpdateBleConnParams(p_cb->pairing_bda, TRUE);
if ((p_cb->status == SMP_SUCCESS) ||
@@ -927,7 +927,7 @@ void smp_pair_terminate(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
{
UNUSED(p_data);
- SMP_TRACE_DEBUG0 ("smp_pair_terminate ");
+ SMP_TRACE_DEBUG ("smp_pair_terminate ");
p_cb->status = SMP_CONN_TOUT;
@@ -941,7 +941,7 @@ void smp_pair_terminate(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
*******************************************************************************/
void smp_delay_terminate(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
{
- SMP_TRACE_DEBUG0 ("smp_delay_terminate ");
+ SMP_TRACE_DEBUG ("smp_delay_terminate ");
btu_stop_timer (&p_cb->rsp_timer_ent);
@@ -962,7 +962,7 @@ void smp_idle_terminate(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
UNUSED(p_data);
if (p_cb->flags & SMP_PAIR_FLAGS_WE_STARTED_DD)
{
- SMP_TRACE_DEBUG0("Pairing terminated at IDLE state.");
+ SMP_TRACE_DEBUG("Pairing terminated at IDLE state.");
p_cb->status = SMP_FAIL;
smp_proc_pairing_cmpl(p_cb);
}
@@ -995,7 +995,7 @@ void smp_link_encrypted(BD_ADDR bda, UINT8 encr_enable)
{
tSMP_CB *p_cb = &smp_cb;
- SMP_TRACE_DEBUG1 ("smp_link_encrypted encr_enable=%d",encr_enable);
+ SMP_TRACE_DEBUG ("smp_link_encrypted encr_enable=%d",encr_enable);
if (memcmp(&smp_cb.pairing_bda[0], bda, BD_ADDR_LEN) == 0)
{
@@ -1022,7 +1022,7 @@ void smp_link_encrypted(BD_ADDR bda, UINT8 encr_enable)
*******************************************************************************/
BOOLEAN smp_proc_ltk_request(BD_ADDR bda)
{
- SMP_TRACE_DEBUG1 ("smp_proc_ltk_request state = %d", smp_cb.state);
+ SMP_TRACE_DEBUG ("smp_proc_ltk_request state = %d", smp_cb.state);
if ( smp_cb.state == SMP_ST_ENC_PENDING &&
!memcmp(bda, smp_cb.pairing_bda, BD_ADDR_LEN))
{
diff --git a/stack/smp/smp_api.c b/stack/smp/smp_api.c
index 3149b09f7..85d1054f4 100644
--- a/stack/smp/smp_api.c
+++ b/stack/smp/smp_api.c
@@ -49,7 +49,7 @@
void SMP_Init(void)
{
- SMP_TRACE_EVENT0 ("SMP_Init");
+ SMP_TRACE_EVENT ("SMP_Init");
memset(&smp_cb, 0, sizeof(tSMP_CB));
#if defined(SMP_INITIAL_TRACE_LEVEL)
@@ -102,11 +102,11 @@ SMP_API extern UINT8 SMP_SetTraceLevel (UINT8 new_level)
*******************************************************************************/
BOOLEAN SMP_Register (tSMP_CALLBACK *p_cback)
{
- SMP_TRACE_EVENT1 ("SMP_Register state=%d", smp_cb.state);
+ SMP_TRACE_EVENT ("SMP_Register state=%d", smp_cb.state);
if (smp_cb.p_callback != NULL)
{
- SMP_TRACE_ERROR0 ("SMP_Register: duplicate registration, overwrite it");
+ SMP_TRACE_ERROR ("SMP_Register: duplicate registration, overwrite it");
}
smp_cb.p_callback = p_cback;
@@ -145,7 +145,7 @@ tSMP_STATUS SMP_Pair (BD_ADDR bd_addr)
if (!L2CA_ConnectFixedChnl (L2CAP_SMP_CID, bd_addr))
{
- SMP_TRACE_ERROR0("SMP_Pair: L2C connect fixed channel failed.");
+ SMP_TRACE_ERROR("SMP_Pair: L2C connect fixed channel failed.");
smp_sm_event(p_cb, SMP_AUTH_CMPL_EVT, &status);
return status;
}
@@ -177,7 +177,7 @@ BOOLEAN SMP_PairCancel (BD_ADDR bd_addr)
(!memcmp (p_cb->pairing_bda, bd_addr, BD_ADDR_LEN)) )
{
p_cb->is_pair_cancel = TRUE;
- SMP_TRACE_DEBUG0("Cancel Pairing: set fail reason Unknown");
+ SMP_TRACE_DEBUG("Cancel Pairing: set fail reason Unknown");
smp_sm_event(p_cb, SMP_AUTH_CMPL_EVT, &err_code);
status = TRUE;
}
@@ -199,7 +199,7 @@ BOOLEAN SMP_PairCancel (BD_ADDR bd_addr)
*******************************************************************************/
void SMP_SecurityGrant(BD_ADDR bd_addr, UINT8 res)
{
- SMP_TRACE_EVENT0 ("SMP_SecurityGrant ");
+ SMP_TRACE_EVENT ("SMP_SecurityGrant ");
if (smp_cb.state != SMP_ST_WAIT_APP_RSP ||
smp_cb.cb_evt != SMP_SEC_REQUEST_EVT ||
memcmp (smp_cb.pairing_bda, bd_addr, BD_ADDR_LEN))
@@ -230,32 +230,32 @@ void SMP_PasskeyReply (BD_ADDR bd_addr, UINT8 res, UINT32 passkey)
UINT8 failure = SMP_PASSKEY_ENTRY_FAIL;
tBTM_SEC_DEV_REC *p_dev_rec;
- SMP_TRACE_EVENT2 ("SMP_PasskeyReply: Key: %d Result:%d",
+ SMP_TRACE_EVENT ("SMP_PasskeyReply: Key: %d Result:%d",
passkey, res);
/* If timeout already expired or has been canceled, ignore the reply */
if (p_cb->cb_evt != SMP_PASSKEY_REQ_EVT)
{
- SMP_TRACE_WARNING1 ("SMP_PasskeyReply() - Wrong State: %d", p_cb->state);
+ SMP_TRACE_WARNING ("SMP_PasskeyReply() - Wrong State: %d", p_cb->state);
return;
}
if (memcmp (bd_addr, p_cb->pairing_bda, BD_ADDR_LEN) != 0)
{
- SMP_TRACE_ERROR0 ("SMP_PasskeyReply() - Wrong BD Addr");
+ SMP_TRACE_ERROR ("SMP_PasskeyReply() - Wrong BD Addr");
return;
}
if ((p_dev_rec = btm_find_dev (bd_addr)) == NULL)
{
- SMP_TRACE_ERROR0 ("SMP_PasskeyReply() - no dev CB");
+ SMP_TRACE_ERROR ("SMP_PasskeyReply() - no dev CB");
return;
}
if (passkey > BTM_MAX_PASSKEY_VAL || res != SMP_SUCCESS)
{
- SMP_TRACE_WARNING1 ("SMP_PasskeyReply() - Wrong key len: %d or passkey entry fail", passkey);
+ SMP_TRACE_WARNING ("SMP_PasskeyReply() - Wrong key len: %d or passkey entry fail", passkey);
/* send pairing failure */
smp_sm_event(p_cb, SMP_AUTH_CMPL_EVT, &failure);
@@ -287,7 +287,7 @@ void SMP_OobDataReply(BD_ADDR bd_addr, tSMP_STATUS res, UINT8 len, UINT8 *p_data
tSMP_KEY key;
UNUSED(bd_addr);
- SMP_TRACE_EVENT2 ("SMP_OobDataReply State: %d res:%d",
+ SMP_TRACE_EVENT ("SMP_OobDataReply State: %d res:%d",
smp_cb.state, res);
/* If timeout already expired or has been canceled, ignore the reply */
diff --git a/stack/smp/smp_cmac.c b/stack/smp/smp_cmac.c
index 44e776e26..138c6f1df 100644
--- a/stack/smp/smp_cmac.c
+++ b/stack/smp/smp_cmac.c
@@ -53,11 +53,11 @@ void print128(BT_OCTET16 x, const UINT8 *key_name)
UINT8 *p = (UINT8 *)x;
UINT8 i;
- SMP_TRACE_WARNING1("%s(MSB ~ LSB) = ", key_name);
+ SMP_TRACE_WARNING("%s(MSB ~ LSB) = ", key_name);
for (i = 0; i < 4; i ++)
{
- SMP_TRACE_WARNING4("%02x %02x %02x %02x",
+ SMP_TRACE_WARNING("%02x %02x %02x %02x",
p[BT_OCTET16_LEN - i*4 -1], p[BT_OCTET16_LEN - i*4 -2],
p[BT_OCTET16_LEN - i*4 -3], p[BT_OCTET16_LEN - i*4 -4]);
}
@@ -95,7 +95,7 @@ static void padding ( BT_OCTET16 dest, UINT8 length )
static void leftshift_onebit(UINT8 *input, UINT8 *output)
{
UINT8 i, overflow = 0 , next_overflow = 0;
- SMP_TRACE_EVENT0 ("leftshift_onebit ");
+ SMP_TRACE_EVENT ("leftshift_onebit ");
/* input[0] is LSB */
for ( i = 0; i < BT_OCTET16_LEN ; i ++ )
{
@@ -139,7 +139,7 @@ static BOOLEAN cmac_aes_k_calculate(BT_OCTET16 key, UINT8 *p_signature, UINT16 t
UINT8 x[16] = {0};
UINT8 *p_mac;
- SMP_TRACE_EVENT0 ("cmac_aes_k_calculate ");
+ SMP_TRACE_EVENT ("cmac_aes_k_calculate ");
while (i <= cmac_cb.round)
{
@@ -160,10 +160,10 @@ static BOOLEAN cmac_aes_k_calculate(BT_OCTET16 key, UINT8 *p_signature, UINT16 t
p_mac = output.param_buf + (BT_OCTET16_LEN - tlen);
memcpy(p_signature, p_mac, tlen);
- SMP_TRACE_DEBUG2("tlen = %d p_mac = %d", tlen, p_mac);
- SMP_TRACE_DEBUG4("p_mac[0] = 0x%02x p_mac[1] = 0x%02x p_mac[2] = 0x%02x p_mac[3] = 0x%02x",
+ SMP_TRACE_DEBUG("tlen = %d p_mac = %d", tlen, p_mac);
+ SMP_TRACE_DEBUG("p_mac[0] = 0x%02x p_mac[1] = 0x%02x p_mac[2] = 0x%02x p_mac[3] = 0x%02x",
*p_mac, *(p_mac + 1), *(p_mac + 2), *(p_mac + 3));
- SMP_TRACE_DEBUG4("p_mac[4] = 0x%02x p_mac[5] = 0x%02x p_mac[6] = 0x%02x p_mac[7] = 0x%02x",
+ SMP_TRACE_DEBUG("p_mac[4] = 0x%02x p_mac[5] = 0x%02x p_mac[6] = 0x%02x p_mac[7] = 0x%02x",
*(p_mac + 4), *(p_mac + 5), *(p_mac + 6), *(p_mac + 7));
return TRUE;
@@ -187,11 +187,11 @@ static void cmac_prepare_last_block (BT_OCTET16 k1, BT_OCTET16 k2)
// UINT8 x[16] = {0};
BOOLEAN flag;
- SMP_TRACE_EVENT0 ("cmac_prepare_last_block ");
+ SMP_TRACE_EVENT ("cmac_prepare_last_block ");
/* last block is a complete block set flag to 1 */
flag = ((cmac_cb.len % BT_OCTET16_LEN) == 0 && cmac_cb.len != 0) ? TRUE : FALSE;
- SMP_TRACE_WARNING2("flag = %d round = %d", flag, cmac_cb.round);
+ SMP_TRACE_WARNING("flag = %d round = %d", flag, cmac_cb.round);
if ( flag )
{ /* last block is complete block */
@@ -217,7 +217,7 @@ static void cmac_subkey_cont(tSMP_ENC *p)
{
UINT8 k1[BT_OCTET16_LEN], k2[BT_OCTET16_LEN];
UINT8 *pp = p->param_buf;
- SMP_TRACE_EVENT0 ("cmac_subkey_cont ");
+ SMP_TRACE_EVENT ("cmac_subkey_cont ");
print128(pp, (const UINT8 *)"K1 before shift");
/* If MSB(L) = 0, then K1 = L << 1 */
@@ -265,7 +265,7 @@ static BOOLEAN cmac_generate_subkey(BT_OCTET16 key)
BT_OCTET16 z = {0};
BOOLEAN ret = TRUE;
tSMP_ENC output;
- SMP_TRACE_EVENT0 (" cmac_generate_subkey");
+ SMP_TRACE_EVENT (" cmac_generate_subkey");
if (SMP_Encrypt(key, BT_OCTET16_LEN, z, BT_OCTET16_LEN, &output))
{
@@ -298,12 +298,12 @@ BOOLEAN AES_CMAC ( BT_OCTET16 key, UINT8 *input, UINT16 length,
UINT16 n = (length + BT_OCTET16_LEN - 1) / BT_OCTET16_LEN; /* n is number of rounds */
BOOLEAN ret = FALSE;
- SMP_TRACE_EVENT0 ("AES_CMAC ");
+ SMP_TRACE_EVENT ("AES_CMAC ");
if (n == 0) n = 1;
len = n * BT_OCTET16_LEN;
- SMP_TRACE_WARNING1("AES128_CMAC started, allocate buffer size = %d", len);
+ SMP_TRACE_WARNING("AES128_CMAC started, allocate buffer size = %d", len);
/* allocate a memory space of multiple of 16 bytes to hold text */
if ((cmac_cb.text = (UINT8 *)GKI_getbuf(len)) != NULL)
{
@@ -332,7 +332,7 @@ BOOLEAN AES_CMAC ( BT_OCTET16 key, UINT8 *input, UINT16 length,
else
{
ret = FALSE;
- SMP_TRACE_ERROR0("No resources");
+ SMP_TRACE_ERROR("No resources");
}
return ret;
@@ -341,13 +341,13 @@ BOOLEAN AES_CMAC ( BT_OCTET16 key, UINT8 *input, UINT16 length,
#if 0 /* testing code, sample data from spec */
void test_cmac_cback(UINT8 *p_mac, UINT16 tlen)
{
- SMP_TRACE_EVENT0 ("test_cmac_cback ");
- SMP_TRACE_ERROR0("test_cmac_cback");
+ SMP_TRACE_EVENT ("test_cmac_cback ");
+ SMP_TRACE_ERROR("test_cmac_cback");
}
void test_cmac(void)
{
- SMP_TRACE_EVENT0 ("test_cmac ");
+ SMP_TRACE_EVENT ("test_cmac ");
UINT8 M[64] = {
0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96,
0xe9, 0x3d, 0x7e, 0x11, 0x73, 0x93, 0x17, 0x2a,
@@ -378,7 +378,7 @@ void test_cmac(void)
memset(&cmac_cb, 0, sizeof(tCMAC_CB));
- SMP_TRACE_WARNING1("\n Example 1: len = %d\n", len);
+ SMP_TRACE_WARNING("\n Example 1: len = %d\n", len);
AES_CMAC(key, M, len, 128, test_cmac_cback, 0);
diff --git a/stack/smp/smp_keys.c b/stack/smp/smp_keys.c
index 5bf6c2e3c..891d7f868 100644
--- a/stack/smp/smp_keys.c
+++ b/stack/smp/smp_keys.c
@@ -81,7 +81,7 @@ static void smp_debug_print_nbyte_little_endian (UINT8 *p, const UINT8 *key_name
{
x += sprintf ((char *)&p_buf[x], "%02x ", p[i]);
}
- SMP_TRACE_WARNING2("%s(LSB ~ MSB) = %s", key_name, p_buf);
+ SMP_TRACE_WARNING("%s(LSB ~ MSB) = %s", key_name, p_buf);
}
#else
#define smp_debug_print_nbyte_little_endian(p, key_name, len)
@@ -107,7 +107,7 @@ BOOLEAN smp_encrypt_data (UINT8 *key, UINT8 key_len,
UINT8 *p_rev_key = NULL; /* input key in big endilan format */
UINT8 *p_rev_output = NULL; /* encrypted output in big endilan format */
- SMP_TRACE_DEBUG0 ("smp_encrypt_data");
+ SMP_TRACE_DEBUG ("smp_encrypt_data");
if ( (p_out == NULL ) || (key_len != SMP_ENCRYT_KEY_SIZE) )
{
BTM_TRACE_ERROR ("smp_encrypt_data Failed");
@@ -164,7 +164,7 @@ void smp_generate_passkey(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
{
UNUSED(p_data);
- SMP_TRACE_DEBUG0 ("smp_generate_passkey");
+ SMP_TRACE_DEBUG ("smp_generate_passkey");
p_cb->rand_enc_proc = SMP_GEN_TK;
/* generate MRand or SRand */
@@ -187,14 +187,14 @@ void smp_proc_passkey(tSMP_CB *p_cb , tBTM_RAND_ENC *p)
UINT32 passkey; /* 19655 test number; */
UINT8 *pp = p->param_buf;
- SMP_TRACE_DEBUG0 ("smp_proc_passkey ");
+ SMP_TRACE_DEBUG ("smp_proc_passkey ");
STREAM_TO_UINT32(passkey, pp);
passkey &= ~SMP_PASSKEY_MASK;
/* truncate by maximum value */
while (passkey > BTM_MAX_PASSKEY_VAL)
passkey >>= 1;
- SMP_TRACE_ERROR1("Passkey generated = %d", passkey);
+ SMP_TRACE_ERROR("Passkey generated = %d", passkey);
/* save the TK */
memset(p_cb->tk, 0, BT_OCTET16_LEN);
@@ -231,7 +231,7 @@ void smp_generate_stk (tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
tSMP_STATUS status = SMP_PAIR_FAIL_UNKNOWN;
UNUSED(p_data);
- SMP_TRACE_DEBUG0 ("smp_generate_stk ");
+ SMP_TRACE_DEBUG ("smp_generate_stk ");
memset(p, 0, BT_OCTET16_LEN);
if (p_cb->role == HCI_ROLE_MASTER)
@@ -248,7 +248,7 @@ void smp_generate_stk (tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
/* generate STK = Etk(rand|rrand)*/
if (!SMP_Encrypt( p_cb->tk, BT_OCTET16_LEN, ptext, BT_OCTET16_LEN, &output))
{
- SMP_TRACE_ERROR0("smp_generate_stk failed");
+ SMP_TRACE_ERROR("smp_generate_stk failed");
smp_sm_event(p_cb, SMP_AUTH_CMPL_EVT, &status);
}
else
@@ -272,7 +272,7 @@ void smp_generate_confirm (tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
{
UNUSED(p_data);
- SMP_TRACE_DEBUG0 ("smp_generate_confirm");
+ SMP_TRACE_DEBUG ("smp_generate_confirm");
p_cb->rand_enc_proc = SMP_GEN_SRAND_MRAND;
/* generate MRand or SRand */
if (!btsnd_hcic_ble_rand((void *)smp_rand_back))
@@ -292,7 +292,7 @@ void smp_genenrate_rand_cont(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
{
UNUSED(p_data);
- SMP_TRACE_DEBUG0 ("smp_genenrate_rand_cont ");
+ SMP_TRACE_DEBUG ("smp_genenrate_rand_cont ");
p_cb->rand_enc_proc = SMP_GEN_SRAND_MRAND_CONT;
/* generate 64 MSB of MRand or SRand */
@@ -315,7 +315,7 @@ void smp_generate_ltk(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
BOOLEAN div_status;
UNUSED(p_data);
- SMP_TRACE_DEBUG0 ("smp_generate_ltk ");
+ SMP_TRACE_DEBUG ("smp_generate_ltk ");
div_status = btm_get_local_div(p_cb->pairing_bda, &p_cb->div);
@@ -325,7 +325,7 @@ void smp_generate_ltk(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
}
else
{
- SMP_TRACE_DEBUG0 ("Generate DIV for LTK");
+ SMP_TRACE_DEBUG ("Generate DIV for LTK");
p_cb->rand_enc_proc = SMP_GEN_DIV_LTK;
/* generate MRand or SRand */
if (!btsnd_hcic_ble_rand((void *)smp_rand_back))
@@ -354,7 +354,7 @@ void smp_compute_csrk(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
tSMP_STATUS status = SMP_PAIR_FAIL_UNKNOWN;
UNUSED(p_data);
- SMP_TRACE_DEBUG1 ("smp_compute_csrk div=%x", p_cb->div);
+ SMP_TRACE_DEBUG ("smp_compute_csrk div=%x", p_cb->div);
BTM_GetDeviceEncRoot(er);
/* CSRK = d1(ER, DIV, 1) */
UINT16_TO_STREAM(p, p_cb->div);
@@ -362,7 +362,7 @@ void smp_compute_csrk(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
if (!SMP_Encrypt(er, BT_OCTET16_LEN, buffer, 4, &output))
{
- SMP_TRACE_ERROR0("smp_generate_csrk failed");
+ SMP_TRACE_ERROR("smp_generate_csrk failed");
smp_sm_event(p_cb, SMP_AUTH_CMPL_EVT, &status);
}
else
@@ -388,7 +388,7 @@ void smp_generate_csrk(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
BOOLEAN div_status;
UNUSED(p_data);
- SMP_TRACE_DEBUG0 ("smp_generate_csrk");
+ SMP_TRACE_DEBUG ("smp_generate_csrk");
div_status = btm_get_local_div(p_cb->pairing_bda, &p_cb->div);
if (div_status)
@@ -397,7 +397,7 @@ void smp_generate_csrk(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
}
else
{
- SMP_TRACE_DEBUG0 ("Generate DIV for CSRK");
+ SMP_TRACE_DEBUG ("Generate DIV for CSRK");
p_cb->rand_enc_proc = SMP_GEN_DIV_CSRK;
if (!btsnd_hcic_ble_rand((void *)smp_rand_back))
smp_rand_back(NULL);
@@ -413,7 +413,7 @@ void smp_concatenate_local( tSMP_CB *p_cb, UINT8 **p_data, UINT8 op_code)
{
UINT8 *p = *p_data;
- SMP_TRACE_DEBUG0 ("smp_concatenate_local ");
+ SMP_TRACE_DEBUG ("smp_concatenate_local ");
UINT8_TO_STREAM(p, op_code);
UINT8_TO_STREAM(p, p_cb->loc_io_caps);
UINT8_TO_STREAM(p, p_cb->loc_oob_flag);
@@ -432,7 +432,7 @@ void smp_concatenate_peer( tSMP_CB *p_cb, UINT8 **p_data, UINT8 op_code)
{
UINT8 *p = *p_data;
- SMP_TRACE_DEBUG0 ("smp_concatenate_peer ");
+ SMP_TRACE_DEBUG ("smp_concatenate_peer ");
UINT8_TO_STREAM(p, op_code);
UINT8_TO_STREAM(p, p_cb->peer_io_caps);
UINT8_TO_STREAM(p, p_cb->peer_oob_flag);
@@ -459,11 +459,11 @@ void smp_gen_p1_4_confirm( tSMP_CB *p_cb, BT_OCTET16 p1)
tBLE_ADDR_TYPE addr_type = 0;
BD_ADDR remote_bda;
- SMP_TRACE_DEBUG0 ("smp_gen_p1_4_confirm");
+ SMP_TRACE_DEBUG ("smp_gen_p1_4_confirm");
if (!BTM_ReadRemoteConnectionAddr(p_cb->pairing_bda, remote_bda, &addr_type))
{
- SMP_TRACE_ERROR0("can not generate confirm for unknown device");
+ SMP_TRACE_ERROR("can not generate confirm for unknown device");
return;
}
@@ -492,7 +492,7 @@ void smp_gen_p1_4_confirm( tSMP_CB *p_cb, BT_OCTET16 p1)
smp_concatenate_local(p_cb, &p, SMP_OPCODE_PAIRING_RSP);
}
#if SMP_DEBUG == TRUE
- SMP_TRACE_DEBUG0("p1 = pres || preq || rat' || iat'");
+ SMP_TRACE_DEBUG("p1 = pres || preq || rat' || iat'");
smp_debug_print_nbyte_little_endian ((UINT8 *)p1, (const UINT8 *)"P1", 16);
#endif
}
@@ -514,11 +514,11 @@ void smp_gen_p2_4_confirm( tSMP_CB *p_cb, BT_OCTET16 p2)
if (!BTM_ReadRemoteConnectionAddr(p_cb->pairing_bda, remote_bda, &addr_type))
{
- SMP_TRACE_ERROR0("can not generate confirm p2 for unknown device");
+ SMP_TRACE_ERROR("can not generate confirm p2 for unknown device");
return;
}
- SMP_TRACE_DEBUG0 ("smp_gen_p2_4_confirm");
+ SMP_TRACE_DEBUG ("smp_gen_p2_4_confirm");
memset(p, 0, sizeof(BT_OCTET16));
@@ -537,7 +537,7 @@ void smp_gen_p2_4_confirm( tSMP_CB *p_cb, BT_OCTET16 p2)
BDADDR_TO_STREAM(p, remote_bda);
}
#if SMP_DEBUG == TRUE
- SMP_TRACE_DEBUG0("p2 = padding || ia || ra");
+ SMP_TRACE_DEBUG("p2 = padding || ia || ra");
smp_debug_print_nbyte_little_endian(p2, (const UINT8 *)"p2", 16);
#endif
}
@@ -557,7 +557,7 @@ void smp_calculate_comfirm (tSMP_CB *p_cb, BT_OCTET16 rand, BD_ADDR bda)
tSMP_STATUS status = SMP_PAIR_FAIL_UNKNOWN;
UNUSED(bda);
- SMP_TRACE_DEBUG0 ("smp_calculate_comfirm ");
+ SMP_TRACE_DEBUG ("smp_calculate_comfirm ");
/* generate p1 = pres || preq || rat' || iat' */
smp_gen_p1_4_confirm(p_cb, p1);
@@ -569,7 +569,7 @@ void smp_calculate_comfirm (tSMP_CB *p_cb, BT_OCTET16 rand, BD_ADDR bda)
/* calculate e(k, r XOR p1), where k = TK */
if (!SMP_Encrypt(p_cb->tk, BT_OCTET16_LEN, p1, BT_OCTET16_LEN, &output))
{
- SMP_TRACE_ERROR0("smp_generate_csrk failed");
+ SMP_TRACE_ERROR("smp_generate_csrk failed");
smp_sm_event(p_cb, SMP_AUTH_CMPL_EVT, &status);
}
else
@@ -593,9 +593,9 @@ static void smp_calculate_comfirm_cont(tSMP_CB *p_cb, tSMP_ENC *p)
tSMP_ENC output;
tSMP_STATUS status = SMP_PAIR_FAIL_UNKNOWN;
- SMP_TRACE_DEBUG0 ("smp_calculate_comfirm_cont ");
+ SMP_TRACE_DEBUG ("smp_calculate_comfirm_cont ");
#if SMP_DEBUG == TRUE
- SMP_TRACE_DEBUG0("Confirm step 1 p1' = e(k, r XOR p1) Generated");
+ SMP_TRACE_DEBUG("Confirm step 1 p1' = e(k, r XOR p1) Generated");
smp_debug_print_nbyte_little_endian (p->param_buf, (const UINT8 *)"C1", 16);
#endif
@@ -608,7 +608,7 @@ static void smp_calculate_comfirm_cont(tSMP_CB *p_cb, tSMP_ENC *p)
/* calculate: Confirm = E(k, p1' XOR p2) */
if (!SMP_Encrypt(p_cb->tk, BT_OCTET16_LEN, p2, BT_OCTET16_LEN, &output))
{
- SMP_TRACE_ERROR0("smp_calculate_comfirm_cont failed");
+ SMP_TRACE_ERROR("smp_calculate_comfirm_cont failed");
smp_sm_event(p_cb, SMP_AUTH_CMPL_EVT, &status);
}
else
@@ -639,7 +639,7 @@ static void smp_genenrate_confirm(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
{
UNUSED(p_data);
- SMP_TRACE_DEBUG0 ("smp_genenrate_confirm ");
+ SMP_TRACE_DEBUG ("smp_genenrate_confirm ");
p_cb->rand_enc_proc = SMP_GEN_CONFIRM;
smp_debug_print_nbyte_little_endian ((UINT8 *)p_cb->rand, (const UINT8 *)"local rand", 16);
@@ -661,7 +661,7 @@ void smp_generate_compare (tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
{
UNUSED(p_data);
- SMP_TRACE_DEBUG0 ("smp_generate_compare ");
+ SMP_TRACE_DEBUG ("smp_generate_compare ");
p_cb->rand_enc_proc = SMP_GEN_COMPARE;
smp_debug_print_nbyte_little_endian ((UINT8 *)p_cb->rrand, (const UINT8 *)"peer rand", 16);
@@ -682,7 +682,7 @@ static void smp_process_confirm(tSMP_CB *p_cb, tSMP_ENC *p)
{
tSMP_KEY key;
- SMP_TRACE_DEBUG0 ("smp_process_confirm ");
+ SMP_TRACE_DEBUG ("smp_process_confirm ");
#if SMP_CONFORMANCE_TESTING == TRUE
if (p_cb->enable_test_confirm_val)
{
@@ -697,7 +697,7 @@ static void smp_process_confirm(tSMP_CB *p_cb, tSMP_ENC *p)
#if (SMP_DEBUG == TRUE)
- SMP_TRACE_DEBUG0("Confirm Generated");
+ SMP_TRACE_DEBUG("Confirm Generated");
smp_debug_print_nbyte_little_endian ((UINT8 *)p_cb->confirm, (const UINT8 *)"Confirm", 16);
#endif
@@ -720,9 +720,9 @@ static void smp_process_compare(tSMP_CB *p_cb, tSMP_ENC *p)
{
tSMP_KEY key;
- SMP_TRACE_DEBUG0 ("smp_process_compare ");
+ SMP_TRACE_DEBUG ("smp_process_compare ");
#if (SMP_DEBUG == TRUE)
- SMP_TRACE_DEBUG0("Compare Generated");
+ SMP_TRACE_DEBUG("Compare Generated");
smp_debug_print_nbyte_little_endian (p->param_buf, (const UINT8 *)"Compare", 16);
#endif
key.key_type = SMP_KEY_TYPE_CMP;
@@ -745,9 +745,9 @@ static void smp_process_stk(tSMP_CB *p_cb, tSMP_ENC *p)
{
tSMP_KEY key;
- SMP_TRACE_DEBUG0 ("smp_process_stk ");
+ SMP_TRACE_DEBUG ("smp_process_stk ");
#if (SMP_DEBUG == TRUE)
- SMP_TRACE_ERROR0("STK Generated");
+ SMP_TRACE_ERROR("STK Generated");
#endif
smp_mask_enc_key(p_cb->loc_enc_size, p->param_buf);
@@ -773,14 +773,14 @@ static void smp_genenrate_ltk_cont(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
tSMP_STATUS status = SMP_PAIR_FAIL_UNKNOWN;
UNUSED(p_data);
- SMP_TRACE_DEBUG0 ("smp_genenrate_ltk_cont ");
+ SMP_TRACE_DEBUG ("smp_genenrate_ltk_cont ");
BTM_GetDeviceEncRoot(er);
/* LTK = d1(ER, DIV, 0)= e(ER, DIV)*/
if (!SMP_Encrypt(er, BT_OCTET16_LEN, (UINT8 *)&p_cb->div,
sizeof(UINT16), &output))
{
- SMP_TRACE_ERROR0("smp_genenrate_ltk_cont failed");
+ SMP_TRACE_ERROR("smp_genenrate_ltk_cont failed");
smp_sm_event(p_cb, SMP_AUTH_CMPL_EVT, &status);
}
else
@@ -809,13 +809,13 @@ static void smp_generate_y(tSMP_CB *p_cb, tSMP_INT_DATA *p)
tSMP_STATUS status = SMP_PAIR_FAIL_UNKNOWN;
UNUSED(p);
- SMP_TRACE_DEBUG0 ("smp_generate_y ");
+ SMP_TRACE_DEBUG ("smp_generate_y ");
BTM_GetDeviceDHK(dhk);
if (!SMP_Encrypt(dhk, BT_OCTET16_LEN, p_cb->enc_rand,
BT_OCTET8_LEN, &output))
{
- SMP_TRACE_ERROR0("smp_generate_y failed");
+ SMP_TRACE_ERROR("smp_generate_y failed");
smp_sm_event(p_cb, SMP_AUTH_CMPL_EVT, &status);
}
else
@@ -839,7 +839,7 @@ static void smp_generate_rand_vector (tSMP_CB *p_cb, tSMP_INT_DATA *p)
/* generate EDIV and rand now */
/* generate random vector */
- SMP_TRACE_DEBUG0 ("smp_generate_rand_vector ");
+ SMP_TRACE_DEBUG ("smp_generate_rand_vector ");
p_cb->rand_enc_proc = SMP_GEN_RAND_V;
if (!btsnd_hcic_ble_rand((void *)smp_rand_back))
smp_rand_back(NULL);
@@ -860,13 +860,13 @@ static void smp_process_ediv(tSMP_CB *p_cb, tSMP_ENC *p)
UINT8 *pp= p->param_buf;
UINT16 y;
- SMP_TRACE_DEBUG0 ("smp_process_ediv ");
+ SMP_TRACE_DEBUG ("smp_process_ediv ");
STREAM_TO_UINT16(y, pp);
/* EDIV = Y xor DIV */
p_cb->ediv = p_cb->div ^ y;
/* send LTK ready */
- SMP_TRACE_ERROR0("LTK ready");
+ SMP_TRACE_ERROR("LTK ready");
key.key_type = SMP_KEY_TYPE_LTK;
key.p_data = p->param_buf;
@@ -890,7 +890,7 @@ static void smp_rand_back(tBTM_RAND_ENC *p)
UINT8 failure = SMP_PAIR_FAIL_UNKNOWN;
UINT8 state = p_cb->rand_enc_proc & ~0x80;
- SMP_TRACE_DEBUG1 ("smp_rand_back state=0x%x", state);
+ SMP_TRACE_DEBUG ("smp_rand_back state=0x%x", state);
if (p && p->status == HCI_SUCCESS)
{
switch (state)
@@ -930,7 +930,7 @@ static void smp_rand_back(tBTM_RAND_ENC *p)
return;
}
- SMP_TRACE_ERROR1("smp_rand_back Key generation failed: (%d)", p_cb->rand_enc_proc);
+ SMP_TRACE_ERROR("smp_rand_back Key generation failed: (%d)", p_cb->rand_enc_proc);
smp_sm_event(p_cb, SMP_AUTH_CMPL_EVT, &failure);
diff --git a/stack/smp/smp_l2c.c b/stack/smp/smp_l2c.c
index 02ec38eb6..078009bb6 100644
--- a/stack/smp/smp_l2c.c
+++ b/stack/smp/smp_l2c.c
@@ -48,7 +48,7 @@ static void smp_data_ind (BD_ADDR bd_addr, BT_HDR *p_buf);
void smp_l2cap_if_init (void)
{
tL2CAP_FIXED_CHNL_REG fixed_reg;
- SMP_TRACE_EVENT0 ("SMDBG l2c smp_l2cap_if_init");
+ SMP_TRACE_EVENT ("SMDBG l2c smp_l2cap_if_init");
fixed_reg.fixed_chnl_opts.mode = L2CAP_FCR_BASIC_MODE;
fixed_reg.fixed_chnl_opts.max_transmit = 0;
fixed_reg.fixed_chnl_opts.rtrans_tout = 0;
@@ -79,17 +79,17 @@ static void smp_connect_cback (BD_ADDR bd_addr, BOOLEAN connected, UINT16 reason
tSMP_CB *p_cb = &smp_cb;
tSMP_INT_DATA int_data;
- SMP_TRACE_EVENT0 ("SMDBG l2c smp_connect_cback ");
+ SMP_TRACE_EVENT ("SMDBG l2c smp_connect_cback ");
if (transport == BT_TRANSPORT_BR_EDR)
{
- SMP_TRACE_ERROR0 ("smp_connect_cback : Wrong transport");
+ SMP_TRACE_ERROR ("smp_connect_cback : Wrong transport");
return;
}
if (memcmp(bd_addr, p_cb->pairing_bda, BD_ADDR_LEN) == 0)
{
- SMP_TRACE_EVENT3 ("smp_connect_cback() for pairing BDA: %08x%04x Event: %s",
+ SMP_TRACE_EVENT ("smp_connect_cback() for pairing BDA: %08x%04x Event: %s",
(bd_addr[0]<<24)+(bd_addr[1]<<16)+(bd_addr[2]<<8) + bd_addr[3],
(bd_addr[4]<<8)+bd_addr[5], (connected) ? "connected" : "disconnected");
@@ -133,16 +133,16 @@ static void smp_data_ind (BD_ADDR bd_addr, BT_HDR *p_buf)
tSMP_CB *p_cb = &smp_cb;
UINT8 *p = (UINT8 *)(p_buf + 1) + p_buf->offset;
UINT8 cmd ;
- SMP_TRACE_EVENT0 ("SMDBG l2c smp_data_ind");
+ SMP_TRACE_EVENT ("SMDBG l2c smp_data_ind");
- SMP_TRACE_EVENT0 ("Got smp_data_ind");
+ SMP_TRACE_EVENT ("Got smp_data_ind");
STREAM_TO_UINT8(cmd, p);
/* sanity check */
if ((SMP_OPCODE_MAX <= cmd) || (cmd == 0))
{
- SMP_TRACE_WARNING1( "Ignore received command with RESERVED code 0x%02x", cmd);
+ SMP_TRACE_WARNING( "Ignore received command with RESERVED code 0x%02x", cmd);
GKI_freebuf (p_buf);
return;
}
diff --git a/stack/smp/smp_main.c b/stack/smp/smp_main.c
index dd40a7126..aee15dad1 100644
--- a/stack/smp/smp_main.c
+++ b/stack/smp/smp_main.c
@@ -395,14 +395,14 @@ void smp_set_state(tSMP_STATE state)
{
if (state < SMP_ST_MAX)
{
- SMP_TRACE_DEBUG4( "State change: %s(%d) ==> %s(%d)",
+ SMP_TRACE_DEBUG( "State change: %s(%d) ==> %s(%d)",
smp_get_state_name(smp_cb.state), smp_cb.state,
smp_get_state_name(state), state );
smp_cb.state = state;
}
else
{
- SMP_TRACE_DEBUG1("smp_set_state invalid state =%d", state );
+ SMP_TRACE_DEBUG("smp_set_state invalid state =%d", state );
}
}
@@ -438,14 +438,14 @@ void smp_sm_event(tSMP_CB *p_cb, tSMP_EVENT event, void *p_data)
UINT8 action, entry, i;
tSMP_ENTRY_TBL entry_table = smp_entry_table[p_cb->role];
- SMP_TRACE_EVENT0("main smp_sm_event");
+ SMP_TRACE_EVENT("main smp_sm_event");
if (curr_state >= SMP_ST_MAX)
{
- SMP_TRACE_DEBUG1( "Invalid state: %d", curr_state) ;
+ SMP_TRACE_DEBUG( "Invalid state: %d", curr_state) ;
return;
}
- SMP_TRACE_DEBUG5( "SMP Role: %s State: [%s (%d)], Event: [%s (%d)]",\
+ SMP_TRACE_DEBUG( "SMP Role: %s State: [%s (%d)], Event: [%s (%d)]",\
(p_cb->role == 0x01) ?"Slave" : "Master", smp_get_state_name( p_cb->state),
p_cb->state, smp_get_event_name(event), event) ;
@@ -465,7 +465,7 @@ void smp_sm_event(tSMP_CB *p_cb, tSMP_EVENT event, void *p_data)
}
else
{
- SMP_TRACE_DEBUG4( "Ignore event [%s (%d)] in state [%s (%d)]",
+ SMP_TRACE_DEBUG( "Ignore event [%s (%d)] in state [%s (%d)]",
smp_get_event_name(event), event, smp_get_state_name(curr_state), curr_state);
return;
}
@@ -490,7 +490,7 @@ void smp_sm_event(tSMP_CB *p_cb, tSMP_EVENT event, void *p_data)
break;
}
}
- SMP_TRACE_DEBUG1( "result state = %s", smp_get_state_name( p_cb->state ) ) ;
+ SMP_TRACE_DEBUG( "result state = %s", smp_get_state_name( p_cb->state ) ) ;
}
diff --git a/stack/smp/smp_utils.c b/stack/smp/smp_utils.c
index 38b2be860..21d93f889 100644
--- a/stack/smp/smp_utils.c
+++ b/stack/smp/smp_utils.c
@@ -87,11 +87,11 @@ BOOLEAN smp_send_msg_to_L2CAP(BD_ADDR rem_bda, BT_HDR *p_toL2CAP)
{
UINT16 l2cap_ret;
- SMP_TRACE_EVENT0("smp_send_msg_to_L2CAP");
+ SMP_TRACE_EVENT("smp_send_msg_to_L2CAP");
if ((l2cap_ret = L2CA_SendFixedChnlData (L2CAP_SMP_CID, rem_bda, p_toL2CAP)) == L2CAP_DW_FAILED)
{
- SMP_TRACE_ERROR1("SMP failed to pass msg:0x%0x to L2CAP",
+ SMP_TRACE_ERROR("SMP failed to pass msg:0x%0x to L2CAP",
*((UINT8 *)(p_toL2CAP + 1) + p_toL2CAP->offset));
GKI_freebuf(p_toL2CAP);
return FALSE;
@@ -113,7 +113,7 @@ BOOLEAN smp_send_cmd(UINT8 cmd_code, tSMP_CB *p_cb)
BT_HDR *p_buf;
BOOLEAN sent = FALSE;
UINT8 failure = SMP_PAIR_INTERNAL_ERR;
- SMP_TRACE_EVENT1("smp_send_cmd on l2cap cmd_code=0x%x", cmd_code);
+ SMP_TRACE_EVENT("smp_send_cmd on l2cap cmd_code=0x%x", cmd_code);
if ( cmd_code < SMP_OPCODE_MAX &&
smp_cmd_build_act[cmd_code] != NULL)
{
@@ -154,7 +154,7 @@ void smp_rsp_timeout(TIMER_LIST_ENT *p_tle)
UINT8 failure = SMP_RSP_TIMEOUT;
UNUSED(p_tle);
- SMP_TRACE_EVENT1("smp_rsp_timeout state:%d", p_cb->state);
+ SMP_TRACE_EVENT("smp_rsp_timeout state:%d", p_cb->state);
if (smp_get_state() == SMP_ST_RELEASE_DELAY)
{
@@ -177,7 +177,7 @@ BT_HDR * smp_build_pairing_cmd(UINT8 cmd_code, tSMP_CB *p_cb)
{
BT_HDR *p_buf = NULL ;
UINT8 *p;
- SMP_TRACE_EVENT0("smp_build_pairing_cmd");
+ SMP_TRACE_EVENT("smp_build_pairing_cmd");
if ((p_buf = (BT_HDR *)GKI_getbuf(sizeof(BT_HDR) + SMP_PAIRING_REQ_SIZE + L2CAP_MIN_OFFSET)) != NULL)
{
p = (UINT8 *)(p_buf + 1) + L2CAP_MIN_OFFSET;
@@ -211,7 +211,7 @@ static BT_HDR * smp_build_confirm_cmd(UINT8 cmd_code, tSMP_CB *p_cb)
UINT8 *p;
UNUSED(cmd_code);
- SMP_TRACE_EVENT0("smp_build_confirm_cmd");
+ SMP_TRACE_EVENT("smp_build_confirm_cmd");
if ((p_buf = (BT_HDR *)GKI_getbuf(sizeof(BT_HDR) + SMP_CONFIRM_CMD_SIZE + L2CAP_MIN_OFFSET)) != NULL)
{
p = (UINT8 *)(p_buf + 1) + L2CAP_MIN_OFFSET;
@@ -238,7 +238,7 @@ static BT_HDR * smp_build_rand_cmd(UINT8 cmd_code, tSMP_CB *p_cb)
UINT8 *p;
UNUSED(cmd_code);
- SMP_TRACE_EVENT0("smp_build_rand_cmd");
+ SMP_TRACE_EVENT("smp_build_rand_cmd");
if ((p_buf = (BT_HDR *)GKI_getbuf(sizeof(BT_HDR) + SMP_INIT_CMD_SIZE + L2CAP_MIN_OFFSET)) != NULL)
{
p = (UINT8 *)(p_buf + 1) + L2CAP_MIN_OFFSET;
@@ -265,7 +265,7 @@ static BT_HDR * smp_build_encrypt_info_cmd(UINT8 cmd_code, tSMP_CB *p_cb)
UINT8 *p;
UNUSED(cmd_code);
- SMP_TRACE_EVENT0("smp_build_encrypt_info_cmd");
+ SMP_TRACE_EVENT("smp_build_encrypt_info_cmd");
if ((p_buf = (BT_HDR *)GKI_getbuf(sizeof(BT_HDR) + SMP_ENC_INFO_SIZE + L2CAP_MIN_OFFSET)) != NULL)
{
p = (UINT8 *)(p_buf + 1) + L2CAP_MIN_OFFSET;
@@ -292,7 +292,7 @@ static BT_HDR * smp_build_master_id_cmd(UINT8 cmd_code, tSMP_CB *p_cb)
UINT8 *p;
UNUSED(cmd_code);
- SMP_TRACE_EVENT0("smp_build_master_id_cmd ");
+ SMP_TRACE_EVENT("smp_build_master_id_cmd ");
if ((p_buf = (BT_HDR *)GKI_getbuf(sizeof(BT_HDR) + SMP_MASTER_ID_SIZE + L2CAP_MIN_OFFSET)) != NULL)
{
p = (UINT8 *)(p_buf + 1) + L2CAP_MIN_OFFSET;
@@ -322,7 +322,7 @@ static BT_HDR * smp_build_identity_info_cmd(UINT8 cmd_code, tSMP_CB *p_cb)
UNUSED(cmd_code);
UNUSED(p_cb);
- SMP_TRACE_EVENT0("smp_build_identity_info_cmd");
+ SMP_TRACE_EVENT("smp_build_identity_info_cmd");
if ((p_buf = (BT_HDR *)GKI_getbuf(sizeof(BT_HDR) + SMP_ID_INFO_SIZE + L2CAP_MIN_OFFSET)) != NULL)
{
p = (UINT8 *)(p_buf + 1) + L2CAP_MIN_OFFSET;
@@ -353,7 +353,7 @@ static BT_HDR * smp_build_id_addr_cmd(UINT8 cmd_code, tSMP_CB *p_cb)
UNUSED(cmd_code);
UNUSED(p_cb);
- SMP_TRACE_EVENT0("smp_build_id_addr_cmd");
+ SMP_TRACE_EVENT("smp_build_id_addr_cmd");
if ((p_buf = (BT_HDR *)GKI_getbuf(sizeof(BT_HDR) + SMP_ID_ADDR_SIZE + L2CAP_MIN_OFFSET)) != NULL)
{
p = (UINT8 *)(p_buf + 1) + L2CAP_MIN_OFFSET;
@@ -383,7 +383,7 @@ static BT_HDR * smp_build_signing_info_cmd(UINT8 cmd_code, tSMP_CB *p_cb)
UINT8 *p;
UNUSED(cmd_code);
- SMP_TRACE_EVENT0("smp_build_signing_info_cmd");
+ SMP_TRACE_EVENT("smp_build_signing_info_cmd");
if ((p_buf = (BT_HDR *)GKI_getbuf(sizeof(BT_HDR) + SMP_SIGN_INFO_SIZE + L2CAP_MIN_OFFSET)) != NULL)
{
p = (UINT8 *)(p_buf + 1) + L2CAP_MIN_OFFSET;
@@ -410,7 +410,7 @@ static BT_HDR * smp_build_pairing_fail(UINT8 cmd_code, tSMP_CB *p_cb)
UINT8 *p;
UNUSED(cmd_code);
- SMP_TRACE_EVENT0("smp_build_pairing_fail");
+ SMP_TRACE_EVENT("smp_build_pairing_fail");
if ((p_buf = (BT_HDR *)GKI_getbuf(sizeof(BT_HDR) + SMP_PAIR_FAIL_SIZE + L2CAP_MIN_OFFSET)) != NULL)
{
p = (UINT8 *)(p_buf + 1) + L2CAP_MIN_OFFSET;
@@ -437,7 +437,7 @@ static BT_HDR * smp_build_security_request(UINT8 cmd_code, tSMP_CB *p_cb)
UINT8 *p;
UNUSED(cmd_code);
- SMP_TRACE_EVENT0("smp_build_security_request");
+ SMP_TRACE_EVENT("smp_build_security_request");
if ((p_buf = (BT_HDR *)GKI_getbuf(sizeof(BT_HDR) + 2 + L2CAP_MIN_OFFSET)) != NULL)
{
@@ -449,7 +449,7 @@ static BT_HDR * smp_build_security_request(UINT8 cmd_code, tSMP_CB *p_cb)
p_buf->offset = L2CAP_MIN_OFFSET;
p_buf->len = 2;
- SMP_TRACE_EVENT2("opcode=%d auth_req=0x%x",SMP_OPCODE_SEC_REQ, p_cb->loc_auth_req );
+ SMP_TRACE_EVENT("opcode=%d auth_req=0x%x",SMP_OPCODE_SEC_REQ, p_cb->loc_auth_req );
}
return p_buf;
@@ -471,7 +471,7 @@ void smp_convert_string_to_tk(BT_OCTET16 tk, UINT32 passkey)
{
UINT8 *p = tk;
tSMP_KEY key;
- SMP_TRACE_EVENT0("smp_convert_string_to_tk");
+ SMP_TRACE_EVENT("smp_convert_string_to_tk");
UINT32_TO_STREAM(p, passkey);
key.key_type = SMP_KEY_TYPE_TK;
@@ -493,7 +493,7 @@ void smp_convert_string_to_tk(BT_OCTET16 tk, UINT32 passkey)
*******************************************************************************/
void smp_mask_enc_key(UINT8 loc_enc_size, UINT8 * p_data)
{
- SMP_TRACE_EVENT0("smp_mask_enc_key");
+ SMP_TRACE_EVENT("smp_mask_enc_key");
if (loc_enc_size < BT_OCTET16_LEN)
{
for (; loc_enc_size < BT_OCTET16_LEN; loc_enc_size ++)
@@ -515,7 +515,7 @@ void smp_xor_128(BT_OCTET16 a, BT_OCTET16 b)
{
UINT8 i, *aa = a, *bb = b;
- SMP_TRACE_EVENT0("smp_xor_128");
+ SMP_TRACE_EVENT("smp_xor_128");
for (i = 0; i < BT_OCTET16_LEN; i++)
{
aa[i] = aa[i] ^ bb[i];
@@ -537,7 +537,7 @@ void smp_cb_cleanup(tSMP_CB *p_cb)
tSMP_CALLBACK *p_callback = p_cb->p_callback;
UINT8 trace_level = p_cb->trace_level;
- SMP_TRACE_EVENT0("smp_cb_cleanup");
+ SMP_TRACE_EVENT("smp_cb_cleanup");
memset(p_cb, 0, sizeof(tSMP_CB));
p_cb->p_callback = p_callback;
p_cb->trace_level = trace_level;
@@ -555,18 +555,18 @@ void smp_cb_cleanup(tSMP_CB *p_cb)
*******************************************************************************/
void smp_reset_control_value(tSMP_CB *p_cb)
{
- SMP_TRACE_EVENT0("smp_reset_control_value");
+ SMP_TRACE_EVENT("smp_reset_control_value");
btu_stop_timer (&p_cb->rsp_timer_ent);
#if SMP_CONFORMANCE_TESTING == TRUE
- SMP_TRACE_EVENT1("smp_cb.remove_fixed_channel_disable=%d", smp_cb.remove_fixed_channel_disable);
+ SMP_TRACE_EVENT("smp_cb.remove_fixed_channel_disable=%d", smp_cb.remove_fixed_channel_disable);
if (!smp_cb.remove_fixed_channel_disable)
{
L2CA_RemoveFixedChnl (L2CAP_SMP_CID, p_cb->pairing_bda);
}
else
{
- SMP_TRACE_EVENT0("disable the removal of the fixed channel");
+ SMP_TRACE_EVENT("disable the removal of the fixed channel");
}
@@ -592,7 +592,7 @@ void smp_proc_pairing_cmpl(tSMP_CB *p_cb)
{
tSMP_EVT_DATA evt_data = {0};
- SMP_TRACE_DEBUG0 ("smp_proc_pairing_cmpl ");
+ SMP_TRACE_DEBUG ("smp_proc_pairing_cmpl ");
evt_data.cmplt.reason = p_cb->status;
@@ -605,7 +605,7 @@ void smp_proc_pairing_cmpl(tSMP_CB *p_cb)
evt_data.cmplt.is_pair_cancel = TRUE;
- SMP_TRACE_DEBUG2 ("send SMP_COMPLT_EVT reason=0x%0x sec_level=0x%0x",
+ SMP_TRACE_DEBUG ("send SMP_COMPLT_EVT reason=0x%0x sec_level=0x%0x",
evt_data.cmplt.reason,
evt_data.cmplt.sec_level );
if (p_cb->p_callback)
@@ -662,7 +662,7 @@ void smp_reject_unexp_pair_req(BD_ADDR bd_addr)
*******************************************************************************/
void smp_set_test_confirm_value(BOOLEAN enable, UINT8 *p_c_val)
{
- SMP_TRACE_DEBUG1("smp_set_test_confirm_value enable=%d", enable);
+ SMP_TRACE_DEBUG("smp_set_test_confirm_value enable=%d", enable);
smp_cb.enable_test_confirm_val = enable;
memcpy(smp_cb.test_confirm, p_c_val, BT_OCTET16_LEN);
}
@@ -679,7 +679,7 @@ void smp_set_test_confirm_value(BOOLEAN enable, UINT8 *p_c_val)
*******************************************************************************/
void smp_set_test_rand_value(BOOLEAN enable, UINT8 *p_c_val)
{
- SMP_TRACE_DEBUG1("smp_set_test_rand_value enable=%d", enable);
+ SMP_TRACE_DEBUG("smp_set_test_rand_value enable=%d", enable);
smp_cb.enable_test_rand_val = enable;
memcpy(smp_cb.test_rand, p_c_val, BT_OCTET16_LEN);
}
@@ -696,7 +696,7 @@ void smp_set_test_rand_value(BOOLEAN enable, UINT8 *p_c_val)
*******************************************************************************/
void smp_set_test_pair_fail_status (BOOLEAN enable, UINT8 status)
{
- SMP_TRACE_DEBUG1("smp_set_test_confirm_value enable=%d", enable);
+ SMP_TRACE_DEBUG("smp_set_test_confirm_value enable=%d", enable);
smp_cb.enable_test_pair_fail = enable;
smp_cb.pair_fail_status = status;
}
@@ -712,7 +712,7 @@ void smp_set_test_pair_fail_status (BOOLEAN enable, UINT8 status)
*******************************************************************************/
void smp_remove_fixed_channel_disable (BOOLEAN disable)
{
- SMP_TRACE_DEBUG1("smp_remove_fixed_channel_disable disable =%d", disable);
+ SMP_TRACE_DEBUG("smp_remove_fixed_channel_disable disable =%d", disable);
smp_cb.remove_fixed_channel_disable = disable;
}
/*******************************************************************************
@@ -726,7 +726,7 @@ void smp_remove_fixed_channel_disable (BOOLEAN disable)
*******************************************************************************/
void smp_skip_compare_check(BOOLEAN enable)
{
- SMP_TRACE_DEBUG1("smp_skip_compare_check enable=%d", enable);
+ SMP_TRACE_DEBUG("smp_skip_compare_check enable=%d", enable);
smp_cb.skip_test_compare_check = enable;
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-17 12:52:14 +0000