[
https://issues.apache.org/jira/browse/MYNEWT-405?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Simon Ratner updated MYNEWT-405:
--------------------------------
Description:
Several compilation errors (mostly unused variables) when privacy feature is
disabled.
{noformat}
diff --git a/net/nimble/controller/src/ble_ll_adv.c
b/net/nimble/controller/src/ble_ll_adv.c
--- a/net/nimble/controller/src/ble_ll_adv.c
+++ b/net/nimble/controller/src/ble_ll_adv.c
@@ -971,7 +973,9 @@ ble_ll_adv_conn_req_rxd(uint8_t *rxbuf, struct ble_mbuf_hdr
*hdr)
{
int valid;
uint8_t pyld_len;
+#if (BLE_LL_CFG_FEAT_LL_PRIVACY == 1)
uint8_t resolved;
+#endif
uint8_t addr_type;
uint8_t *inita;
uint8_t *ident_addr;
@@ -980,7 +984,9 @@ ble_ll_adv_conn_req_rxd(uint8_t *rxbuf, struct ble_mbuf_hdr
*hdr)
/* Check filter policy. */
valid = 0;
+#if (BLE_LL_CFG_FEAT_LL_PRIVACY == 1)
resolved = BLE_MBUF_HDR_RESOLVED(hdr);
+#endif
advsm = &g_ble_ll_adv_sm;
inita = rxbuf + BLE_LL_PDU_HDR_LEN;
if (hdr->rxinfo.flags & BLE_MBUF_HDR_F_DEVMATCH) {
diff --git a/net/nimble/controller/src/ble_ll_scan.c
b/net/nimble/controller/src/ble_ll_scan.c
--- a/net/nimble/controller/src/ble_ll_scan.c
+++ b/net/nimble/controller/src/ble_ll_scan.c
@@ -1100,7 +1100,9 @@ ble_ll_scan_wfr_timer_exp(void)
void
ble_ll_scan_rx_pkt_in(uint8_t ptype, uint8_t *rxbuf, struct ble_mbuf_hdr *hdr)
{
+#if (BLE_LL_CFG_FEAT_LL_PRIVACY == 1)
int index;
+#endif
uint8_t *adv_addr;
uint8_t *adva;
uint8_t *ident_addr;
@@ -1139,8 +1141,6 @@ ble_ll_scan_rx_pkt_in(uint8_t ptype, uint8_t *rxbuf,
struct ble_mbuf_hdr *hdr)
ident_addr = g_ble_ll_resolv_list[index].rl_identity_addr;
ident_addr_type = g_ble_ll_resolv_list[index].rl_addr_type;
}
-#else
- index = -1;
#endif
/*
{noformat}
was:
Several compilation errors (mostly unused variables) when privacy feature is
disabled.
> Compilation error with -DBLE_LL_CFG_FEAT_LL_PRIVACY=0
> -----------------------------------------------------
>
> Key: MYNEWT-405
> URL: https://issues.apache.org/jira/browse/MYNEWT-405
> Project: Mynewt
> Issue Type: Bug
> Components: Nimble
> Affects Versions: v0_9_0, v1_0_0_beta1
> Reporter: Simon Ratner
>
> Several compilation errors (mostly unused variables) when privacy feature is
> disabled.
> {noformat}
> diff --git a/net/nimble/controller/src/ble_ll_adv.c
> b/net/nimble/controller/src/ble_ll_adv.c
> --- a/net/nimble/controller/src/ble_ll_adv.c
> +++ b/net/nimble/controller/src/ble_ll_adv.c
> @@ -971,7 +973,9 @@ ble_ll_adv_conn_req_rxd(uint8_t *rxbuf, struct
> ble_mbuf_hdr *hdr)
> {
> int valid;
> uint8_t pyld_len;
> +#if (BLE_LL_CFG_FEAT_LL_PRIVACY == 1)
> uint8_t resolved;
> +#endif
> uint8_t addr_type;
> uint8_t *inita;
> uint8_t *ident_addr;
> @@ -980,7 +984,9 @@ ble_ll_adv_conn_req_rxd(uint8_t *rxbuf, struct
> ble_mbuf_hdr *hdr)
> /* Check filter policy. */
> valid = 0;
> +#if (BLE_LL_CFG_FEAT_LL_PRIVACY == 1)
> resolved = BLE_MBUF_HDR_RESOLVED(hdr);
> +#endif
> advsm = &g_ble_ll_adv_sm;
> inita = rxbuf + BLE_LL_PDU_HDR_LEN;
> if (hdr->rxinfo.flags & BLE_MBUF_HDR_F_DEVMATCH) {
> diff --git a/net/nimble/controller/src/ble_ll_scan.c
> b/net/nimble/controller/src/ble_ll_scan.c
> --- a/net/nimble/controller/src/ble_ll_scan.c
> +++ b/net/nimble/controller/src/ble_ll_scan.c
> @@ -1100,7 +1100,9 @@ ble_ll_scan_wfr_timer_exp(void)
> void
> ble_ll_scan_rx_pkt_in(uint8_t ptype, uint8_t *rxbuf, struct ble_mbuf_hdr
> *hdr)
> {
> +#if (BLE_LL_CFG_FEAT_LL_PRIVACY == 1)
> int index;
> +#endif
> uint8_t *adv_addr;
> uint8_t *adva;
> uint8_t *ident_addr;
> @@ -1139,8 +1141,6 @@ ble_ll_scan_rx_pkt_in(uint8_t ptype, uint8_t *rxbuf,
> struct ble_mbuf_hdr *hdr)
> ident_addr = g_ble_ll_resolv_list[index].rl_identity_addr;
> ident_addr_type = g_ble_ll_resolv_list[index].rl_addr_type;
> }
> -#else
> - index = -1;
> #endif
> /*
> {noformat}
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
