diff --git a/porting/examples/linux/include/syscfg/syscfg.h b/porting/examples/linux/include/syscfg/syscfg.h index a74ff46b5..f60846de7 100644 --- a/porting/examples/linux/include/syscfg/syscfg.h +++ b/porting/examples/linux/include/syscfg/syscfg.h @@ -430,6 +430,10 @@ #endif /*** @apache-mynewt-nimble/nimble */ +#ifndef MYNEWT_VAL_BLE_CONN_SUBRATING +#define MYNEWT_VAL_BLE_CONN_SUBRATING (0) +#endif + #ifndef MYNEWT_VAL_BLE_EXT_ADV #define MYNEWT_VAL_BLE_EXT_ADV (0) #endif @@ -478,10 +482,6 @@ #define MYNEWT_VAL_BLE_POWER_CONTROL (0) #endif -#ifndef MYNEWT_VAL_BLE_CONN_SUBRATING -#define MYNEWT_VAL_BLE_CONN_SUBRATING (0) -#endif - #ifndef MYNEWT_VAL_BLE_ROLE_BROADCASTER #define MYNEWT_VAL_BLE_ROLE_BROADCASTER (1) #endif @@ -1063,9 +1063,8 @@ #define MYNEWT_VAL_BLE_TRANSPORT_EVT_DISCARDABLE_COUNT (16) #endif -/* Overridden by @apache-mynewt-nimble/nimble/transport (defined by @apache-mynewt-nimble/nimble/transport) */ #ifndef MYNEWT_VAL_BLE_TRANSPORT_EVT_SIZE -#define MYNEWT_VAL_BLE_TRANSPORT_EVT_SIZE (257) +#define MYNEWT_VAL_BLE_TRANSPORT_EVT_SIZE (70) #endif #ifndef MYNEWT_VAL_BLE_TRANSPORT_HS__cdc diff --git a/porting/examples/linux_blemesh/include/syscfg/syscfg.h b/porting/examples/linux_blemesh/include/syscfg/syscfg.h index a5ee90298..3af3ecc09 100644 --- a/porting/examples/linux_blemesh/include/syscfg/syscfg.h +++ b/porting/examples/linux_blemesh/include/syscfg/syscfg.h @@ -431,6 +431,10 @@ #endif /*** @apache-mynewt-nimble/nimble */ +#ifndef MYNEWT_VAL_BLE_CONN_SUBRATING +#define MYNEWT_VAL_BLE_CONN_SUBRATING (0) +#endif + #ifndef MYNEWT_VAL_BLE_EXT_ADV #define MYNEWT_VAL_BLE_EXT_ADV (0) #endif @@ -479,10 +483,6 @@ #define MYNEWT_VAL_BLE_POWER_CONTROL (0) #endif -#ifndef MYNEWT_VAL_BLE_CONN_SUBRATING -#define MYNEWT_VAL_BLE_CONN_SUBRATING (0) -#endif - #ifndef MYNEWT_VAL_BLE_ROLE_BROADCASTER #define MYNEWT_VAL_BLE_ROLE_BROADCASTER (1) #endif @@ -1638,9 +1638,8 @@ #define MYNEWT_VAL_BLE_TRANSPORT_EVT_DISCARDABLE_COUNT (16) #endif -/* Overridden by @apache-mynewt-nimble/nimble/transport (defined by @apache-mynewt-nimble/nimble/transport) */ #ifndef MYNEWT_VAL_BLE_TRANSPORT_EVT_SIZE -#define MYNEWT_VAL_BLE_TRANSPORT_EVT_SIZE (257) +#define MYNEWT_VAL_BLE_TRANSPORT_EVT_SIZE (70) #endif #ifndef MYNEWT_VAL_BLE_TRANSPORT_HS__cdc diff --git a/porting/examples/nuttx/include/syscfg/syscfg.h b/porting/examples/nuttx/include/syscfg/syscfg.h index 741695d86..6035f7966 100644 --- a/porting/examples/nuttx/include/syscfg/syscfg.h +++ b/porting/examples/nuttx/include/syscfg/syscfg.h @@ -430,6 +430,10 @@ #endif /*** @apache-mynewt-nimble/nimble */ +#ifndef MYNEWT_VAL_BLE_CONN_SUBRATING +#define MYNEWT_VAL_BLE_CONN_SUBRATING (0) +#endif + #ifndef MYNEWT_VAL_BLE_EXT_ADV #define MYNEWT_VAL_BLE_EXT_ADV (0) #endif @@ -478,10 +482,6 @@ #define MYNEWT_VAL_BLE_POWER_CONTROL (0) #endif -#ifndef MYNEWT_VAL_BLE_CONN_SUBRATING -#define MYNEWT_VAL_BLE_CONN_SUBRATING (0) -#endif - #ifndef MYNEWT_VAL_BLE_ROLE_BROADCASTER #define MYNEWT_VAL_BLE_ROLE_BROADCASTER (1) #endif @@ -1065,9 +1065,8 @@ #define MYNEWT_VAL_BLE_TRANSPORT_EVT_DISCARDABLE_COUNT (16) #endif -/* Overridden by @apache-mynewt-nimble/nimble/transport (defined by @apache-mynewt-nimble/nimble/transport) */ #ifndef MYNEWT_VAL_BLE_TRANSPORT_EVT_SIZE -#define MYNEWT_VAL_BLE_TRANSPORT_EVT_SIZE (257) +#define MYNEWT_VAL_BLE_TRANSPORT_EVT_SIZE (70) #endif #ifndef MYNEWT_VAL_BLE_TRANSPORT_HS__cdc diff --git a/porting/nimble/include/syscfg/syscfg.h b/porting/nimble/include/syscfg/syscfg.h index dcd5acc0d..612afbd8e 100644 --- a/porting/nimble/include/syscfg/syscfg.h +++ b/porting/nimble/include/syscfg/syscfg.h @@ -429,6 +429,10 @@ #endif /*** @apache-mynewt-nimble/nimble */ +#ifndef MYNEWT_VAL_BLE_CONN_SUBRATING +#define MYNEWT_VAL_BLE_CONN_SUBRATING (0) +#endif + #ifndef MYNEWT_VAL_BLE_EXT_ADV #define MYNEWT_VAL_BLE_EXT_ADV (0) #endif @@ -477,10 +481,6 @@ #define MYNEWT_VAL_BLE_POWER_CONTROL (0) #endif -#ifndef MYNEWT_VAL_BLE_CONN_SUBRATING -#define MYNEWT_VAL_BLE_CONN_SUBRATING (0) -#endif - #ifndef MYNEWT_VAL_BLE_ROLE_BROADCASTER #define MYNEWT_VAL_BLE_ROLE_BROADCASTER (1) #endif @@ -1062,9 +1062,8 @@ #define MYNEWT_VAL_BLE_TRANSPORT_EVT_DISCARDABLE_COUNT (16) #endif -/* Overridden by @apache-mynewt-nimble/nimble/transport (defined by @apache-mynewt-nimble/nimble/transport) */ #ifndef MYNEWT_VAL_BLE_TRANSPORT_EVT_SIZE -#define MYNEWT_VAL_BLE_TRANSPORT_EVT_SIZE (257) +#define MYNEWT_VAL_BLE_TRANSPORT_EVT_SIZE (70) #endif #ifndef MYNEWT_VAL_BLE_TRANSPORT_HS__cdc diff --git a/porting/npl/riot/include/syscfg/syscfg.h b/porting/npl/riot/include/syscfg/syscfg.h index b732e00f3..71c0798fb 100644 --- a/porting/npl/riot/include/syscfg/syscfg.h +++ b/porting/npl/riot/include/syscfg/syscfg.h @@ -19,6 +19,19 @@ #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) @@ -145,7 +158,7 @@ #endif #ifndef MYNEWT_VAL_MCU_ICACHE_ENABLED -#define MYNEWT_VAL_MCU_ICACHE_ENABLED (0) +#define MYNEWT_VAL_MCU_ICACHE_ENABLED (1) #endif /* Overridden by @apache-mynewt-nimble/porting/targets/riot (defined by @apache-mynewt-core/hw/mcu/nordic/nrf52xxx) */ @@ -792,6 +805,10 @@ #endif /*** @apache-mynewt-nimble/nimble */ +#ifndef MYNEWT_VAL_BLE_CONN_SUBRATING +#define MYNEWT_VAL_BLE_CONN_SUBRATING (0) +#endif + #ifndef MYNEWT_VAL_BLE_EXT_ADV #define MYNEWT_VAL_BLE_EXT_ADV (0) #endif @@ -842,10 +859,6 @@ #define MYNEWT_VAL_BLE_POWER_CONTROL (0) #endif -#ifndef MYNEWT_VAL_BLE_CONN_SUBRATING -#define MYNEWT_VAL_BLE_CONN_SUBRATING (0) -#endif - #ifndef MYNEWT_VAL_BLE_ROLE_BROADCASTER #define MYNEWT_VAL_BLE_ROLE_BROADCASTER (1) #endif @@ -1029,6 +1042,10 @@ #define MYNEWT_VAL_BLE_LL_CFG_FEAT_SLAVE_INIT_FEAT_XCHG (0) #endif +#ifndef MYNEWT_VAL_BLE_LL_CONN_EVENT_END_MARGIN +#define MYNEWT_VAL_BLE_LL_CONN_EVENT_END_MARGIN (0) +#endif + /* Overridden by @apache-mynewt-nimble/porting/targets/riot (defined by @apache-mynewt-nimble/nimble/controller) */ #ifndef MYNEWT_VAL_BLE_LL_CONN_INIT_MAX_TX_BYTES #define MYNEWT_VAL_BLE_LL_CONN_INIT_MAX_TX_BYTES (MYNEWT_VAL_BLE_LL_MAX_PKT_SIZE) @@ -1103,6 +1120,10 @@ #define MYNEWT_VAL_BLE_LL_DTM_EXTENSIONS (0) #endif +#ifndef MYNEWT_VAL_BLE_LL_EXT +#define MYNEWT_VAL_BLE_LL_EXT (0) +#endif + #ifndef MYNEWT_VAL_BLE_LL_EXT_ADV_AUX_PTR_CNT #define MYNEWT_VAL_BLE_LL_EXT_ADV_AUX_PTR_CNT (0) #endif @@ -1283,6 +1304,10 @@ #define MYNEWT_VAL_BLE_LL_TX_PWR_DBM (0) #endif +#ifndef MYNEWT_VAL_BLE_LL_TX_PWR_MAX_DBM +#define MYNEWT_VAL_BLE_LL_TX_PWR_MAX_DBM (20) +#endif + #ifndef MYNEWT_VAL_BLE_LL_USECS_PER_PERIOD #define MYNEWT_VAL_BLE_LL_USECS_PER_PERIOD (0) #endif @@ -1332,6 +1357,10 @@ #define MYNEWT_VAL_BLE_PHY_UBLOX_BMD345_PUBLIC_ADDR (0) #endif +#ifndef MYNEWT_VAL_BLE_PHY_VARIABLE_TIFS +#define MYNEWT_VAL_BLE_PHY_VARIABLE_TIFS (0) +#endif + /*** @apache-mynewt-nimble/nimble/host */ #ifndef MYNEWT_VAL_BLE_ATT_PREFERRED_MTU #define MYNEWT_VAL_BLE_ATT_PREFERRED_MTU (256) @@ -1776,9 +1805,8 @@ #define MYNEWT_VAL_BLE_TRANSPORT_EVT_DISCARDABLE_COUNT (16) #endif -/* Overridden by @apache-mynewt-nimble/nimble/transport (defined by @apache-mynewt-nimble/nimble/transport) */ #ifndef MYNEWT_VAL_BLE_TRANSPORT_EVT_SIZE -#define MYNEWT_VAL_BLE_TRANSPORT_EVT_SIZE (257) +#define MYNEWT_VAL_BLE_TRANSPORT_EVT_SIZE (70) #endif #ifndef MYNEWT_VAL_BLE_TRANSPORT_HS__cdc @@ -1874,6 +1902,7 @@ /*** Included packages */ #define MYNEWT_PKG_apache_mynewt_core__compiler_arm_none_eabi_m4 1 +#define MYNEWT_PKG_apache_mynewt_core__crypto_tinycrypt 1 #define MYNEWT_PKG_apache_mynewt_core__hw_bsp_nordic_pca10056 1 #define MYNEWT_PKG_apache_mynewt_core__hw_cmsis_core 1 #define MYNEWT_PKG_apache_mynewt_core__hw_drivers_uart 1