Update IDF to 3a271a4 (espressif#735)

Author: me-no-dev

libraries/BLE

@@ -70,7 +70,6 @@
  join(FRAMEWORK_DIR, "tools", "sdk", "include", "newlib"),
  join(FRAMEWORK_DIR, "tools", "sdk", "include", "nvs_flash"),
  join(FRAMEWORK_DIR, "tools", "sdk", "include", "openssl"),
- join(FRAMEWORK_DIR, "tools", "sdk", "include", "soc"),
  join(FRAMEWORK_DIR, "tools", "sdk", "include", "spi_flash"),
  join(FRAMEWORK_DIR, "tools", "sdk", "include", "sdmmc"),
  join(FRAMEWORK_DIR, "tools", "sdk", "include", "spiffs"),
@@ -80,6 +79,7 @@
  join(FRAMEWORK_DIR, "tools", "sdk", "include", "wear_levelling"),
  join(FRAMEWORK_DIR, "tools", "sdk", "include", "xtensa-debug-module"),
  join(FRAMEWORK_DIR, "tools", "sdk", "include", "console"),
+ join(FRAMEWORK_DIR, "tools", "sdk", "include", "soc"),
  join(FRAMEWORK_DIR, "tools", "sdk", "include", "newlib"),
  join(FRAMEWORK_DIR, "tools", "sdk", "include", "coap"),
  join(FRAMEWORK_DIR, "tools", "sdk", "include", "wpa_supplicant"),
@@ -94,7 +94,7 @@
  join(FRAMEWORK_DIR, "tools", "sdk", "ld")
  ],
  LIBS=[
- "gcc", "stdc++", "app_trace", "app_update", "bootloader_support", "bt", "btdm_app", "c", "c_nano", "coap", "coexist", "console", "core", "cxx", "driver", "esp32", "esp_adc_cal", "espnow", "ethernet", "expat", "fatfs", "freertos", "hal", "heap", "jsmn", "json", "log", "lwip", "m", "mbedtls", "mdns", "micro-ecc", "net80211", "newlib", "nghttp", "nvs_flash", "openssl", "phy", "pp", "pthread", "rtc", "sdmmc", "smartconfig", "soc", "spi_flash", "spiffs", "tcpip_adapter", "ulp", "vfs", "wear_levelling", "wpa", "wpa2", "wpa_supplicant", "wps", "xtensa-debug-module"
+ "gcc", "app_trace", "app_update", "bootloader_support", "bt", "btdm_app", "c", "c_nano", "coap", "coexist", "console", "core", "cxx", "driver", "esp32", "esp_adc_cal", "espnow", "ethernet", "expat", "fatfs", "freertos", "hal", "heap", "jsmn", "json", "log", "lwip", "m", "mbedtls", "mdns", "micro-ecc", "net80211", "newlib", "nghttp", "nvs_flash", "openssl", "phy", "pp", "pthread", "rtc", "sdmmc", "smartconfig", "soc", "spi_flash", "spiffs", "tcpip_adapter", "ulp", "vfs", "wear_levelling", "wpa", "wpa2", "wpa_supplicant", "wps", "xtensa-debug-module", "stdc++"
  ],
 
  UPLOADERFLAGS=[

tools/platformio-build.py

@@ -402,6 +402,8 @@ typedef void (tBTA_SET_ADV_DATA_CMPL_CBACK) (tBTA_STATUS status);
 
 typedef void (tBTA_START_ADV_CMPL_CBACK) (tBTA_STATUS status);
 
+typedef tBTM_ADD_WHITELIST_CBACK tBTA_ADD_WHITELIST_CBACK;
+
 typedef tBTM_SET_PKT_DATA_LENGTH_CBACK tBTA_SET_PKT_DATA_LENGTH_CBACK;
 
 typedef tBTM_SET_LOCAL_PRIVACY_CBACK tBTA_SET_LOCAL_PRIVACY_CBACK;
@@ -1410,7 +1412,7 @@ extern void BTA_DisableTestMode(void);
 *******************************************************************************/
 extern void BTA_DmSetDeviceName(char *p_name);
 
-extern void BTA_DmUpdateWhiteList(BOOLEAN add_remove, BD_ADDR remote_addr);
+extern void BTA_DmUpdateWhiteList(BOOLEAN add_remove, BD_ADDR remote_addr, tBTA_ADD_WHITELIST_CBACK *add_wl_cb);
 
 extern void BTA_DmBleReadAdvTxPower(tBTA_CMPL_CB *cmpl_cb);
 
@@ -2034,6 +2036,24 @@ extern void BTA_DmBleObserve(BOOLEAN start, UINT32 duration,
  tBTA_DM_SEARCH_CBACK *p_results_cb,
  tBTA_START_STOP_SCAN_CMPL_CBACK *p_start_stop_scan_cb);
 
+/*******************************************************************************
+**
+** Function BTA_DmBleScan
+**
+** Description This procedure keep the device listening for advertising
+** events from a broadcast device.
+**
+** Parameters start: start or stop observe.
+** duration : Duration of the scan. Continuous scan if 0 is passed
+** p_results_cb: Callback to be called with scan results
+**
+** Returns void
+**
+*******************************************************************************/
+extern void BTA_DmBleScan(BOOLEAN start, UINT32 duration,
+ tBTA_DM_SEARCH_CBACK *p_results_cb,
+ tBTA_START_STOP_SCAN_CMPL_CBACK *p_start_stop_scan_cb);
+
 extern void BTA_DmBleStopAdvertising(void);
 
 extern void BTA_DmSetRandAddress(BD_ADDR rand_addr);

tools/sdk/include/bluedroid/bta_api.h

@@ -72,7 +72,11 @@ typedef UINT16 tBTA_GATTC_INT_EVT;
 
 /* max client application GATTC can support */
 #ifndef BTA_GATTC_CL_MAX
-#define BTA_GATTC_CL_MAX 3 // 32
+#if (GATT_MAX_PHY_CHANNEL > 3)
+ #define BTA_GATTC_CL_MAX GATT_MAX_PHY_CHANNEL
+#else
+ #define BTA_GATTC_CL_MAX 3 // The origin value is 10
+#endif
 #endif
 
 /* max known devices GATTC can support */

tools/sdk/include/bluedroid/bta_gattc_int.h

@@ -146,6 +146,11 @@ typedef struct {
  UINT16 supervision_tout;
 }tBTM_LE_UPDATE_CONN_PRAMS;
 
+typedef enum{
+ BTM_WHITELIST_REMOVE = 0X00,
+ BTM_WHITELIST_ADD = 0X01,
+}tBTM_WL_OPERATION;
+
 
 typedef void (tBTM_DEV_STATUS_CB) (tBTM_DEV_STATUS status);
 
@@ -177,6 +182,8 @@ typedef void (tBTM_UPDATE_CONN_PARAM_CBACK) (UINT8 status, BD_ADDR bd_addr, tBTM
 
 typedef void (tBTM_SET_PKT_DATA_LENGTH_CBACK) (UINT8 status, tBTM_LE_SET_PKT_DATA_LENGTH_PARAMS *data_length_params);
 
+typedef void (tBTM_ADD_WHITELIST_CBACK) (UINT8 status, tBTM_WL_OPERATION wl_opration);
+
 typedef void (tBTM_SET_LOCAL_PRIVACY_CBACK) (UINT8 status);
 
 
@@ -234,7 +241,7 @@ typedef void (tBTM_SET_LOCAL_PRIVACY_CBACK) (UINT8 status);
 
 /* inquiry activity mask */
 #define BTM_BR_INQ_ACTIVE_MASK (BTM_GENERAL_INQUIRY_ACTIVE|BTM_LIMITED_INQUIRY_ACTIVE|BTM_PERIODIC_INQUIRY_ACTIVE) /* BR/EDR inquiry activity mask */
-#define BTM_BLE_SCAN_ACTIVE_MASK 0xF0 /* LE scan activity mask */
+#define BTM_BLE_SCAN_ACTIVE_MASK 0x01F0 /* LE scan activity mask */
 #define BTM_BLE_INQ_ACTIVE_MASK (BTM_LE_GENERAL_INQUIRY_ACTIVE|BTM_LE_LIMITED_INQUIRY_ACTIVE) /* LE inquiry activity mask*/
 #define BTM_INQUIRY_ACTIVE_MASK (BTM_BR_INQ_ACTIVE_MASK | BTM_BLE_INQ_ACTIVE_MASK) /* inquiry activity mask */
 

tools/sdk/include/bluedroid/btm_api.h

@@ -1207,6 +1207,22 @@ tBTM_STATUS BTM_BleWriteScanRspRaw(UINT8 *p_raw_scan_rsp, UINT32 raw_scan_rsp_le
 tBTM_STATUS BTM_BleObserve(BOOLEAN start, UINT32 duration,
  tBTM_INQ_RESULTS_CB *p_results_cb, tBTM_CMPL_CB *p_cmpl_cb);
 
+/*******************************************************************************
+**
+** Function BTM_BleScan
+**
+** Description This procedure keep the device listening for advertising
+** events from a broadcast device.
+**
+** Parameters start: start or stop scan.
+**
+** Returns void
+**
+*******************************************************************************/
+//extern
+tBTM_STATUS BTM_BleScan(BOOLEAN start, UINT32 duration,
+ tBTM_INQ_RESULTS_CB *p_results_cb, tBTM_CMPL_CB *p_cmpl_cb);
+
 
 /*******************************************************************************
 **
@@ -1695,7 +1711,7 @@ void BTM_BleTurnOnPrivacyOnRemote(BD_ADDR bd_addr,
 **
 *******************************************************************************/
 //extern
-BOOLEAN BTM_BleUpdateAdvWhitelist(BOOLEAN add_remove, BD_ADDR emote_bda);
+BOOLEAN BTM_BleUpdateAdvWhitelist(BOOLEAN add_remove, BD_ADDR emote_bda, tBTM_ADD_WHITELIST_CBACK *add_wl_cb);
 
 /*******************************************************************************
 **

tools/sdk/include/bluedroid/btm_ble_api.h

@@ -86,13 +86,15 @@ typedef UINT8 tBTM_BLE_SEC_REQ_ACT;
 #define BTM_BLE_IS_RESOLVE_BDA(x) ((x[0] & BLE_RESOLVE_ADDR_MASK) == BLE_RESOLVE_ADDR_MSB)
 
 /* LE scan activity bit mask, continue with LE inquiry bits */
-#define BTM_LE_SELECT_CONN_ACTIVE 0x40 /* selection connection is in progress */
-#define BTM_LE_OBSERVE_ACTIVE 0x80 /* observe is in progress */
+#define BTM_LE_SELECT_CONN_ACTIVE 0x0040 /* selection connection is in progress */
+#define BTM_LE_OBSERVE_ACTIVE 0x0080 /* observe is in progress */
+#define BTM_LE_DISCOVER_ACTIVE 0x0100 /* scan is in progress */
 
 /* BLE scan activity mask checking */
 #define BTM_BLE_IS_SCAN_ACTIVE(x) ((x) & BTM_BLE_SCAN_ACTIVE_MASK)
 #define BTM_BLE_IS_INQ_ACTIVE(x) ((x) & BTM_BLE_INQUIRY_MASK)
 #define BTM_BLE_IS_OBS_ACTIVE(x) ((x) & BTM_LE_OBSERVE_ACTIVE)
+#define BTM_BLE_IS_DISCO_ACTIVE(x) ((x) & BTM_LE_DISCOVER_ACTIVE)
 #define BTM_BLE_IS_SEL_CONN_ACTIVE(x) ((x) & BTM_LE_SELECT_CONN_ACTIVE)
 
 /* BLE ADDR type ID bit */
@@ -136,6 +138,7 @@ typedef struct {
 typedef struct {
  UINT16 discoverable_mode;
  UINT16 connectable_mode;
+ BOOLEAN scan_params_set;
  UINT32 scan_window;
  UINT32 scan_interval;
  UINT8 scan_type; /* current scan type: active or passive */
@@ -294,7 +297,7 @@ typedef void (tBTM_DATA_LENGTH_CHANGE_CBACK) (UINT16 max_tx_length, UINT16 max_r
 /* Define BLE Device Management control structure
 */
 typedef struct {
- UINT8 scan_activity; /* LE scan activity mask */
+ UINT16 scan_activity; /* LE scan activity mask */
 
  /*****************************************************
  ** BLE Inquiry
@@ -306,6 +309,11 @@ typedef struct {
  tBTM_CMPL_CB *p_obs_cmpl_cb;
  TIMER_LIST_ENT obs_timer_ent;
 
+ /* scan callback and timer */
+ tBTM_INQ_RESULTS_CB *p_scan_results_cb;
+ tBTM_CMPL_CB *p_scan_cmpl_cb;
+ TIMER_LIST_ENT scan_timer_ent;
+
  /* background connection procedure cb value */
  tBTM_BLE_CONN_TYPE bg_conn_type;
  UINT32 scan_int;
@@ -314,6 +322,7 @@ typedef struct {
 
  /* white list information */
  UINT8 white_list_avail_size;
+ tBTM_ADD_WHITELIST_CBACK *add_wl_cb;
  tBTM_BLE_WL_STATE wl_state;
 
  fixed_queue_t *conn_pending_q;
@@ -357,7 +366,6 @@ tBTM_STATUS btm_ble_start_inquiry (UINT8 mode, UINT8 duration);
 void btm_ble_stop_scan(void);
 void btm_clear_all_pending_le_entry(void);
 
-void btm_ble_stop_scan();
 BOOLEAN btm_ble_send_extended_scan_params(UINT8 scan_type, UINT32 scan_int,
  UINT32 scan_win, UINT8 addr_type_own,
  UINT8 scan_filter_policy);
@@ -405,7 +413,7 @@ void btm_ble_update_sec_key_size(BD_ADDR bd_addr, UINT8 enc_key_size);
 UINT8 btm_ble_read_sec_key_size(BD_ADDR bd_addr);
 
 /* white list function */
-BOOLEAN btm_update_dev_to_white_list(BOOLEAN to_add, BD_ADDR bd_addr);
+BOOLEAN btm_update_dev_to_white_list(BOOLEAN to_add, BD_ADDR bd_addr, tBTM_ADD_WHITELIST_CBACK *add_wl_cb);
 void btm_update_scanner_filter_policy(tBTM_BLE_SFP scan_policy);
 void btm_update_adv_filter_policy(tBTM_BLE_AFP adv_policy);
 void btm_ble_clear_white_list (void);

tools/sdk/include/bluedroid/btm_ble_int.h

@@ -160,9 +160,8 @@ typedef void (*tBTU_EVENT_CALLBACK)(BT_HDR *p_hdr);
 #define BTU_TTYPE_BLE_GAP_FAST_ADV 106
 #define BTU_TTYPE_BLE_OBSERVE 107
 
-
 #define BTU_TTYPE_UCD_TO 108
-
+#define BTU_TTYPE_BLE_SCAN 109
 
 
 /* This is the inquiry response information held by BTU, and available

tools/sdk/include/bluedroid/btu.h

@@ -97,6 +97,7 @@ typedef enum {
  ESP_GAP_BLE_CLEAR_BOND_DEV_COMPLETE_EVT, /*!< When clear the bond device clear complete, the event comes */
  ESP_GAP_BLE_GET_BOND_DEV_COMPLETE_EVT, /*!< When get the bond device list complete, the event comes */
  ESP_GAP_BLE_READ_RSSI_COMPLETE_EVT, /*!< When read the rssi complete, the event comes */
+ ESP_GAP_BLE_ADD_WHITELIST_COMPLETE_EVT, /*!< When add or remove whitelist complete, the event comes */
  ESP_GAP_BLE_EVT_MAX,
 } esp_gap_ble_cb_event_t;
 
@@ -462,6 +463,10 @@ typedef enum {
  ESP_BLE_EVT_SCAN_RSP = 0x04, /*!< Scan Response (SCAN_RSP) */
 } esp_ble_evt_type_t;
 
+typedef enum{
+ ESP_BLE_WHITELIST_REMOVE = 0X00, /*!< remove mac from whitelist */
+ ESP_BLE_WHITELIST_ADD = 0X01, /*!< add address to whitelist */
+}esp_ble_wl_opration;
 /**
  * @brief Gap callback parameters union
  */
@@ -600,6 +605,13 @@ typedef union {
  if the RSSI cannot be read, the RSSI metric shall be set to 127. */
  esp_bd_addr_t remote_addr; /*!< The remote device address */
  } read_rssi_cmpl; /*!< Event parameter of ESP_GAP_BLE_READ_RSSI_COMPLETE_EVT */
+ /**
+ * @brief ESP_GAP_BLE_ADD_WHITELIST_COMPLETE_EVT
+ */
+ struct ble_add_whitelist_cmpl_evt_param {
+ esp_bt_status_t status; /*!< Indicate the add or remove whitelist operation success status */
+ esp_ble_wl_opration wl_opration; /*!< The value is ESP_BLE_WHITELIST_ADD if add address to whitelist operation success, ESP_BLE_WHITELIST_REMOVE if remove address from the whitelist operation success */
+ } add_whitelist_cmpl; /*!< Event parameter of ESP_GAP_BLE_ADD_WHITELIST_COMPLETE_EVT */
 } esp_ble_gap_cb_param_t;
 
 /**
@@ -972,6 +984,12 @@ esp_err_t esp_ble_get_bond_device_list(int *dev_num, esp_ble_bond_dev_t *dev_lis
 
 /**
 * @brief This function is to disconnect the physical connection of the peer device
+* gattc maybe have multiple virtual GATT server connections when multiple app_id registed.
+* esp_ble_gattc_close (esp_gatt_if_t gattc_if, uint16_t conn_id) only close one virtual GATT server connection.
+* if there exist other virtual GATT server connections, it does not disconnect the physical connection.
+* esp_ble_gap_disconnect(esp_bd_addr_t remote_device) disconnect the physical connection directly.
+*
+*
 *
 * @param[in] remote_device : BD address of the peer device
 *

tools/sdk/include/bluedroid/esp_gap_ble_api.h

@@ -78,7 +78,6 @@ typedef enum {
  ESP_BT_CONTROLLER_STATUS_IDLE = 0,
  ESP_BT_CONTROLLER_STATUS_INITED,
  ESP_BT_CONTROLLER_STATUS_ENABLED,
- ESP_BT_CONTROLLER_STATUS_SHUTDOWN,
  ESP_BT_CONTROLLER_STATUS_NUM,
 } esp_bt_controller_status_t;