espressif/esp-nimble
1
0
Fork 0
mirror of https://github.com/espressif/esp-nimble.git synced 2026-11-06 20:42:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

nimble: Use consistent schema for MYNEWT_VAL

Browse Source
This commit is contained in:
Szymon Janc
2019-04-24 10:05:25 +02:00
parent bec06d9180
commit a369a5bcbd
28 changed files with 168 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nimble/controller/include/controller/ble_ll.h
+1 -1
View File
@@ -539,7 +539,7 @@ ble_ll_usecs_to_ticks_round_up(uint32_t usecs)
return os_cputime_usecs_to_ticks(usecs + 30);
}
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
/* LTK 0x4C68384139F574D836BCF34E9DFB01BF */
extern const uint8_t g_bletest_LTK[];
extern uint16_t g_bletest_EDIV;
nimble/controller/include/controller/ble_ll_conn.h
+3 -3
View File
@@ -58,7 +58,7 @@ extern "C" {
/* Definition for RSSI when the RSSI is unknown */
#define BLE_LL_CONN_UNKNOWN_RSSI (127)
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
/*
* Encryption states for a connection
*
@@ -303,7 +303,7 @@ struct ble_ll_conn_sm
/* For scheduling connections */
struct ble_ll_sched_item conn_sch;
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_PING) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_PING)
struct ble_npl_callout auth_pyld_timer;
#endif
@@ -315,7 +315,7 @@ struct ble_ll_conn_sm
* allocate these from a pool? Not sure what to do. For now, I just use
* a large chunk of memory per connection.
*/
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
struct ble_ll_conn_enc_data enc_data;
#endif
/*
nimble/controller/include/controller/ble_ll_scan.h
+1 -1
View File
@@ -131,7 +131,7 @@ struct ble_ll_scan_sm
uint8_t scan_rsp_cons_ok;
int8_t scan_rpa_index;
uint8_t scan_peer_rpa[BLE_DEV_ADDR_LEN];
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
ble_npl_time_t scan_nrpa_timer;
uint8_t scan_nrpa[BLE_DEV_ADDR_LEN];
#endif
nimble/controller/include/controller/ble_ll_sched.h
+1 -1
View File
@@ -205,7 +205,7 @@ void ble_ll_sched_stop(void);
void ble_ll_sched_rfclk_chk_restart(void);
#endif
#if MYNEWT_VAL(BLE_LL_DIRECT_TEST_MODE) == 1
#if MYNEWT_VAL(BLE_LL_DIRECT_TEST_MODE)
int ble_ll_sched_dtm(struct ble_ll_sched_item *sch);
#endif
nimble/controller/src/ble_ll.c
+17 -17
View File
@@ -44,7 +44,7 @@
#include "controller/ble_ll_trace.h"
#include "ble_ll_conn_priv.h"
#if MYNEWT_VAL(BLE_LL_DIRECT_TEST_MODE) == 1
#if MYNEWT_VAL(BLE_LL_DIRECT_TEST_MODE)
#include "ble_ll_dtm_priv.h"
#endif
@@ -590,7 +590,7 @@ ble_ll_wfr_timer_exp(void *arg)
case BLE_LL_STATE_INITIATING:
ble_ll_conn_init_wfr_timer_exp();
break;
#if MYNEWT_VAL(BLE_LL_DIRECT_TEST_MODE) == 1
#if MYNEWT_VAL(BLE_LL_DIRECT_TEST_MODE)
case BLE_LL_STATE_DTM:
ble_ll_dtm_wfr_timer_exp();
break;
@@ -685,7 +685,7 @@ ble_ll_count_rx_stats(struct ble_mbuf_hdr *hdr, uint16_t len, uint8_t pdu_type)
crcok = BLE_MBUF_HDR_CRC_OK(hdr);
connection_data = (BLE_MBUF_HDR_RX_STATE(hdr) == BLE_LL_STATE_CONNECTION);
#if MYNEWT_VAL(BLE_LL_DIRECT_TEST_MODE) == 1
#if MYNEWT_VAL(BLE_LL_DIRECT_TEST_MODE)
/* Reuse connection stats for DTM */
connection_data = (BLE_MBUF_HDR_RX_STATE(hdr) == BLE_LL_STATE_DTM);
#endif
@@ -762,7 +762,7 @@ ble_ll_rx_pkt_in(void)
case BLE_LL_STATE_INITIATING:
ble_ll_init_rx_pkt_in(pdu_type, rxbuf, ble_hdr);
break;
#if MYNEWT_VAL(BLE_LL_DIRECT_TEST_MODE) == 1
#if MYNEWT_VAL(BLE_LL_DIRECT_TEST_MODE)
case BLE_LL_STATE_DTM:
ble_ll_dtm_rx_pkt_in(m, ble_hdr);
break;
@@ -893,7 +893,7 @@ ble_ll_rx_start(uint8_t *rxbuf, uint8_t chan, struct ble_mbuf_hdr *rxhdr)
case BLE_LL_STATE_SCANNING:
rc = ble_ll_scan_rx_isr_start(pdu_type, &rxhdr->rxinfo.flags);
break;
#if MYNEWT_VAL(BLE_LL_DIRECT_TEST_MODE) == 1
#if MYNEWT_VAL(BLE_LL_DIRECT_TEST_MODE)
case BLE_LL_STATE_DTM:
rc = ble_ll_dtm_rx_isr_start(rxhdr, ble_phy_access_addr_get());
break;
@@ -941,7 +941,7 @@ ble_ll_rx_end(uint8_t *rxbuf, struct ble_mbuf_hdr *rxhdr)
ble_ll_trace_u32x3(BLE_LL_TRACE_ID_RX_END, pdu_type, len,
rxhdr->rxinfo.flags);
#if MYNEWT_VAL(BLE_LL_DIRECT_TEST_MODE) == 1
#if MYNEWT_VAL(BLE_LL_DIRECT_TEST_MODE)
if (BLE_MBUF_HDR_RX_STATE(rxhdr) == BLE_LL_STATE_DTM) {
rc = ble_ll_dtm_rx_isr_end(rxbuf, rxhdr);
return rc;
@@ -1307,7 +1307,7 @@ ble_ll_reset(void)
ble_ll_whitelist_clear();
/* Reset resolving list */
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
ble_ll_resolv_list_reset();
#endif
@@ -1512,42 +1512,42 @@ ble_ll_init(void)
/* Set the supported features. NOTE: we always support extended reject. */
features = BLE_LL_FEAT_EXTENDED_REJ;
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_DATA_LEN_EXT) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_DATA_LEN_EXT)
features |= BLE_LL_FEAT_DATA_LEN_EXT;
#endif
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_CONN_PARAM_REQ) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_CONN_PARAM_REQ)
features |= BLE_LL_FEAT_CONN_PARM_REQ;
#endif
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_SLAVE_INIT_FEAT_XCHG) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_SLAVE_INIT_FEAT_XCHG)
features |= BLE_LL_FEAT_SLAVE_INIT;
#endif
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
features |= BLE_LL_FEAT_LE_ENCRYPTION;
#endif
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
features |= (BLE_LL_FEAT_LL_PRIVACY | BLE_LL_FEAT_EXT_SCAN_FILT);
ble_ll_resolv_init();
#endif
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_PING) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_PING)
features |= BLE_LL_FEAT_LE_PING;
#endif
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
features |= BLE_LL_FEAT_EXT_ADV;
#endif
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CSA2) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CSA2)
/* CSA2 */
features |= BLE_LL_FEAT_CSA2;
#endif
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_2M_PHY) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_2M_PHY)
features |= BLE_LL_FEAT_LE_2M_PHY;
#endif
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CODED_PHY) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CODED_PHY)
features |= BLE_LL_FEAT_LE_CODED_PHY;
#endif
nimble/controller/src/ble_ll_adv.c
+24 -23
View File
@@ -123,7 +123,7 @@ struct ble_ll_adv_sm
uint8_t *conn_comp_ev;
struct ble_npl_event adv_txdone_ev;
struct ble_ll_sched_item adv_sch;
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CSA2) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CSA2)
uint16_t channel_id;
uint16_t event_cntr;
#endif
@@ -278,7 +278,7 @@ static void ble_ll_adv_make_done(struct ble_ll_adv_sm *advsm, struct ble_mbuf_hd
static void ble_ll_adv_sm_init(struct ble_ll_adv_sm *advsm);
static void ble_ll_adv_sm_stop_timeout(struct ble_ll_adv_sm *advsm);
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
static void
ble_ll_adv_rpa_update(struct ble_ll_adv_sm *advsm)
{
@@ -426,7 +426,7 @@ ble_ll_adv_legacy_pdu_make(uint8_t *dptr, void *pducb_arg, uint8_t *hdr_byte)
if (advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_DIRECTED) {
pdu_type = BLE_ADV_PDU_TYPE_ADV_DIRECT_IND;
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CSA2) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CSA2)
pdu_type |= BLE_ADV_PDU_HDR_CHSEL;
#endif
@@ -439,7 +439,7 @@ ble_ll_adv_legacy_pdu_make(uint8_t *dptr, void *pducb_arg, uint8_t *hdr_byte)
} else if (advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_CONNECTABLE) {
pdu_type = BLE_ADV_PDU_TYPE_ADV_IND;
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CSA2) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CSA2)
pdu_type |= BLE_ADV_PDU_HDR_CHSEL;
#endif
} else if (advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_SCANNABLE) {
@@ -1031,12 +1031,12 @@ ble_ll_adv_tx_start_cb(struct ble_ll_sched_item *sch)
goto adv_tx_done;
}
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
/* XXX: automatically do this in the phy based on channel? */
ble_phy_encrypt_disable();
#endif
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
advsm->adv_rpa_index = -1;
if (ble_ll_resolv_enabled()) {
ble_phy_resolv_list_enable();
@@ -1171,11 +1171,11 @@ ble_ll_adv_secondary_tx_start_cb(struct ble_ll_sched_item *sch)
goto adv_tx_done;
}
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
ble_phy_encrypt_disable();
#endif
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
advsm->adv_rpa_index = -1;
if (ble_ll_resolv_enabled()) {
ble_phy_resolv_list_enable();
@@ -1270,7 +1270,7 @@ ble_ll_adv_aux_calculate(struct ble_ll_adv_sm *advsm,
aux->payload_len = 0;
aux->ext_hdr = 0;
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CSA2) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CSA2)
aux->chan = ble_ll_utils_calc_dci_csa2(advsm->event_cntr++,
advsm->channel_id,
g_ble_ll_conn_params.num_used_chans,
@@ -1687,7 +1687,7 @@ ble_ll_adv_set_adv_params(uint8_t *cmd)
advsm->adv_txpwr = MYNEWT_VAL(BLE_LL_TX_PWR_DBM);
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
if (own_addr_type > BLE_HCI_ADV_OWN_ADDR_RANDOM) {
/* Copy peer address */
memcpy(advsm->peer_addr, cmd + 7, BLE_DEV_ADDR_LEN);
@@ -2058,11 +2058,11 @@ ble_ll_adv_sync_tx_start_cb(struct ble_ll_sched_item *sch)
goto adv_tx_done;
}
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
ble_phy_encrypt_disable();
#endif
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
ble_phy_resolv_list_disable();
#endif
@@ -2473,7 +2473,7 @@ ble_ll_adv_sm_start(struct ble_ll_adv_sm *advsm)
uint8_t adv_chan;
uint8_t *addr;
uint8_t *evbuf;
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CSA2) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CSA2)
uint32_t access_addr;
#endif
@@ -2529,7 +2529,7 @@ ble_ll_adv_sm_start(struct ble_ll_adv_sm *advsm)
}
}
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
/* This will generate an RPA for both initiator addr and adva */
if (advsm->own_addr_type > BLE_HCI_ADV_OWN_ADDR_RANDOM) {
ble_ll_adv_rpa_update(advsm);
@@ -2539,7 +2539,7 @@ ble_ll_adv_sm_start(struct ble_ll_adv_sm *advsm)
/* Set flag telling us that advertising is enabled */
advsm->adv_enabled = 1;
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CSA2) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CSA2)
advsm->event_cntr = 0;
access_addr = ble_ll_utils_calc_access_addr();
advsm->channel_id = ((access_addr & 0xffff0000) >> 16) ^
@@ -3169,7 +3169,7 @@ ble_ll_adv_ext_set_param(uint8_t *cmdbuf, uint8_t *rspbuf, uint8_t *rsplen)
goto done;
}
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY) == 0)
#if !MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
/* If we dont support privacy some address types wont work */
if (own_addr_type > BLE_HCI_ADV_OWN_ADDR_RANDOM) {
rc = BLE_ERR_UNSUPPORTED;
@@ -3766,7 +3766,7 @@ ble_ll_adv_rx_req(uint8_t pdu_type, struct os_mbuf *rxpdu)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
struct aux_conn_rsp_data rsp_data;
#endif
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
struct ble_ll_resolv_entry *rl;
#endif
@@ -3797,7 +3797,7 @@ ble_ll_adv_rx_req(uint8_t pdu_type, struct os_mbuf *rxpdu)
peer_addr_type = txadd;
resolved = 0;
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
rl = NULL;
if (ble_ll_resolv_enabled()) {
if (ble_ll_is_rpa(peer, txadd)) {
@@ -4399,7 +4399,7 @@ ble_ll_adv_done(struct ble_ll_adv_sm *advsm)
#endif
/* We need to regenerate our RPA's if we have passed timeout */
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
ble_ll_adv_chk_rpa_timeout(advsm);
#endif
@@ -4568,7 +4568,7 @@ ble_ll_adv_send_conn_comp_ev(struct ble_ll_conn_sm *connsm,
ble_ll_conn_comp_event_send(connsm, BLE_ERR_SUCCESS, evbuf, advsm);
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CSA2) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CSA2)
ble_ll_hci_ev_le_csa(connsm);
#endif
@@ -4697,8 +4697,9 @@ ble_ll_adv_sm_init(struct ble_ll_adv_sm *advsm)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
ble_npl_event_init(&advsm->adv_sec_txdone_ev, ble_ll_adv_sec_event_done, advsm);
#endif
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PERIODIC_ADV) == 1)
ble_npl_event_init(&advsm->adv_periodic_txdone_ev, ble_ll_adv_periodic_event_done, advsm);
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PERIODIC_ADV)
ble_npl_event_init(&advsm->adv_periodic_txdone_ev,
ble_ll_adv_periodic_event_done, advsm);
#endif
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
@@ -4711,7 +4712,7 @@ ble_ll_adv_sm_init(struct ble_ll_adv_sm *advsm)
advsm->aux[1].sch.sched_cb = ble_ll_adv_secondary_tx_start_cb;
advsm->aux[1].sch.sched_type = BLE_LL_SCHED_TYPE_ADV;
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PERIODIC_ADV) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PERIODIC_ADV)
/* Initialize sync schedulers */
advsm->periodic_sync_active = 0;
advsm->periodic_sync[0].sch.cb_arg = advsm;
nimble/controller/src/ble_ll_conn.c
+8 -8
View File
@@ -505,7 +505,7 @@ ble_ll_conn_calc_dci(struct ble_ll_conn_sm *conn, uint16_t latency)
{
uint8_t index;
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CSA2) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CSA2)
if (CONN_F_CSA2_SUPP(conn)) {
return ble_ll_utils_calc_dci_csa2(conn->event_cntr, conn->channel_id,
conn->num_used_chans, conn->chanmap);
@@ -1658,7 +1658,7 @@ ble_ll_conn_ext_set_params(struct ble_ll_conn_sm *connsm,
static void
ble_ll_conn_set_csa(struct ble_ll_conn_sm *connsm, bool chsel)
{
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CSA2) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CSA2)
if (chsel) {
CONN_F_CSA2_SUPP(connsm) = 1;
connsm->channel_id = ((connsm->access_addr & 0xffff0000) >> 16) ^
@@ -2286,7 +2286,7 @@ ble_ll_conn_created(struct ble_ll_conn_sm *connsm, struct ble_mbuf_hdr *rxhdr)
} else {
evbuf = ble_ll_init_get_conn_comp_ev();
ble_ll_conn_comp_event_send(connsm, BLE_ERR_SUCCESS, evbuf, NULL);
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CSA2) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CSA2)
ble_ll_hci_ev_le_csa(connsm);
#endif
@@ -2552,7 +2552,7 @@ ble_ll_conn_is_peer_adv(uint8_t addr_type, uint8_t *adva, int index)
int rc;
uint8_t *peer_addr;
struct ble_ll_conn_sm *connsm;
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
struct ble_ll_resolv_entry *rl;
#endif
@@ -2567,7 +2567,7 @@ ble_ll_conn_is_peer_adv(uint8_t addr_type, uint8_t *adva, int index)
case BLE_HCI_CONN_PEER_ADDR_PUBLIC:
case BLE_HCI_CONN_PEER_ADDR_RANDOM:
if (addr_type == connsm->peer_addr_type) {
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
/* Peer uses its identity address. Let's verify privacy mode.
*
* Note: Core Spec 5.0 Vol 6, Part B
@@ -2587,7 +2587,7 @@ ble_ll_conn_is_peer_adv(uint8_t addr_type, uint8_t *adva, int index)
break;
}
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
/* Check if peer uses RPA. If so and it match, use it as controller
* supports privacy mode
*/
@@ -2907,7 +2907,7 @@ ble_ll_conn_req_pdu_make(struct ble_ll_conn_sm *connsm, uint8_t chan)
/* Construct first PDU header byte */
pdu_type = BLE_ADV_PDU_TYPE_CONNECT_REQ;
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CSA2) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CSA2)
/* We need CSA2 bit only for legacy connect */
if (chan >= BLE_PHY_NUM_DATA_CHANS) {
pdu_type |= BLE_ADV_PDU_HDR_CHSEL;
@@ -3088,7 +3088,7 @@ ble_ll_init_rx_isr_end(uint8_t *rxbuf, uint8_t crcok,
goto init_rx_isr_exit;
}
}
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY) == 0
#if !MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
else {
/* If privacy is off - reject RPA InitA*/
goto init_rx_isr_exit;
nimble/controller/src/ble_ll_conn_hci.c
+4 -4
View File
@@ -330,7 +330,7 @@ skip_conn:
}
}
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_PING) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_PING)
/**
* Send a authenticated payload timeout event
*
@@ -1245,7 +1245,7 @@ ble_ll_conn_hci_set_chan_class(uint8_t *cmdbuf)
return rc;
}
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_DATA_LEN_EXT) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_DATA_LEN_EXT)
int
ble_ll_conn_hci_set_data_len(uint8_t *cmdbuf, uint8_t *rspbuf, uint8_t *rsplen)
{
@@ -1290,7 +1290,7 @@ done:
}
#endif
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
/**
* LE start encrypt command
*
@@ -1432,7 +1432,7 @@ ltk_key_cmd_complete:
}
#endif
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_PING) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_PING)
/**
* Read authenticated payload timeout (OGF=3, OCF==0x007B)
*
nimble/controller/src/ble_ll_conn_priv.h
+1 -1
View File
@@ -172,7 +172,7 @@ int ble_ll_conn_hci_wr_auth_pyld_tmo(uint8_t *cmdbuf, uint8_t *rsp,
uint8_t *rsplen);
int ble_ll_conn_hci_rd_auth_pyld_tmo(uint8_t *cmdbuf, uint8_t *rsp,
uint8_t *rsplen);
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_PING) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_PING)
void ble_ll_conn_auth_pyld_timer_start(struct ble_ll_conn_sm *connsm);
#else
#define ble_ll_conn_auth_pyld_timer_start(x)
nimble/controller/src/ble_ll_ctrl.c
+11 -11
View File
@@ -1007,7 +1007,7 @@ ble_ll_ctrl_datalen_upd_make(struct ble_ll_conn_sm *connsm, uint8_t *dptr)
put_le16(dptr + 7, connsm->max_tx_time);
}
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
void
ble_ll_calc_session_key(struct ble_ll_conn_sm *connsm)
{
@@ -1423,7 +1423,7 @@ ble_ll_ctrl_rx_start_enc_rsp(struct ble_ll_conn_sm *connsm)
/* We are encrypted */
connsm->enc_data.enc_state = CONN_ENC_S_ENCRYPTED;
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_PING) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_PING)
ble_ll_conn_auth_pyld_timer_start(connsm);
#endif
rc = BLE_ERR_MAX;
@@ -1600,7 +1600,7 @@ ble_ll_ctrl_rx_reject_ind(struct ble_ll_conn_sm *connsm, uint8_t *dptr,
}
}
break;
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
case BLE_LL_CTRL_PROC_ENCRYPT:
ble_ll_ctrl_proc_stop(connsm, BLE_LL_CTRL_PROC_ENCRYPT);
ble_ll_hci_ev_encrypt_chg(connsm, ble_error);
@@ -2043,7 +2043,7 @@ ble_ll_ctrl_proc_init(struct ble_ll_conn_sm *connsm, int ctrl_proc)
opcode = BLE_LL_CTRL_LENGTH_REQ;
ble_ll_ctrl_datalen_upd_make(connsm, dptr);
break;
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
/* XXX: deal with already encrypted connection.*/
case BLE_LL_CTRL_PROC_ENCRYPT:
/* If we are already encrypted we do pause procedure */
@@ -2266,7 +2266,7 @@ ble_ll_ctrl_rx_pdu(struct ble_ll_conn_sm *connsm, struct os_mbuf *om)
uint8_t *dptr;
uint8_t *rspbuf;
uint8_t *rspdata;
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
int restart_encryption;
#endif
uint8_t new_features = 0;
@@ -2307,7 +2307,7 @@ ble_ll_ctrl_rx_pdu(struct ble_ll_conn_sm *connsm, struct os_mbuf *om)
ble_ll_trace_u32x2(BLE_LL_TRACE_ID_CTRL_RX, opcode, len);
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
restart_encryption = 0;
#endif
@@ -2436,7 +2436,7 @@ ble_ll_ctrl_rx_pdu(struct ble_ll_conn_sm *connsm, struct os_mbuf *om)
case BLE_LL_CTRL_SLAVE_FEATURE_REQ:
rsp_opcode = ble_ll_ctrl_rx_feature_req(connsm, dptr, rspbuf, opcode, &new_features);
break;
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
case BLE_LL_CTRL_ENC_REQ:
rsp_opcode = ble_ll_ctrl_rx_enc_req(connsm, dptr, rspdata);
break;
@@ -2508,7 +2508,7 @@ ll_ctrl_send_rsp:
}
len = g_ble_ll_ctrl_pkt_lengths[rsp_opcode] + 1;
ble_ll_conn_enqueue_pkt(connsm, om, BLE_LL_LLID_CTRL, len);
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
if (restart_encryption) {
/* XXX: what happens if this fails? Meaning we cant allocate
mbuf? */
@@ -2605,18 +2605,18 @@ ble_ll_ctrl_tx_done(struct os_mbuf *txpdu, struct ble_ll_conn_sm *connsm)
connsm->csmflags.cfbit.host_expects_upd_event = 1;
}
}
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
if (connsm->enc_data.enc_state > CONN_ENC_S_ENCRYPTED) {
connsm->enc_data.enc_state = CONN_ENC_S_UNENCRYPTED;
}
#endif
break;
case BLE_LL_CTRL_REJECT_IND:
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
connsm->enc_data.enc_state = CONN_ENC_S_UNENCRYPTED;
#endif
break;
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
case BLE_LL_CTRL_PAUSE_ENC_REQ:
/* note: fall-through intentional */
case BLE_LL_CTRL_ENC_REQ:
nimble/controller/src/ble_ll_dtm.c
+1 -1
View File
@@ -20,7 +20,7 @@
#include "syscfg/syscfg.h"
#include "sysinit/sysinit.h"
#if MYNEWT_VAL(BLE_LL_DIRECT_TEST_MODE) == 1
#if MYNEWT_VAL(BLE_LL_DIRECT_TEST_MODE)
#include <assert.h>
#include "os/os.h"
nimble/controller/src/ble_ll_hci.c
+15 -15
View File
@@ -34,7 +34,7 @@
#include "controller/ble_ll_resolv.h"
#include "ble_ll_conn_priv.h"
#if MYNEWT_VAL(BLE_LL_DIRECT_TEST_MODE) == 1
#if MYNEWT_VAL(BLE_LL_DIRECT_TEST_MODE)
#include "ble_ll_dtm_priv.h"
#endif
@@ -137,7 +137,7 @@ ble_ll_hci_send_noop(void)
return rc;
}
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
/**
* LE encrypt command
*
@@ -394,7 +394,7 @@ ble_ll_hci_le_set_def_phy(uint8_t *cmdbuf)
}
#endif
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_DATA_LEN_EXT) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_DATA_LEN_EXT)
/**
* HCI write suggested default data length command.
*
@@ -933,7 +933,7 @@ ble_ll_hci_le_cmd_proc(uint8_t *cmdbuf, uint16_t ocf, uint8_t *rsplen,
rc = ble_ll_conn_hci_read_rem_features(cmdbuf);
}
break;
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
case BLE_HCI_OCF_LE_ENCRYPT:
if (len == BLE_HCI_LE_ENCRYPT_LEN) {
rc = ble_ll_hci_le_encrypt(cmdbuf, rspbuf, rsplen);
@@ -945,7 +945,7 @@ ble_ll_hci_le_cmd_proc(uint8_t *cmdbuf, uint16_t ocf, uint8_t *rsplen,
rc = ble_ll_hci_le_rand(rspbuf, rsplen);
}
break;
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
case BLE_HCI_OCF_LE_START_ENCRYPT:
if (len == BLE_HCI_LE_START_ENCRYPT_LEN) {
rc = ble_ll_conn_hci_le_start_encrypt(cmdbuf);
@@ -967,7 +967,7 @@ ble_ll_hci_le_cmd_proc(uint8_t *cmdbuf, uint16_t ocf, uint8_t *rsplen,
rc = ble_ll_hci_le_read_supp_states(rspbuf, rsplen);
}
break;
#if MYNEWT_VAL(BLE_LL_DIRECT_TEST_MODE) == 1
#if MYNEWT_VAL(BLE_LL_DIRECT_TEST_MODE)
case BLE_HCI_OCF_LE_TX_TEST:
if (len == BLE_HCI_TX_TEST_LEN) {
rc = ble_ll_dtm_tx_test(cmdbuf, false);
@@ -994,7 +994,7 @@ ble_ll_hci_le_cmd_proc(uint8_t *cmdbuf, uint16_t ocf, uint8_t *rsplen,
rc = ble_ll_conn_hci_param_reply(cmdbuf, 0, rspbuf, rsplen);
}
break;
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_DATA_LEN_EXT) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_DATA_LEN_EXT)
case BLE_HCI_OCF_LE_SET_DATA_LEN:
if (len == BLE_HCI_SET_DATALEN_LEN) {
rc = ble_ll_conn_hci_set_data_len(cmdbuf, rspbuf, rsplen);
@@ -1011,7 +1011,7 @@ ble_ll_hci_le_cmd_proc(uint8_t *cmdbuf, uint16_t ocf, uint8_t *rsplen,
}
break;
#endif
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
case BLE_HCI_OCF_LE_ADD_RESOLV_LIST :
if (len == BLE_HCI_ADD_TO_RESOLV_LIST_LEN) {
rc = ble_ll_resolv_list_add(cmdbuf);
@@ -1053,7 +1053,7 @@ ble_ll_hci_le_cmd_proc(uint8_t *cmdbuf, uint16_t ocf, uint8_t *rsplen,
}
break;
#endif
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_DATA_LEN_EXT) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_DATA_LEN_EXT)
case BLE_HCI_OCF_LE_RD_MAX_DATA_LEN:
if (len == 0) {
rc = ble_ll_hci_le_rd_max_data_len(rspbuf, rsplen);
@@ -1077,7 +1077,7 @@ ble_ll_hci_le_cmd_proc(uint8_t *cmdbuf, uint16_t ocf, uint8_t *rsplen,
}
break;
#endif
#if MYNEWT_VAL(BLE_LL_DIRECT_TEST_MODE) == 1
#if MYNEWT_VAL(BLE_LL_DIRECT_TEST_MODE)
case BLE_HCI_OCF_LE_ENH_RX_TEST:
if (len == BLE_HCI_LE_ENH_RX_TEST_LEN) {
rc = ble_ll_dtm_rx_test(cmdbuf, true);
@@ -1089,7 +1089,7 @@ ble_ll_hci_le_cmd_proc(uint8_t *cmdbuf, uint16_t ocf, uint8_t *rsplen,
}
break;
#endif
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
case BLE_HCI_OCF_LE_SET_ADV_SET_RND_ADDR:
if (len == BLE_HCI_LE_SET_ADV_SET_RND_ADDR_LEN) {
rc = ble_ll_adv_set_random_addr(cmdbuf + 1, cmdbuf[0]);
@@ -1175,7 +1175,7 @@ ble_ll_hci_le_cmd_proc(uint8_t *cmdbuf, uint16_t ocf, uint8_t *rsplen,
rc = ble_ll_write_rf_path_compensation(cmdbuf);
}
break;
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
case BLE_HCI_OCF_LE_SET_PRIVACY_MODE:
if (len == BLE_HCI_LE_SET_PRIVACY_MODE_LEN) {
rc = ble_ll_resolve_set_priv_mode(cmdbuf);
@@ -1264,7 +1264,7 @@ ble_ll_hci_ctlr_bb_cmd_proc(uint8_t *cmdbuf, uint16_t ocf, uint8_t *rsplen)
{
int rc;
uint8_t len;
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_PING) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_PING)
uint8_t *rspbuf;
#endif
@@ -1276,7 +1276,7 @@ ble_ll_hci_ctlr_bb_cmd_proc(uint8_t *cmdbuf, uint16_t ocf, uint8_t *rsplen)
/* Move past HCI command header */
cmdbuf += BLE_HCI_CMD_HDR_LEN;
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_PING) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_PING)
rspbuf = cmdbuf + BLE_HCI_EVENT_CMD_COMPLETE_MIN_LEN;
#endif
@@ -1298,7 +1298,7 @@ ble_ll_hci_ctlr_bb_cmd_proc(uint8_t *cmdbuf, uint16_t ocf, uint8_t *rsplen)
rc = BLE_ERR_SUCCESS;
}
break;
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_PING) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_PING)
case BLE_HCI_OCF_CB_RD_AUTH_PYLD_TMO:
rc = ble_ll_conn_hci_rd_auth_pyld_tmo(cmdbuf, rspbuf, rsplen);
break;
nimble/controller/src/ble_ll_hci_ev.c
+2 -2
View File
@@ -112,7 +112,7 @@ ble_ll_hci_ev_conn_update(struct ble_ll_conn_sm *connsm, uint8_t status)
}
}
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
void
ble_ll_hci_ev_encrypt_chg(struct ble_ll_conn_sm *connsm, uint8_t status)
{
@@ -274,7 +274,7 @@ ble_ll_hci_ev_databuf_overflow(void)
*
* @param connsm Pointer to connection state machine
*/
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CSA2) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CSA2)
void
ble_ll_hci_ev_le_csa(struct ble_ll_conn_sm *connsm)
{
nimble/controller/src/ble_ll_resolv.c
+2 -2
View File
@@ -31,7 +31,7 @@
#include "controller/ble_hw.h"
#include "ble_ll_conn_priv.h"
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
struct ble_ll_resolv_data
{
uint8_t addr_res_enabled;
@@ -676,5 +676,5 @@ ble_ll_resolv_init(void)
NULL);
}
#endif /* if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY) == 1 */
#endif /* if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY) */
nimble/controller/src/ble_ll_scan.c
+8 -8
View File
@@ -270,7 +270,7 @@ ble_ll_scan_req_backoff(struct ble_ll_scan_sm *scansm, int success)
BLE_LL_ASSERT(scansm->backoff_count <= 256);
}
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
static void
ble_ll_scan_refresh_nrpa(struct ble_ll_scan_sm *scansm)
{
@@ -306,7 +306,7 @@ ble_ll_scan_req_pdu_make(struct ble_ll_scan_sm *scansm, uint8_t *adv_addr,
uint8_t pdu_type;
uint8_t *scana;
struct os_mbuf *m;
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
uint8_t rpa[BLE_DEV_ADDR_LEN];
struct ble_ll_resolv_entry *rl;
#endif
@@ -329,7 +329,7 @@ ble_ll_scan_req_pdu_make(struct ble_ll_scan_sm *scansm, uint8_t *adv_addr,
scana = g_random_addr;
}
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
if (scansm->own_addr_type > BLE_HCI_ADV_OWN_ADDR_RANDOM) {
rl = NULL;
if (ble_ll_is_rpa(adv_addr, adv_addr_type)) {
@@ -1107,11 +1107,11 @@ ble_ll_scan_start(struct ble_ll_scan_sm *scansm, struct ble_ll_sched_item *sch)
*/
ble_phy_set_txend_cb(NULL, NULL);
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
ble_phy_encrypt_disable();
#endif
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
if (ble_ll_resolv_enabled()) {
ble_phy_resolv_list_enable();
} else {
@@ -2407,7 +2407,7 @@ ble_ll_scan_rx_isr_end(struct os_mbuf *rxpdu, uint8_t crcok)
resolved = 0;
index = -1;
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
if (ble_ll_resolv_enabled()) {
if (ble_ll_is_rpa(peer, peer_addr_type)) {
index = ble_hw_resolv_list_match();
@@ -2856,7 +2856,7 @@ ble_ll_scan_rx_pkt_in(uint8_t ptype, struct os_mbuf *om, struct ble_mbuf_hdr *hd
ident_addr = adv_addr;
ident_addr_type = txadd;
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
index = scansm->scan_rpa_index;
if (index >= 0) {
ident_addr = g_ble_ll_resolv_list[index].rl_identity_addr;
@@ -3703,7 +3703,7 @@ ble_ll_scan_common_init(void)
scansm->phy_data[PHY_CODED].phy = BLE_PHY_CODED;
#endif
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
/* Make sure we'll generate new NRPA if necessary */
scansm->scan_nrpa_timer = ble_npl_time_get();
#endif
nimble/controller/src/ble_ll_sched.c
+1 -1
View File
@@ -1549,7 +1549,7 @@ done:
}
#endif
#if MYNEWT_VAL(BLE_LL_DIRECT_TEST_MODE) == 1
#if MYNEWT_VAL(BLE_LL_DIRECT_TEST_MODE)
int ble_ll_sched_dtm(struct ble_ll_sched_item *sch)
{
int rc;
nimble/controller/src/ble_ll_supp_cmd.c
+22 -21
View File
@@ -106,7 +106,7 @@
#define BLE_SUPP_CMD_LE_SET_HOST_CHAN_CLASS (1 << 3)
#define BLE_SUPP_CMD_LE_RD_CHAN_MAP (1 << 4)
#define BLE_SUPP_CMD_LE_RD_REM_USED_FEAT (1 << 5)
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
#define BLE_SUPP_CMD_LE_ENCRYPT (1 << 6)
#else
#define BLE_SUPP_CMD_LE_ENCRYPT (0 << 6)
@@ -126,7 +126,7 @@
)
/* Octet 28 */
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
#define BLE_SUPP_CMD_LE_START_ENCRYPT (1 << 0)
#define BLE_SUPP_CMD_LE_LTK_REQ_REPLY (1 << 1)
#define BLE_SUPP_CMD_LE_LTK_REQ_NEG_REPLY (1 << 2)
@@ -137,14 +137,15 @@
#endif
#define BLE_SUPP_CMD_LE_READ_SUPP_STATES (1 << 3)
#if MYNEWT_VAL(BLE_LL_DIRECT_TEST_MODE) == 0
#define BLE_SUPP_CMD_LE_RX_TEST (0 << 4)
#define BLE_SUPP_CMD_LE_TX_TEST (0 << 5)
#define BLE_SUPP_CMD_LE_TEST_END (0 << 6)
#else
#if MYNEWT_VAL(BLE_LL_DIRECT_TEST_MODE)
#define BLE_SUPP_CMD_LE_RX_TEST (1 << 4)
#define BLE_SUPP_CMD_LE_TX_TEST (1 << 5)
#define BLE_SUPP_CMD_LE_TEST_END (1 << 6)
#else
#define BLE_SUPP_CMD_LE_RX_TEST (0 << 4)
#define BLE_SUPP_CMD_LE_TX_TEST (0 << 5)
#define BLE_SUPP_CMD_LE_TEST_END (0 << 6)
#endif
#define BLE_LL_SUPP_CMD_OCTET_28 \
@@ -161,7 +162,7 @@
/* Octet 33 */
#define BLE_SUPP_CMD_LE_REM_CONN_PRR (1 << 4)
#define BLE_SUPP_CMD_LE_REM_CONN_PRNR (1 << 5)
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_DATA_LEN_EXT) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_DATA_LEN_EXT)
#define BLE_SUPP_CMD_LE_SET_DATALEN (1 << 6)
#define BLE_SUPP_CMD_LE_RD_SUGG_DATALEN (1 << 7)
#else
@@ -178,14 +179,14 @@
)
/* Octet 34 */
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_DATA_LEN_EXT) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_DATA_LEN_EXT)
#define BLE_SUPP_CMD_LE_WR_SUGG_DATALEN (1 << 0)
#else
#define BLE_SUPP_CMD_LE_WR_SUGG_DATALEN (0 << 0)
#endif
#define BLE_SUPP_CMD_LE_READ_LOCAL_P256_PK (0 << 1)
#define BLE_SUPP_CMD_LE_GENERATE_DH_KEY (0 << 2)
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
#define BLE_SUPP_CMD_LE_ADD_RESOLV_LIST (1 << 3)
#define BLE_SUPP_CMD_LE_REMOVE_RESOLV_LIST (1 << 4)
#define BLE_SUPP_CMD_LE_CLEAR_RESOLV_LIST (1 << 5)
@@ -212,7 +213,7 @@
)
/* Octet 35 */
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
#define BLE_SUPP_CMD_LE_RD_LOCAL_RESV_ADDR (1 << 0)
#define BLE_SUPP_CMD_LE_SET_ADDR_RES_EN (1 << 1)
#define BLE_SUPP_CMD_LE_SET_RESV_ADDR_TMO (1 << 2)
@@ -232,10 +233,10 @@
#define BLE_SUPP_CMD_LE_SET_PHY (0 << 6)
#endif
#if MYNEWT_VAL(BLE_LL_DIRECT_TEST_MODE) == 0
#define BLE_SUPP_CMD_LE_ENHANCED_RX_TEST (0 << 7)
#else
#if MYNEWT_VAL(BLE_LL_DIRECT_TEST_MODE)
#define BLE_SUPP_CMD_LE_ENHANCED_RX_TEST (1 << 7)
#else
#define BLE_SUPP_CMD_LE_ENHANCED_RX_TEST (0 << 7)
#endif
#define BLE_LL_SUPP_CMD_OCTET_35 \
@@ -251,13 +252,13 @@
)
/* Octet 36 */
#if MYNEWT_VAL(BLE_LL_DIRECT_TEST_MODE) == 0
#define BLE_SUPP_CMD_LE_ENHANCED_TX_TEST (0 << 0)
#else
#if MYNEWT_VAL(BLE_LL_DIRECT_TEST_MODE)
#define BLE_SUPP_CMD_LE_ENHANCED_TX_TEST (1 << 0)
#else
#define BLE_SUPP_CMD_LE_ENHANCED_TX_TEST (0 << 0)
#endif
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
#define BLE_SUPP_CMD_LE_SET_ADVS_RAND_ADDR (1 << 1)
#define BLE_SUPP_CMD_LE_SET_EXT_ADV_PARAM (1 << 2)
#define BLE_SUPP_CMD_LE_SET_EXT_ADV_DATA (1 << 3)
@@ -288,7 +289,7 @@
)
/* Octet 37 */
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
#define BLE_SUPP_CMD_LE_REMOVE_ADVS (1 << 0)
#define BLE_SUPP_CMD_LE_CLEAR_ADVS (1 << 1)
#else
@@ -304,7 +305,7 @@
#define BLE_SUPP_CMD_LE_SET_PADV_DATA (0 << 3)
#define BLE_SUPP_CMD_LE_SET_PADV_ENABLE (0 << 4)
#endif
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
#define BLE_SUPP_CMD_LE_SET_EXT_SCAN_PARAM (1 << 5)
#define BLE_SUPP_CMD_LE_SET_EXT_SCAN_ENABLE (1 << 6)
#define BLE_SUPP_CMD_LE_EXT_CREATE_CONN (1 << 7)
@@ -351,7 +352,7 @@
/* Octet 39 */
#define BLE_SUPP_CMD_LE_RD_RF_PATH_COMP (1 << 0)
#define BLE_SUPP_CMD_LE_WR_RF_PATH_COMP (1 << 1)
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
#define BLE_SUPP_CMD_LE_SET_PRIVACY_MODE (1 << 2)
#else
#define BLE_SUPP_CMD_LE_SET_PRIVACY_MODE (0 << 2)
nimble/controller/src/ble_ll_utils.c
+1 -1
View File
@@ -204,7 +204,7 @@ ble_ll_utils_calc_num_used_chans(const uint8_t *chmap)
return used_channels;
}
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CSA2) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CSA2)
static uint16_t
ble_ll_utils_csa2_perm(uint16_t in)
{
nimble/drivers/native/src/ble_hw.c
+1 -1
View File
@@ -179,7 +179,7 @@ ble_hw_rng_read(void)
return 0;
}
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
/**
* Clear the resolving list
*
nimble/drivers/native/src/ble_phy.c
+2 -2
View File
@@ -341,7 +341,7 @@ ble_phy_restart_rx(void)
{
}
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
/**
* Called to enable encryption at the PHY. Note that this state will persist
* in the PHY; in other words, if you call this function you have to call
@@ -610,7 +610,7 @@ ble_phy_max_data_pdu_pyld(void)
return BLE_LL_DATA_PDU_MAX_PYLD;
}
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
void
ble_phy_resolv_list_enable(void)
{
nimble/drivers/nrf51/src/ble_hw.c
+2 -2
View File
@@ -39,7 +39,7 @@ static uint8_t g_ble_hw_whitelist_mask;
ble_rng_isr_cb_t g_ble_rng_isr_cb;
/* If LL privacy is enabled, allocate memory for AAR */
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
/* The NRF51 supports up to 16 IRK entries */
#if (MYNEWT_VAL(BLE_LL_RESOLV_LIST_SIZE) < 16)
@@ -384,7 +384,7 @@ ble_hw_rng_read(void)
return rnum;
}
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY))
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
/**
* Clear the resolving list
*
nimble/drivers/nrf51/src/ble_phy.c
+13 -13
View File
@@ -99,7 +99,7 @@ struct ble_phy_obj g_ble_phy_data;
static uint32_t g_ble_phy_tx_buf[(BLE_PHY_MAX_PDU_LEN + 3) / 4];
static uint32_t g_ble_phy_rx_buf[(BLE_PHY_MAX_PDU_LEN + 3) / 4];
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
/* Make sure word-aligned for faster copies */
static uint32_t g_ble_phy_enc_buf[(NRF_ENC_BUF_SIZE + 3) / 4];
#endif
@@ -175,7 +175,7 @@ STATS_NAME_END(ble_phy_stats)
* bit in the NVIC just to be sure when we disable the PHY.
*/
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
/* Per nordic, the number of bytes needed for scratch is 16 + MAX_PKT_SIZE. */
#define NRF_ENC_SCRATCH_WORDS (((NRF_MAX_ENCRYPTED_PYLD_LEN + 16) + 3) / 4)
@@ -531,7 +531,7 @@ ble_phy_tx_end_isr(void)
wfr_time = NRF_RADIO->SHORTS;
(void)wfr_time;
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
/*
* XXX: not sure what to do. We had a HW error during transmission.
* For now I just count a stat but continue on like all is good.
@@ -663,7 +663,7 @@ ble_phy_rx_start_isr(void)
uint32_t usecs;
uint32_t ticks;
struct ble_mbuf_hdr *ble_hdr;
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
uint8_t *dptr;
dptr = (uint8_t *)&g_ble_phy_rx_buf[0];
@@ -727,7 +727,7 @@ ble_phy_rx_start_isr(void)
g_ble_phy_data.phy_rx_started = 1;
NRF_RADIO->INTENSET = RADIO_INTENSET_END_Msk;
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
/* Must start aar if we need to */
if (g_ble_phy_data.phy_privacy) {
NRF_RADIO->EVENTS_BCMATCH = 0;
@@ -869,14 +869,14 @@ ble_phy_init(void)
/* Captures tx/rx start in timer0 cc 1 and tx/rx end in timer0 cc 2 */
NRF_PPI->CHENSET = PPI_CHEN_CH26_Msk | PPI_CHEN_CH27_Msk;
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
NRF_CCM->INTENCLR = 0xffffffff;
NRF_CCM->SHORTS = CCM_SHORTS_ENDKSGEN_CRYPT_Msk;
NRF_CCM->EVENTS_ERROR = 0;
memset(g_nrf_encrypt_scratchpad, 0, sizeof(g_nrf_encrypt_scratchpad));
#endif
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
g_ble_phy_data.phy_aar_scratch = 0;
NRF_AAR->IRKPTR = (uint32_t)&g_nrf_irk_list[0];
NRF_AAR->INTENCLR = 0xffffffff;
@@ -959,7 +959,7 @@ ble_phy_rx(void)
return 0;
}
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
/**
* Called to enable encryption at the PHY. Note that this state will persist
* in the PHY; in other words, if you call this function you have to call
@@ -1134,7 +1134,7 @@ ble_phy_tx(ble_phy_tx_pducb_t pducb, void *pducb_arg, uint8_t end_trans)
NRF_PPI->CHENCLR = PPI_CHEN_CH4_Msk | PPI_CHEN_CH5_Msk | PPI_CHEN_CH23_Msk |
PPI_CHEN_CH25_Msk;
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
if (g_ble_phy_data.phy_encrypted) {
/* RAM representation has S0, LENGTH and S1 fields. (3 bytes) */
dptr = (uint8_t *)&g_ble_phy_enc_buf[0];
@@ -1149,7 +1149,7 @@ ble_phy_tx(ble_phy_tx_pducb_t pducb, void *pducb_arg, uint8_t end_trans)
NRF_CCM->CNFPTR = (uint32_t)&g_nrf_ccm_data;
NRF_PPI->CHENSET = PPI_CHEN_CH24_Msk;
} else {
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
/* Reconfigure PCNF0 */
NRF_RADIO->PCNF0 = (NRF_LFLEN_BITS << RADIO_PCNF0_LFLEN_Pos) |
(NRF_S0_LEN << RADIO_PCNF0_S0LEN_Pos);
@@ -1161,7 +1161,7 @@ ble_phy_tx(ble_phy_tx_pducb_t pducb, void *pducb_arg, uint8_t end_trans)
}
#else
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
/* Reconfigure PCNF0 */
NRF_RADIO->PCNF0 = (NRF_LFLEN_BITS << RADIO_PCNF0_LFLEN_Pos) |
(NRF_S0_LEN << RADIO_PCNF0_S0LEN_Pos);
@@ -1461,14 +1461,14 @@ ble_phy_xcvr_state_get(void)
uint8_t
ble_phy_max_data_pdu_pyld(void)
{
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
return NRF_MAX_ENCRYPTED_PYLD_LEN;
#else
return BLE_LL_DATA_PDU_MAX_PYLD;
#endif
}
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
void
ble_phy_resolv_list_enable(void)
{
nimble/drivers/nrf52/src/ble_hw.c
+2 -2
View File
@@ -45,7 +45,7 @@ static uint8_t g_ble_hw_whitelist_mask;
ble_rng_isr_cb_t g_ble_rng_isr_cb;
/* If LL privacy is enabled, allocate memory for AAR */
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
/* The NRF51 supports up to 16 IRK entries */
#if (MYNEWT_VAL(BLE_LL_RESOLV_LIST_SIZE) < 16)
@@ -394,7 +394,7 @@ ble_hw_rng_read(void)
return rnum;
}
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY))
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
/**
* Clear the resolving list
*
nimble/drivers/nrf52/src/ble_phy.c
+14 -14
View File
@@ -126,7 +126,7 @@ struct ble_phy_obj g_ble_phy_data;
static uint32_t g_ble_phy_tx_buf[(BLE_PHY_MAX_PDU_LEN + 3) / 4];
static uint32_t g_ble_phy_rx_buf[(BLE_PHY_MAX_PDU_LEN + 3) / 4];
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
/* Make sure word-aligned for faster copies */
static uint32_t g_ble_phy_enc_buf[(BLE_PHY_MAX_PDU_LEN + 3) / 4];
#endif
@@ -220,7 +220,7 @@ STATS_NAME_END(ble_phy_stats)
* bit in the NVIC just to be sure when we disable the PHY.
*/
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
/*
* Per nordic, the number of bytes needed for scratch is 16 + MAX_PKT_SIZE.
@@ -767,7 +767,7 @@ ble_phy_rx_xcvr_setup(void)
NRF_RADIO->PACKETPTR = (uint32_t)dptr;
#endif
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
if (g_ble_phy_data.phy_privacy) {
NRF_AAR->ENABLE = AAR_ENABLE_ENABLE_Enabled;
NRF_AAR->IRKPTR = (uint32_t)&g_nrf_irk_list[0];
@@ -853,7 +853,7 @@ ble_phy_tx_end_isr(void)
wfr_time = NRF_RADIO->SHORTS;
(void)wfr_time;
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
/*
* XXX: not sure what to do. We had a HW error during transmission.
* For now I just count a stat but continue on like all is good.
@@ -969,7 +969,7 @@ ble_phy_rx_end_isr(void)
} else {
STATS_INC(ble_phy_stats, rx_valid);
ble_hdr->rxinfo.flags |= BLE_MBUF_HDR_F_CRC_OK;
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
if (g_ble_phy_data.phy_encrypted) {
/* Only set MIC failure flag if frame is not zero length */
if ((dptr[1] != 0) && (NRF_CCM->MICSTATUS == 0)) {
@@ -1148,7 +1148,7 @@ ble_phy_rx_start_isr(void)
g_ble_phy_data.phy_rx_started = 1;
NRF_RADIO->INTENSET = RADIO_INTENSET_END_Msk;
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
/* Must start aar if we need to */
if (g_ble_phy_data.phy_privacy) {
NRF_RADIO->EVENTS_BCMATCH = 0;
@@ -1400,14 +1400,14 @@ ble_phy_init(void)
/* Captures tx/rx start in timer0 cc 1 and tx/rx end in timer0 cc 2 */
NRF_PPI->CHENSET = PPI_CHEN_CH26_Msk | PPI_CHEN_CH27_Msk;
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
NRF_CCM->INTENCLR = 0xffffffff;
NRF_CCM->SHORTS = CCM_SHORTS_ENDKSGEN_CRYPT_Msk;
NRF_CCM->EVENTS_ERROR = 0;
memset(g_nrf_encrypt_scratchpad, 0, sizeof(g_nrf_encrypt_scratchpad));
#endif
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
g_ble_phy_data.phy_aar_scratch = 0;
NRF_AAR->IRKPTR = (uint32_t)&g_nrf_irk_list[0];
NRF_AAR->INTENCLR = 0xffffffff;
@@ -1504,7 +1504,7 @@ ble_phy_rx(void)
return 0;
}
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
/**
* Called to enable encryption at the PHY. Note that this state will persist
* in the PHY; in other words, if you call this function you have to call
@@ -1680,7 +1680,7 @@ ble_phy_tx(ble_phy_tx_pducb_t pducb, void *pducb_arg, uint8_t end_trans)
NRF_PPI->CHENCLR = PPI_CHEN_CH4_Msk | PPI_CHEN_CH5_Msk | PPI_CHEN_CH23_Msk |
PPI_CHEN_CH25_Msk;
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
if (g_ble_phy_data.phy_encrypted) {
dptr = (uint8_t *)&g_ble_phy_enc_buf[0];
pktptr = (uint8_t *)&g_ble_phy_tx_buf[0];
@@ -1692,7 +1692,7 @@ ble_phy_tx(ble_phy_tx_pducb_t pducb, void *pducb_arg, uint8_t end_trans)
NRF_CCM->MODE = CCM_MODE_LENGTH_Msk | ble_phy_get_ccm_datarate();
NRF_CCM->CNFPTR = (uint32_t)&g_nrf_ccm_data;
} else {
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
NRF_AAR->IRKPTR = (uint32_t)&g_nrf_irk_list[0];
#endif
dptr = (uint8_t *)&g_ble_phy_tx_buf[0];
@@ -1711,7 +1711,7 @@ ble_phy_tx(ble_phy_tx_pducb_t pducb, void *pducb_arg, uint8_t end_trans)
dptr[1] = payload_len;
dptr[2] = 0;
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
/* Start key-stream generation and encryption (via short) */
if (g_ble_phy_data.phy_encrypted) {
NRF_CCM->TASKS_KSGEN = 1;
@@ -2016,7 +2016,7 @@ ble_phy_max_data_pdu_pyld(void)
return BLE_LL_DATA_PDU_MAX_PYLD;
}
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY) == 1)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
void
ble_phy_resolv_list_enable(void)
{
@@ -2031,7 +2031,7 @@ ble_phy_resolv_list_disable(void)
}
#endif
#if MYNEWT_VAL(BLE_LL_DIRECT_TEST_MODE) == 1
#if MYNEWT_VAL(BLE_LL_DIRECT_TEST_MODE)
void ble_phy_enable_dtm(void)
{
/* When DTM is enabled we need to disable whitening as per
nimble/host/mesh/src/friend.c
+2 -2
View File
@@ -8,7 +8,7 @@
#include "syscfg/syscfg.h"
#if MYNEWT_VAL(BLE_MESH_FRIEND) == 1
#if MYNEWT_VAL(BLE_MESH_FRIEND)
#include <stdint.h>
#include <errno.h>
@@ -1347,4 +1347,4 @@ void bt_mesh_friend_clear_incomplete(struct bt_mesh_subnet *sub, u16_t src,
}
}
#endif //MYNEWT_VAL(BLE_MESH_FRIEND)
#endif /* MYNEWT_VAL(BLE_MESH_FRIEND) */
nimble/host/mesh/src/lpn.c
+5 -5
View File
@@ -8,7 +8,7 @@
#include "syscfg/syscfg.h"
#if MYNEWT_VAL(BLE_MESH_LOW_POWER) == 1
#if MYNEWT_VAL(BLE_MESH_LOW_POWER)
#include <stdint.h>
@@ -66,7 +66,7 @@
static void (*lpn_cb)(u16_t friend_addr, bool established);
#if (MYNEWT_VAL(BLE_MESH_DEBUG_LOW_POWER))
#if MYNEWT_VAL(BLE_MESH_DEBUG_LOW_POWER)
static const char *state2str(int state)
{
switch (state) {
@@ -96,7 +96,7 @@ static const char *state2str(int state)
static inline void lpn_set_state(int state)
{
#if (MYNEWT_VAL(BLE_MESH_DEBUG_LOW_POWER))
#if MYNEWT_VAL(BLE_MESH_DEBUG_LOW_POWER)
BT_DBG("%s -> %s", state2str(bt_mesh.lpn.state), state2str(state));
#endif
bt_mesh.lpn.state = state;
@@ -725,7 +725,7 @@ static void lpn_timeout(struct ble_npl_event *work)
{
struct bt_mesh_lpn *lpn = &bt_mesh.lpn;
#if (MYNEWT_VAL(BLE_MESH_DEBUG_LOW_POWER))
#if MYNEWT_VAL(BLE_MESH_DEBUG_LOW_POWER)
BT_DBG("state: %s", state2str(lpn->state));
#endif
@@ -1043,4 +1043,4 @@ int bt_mesh_lpn_init(void)
return 0;
}
#endif //MYNEWT_VAL(BLE_MESH_LOW_POWER) == 1
#endif /* MYNEWT_VAL(BLE_MESH_LOW_POWER) */
nimble/host/mesh/src/prov.c
+2 -2
View File
@@ -6,7 +6,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
#include "syscfg/syscfg.h"
#if MYNEWT_VAL(BLE_MESH_PROV) == 1
#if MYNEWT_VAL(BLE_MESH_PROV)
#include <errno.h>
@@ -1653,4 +1653,4 @@ void bt_mesh_prov_reset(void)
}
}
#endif //MYNEWT_VAL(BLE_MESH_PROV) == 1
#endif /* MYNEWT_VAL(BLE_MESH_PROV) */
nimble/host/mesh/src/proxy.c
+2 -2
View File
@@ -8,7 +8,7 @@
#include "syscfg/syscfg.h"
#if MYNEWT_VAL(BLE_MESH_PROXY) == 1
#if MYNEWT_VAL(BLE_MESH_PROXY)
#include "mesh/mesh.h"
@@ -1428,4 +1428,4 @@ int bt_mesh_proxy_init(void)
return 0;
}
#endif //MYNEWT_VAL(BLE_MESH_PROXY)
#endif /* MYNEWT_VAL(BLE_MESH_PROXY) */