This is an automated email from the ASF dual-hosted git repository.
andk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-nimble.git
The following commit(s) were added to refs/heads/master by this push:
new a366af0d nimble: Add experimental tag for BIGInfo syscfgs
a366af0d is described below
commit a366af0d4b1851b74d1e20b79eac54940d96661c
Author: Michal Gorecki <michal.gore...@codecoup.pl>
AuthorDate: Mon Jun 5 10:23:53 2023 +0200
nimble: Add experimental tag for BIGInfo syscfgs
This adds "experimental" tag for BIGInfo sycfgs and changes the
name of host's syscfg to describe it better.
---
nimble/controller/syscfg.yml | 3 ++-
nimble/host/include/host/ble_gap.h | 2 +-
nimble/host/src/ble_gap.c | 2 +-
nimble/host/src/ble_gap_priv.h | 2 +-
nimble/host/src/ble_hs_hci_evt.c | 6 +++---
nimble/host/src/ble_hs_startup.c | 2 +-
nimble/syscfg.yml | 3 ++-
7 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/nimble/controller/syscfg.yml b/nimble/controller/syscfg.yml
index 55c20cf1..a7e6af03 100644
--- a/nimble/controller/syscfg.yml
+++ b/nimble/controller/syscfg.yml
@@ -367,7 +367,8 @@ syscfg.defs:
description: >
This option is used to enable/disable support for
handling BIGInfo data
- value: MYNEWT_VAL(BLE_BIGINFO_REPORTS)
+ value: MYNEWT_VAL(BLE_PERIODIC_ADV_SYNC_BIGINFO_REPORTS)
+ experimental: 1
BLE_LL_SCAN_AUX_SEGMENT_CNT:
description: >
diff --git a/nimble/host/include/host/ble_gap.h
b/nimble/host/include/host/ble_gap.h
index 09139994..bf40236e 100644
--- a/nimble/host/include/host/ble_gap.h
+++ b/nimble/host/include/host/ble_gap.h
@@ -983,7 +983,7 @@ struct ble_gap_event {
} periodic_transfer;
#endif
-#if MYNEWT_VAL(BLE_BIGINFO_REPORTS)
+#if MYNEWT_VAL(BLE_PERIODIC_ADV_SYNC_BIGINFO_REPORTS)
/**
* Represents a periodic advertising sync transfer received. Valid for
* the following event types:
diff --git a/nimble/host/src/ble_gap.c b/nimble/host/src/ble_gap.c
index 92023a49..119e3521 100644
--- a/nimble/host/src/ble_gap.c
+++ b/nimble/host/src/ble_gap.c
@@ -1853,7 +1853,7 @@ ble_gap_rx_periodic_adv_sync_transfer(const struct
ble_hci_ev_le_subev_periodic_
}
#endif
-#if MYNEWT_VAL(BLE_BIGINFO_REPORTS)
+#if MYNEWT_VAL(BLE_PERIODIC_ADV_SYNC_BIGINFO_REPORTS)
void
ble_gap_rx_biginfo_adv_rpt(const struct ble_hci_ev_le_subev_biginfo_adv_report
*ev)
{
diff --git a/nimble/host/src/ble_gap_priv.h b/nimble/host/src/ble_gap_priv.h
index d7fb7609..0be949da 100644
--- a/nimble/host/src/ble_gap_priv.h
+++ b/nimble/host/src/ble_gap_priv.h
@@ -88,7 +88,7 @@ void ble_gap_rx_periodic_adv_rpt(const struct
ble_hci_ev_le_subev_periodic_adv_r
void ble_gap_rx_periodic_adv_sync_lost(const struct
ble_hci_ev_le_subev_periodic_adv_sync_lost *ev);
void ble_gap_rx_periodic_adv_sync_transfer(const struct
ble_hci_ev_le_subev_periodic_adv_sync_transfer *ev);
#endif
-#if MYNEWT_VAL(BLE_BIGINFO_REPORTS)
+#if MYNEWT_VAL(BLE_PERIODIC_ADV_SYNC_BIGINFO_REPORTS)
void ble_gap_rx_biginfo_adv_rpt(const struct
ble_hci_ev_le_subev_biginfo_adv_report *ev);
#endif
void ble_gap_rx_scan_req_rcvd(const struct ble_hci_ev_le_subev_scan_req_rcvd
*ev);
diff --git a/nimble/host/src/ble_hs_hci_evt.c b/nimble/host/src/ble_hs_hci_evt.c
index b91e771c..e7af2243 100644
--- a/nimble/host/src/ble_hs_hci_evt.c
+++ b/nimble/host/src/ble_hs_hci_evt.c
@@ -63,7 +63,7 @@ static ble_hs_hci_evt_le_fn
ble_hs_hci_evt_le_periodic_adv_rpt;
static ble_hs_hci_evt_le_fn ble_hs_hci_evt_le_periodic_adv_sync_lost;
static ble_hs_hci_evt_le_fn ble_hs_hci_evt_le_scan_req_rcvd;
static ble_hs_hci_evt_le_fn ble_hs_hci_evt_le_periodic_adv_sync_transfer;
-#if MYNEWT_VAL(BLE_BIGINFO_REPORTS)
+#if MYNEWT_VAL(BLE_PERIODIC_ADV_SYNC_BIGINFO_REPORTS)
static ble_hs_hci_evt_le_fn ble_hs_hci_evt_le_biginfo_adv_report;
#endif
#if MYNEWT_VAL(BLE_POWER_CONTROL)
@@ -131,7 +131,7 @@ static ble_hs_hci_evt_le_fn * const
ble_hs_hci_evt_le_dispatch[] = {
[BLE_HCI_LE_SUBEV_ADV_SET_TERMINATED] =
ble_hs_hci_evt_le_adv_set_terminated,
[BLE_HCI_LE_SUBEV_SCAN_REQ_RCVD] = ble_hs_hci_evt_le_scan_req_rcvd,
[BLE_HCI_LE_SUBEV_PERIODIC_ADV_SYNC_TRANSFER] =
ble_hs_hci_evt_le_periodic_adv_sync_transfer,
-#if MYNEWT_VAL(BLE_BIGINFO_REPORTS)
+#if MYNEWT_VAL(BLE_PERIODIC_ADV_SYNC_BIGINFO_REPORTS)
[BLE_HCI_LE_SUBEV_BIGINFO_ADV_REPORT] =
ble_hs_hci_evt_le_biginfo_adv_report,
#endif
#if MYNEWT_VAL(BLE_POWER_CONTROL)
@@ -729,7 +729,7 @@ ble_hs_hci_evt_le_periodic_adv_sync_transfer(uint8_t
subevent, const void *data,
return 0;
}
-#if MYNEWT_VAL(BLE_BIGINFO_REPORTS)
+#if MYNEWT_VAL(BLE_PERIODIC_ADV_SYNC_BIGINFO_REPORTS)
static int
ble_hs_hci_evt_le_biginfo_adv_report(uint8_t subevent, const void *data,
unsigned int len)
diff --git a/nimble/host/src/ble_hs_startup.c b/nimble/host/src/ble_hs_startup.c
index 15e50bf0..75e98ebc 100644
--- a/nimble/host/src/ble_hs_startup.c
+++ b/nimble/host/src/ble_hs_startup.c
@@ -261,7 +261,7 @@ ble_hs_startup_le_set_evmask_tx(void)
}
#endif
-#if MYNEWT_VAL(BLE_BIGINFO_REPORTS)
+#if MYNEWT_VAL(BLE_PERIODIC_ADV_SYNC_BIGINFO_REPORTS)
if (version >= BLE_HCI_VER_BCS_5_2) {
/**
* Enable the following LE events:
diff --git a/nimble/syscfg.yml b/nimble/syscfg.yml
index 81424931..ce43a00b 100644
--- a/nimble/syscfg.yml
+++ b/nimble/syscfg.yml
@@ -68,13 +68,14 @@ syscfg.defs:
restrictions:
- 'BLE_PERIODIC_ADV if 1'
- '(BLE_ROLE_CENTRAL || BLE_ROLE_PERIPHERAL) if 1'
- BLE_BIGINFO_REPORTS:
+ BLE_PERIODIC_ADV_SYNC_BIGINFO_REPORTS:
description: >
This enables BIGInfo reports.
value: 0
restrictions:
- 'BLE_PERIODIC_ADV if 1'
- '(BLE_VERSION >= 52) if 1'
+ experimental: 1
BLE_EXT_ADV_MAX_SIZE:
description: >
This allows to configure maximum size of advertising data and
