espressif/esp-nimble
1
0
Fork 0
mirror of https://github.com/espressif/esp-nimble.git synced 2026-09-07 09:40:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use common config option for periodic syncs count

Browse Source 
This avoids accidental inconsistency in combined build.
This commit is contained in:
Szymon Janc
2019-06-17 09:50:49 +02:00
parent d6dfb6ceb0
commit ae020dace0
8 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/btshell/src/main.c
+5 -5
View File
@@ -1050,14 +1050,14 @@ struct psync {
uint8_t data[1650]; /* TODO make this configurable */
};
static struct psync g_periodic_data[MYNEWT_VAL(BLE_MAX_PERIODIC_SCANNING_SM)];
static struct psync g_periodic_data[MYNEWT_VAL(BLE_MAX_PERIODIC_SYNCS)];
void
btshell_sync_stats(uint16_t handle)
{
struct psync *psync;
if (handle >= MYNEWT_VAL(BLE_MAX_PERIODIC_SCANNING_SM)) {
if (handle >= MYNEWT_VAL(BLE_MAX_PERIODIC_SYNCS)) {
return;
}
@@ -1077,7 +1077,7 @@ handle_periodic_report(struct ble_gap_event *event)
struct psync *psync;
uint16_t handle = event->periodic_report.sync_handle;
if (handle >= MYNEWT_VAL(BLE_MAX_PERIODIC_SCANNING_SM)) {
if (handle >= MYNEWT_VAL(BLE_MAX_PERIODIC_SYNCS)) {
return;
}
@@ -1337,7 +1337,7 @@ btshell_gap_event(struct ble_gap_event *event, void *arg)
console_printf("\n");
/* TODO non-NimBLE controllers may not start handles from 0 */
if (event->periodic_sync.sync_handle >= MYNEWT_VAL(BLE_MAX_PERIODIC_SCANNING_SM)) {
if (event->periodic_sync.sync_handle >= MYNEWT_VAL(BLE_MAX_PERIODIC_SYNCS)) {
console_printf("Unable to prepare cache for sync data\n");
} else {
psync = &g_periodic_data[event->periodic_sync.sync_handle];
@@ -1349,7 +1349,7 @@ btshell_gap_event(struct ble_gap_event *event, void *arg)
return 0;
case BLE_GAP_EVENT_PERIODIC_SYNC_LOST:
/* TODO non-NimBLE controllers may not start handles from 0 */
if (event->periodic_sync.sync_handle >= MYNEWT_VAL(BLE_MAX_PERIODIC_SCANNING_SM)) {
if (event->periodic_sync.sync_handle >= MYNEWT_VAL(BLE_MAX_PERIODIC_SYNCS)) {
console_printf("Periodic Sync Lost; sync_handle=%d reason=%d\n",
event->periodic_sync_lost.sync_handle,
event->periodic_sync_lost.reason);
nimble/controller/syscfg.yml
+2 -2
View File
@@ -264,7 +264,7 @@ syscfg.defs:
This option is used to enable/disable support for Extended
Advertising Feature. That means extended scanner, advertiser
and connect.
value: MYNEWT_VAL_BLE_EXT_ADV
value: MYNEWT_VAL(BLE_EXT_ADV)
BLE_LL_CFG_FEAT_LL_PERIODIC_ADV:
description: >
@@ -275,7 +275,7 @@ syscfg.defs:
BLE_LL_CFG_FEAT_LL_PERIODIC_ADV_SYNC_CNT:
description: >
This option is used to configure number of supported periodic syncs.
value: 1
value: MYNEWT_VAL(BLE_MAX_PERIODIC_SYNCS)
BLE_LL_EXT_ADV_AUX_PTR_CNT:
description: >
nimble/host/src/ble_hs_periodic_sync.c
+2 -2
View File
@@ -28,7 +28,7 @@ static SLIST_HEAD(, ble_hs_periodic_sync) g_ble_hs_periodic_sync_handles;
static struct os_mempool ble_hs_periodic_sync_pool;
static os_membuf_t ble_hs_psync_elem_mem[
OS_MEMPOOL_SIZE(MYNEWT_VAL(BLE_MAX_PERIODIC_SCANNING_SM),
OS_MEMPOOL_SIZE(MYNEWT_VAL(BLE_MAX_PERIODIC_SYNCS),
sizeof (struct ble_hs_periodic_sync))
];
@@ -139,7 +139,7 @@ ble_hs_periodic_sync_init(void)
int rc;
rc = os_mempool_init(&ble_hs_periodic_sync_pool,
MYNEWT_VAL(BLE_MAX_PERIODIC_SCANNING_SM),
MYNEWT_VAL(BLE_MAX_PERIODIC_SYNCS),
sizeof (struct ble_hs_periodic_sync),
ble_hs_psync_elem_mem, "ble_hs_periodic_disc_pool");
if (rc != 0) {
nimble/syscfg.yml
+1 -1
View File
@@ -34,7 +34,7 @@ syscfg.defs:
BLE_MAX_CONNECTIONS:
description: 'The maximum number of concurrent connections.'
value: 1
BLE_MAX_PERIODIC_SCANNING_SM:
BLE_MAX_PERIODIC_SYNCS:
description: >
The maximum number of concurrent periodic syncs that can
be created
porting/examples/linux/include/syscfg/syscfg.h
+2 -2
View File
@@ -247,8 +247,8 @@
#define MYNEWT_VAL_BLE_MAX_CONNECTIONS (1)
#endif
#ifndef MYNEWT_VAL_BLE_MAX_PERIODIC_SCANNING_SM
#define MYNEWT_VAL_BLE_MAX_PERIODIC_SCANNING_SM (0)
#ifndef MYNEWT_VAL_BLE_MAX_PERIODIC_SYNCS
#define MYNEWT_VAL_BLE_MAX_PERIODIC_SYNCS (0)
#endif
#ifndef MYNEWT_VAL_BLE_MULTI_ADV_INSTANCES
porting/examples/linux_blemesh/include/syscfg/syscfg.h
+2 -2
View File
@@ -247,8 +247,8 @@
#define MYNEWT_VAL_BLE_MAX_CONNECTIONS (1)
#endif
#ifndef MYNEWT_VAL_BLE_MAX_PERIODIC_SCANNING_SM
#define MYNEWT_VAL_BLE_MAX_PERIODIC_SCANNING_SM (0)
#ifndef MYNEWT_VAL_BLE_MAX_PERIODIC_SYNCS
#define MYNEWT_VAL_BLE_MAX_PERIODIC_SYNCS (0)
#endif
#ifndef MYNEWT_VAL_BLE_MULTI_ADV_INSTANCES
porting/nimble/include/syscfg/syscfg.h
+2 -2
View File
@@ -389,8 +389,8 @@
#define MYNEWT_VAL_BLE_MAX_CONNECTIONS (1)
#endif
#ifndef MYNEWT_VAL_BLE_MAX_PERIODIC_SCANNING_SM
#define MYNEWT_VAL_BLE_MAX_PERIODIC_SCANNING_SM (0)
#ifndef MYNEWT_VAL_BLE_MAX_PERIODIC_SYNCS
#define MYNEWT_VAL_BLE_MAX_PERIODIC_SYNCS (0)
#endif
#ifndef MYNEWT_VAL_BLE_MULTI_ADV_INSTANCES
porting/npl/riot/include/syscfg/syscfg.h
+2 -2
View File
@@ -410,8 +410,8 @@
#define MYNEWT_VAL_BLE_MAX_CONNECTIONS (1)
#endif
#ifndef MYNEWT_VAL_BLE_MAX_PERIODIC_SCANNING_SM
#define MYNEWT_VAL_BLE_MAX_PERIODIC_SCANNING_SM (0)
#ifndef MYNEWT_VAL_BLE_MAX_PERIODIC_SYNCS
#define MYNEWT_VAL_BLE_MAX_PERIODIC_SYNCS (0)
#endif
#ifndef MYNEWT_VAL_BLE_MULTI_ADV_INSTANCES