This is an automated email from the ASF dual-hosted git repository. hauke 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 2b03b2c npl/riot: update generated syscfg.h 2b03b2c is described below commit 2b03b2cc4c01e3f64c1b72fac980535143a9610a Author: Hauke Petersen <hauke.peter...@fu-berlin.de> AuthorDate: Wed Feb 19 11:31:26 2020 +0100 npl/riot: update generated syscfg.h --- porting/npl/riot/include/syscfg/syscfg.h | 51 ++++++++++++++++++++------------ porting/targets/riot/syscfg.yml | 2 ++ 2 files changed, 34 insertions(+), 19 deletions(-) diff --git a/porting/npl/riot/include/syscfg/syscfg.h b/porting/npl/riot/include/syscfg/syscfg.h index 2513c48..3d98b13 100644 --- a/porting/npl/riot/include/syscfg/syscfg.h +++ b/porting/npl/riot/include/syscfg/syscfg.h @@ -22,19 +22,6 @@ #define MYNEWT_VAL_HARDFLOAT (0) #endif -/*** @apache-mynewt-core/crypto/tinycrypt */ -#ifndef MYNEWT_VAL_TINYCRYPT_SYSINIT_STAGE -#define MYNEWT_VAL_TINYCRYPT_SYSINIT_STAGE (200) -#endif - -#ifndef MYNEWT_VAL_TINYCRYPT_UECC_RNG_TRNG_DEV_NAME -#define MYNEWT_VAL_TINYCRYPT_UECC_RNG_TRNG_DEV_NAME ("trng") -#endif - -#ifndef MYNEWT_VAL_TINYCRYPT_UECC_RNG_USE_TRNG -#define MYNEWT_VAL_TINYCRYPT_UECC_RNG_USE_TRNG (0) -#endif - /*** @apache-mynewt-core/hw/bsp/nordic_pca10056 */ #ifndef MYNEWT_VAL_BSP_NRF52840 #define MYNEWT_VAL_BSP_NRF52840 (1) @@ -799,6 +786,10 @@ #define MYNEWT_VAL_BLE_PERIODIC_ADV (0) #endif +#ifndef MYNEWT_VAL_BLE_PERIODIC_ADV_SYNC_TRANSFER +#define MYNEWT_VAL_BLE_PERIODIC_ADV_SYNC_TRANSFER (0) +#endif + #ifndef MYNEWT_VAL_BLE_ROLE_BROADCASTER #define MYNEWT_VAL_BLE_ROLE_BROADCASTER (1) #endif @@ -850,10 +841,6 @@ #define MYNEWT_VAL_BLE_LL_CFG_FEAT_DATA_LEN_EXT (0) #endif -#ifndef MYNEWT_VAL_BLE_LL_CFG_FEAT_EXT_SCAN_FILT -#define MYNEWT_VAL_BLE_LL_CFG_FEAT_EXT_SCAN_FILT (0) -#endif - #ifndef MYNEWT_VAL_BLE_LL_CFG_FEAT_LE_2M_PHY #define MYNEWT_VAL_BLE_LL_CFG_FEAT_LE_2M_PHY (0) #endif @@ -891,6 +878,16 @@ #define MYNEWT_VAL_BLE_LL_CFG_FEAT_LL_PERIODIC_ADV_SYNC_CNT (0) #endif +/* Value copied from BLE_MAX_PERIODIC_SYNCS */ +#ifndef MYNEWT_VAL_BLE_LL_CFG_FEAT_LL_PERIODIC_ADV_SYNC_LIST_CNT +#define MYNEWT_VAL_BLE_LL_CFG_FEAT_LL_PERIODIC_ADV_SYNC_LIST_CNT (0) +#endif + +/* Value copied from BLE_PERIODIC_ADV_SYNC_TRANSFER */ +#ifndef MYNEWT_VAL_BLE_LL_CFG_FEAT_LL_PERIODIC_ADV_SYNC_TRANSFER +#define MYNEWT_VAL_BLE_LL_CFG_FEAT_LL_PERIODIC_ADV_SYNC_TRANSFER (0) +#endif + /* Overridden by @apache-mynewt-nimble/targets/riot (defined by @apache-mynewt-nimble/nimble/controller) */ #ifndef MYNEWT_VAL_BLE_LL_CFG_FEAT_LL_PRIVACY #define MYNEWT_VAL_BLE_LL_CFG_FEAT_LL_PRIVACY (0) @@ -974,6 +971,11 @@ #define MYNEWT_VAL_BLE_LL_RESOLV_LIST_SIZE (4) #endif +/* Overridden by @apache-mynewt-core/hw/bsp/nordic_pca10056 (defined by @apache-mynewt-nimble/nimble/controller) */ +#ifndef MYNEWT_VAL_BLE_LL_RFMGMT_ENABLE_TIME +#define MYNEWT_VAL_BLE_LL_RFMGMT_ENABLE_TIME (1500) +#endif + #ifndef MYNEWT_VAL_BLE_LL_RNG_BUFSIZE #define MYNEWT_VAL_BLE_LL_RNG_BUFSIZE (32) #endif @@ -986,14 +988,24 @@ #define MYNEWT_VAL_BLE_LL_SCHED_AUX_MAFS_DELAY (0) #endif +#ifndef MYNEWT_VAL_BLE_LL_SCHED_SCAN_AUX_PDU_LEN +#define MYNEWT_VAL_BLE_LL_SCHED_SCAN_AUX_PDU_LEN (41) +#endif + +#ifndef MYNEWT_VAL_BLE_LL_SCHED_SCAN_SYNC_PDU_LEN +#define MYNEWT_VAL_BLE_LL_SCHED_SCAN_SYNC_PDU_LEN (32) +#endif + #ifndef MYNEWT_VAL_BLE_LL_STRICT_CONN_SCHEDULING #define MYNEWT_VAL_BLE_LL_STRICT_CONN_SCHEDULING (0) #endif +/* Overridden by @apache-mynewt-nimble/targets/riot (defined by @apache-mynewt-nimble/nimble/controller) */ #ifndef MYNEWT_VAL_BLE_LL_SUPP_MAX_RX_BYTES #define MYNEWT_VAL_BLE_LL_SUPP_MAX_RX_BYTES (MYNEWT_VAL_BLE_LL_MAX_PKT_SIZE) #endif +/* Overridden by @apache-mynewt-nimble/targets/riot (defined by @apache-mynewt-nimble/nimble/controller) */ #ifndef MYNEWT_VAL_BLE_LL_SUPP_MAX_TX_BYTES #define MYNEWT_VAL_BLE_LL_SUPP_MAX_TX_BYTES (MYNEWT_VAL_BLE_LL_MAX_PKT_SIZE) #endif @@ -1034,9 +1046,8 @@ #define MYNEWT_VAL_BLE_PUBLIC_DEV_ADDR ((uint8_t[6]){0x00, 0x00, 0x00, 0x00, 0x00, 0x00}) #endif -/* Overridden by @apache-mynewt-core/hw/bsp/nordic_pca10056 (defined by @apache-mynewt-nimble/nimble/controller) */ #ifndef MYNEWT_VAL_BLE_XTAL_SETTLE_TIME -#define MYNEWT_VAL_BLE_XTAL_SETTLE_TIME (1500) +#define MYNEWT_VAL_BLE_XTAL_SETTLE_TIME (0) #endif /*** @apache-mynewt-nimble/nimble/drivers/nrf52 */ @@ -1357,6 +1368,7 @@ #define MYNEWT_VAL_BLE_SM_KEYPRESS (0) #endif +/* Overridden by @apache-mynewt-nimble/targets/riot (defined by @apache-mynewt-nimble/nimble/host) */ #ifndef MYNEWT_VAL_BLE_SM_LEGACY #define MYNEWT_VAL_BLE_SM_LEGACY (0) #endif @@ -1377,6 +1389,7 @@ #define MYNEWT_VAL_BLE_SM_OUR_KEY_DIST (0) #endif +/* Overridden by @apache-mynewt-nimble/targets/riot (defined by @apache-mynewt-nimble/nimble/host) */ #ifndef MYNEWT_VAL_BLE_SM_SC #define MYNEWT_VAL_BLE_SM_SC (0) #endif diff --git a/porting/targets/riot/syscfg.yml b/porting/targets/riot/syscfg.yml index 3903330..7bbb57f 100644 --- a/porting/targets/riot/syscfg.yml +++ b/porting/targets/riot/syscfg.yml @@ -25,6 +25,8 @@ syscfg.vals: BLE_LL_CFG_FEAT_LE_ENCRYPTION: 0 BLE_LL_CFG_FEAT_LL_PRIVACY: 0 BLE_LL_CONN_INIT_MAX_TX_BYTES: 'MYNEWT_VAL_BLE_LL_MAX_PKT_SIZE' + BLE_LL_SUPP_MAX_RX_BYTES: 'MYNEWT_VAL_BLE_LL_MAX_PKT_SIZE' + BLE_LL_SUPP_MAX_TX_BYTES: 'MYNEWT_VAL_BLE_LL_MAX_PKT_SIZE' BLE_SM_LEGACY: 0 BLE_SM_SC: 0 BLE_MAX_PERIODIC_SYNCS: 0