component/bt: Change the cache 'associat' name for unify.

diff --git a/components/bt/bluedroid/api/esp_gattc_api.c b/components/bt/bluedroid/api/esp_gattc_api.c
index cb613f085c484ae2bc944ebd7eccffa7aa15d4a6..9681cd8fe93679d067774af718c81285d18b8960 100644 (file)
--- a/components/bt/bluedroid/api/esp_gattc_api.c
+++ b/components/bt/bluedroid/api/esp_gattc_api.c
@@ -547,7 +547,7 @@ esp_err_t esp_ble_gattc_cache_refresh(esp_bd_addr_t remote_bda)
     return (btc_transfer_context(&msg, &arg, sizeof(btc_ble_gattc_args_t), NULL) == BT_STATUS_SUCCESS ? ESP_OK : ESP_FAIL);
 }
 
-esp_err_t esp_ble_gattc_cache_associa(esp_gatt_if_t gattc_if, esp_bd_addr_t src_addr, esp_bd_addr_t ass_addr, bool is_associa)
+esp_err_t esp_ble_gattc_cache_associat(esp_gatt_if_t gattc_if, esp_bd_addr_t src_addr, esp_bd_addr_t ass_addr, bool is_associat)
 {
     btc_msg_t msg;
     btc_ble_gattc_args_t arg;
@@ -557,7 +557,7 @@ esp_err_t esp_ble_gattc_cache_associa(esp_gatt_if_t gattc_if, esp_bd_addr_t src_
     msg.sig = BTC_SIG_API_CALL;
     msg.pid = BTC_PID_GATTC;
     msg.act = BTC_GATTC_ACT_CACHE_ASSOCIAT;
-    arg.cache_associat.is_associa = is_associa;
+    arg.cache_associat.is_associat = is_associat;
     arg.cache_associat.gattc_if = gattc_if;
     memcpy(arg.cache_associat.src_addr, src_addr, sizeof(esp_bd_addr_t));
     memcpy(arg.cache_associat.ass_addr, ass_addr, sizeof(esp_bd_addr_t));

diff --git a/components/bt/bluedroid/api/include/esp_gattc_api.h b/components/bt/bluedroid/api/include/esp_gattc_api.h
index 577a4109d5c788845e8e23f47f4e073d830e810f..64e015b1d362c7383b5889d060a2fa1e14bde6be 100644 (file)
--- a/components/bt/bluedroid/api/include/esp_gattc_api.h
+++ b/components/bt/bluedroid/api/include/esp_gattc_api.h
@@ -806,14 +806,14 @@ esp_err_t esp_ble_gattc_cache_refresh(esp_bd_addr_t remote_bda);
 * @param[in]       gattc_if: Gatt client access interface.
 * @param[in]       src_addr: the source address which provide the attribute table.
 * @param[in]       ass_addr: the associated device address which went to share the attribute table with the source address.
-* @param[in]       is_associa: true add the associated device address, false remove the associated device address.
+* @param[in]       is_associat: true add the associated device address, false remove the associated device address.
 * @return
 *                  - ESP_OK: success
 *                  - other: failed
 *
 */
-esp_err_t esp_ble_gattc_cache_associa(esp_gatt_if_t gattc_if, esp_bd_addr_t src_addr, 
-                                      esp_bd_addr_t ass_addr, bool is_associa);
+esp_err_t esp_ble_gattc_cache_associat(esp_gatt_if_t gattc_if, esp_bd_addr_t src_addr, 
+                                      esp_bd_addr_t ass_addr, bool is_associat);
 /**
 * @brief           Get the address list which has store the attribute table in the gattc cache. There will
 *                  callback ESP_GATTC_GET_ADDR_LIST_EVT event when get address list complete.

diff --git a/components/bt/bluedroid/btc/profile/std/gatt/btc_gattc.c b/components/bt/bluedroid/btc/profile/std/gatt/btc_gattc.c
index c07ddc75e071ddac4c4a83d2086460515d884eeb..6849080b535bbc8891e70fa0516ca6bb9619efef 100644 (file)
--- a/components/bt/bluedroid/btc/profile/std/gatt/btc_gattc.c
+++ b/components/bt/bluedroid/btc/profile/std/gatt/btc_gattc.c
@@ -743,7 +743,7 @@ void btc_gattc_call_handler(btc_msg_t *msg)
         BTA_GATTC_CacheAssociat(arg->cache_associat.gattc_if,
                                 arg->cache_associat.src_addr,
                                 arg->cache_associat.ass_addr,
-                                arg->cache_associat.is_associa);
+                                arg->cache_associat.is_associat);
         break;
     case BTC_GATTC_ATC_CACHE_GET_ADDR_LIST:
         BTA_GATTC_CacheGetAddrList(arg->get_addr_list.gattc_if);

diff --git a/components/bt/bluedroid/btc/profile/std/include/btc_gattc.h b/components/bt/bluedroid/btc/profile/std/include/btc_gattc.h
index f36bd5a0728ff1ac8a95f56f096a78a961ceed07..73adea406ef0d3cf0622513215db9cd2b3723b2f 100644 (file)
--- a/components/bt/bluedroid/btc/profile/std/include/btc_gattc.h
+++ b/components/bt/bluedroid/btc/profile/std/include/btc_gattc.h
@@ -174,7 +174,7 @@ typedef union {
         esp_gatt_if_t gattc_if;
         esp_bd_addr_t src_addr;
         esp_bd_addr_t ass_addr;
-        bool is_associa;
+        bool is_associat;
     } cache_associat;
     //BTC_GATTC_ATC_CACHE_GET_ADDR_LIST
     struct cache_get_addr_list_arg {