mirror of
https://github.com/espressif/esp-nimble.git
synced 2026-07-27 13:27:47 +00:00
Fix clang compilation issue
This commit is contained in:
@@ -480,7 +480,7 @@ ble_hs_hci_evt_le_enh_conn_complete(uint8_t subevent, const void *data,
|
||||
#if MYNEWT_VAL(BLE_HOST_BASED_PRIVACY)
|
||||
/* RPA needs to be resolved here, as controller is not aware of the
|
||||
* address is RPA in Host based RPA */
|
||||
if (ble_host_rpa_enabled() && !memcmp(evt.local_rpa, ble_hs_conn_null_addr, 6) == 0) {
|
||||
if (ble_host_rpa_enabled() && ((!memcmp(evt.local_rpa, ble_hs_conn_null_addr, 6)) == 0)) {
|
||||
uint8_t *local_id_rpa = ble_hs_get_rpa_local();
|
||||
memcpy(evt.local_rpa, local_id_rpa, BLE_DEV_ADDR_LEN);
|
||||
}
|
||||
|
||||
@@ -36,13 +36,6 @@
|
||||
#define BLE_RESOLV_LIST_SIZE (MYNEWT_VAL(BLE_STORE_MAX_BONDS) + 1)
|
||||
#define BLE_MAX_RPA_TIMEOUT_VAL 0xA1B8
|
||||
|
||||
static struct ble_hs_resolv_data g_ble_hs_resolv_data;
|
||||
static struct ble_hs_resolv_entry g_ble_hs_resolv_list[BLE_RESOLV_LIST_SIZE];
|
||||
/* Allocate one extra space for peer_records than no. of Bonds, it will take
|
||||
* care of storage overflow */
|
||||
static struct ble_hs_dev_records peer_dev_rec[BLE_RESOLV_LIST_SIZE];
|
||||
static int ble_store_num_peer_dev_rec;
|
||||
|
||||
struct ble_hs_resolv_data {
|
||||
uint8_t addr_res_enabled;
|
||||
uint8_t rl_cnt;
|
||||
@@ -50,6 +43,13 @@ struct ble_hs_resolv_data {
|
||||
struct ble_npl_callout rpa_timer;
|
||||
};
|
||||
|
||||
static struct ble_hs_resolv_data g_ble_hs_resolv_data;
|
||||
static struct ble_hs_resolv_entry g_ble_hs_resolv_list[BLE_RESOLV_LIST_SIZE];
|
||||
/* Allocate one extra space for peer_records than no. of Bonds, it will take
|
||||
* care of storage overflow */
|
||||
static struct ble_hs_dev_records peer_dev_rec[BLE_RESOLV_LIST_SIZE];
|
||||
static int ble_store_num_peer_dev_rec;
|
||||
|
||||
/* NRPA bit: Enables NRPA as private address. */
|
||||
static bool nrpa_pvcy;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user