Component /bt: modify some log infor

diff --git a/components/bt/bluedroid/btc/core/btc_dm.c b/components/bt/bluedroid/btc/core/btc_dm.c
index 76e56e9bb7ba9b09d406eed6ee71b1f364e466db..1f98d17da9350ac439f00661c4d04a774c7c1584 100644 (file)
--- a/components/bt/bluedroid/btc/core/btc_dm.c
+++ b/components/bt/bluedroid/btc/core/btc_dm.c
@@ -341,7 +341,7 @@ void btc_dm_sec_cb_handler(btc_msg_t *msg)
     case BTA_DM_LINK_UP_EVT:
     case BTA_DM_LINK_DOWN_EVT:
     case BTA_DM_HW_ERROR_EVT:
-        LOG_WARN( "btc_dm_sec_cback : unhandled event (%d)\n", msg->act );
+        LOG_DEBUG( "btc_dm_sec_cback : unhandled event (%d)\n", msg->act );
         break;
 #if (defined(BLE_INCLUDED) && (BLE_INCLUDED == TRUE) && (SMP_INCLUDED == TRUE))
     case BTA_DM_BLE_AUTH_CMPL_EVT: {
@@ -495,10 +495,10 @@ void btc_dm_sec_cb_handler(btc_msg_t *msg)
     case BTA_DM_SP_RMT_OOB_EVT:
     case BTA_DM_SP_KEYPRESS_EVT:
     case BTA_DM_ROLE_CHG_EVT:
-        LOG_WARN( "btc_dm_sec_cback : unhandled event (%d)\n", msg->act );
+        LOG_DEBUG( "btc_dm_sec_cback : unhandled event (%d)\n", msg->act );
         break;
     default:
-        LOG_WARN( "btc_dm_sec_cback : unhandled event (%d)\n", msg->act );
+        LOG_DEBUG( "btc_dm_sec_cback : unhandled event (%d)\n", msg->act );
         break;
     }
 

diff --git a/components/bt/bluedroid/stack/btm/btm_ble.c b/components/bt/bluedroid/stack/btm/btm_ble.c
index 3e920faae279664a67c4da3148c9ce2096dfa19f..8c90b9c3333e8a3b67f83378a2b71b77e59fab11 100644 (file)
--- a/components/bt/bluedroid/stack/btm/btm_ble.c
+++ b/components/bt/bluedroid/stack/btm/btm_ble.c
@@ -808,7 +808,7 @@ tBTM_STATUS BTM_SetBleDataLength(BD_ADDR bd_addr, UINT16 tx_pdu_length)
     }
 
     if (!HCI_LE_DATA_LEN_EXT_SUPPORTED(p_acl->peer_le_features)) {
-        BTM_TRACE_ERROR("%s failed, peer does not support request", __FUNCTION__);
+        BTM_TRACE_DEBUG("%s failed, peer does not support request", __FUNCTION__);
         return BTM_PEER_LE_DATA_LEN_UNSUPPORTED;
     }
 
@@ -1444,7 +1444,7 @@ void btm_ble_ltk_request_reply(BD_ADDR bda,  BOOLEAN use_stk, BT_OCTET16 stk)
     p_cb->enc_handle = p_rec->ble_hci_handle;
     p_cb->key_size = p_rec->ble.keys.key_size;
 
-    BTM_TRACE_ERROR("key size = %d", p_rec->ble.keys.key_size);
+    BTM_TRACE_DEBUG("key size = %d", p_rec->ble.keys.key_size);
     if (use_stk) {
         btsnd_hcic_ble_ltk_req_reply(btm_cb.enc_handle, stk);
     } else { /* calculate LTK using peer device  */
@@ -1606,7 +1606,7 @@ static void btm_ble_resolve_random_addr_on_conn_cmpl(void *p_rec, void *p_data)
     BTM_TRACE_EVENT ("%s\n", __func__);
 
     if (match_rec) {
-        LOG_INFO("%s matched and resolved random address", __func__);
+        BTM_TRACE_DEBUG("%s matched and resolved random address", __func__);
         match = TRUE;
         match_rec->ble.active_addr_type = BTM_BLE_ADDR_RRA;
         memcpy(match_rec->ble.cur_rand_addr, bda, BD_ADDR_LEN);
@@ -1617,7 +1617,7 @@ static void btm_ble_resolve_random_addr_on_conn_cmpl(void *p_rec, void *p_data)
             memcpy(bda, match_rec->bd_addr, BD_ADDR_LEN);
         }
     } else {
-        LOG_INFO("%s unable to match and resolve random address", __func__);
+        BTM_TRACE_DEBUG("%s unable to match and resolve random address", __func__);
     }
 
     btm_ble_connected(bda, handle, HCI_ENCRYPT_MODE_DISABLED, role, bda_type, match);

diff --git a/components/bt/bluedroid/stack/smp/smp_act.c b/components/bt/bluedroid/stack/smp/smp_act.c
index 7dc09faeb01850e30862d292404420ec879c8146..1ca5bf0d3d7e8fc8810453d85a0d45bfb99ff81c 100644 (file)
--- a/components/bt/bluedroid/stack/smp/smp_act.c
+++ b/components/bt/bluedroid/stack/smp/smp_act.c
@@ -114,7 +114,7 @@ void smp_send_app_cback(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
             cb_data.io_req.max_key_size = SMP_MAX_ENC_KEY_SIZE;
             cb_data.io_req.init_keys = p_cb->local_i_key ;
             cb_data.io_req.resp_keys = p_cb->local_r_key ;
-            SMP_TRACE_WARNING ( "io_cap = %d", cb_data.io_req.io_cap);
+            SMP_TRACE_DEBUG ( "io_cap = %d", cb_data.io_req.io_cap);
             break;
 
         case SMP_NC_REQ_EVT:
@@ -160,7 +160,7 @@ void smp_send_app_cback(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
                     p_cb->local_r_key = 0;
                 }
 
-                SMP_TRACE_WARNING ( "rcvd auth_req: 0x%02x, io_cap: %d \
+                SMP_TRACE_DEBUG ("rcvd auth_req: 0x%02x, io_cap: %d \
                         loc_oob_flag: %d loc_enc_size: %d,"
                                     "local_i_key: 0x%02x, local_r_key: 0x%02x\n",
                                     p_cb->loc_auth_req, p_cb->local_io_capability, p_cb->loc_oob_flag,
@@ -182,7 +182,7 @@ void smp_send_app_cback(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
                     p_cb->local_r_key &= ~SMP_SEC_KEY_TYPE_LK;
                 }
 
-                SMP_TRACE_WARNING("set auth_req: 0x%02x, local_i_key: 0x%02x, local_r_key: 0x%02x\n",
+                SMP_TRACE_DEBUG("set auth_req: 0x%02x, local_i_key: 0x%02x, local_r_key: 0x%02x\n",
                                   p_cb->loc_auth_req, p_cb->local_i_key, p_cb->local_r_key);
 
                 smp_sm_event(p_cb, SMP_IO_RSP_EVT, NULL);
@@ -363,7 +363,7 @@ void smp_send_enc_info(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
         btm_sec_save_le_key(p_cb->pairing_bda, BTM_LE_KEY_LENC,
                             (tBTM_LE_KEY_VALUE *)&le_key, TRUE);
 
-    SMP_TRACE_WARNING ("%s\n", __func__);
+    SMP_TRACE_DEBUG ("%s\n", __func__);
 
     smp_key_distribution(p_cb, NULL);
 }
@@ -385,7 +385,6 @@ void smp_send_id_info(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
         btm_sec_save_le_key(p_cb->pairing_bda, BTM_LE_KEY_LID,
                             &le_key, TRUE);
 
-    SMP_TRACE_WARNING ("%s\n", __func__);
     smp_key_distribution_by_transport(p_cb, NULL);
 }
 

diff --git a/components/bt/bluedroid/stack/smp/smp_keys.c b/components/bt/bluedroid/stack/smp/smp_keys.c
index c61e673ef57430b667ac0e6bafabcbcf93f4595e..28e4499fd58c07eda0e94093177b7ffcd6728083 100644 (file)
--- a/components/bt/bluedroid/stack/smp/smp_keys.c
+++ b/components/bt/bluedroid/stack/smp/smp_keys.c
@@ -886,7 +886,7 @@ static void smp_process_ediv(tSMP_CB *p_cb, tSMP_ENC *p)
     /* EDIV = Y xor DIV */
     p_cb->ediv = p_cb->div ^ y;
     /* send LTK ready */
-    SMP_TRACE_ERROR("LTK ready");
+    SMP_TRACE_DEBUG("LTK ready");
     key.key_type = SMP_KEY_TYPE_LTK;
     key.p_data   = p->param_buf;
 

diff --git a/examples/bluetooth/gatt_server/main/gatts_demo.c b/examples/bluetooth/gatt_server/main/gatts_demo.c
index 50b993993854a8501dc7a3eb3e5d03c22d967cf5..3ddec018becdce89a45bd1b63c1b8f78ce0f2db7 100644 (file)
--- a/examples/bluetooth/gatt_server/main/gatts_demo.c
+++ b/examples/bluetooth/gatt_server/main/gatts_demo.c
@@ -451,7 +451,7 @@ static void gatts_profile_b_event_handler(esp_gatts_cb_event_t event, esp_gatt_i
     case ESP_GATTS_STOP_EVT:
         break;
     case ESP_GATTS_CONNECT_EVT:
-        ESP_LOGI(GATTS_TAG, "SERVICE_START_EVT, conn_id %d, remote %02x:%02x:%02x:%02x:%02x:%02x:, is_conn %d\n",
+        ESP_LOGI(GATTS_TAG, "CONNECT_EVT, conn_id %d, remote %02x:%02x:%02x:%02x:%02x:%02x:, is_conn %d\n",
                  param->connect.conn_id,
                  param->connect.remote_bda[0], param->connect.remote_bda[1], param->connect.remote_bda[2],
                  param->connect.remote_bda[3], param->connect.remote_bda[4], param->connect.remote_bda[5],