From d90b7274fa8bbfa09f79660b45b550d91f7b0125 Mon Sep 17 00:00:00 2001 From: Jean-François Milants Date: Tue, 2 Feb 2021 22:09:00 +0100 Subject: Update to nimble 1.3 master branch commit 82153e744833821e20e9a8b0d61c38b2b0dbcfe1 WARNING : heartbeat task is disabled! --- .../porting/npl/riot/include/logcfg/logcfg.h | 2 +- .../porting/npl/riot/include/syscfg/syscfg.h | 93 ++++++++++++++++------ .../porting/npl/riot/include/sysflash/sysflash.h | 2 +- 3 files changed, 71 insertions(+), 26 deletions(-) (limited to 'src/libs/mynewt-nimble/porting/npl/riot') diff --git a/src/libs/mynewt-nimble/porting/npl/riot/include/logcfg/logcfg.h b/src/libs/mynewt-nimble/porting/npl/riot/include/logcfg/logcfg.h index e21a3ae5..837cdeac 100644 --- a/src/libs/mynewt-nimble/porting/npl/riot/include/logcfg/logcfg.h +++ b/src/libs/mynewt-nimble/porting/npl/riot/include/logcfg/logcfg.h @@ -1,5 +1,5 @@ /** - * This file was generated by Apache newt version: 1.8.0-dev + * This file was generated by Apache newt version: 1.9.0-dev */ #ifndef H_MYNEWT_LOGCFG_ diff --git a/src/libs/mynewt-nimble/porting/npl/riot/include/syscfg/syscfg.h b/src/libs/mynewt-nimble/porting/npl/riot/include/syscfg/syscfg.h index e78ebe0a..816f410a 100644 --- a/src/libs/mynewt-nimble/porting/npl/riot/include/syscfg/syscfg.h +++ b/src/libs/mynewt-nimble/porting/npl/riot/include/syscfg/syscfg.h @@ -1,5 +1,5 @@ /** - * This file was generated by Apache newt version: 1.8.0-dev + * This file was generated by Apache newt version: 1.9.0-dev */ #ifndef H_MYNEWT_SYSCFG_ @@ -15,8 +15,6 @@ #define MYNEWT_VAL(_name) MYNEWT_VAL_ ## _name #define MYNEWT_VAL_CHOICE(_name, _val) MYNEWT_VAL_ ## _name ## __ ## _val - - /*** @apache-mynewt-core/compiler/arm-none-eabi-m4 */ #ifndef MYNEWT_VAL_HARDFLOAT #define MYNEWT_VAL_HARDFLOAT (0) @@ -167,6 +165,10 @@ #define MYNEWT_VAL_NFC_PINS_AS_GPIO (1) #endif +#ifndef MYNEWT_VAL_OS_TICKS_PER_SEC +#define MYNEWT_VAL_OS_TICKS_PER_SEC (128) +#endif + #ifndef MYNEWT_VAL_PWM_0 #define MYNEWT_VAL_PWM_0 (0) #endif @@ -357,6 +359,10 @@ #undef MYNEWT_VAL_SPI_3_MASTER_PIN_SCK +#ifndef MYNEWT_VAL_TEMP +#define MYNEWT_VAL_TEMP (0) +#endif + /* Overridden by @apache-mynewt-core/hw/bsp/nordic_pca10056 (defined by @apache-mynewt-core/hw/mcu/nordic/nrf52xxx) */ #ifndef MYNEWT_VAL_TIMER_0 #define MYNEWT_VAL_TIMER_0 (0) @@ -427,7 +433,7 @@ #undef MYNEWT_VAL_UART_1_PIN_TX -/* Overridden by @apache-mynewt-nimble/targets/riot (defined by @apache-mynewt-core/hw/mcu/nordic/nrf52xxx) */ +/* Overridden by @apache-mynewt-nimble/porting/targets/riot (defined by @apache-mynewt-core/hw/mcu/nordic/nrf52xxx) */ #ifndef MYNEWT_VAL_XTAL_32768 #define MYNEWT_VAL_XTAL_32768 (1) #endif @@ -445,12 +451,12 @@ #define MYNEWT_VAL_FLOAT_USER (0) #endif -/* Overridden by @apache-mynewt-nimble/targets/riot (defined by @apache-mynewt-core/kernel/os) */ +/* Overridden by @apache-mynewt-nimble/porting/targets/riot (defined by @apache-mynewt-core/kernel/os) */ #ifndef MYNEWT_VAL_MSYS_1_BLOCK_COUNT #define MYNEWT_VAL_MSYS_1_BLOCK_COUNT (5) #endif -/* Overridden by @apache-mynewt-nimble/targets/riot (defined by @apache-mynewt-core/kernel/os) */ +/* Overridden by @apache-mynewt-nimble/porting/targets/riot (defined by @apache-mynewt-core/kernel/os) */ #ifndef MYNEWT_VAL_MSYS_1_BLOCK_SIZE #define MYNEWT_VAL_MSYS_1_BLOCK_SIZE (88) #endif @@ -769,11 +775,19 @@ #define MYNEWT_VAL_BLE_EXT_ADV_MAX_SIZE (31) #endif +#ifndef MYNEWT_VAL_BLE_ISO +#define MYNEWT_VAL_BLE_ISO (0) +#endif + +#ifndef MYNEWT_VAL_BLE_ISO_TEST +#define MYNEWT_VAL_BLE_ISO_TEST (0) +#endif + #ifndef MYNEWT_VAL_BLE_MAX_CONNECTIONS #define MYNEWT_VAL_BLE_MAX_CONNECTIONS (1) #endif -/* Overridden by @apache-mynewt-nimble/targets/riot (defined by @apache-mynewt-nimble/nimble) */ +/* Overridden by @apache-mynewt-nimble/porting/targets/riot (defined by @apache-mynewt-nimble/nimble) */ #ifndef MYNEWT_VAL_BLE_MAX_PERIODIC_SYNCS #define MYNEWT_VAL_BLE_MAX_PERIODIC_SYNCS (0) #endif @@ -823,7 +837,7 @@ #define MYNEWT_VAL_BLE_DEVICE (1) #endif -/* Overridden by @apache-mynewt-nimble/targets/riot (defined by @apache-mynewt-nimble/nimble/controller) */ +/* Overridden by @apache-mynewt-nimble/porting/targets/riot (defined by @apache-mynewt-nimble/nimble/controller) */ #ifndef MYNEWT_VAL_BLE_HW_WHITELIST_ENABLE #define MYNEWT_VAL_BLE_HW_WHITELIST_ENABLE (0) #endif @@ -836,7 +850,11 @@ #define MYNEWT_VAL_BLE_LL_CFG_FEAT_CONN_PARAM_REQ (1) #endif -/* Overridden by @apache-mynewt-nimble/targets/riot (defined by @apache-mynewt-nimble/nimble/controller) */ +#ifndef MYNEWT_VAL_BLE_LL_CFG_FEAT_CTRL_TO_HOST_FLOW_CONTROL +#define MYNEWT_VAL_BLE_LL_CFG_FEAT_CTRL_TO_HOST_FLOW_CONTROL (0) +#endif + +/* Overridden by @apache-mynewt-nimble/porting/targets/riot (defined by @apache-mynewt-nimble/nimble/controller) */ #ifndef MYNEWT_VAL_BLE_LL_CFG_FEAT_DATA_LEN_EXT #define MYNEWT_VAL_BLE_LL_CFG_FEAT_DATA_LEN_EXT (0) #endif @@ -849,12 +867,12 @@ #define MYNEWT_VAL_BLE_LL_CFG_FEAT_LE_CODED_PHY (0) #endif -/* Overridden by @apache-mynewt-nimble/targets/riot (defined by @apache-mynewt-nimble/nimble/controller) */ +/* Overridden by @apache-mynewt-nimble/porting/targets/riot (defined by @apache-mynewt-nimble/nimble/controller) */ #ifndef MYNEWT_VAL_BLE_LL_CFG_FEAT_LE_CSA2 #define MYNEWT_VAL_BLE_LL_CFG_FEAT_LE_CSA2 (1) #endif -/* Overridden by @apache-mynewt-nimble/targets/riot (defined by @apache-mynewt-nimble/nimble/controller) */ +/* Overridden by @apache-mynewt-nimble/porting/targets/riot (defined by @apache-mynewt-nimble/nimble/controller) */ #ifndef MYNEWT_VAL_BLE_LL_CFG_FEAT_LE_ENCRYPTION #define MYNEWT_VAL_BLE_LL_CFG_FEAT_LE_ENCRYPTION (0) #endif @@ -868,6 +886,16 @@ #define MYNEWT_VAL_BLE_LL_CFG_FEAT_LL_EXT_ADV (0) #endif +/* Value copied from BLE_ISO */ +#ifndef MYNEWT_VAL_BLE_LL_CFG_FEAT_LL_ISO +#define MYNEWT_VAL_BLE_LL_CFG_FEAT_LL_ISO (0) +#endif + +/* Value copied from BLE_ISO_TEST */ +#ifndef MYNEWT_VAL_BLE_LL_CFG_FEAT_LL_ISO_TEST +#define MYNEWT_VAL_BLE_LL_CFG_FEAT_LL_ISO_TEST (0) +#endif + /* Value copied from BLE_PERIODIC_ADV */ #ifndef MYNEWT_VAL_BLE_LL_CFG_FEAT_LL_PERIODIC_ADV #define MYNEWT_VAL_BLE_LL_CFG_FEAT_LL_PERIODIC_ADV (0) @@ -888,16 +916,20 @@ #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) */ +/* Overridden by @apache-mynewt-nimble/porting/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) #endif +#ifndef MYNEWT_VAL_BLE_LL_CFG_FEAT_LL_SCA_UPDATE +#define MYNEWT_VAL_BLE_LL_CFG_FEAT_LL_SCA_UPDATE (0) +#endif + #ifndef MYNEWT_VAL_BLE_LL_CFG_FEAT_SLAVE_INIT_FEAT_XCHG #define MYNEWT_VAL_BLE_LL_CFG_FEAT_SLAVE_INIT_FEAT_XCHG (1) #endif -/* Overridden by @apache-mynewt-nimble/targets/riot (defined by @apache-mynewt-nimble/nimble/controller) */ +/* 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) #endif @@ -910,12 +942,20 @@ #define MYNEWT_VAL_BLE_LL_CONN_INIT_SLOTS (4) #endif -#ifndef MYNEWT_VAL_BLE_LL_DBG_HCI_CMD_PIN -#define MYNEWT_VAL_BLE_LL_DBG_HCI_CMD_PIN (-1) +#ifndef MYNEWT_VAL_BLE_LL_DEBUG_GPIO_HCI_CMD +#define MYNEWT_VAL_BLE_LL_DEBUG_GPIO_HCI_CMD (-1) #endif -#ifndef MYNEWT_VAL_BLE_LL_DBG_HCI_EV_PIN -#define MYNEWT_VAL_BLE_LL_DBG_HCI_EV_PIN (-1) +#ifndef MYNEWT_VAL_BLE_LL_DEBUG_GPIO_HCI_EV +#define MYNEWT_VAL_BLE_LL_DEBUG_GPIO_HCI_EV (-1) +#endif + +#ifndef MYNEWT_VAL_BLE_LL_DEBUG_GPIO_SCHED_ITEM_CB +#define MYNEWT_VAL_BLE_LL_DEBUG_GPIO_SCHED_ITEM_CB (-1) +#endif + +#ifndef MYNEWT_VAL_BLE_LL_DEBUG_GPIO_SCHED_RUN +#define MYNEWT_VAL_BLE_LL_DEBUG_GPIO_SCHED_RUN (-1) #endif #ifndef MYNEWT_VAL_BLE_LL_DIRECT_TEST_MODE @@ -980,6 +1020,11 @@ #define MYNEWT_VAL_BLE_LL_RNG_BUFSIZE (32) #endif +/* Value copied from BLE_LL_OUR_SCA */ +#ifndef MYNEWT_VAL_BLE_LL_SCA +#define MYNEWT_VAL_BLE_LL_SCA (60) +#endif + #ifndef MYNEWT_VAL_BLE_LL_SCHED_AUX_CHAIN_MAFS_DELAY #define MYNEWT_VAL_BLE_LL_SCHED_AUX_CHAIN_MAFS_DELAY (0) #endif @@ -1000,12 +1045,12 @@ #define MYNEWT_VAL_BLE_LL_STRICT_CONN_SCHEDULING (0) #endif -/* Overridden by @apache-mynewt-nimble/targets/riot (defined by @apache-mynewt-nimble/nimble/controller) */ +/* Overridden by @apache-mynewt-nimble/porting/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) */ +/* Overridden by @apache-mynewt-nimble/porting/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 @@ -1372,7 +1417,7 @@ #define MYNEWT_VAL_BLE_SM_KEYPRESS (0) #endif -/* Overridden by @apache-mynewt-nimble/targets/riot (defined by @apache-mynewt-nimble/nimble/host) */ +/* Overridden by @apache-mynewt-nimble/porting/targets/riot (defined by @apache-mynewt-nimble/nimble/host) */ #ifndef MYNEWT_VAL_BLE_SM_LEGACY #define MYNEWT_VAL_BLE_SM_LEGACY (0) #endif @@ -1393,7 +1438,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) */ +/* Overridden by @apache-mynewt-nimble/porting/targets/riot (defined by @apache-mynewt-nimble/nimble/host) */ #ifndef MYNEWT_VAL_BLE_SM_SC #define MYNEWT_VAL_BLE_SM_SC (0) #endif @@ -1465,9 +1510,9 @@ #endif /*** @apache-mynewt-nimble/nimble/transport/ram */ -/* Overridden by @apache-mynewt-nimble/targets/riot (defined by @apache-mynewt-nimble/nimble/transport/ram) */ +/* Overridden by @apache-mynewt-nimble/porting/targets/riot (defined by @apache-mynewt-nimble/nimble/transport/ram) */ #ifndef MYNEWT_VAL_BLE_ACL_BUF_COUNT -#define MYNEWT_VAL_BLE_ACL_BUF_COUNT (4) +#define MYNEWT_VAL_BLE_ACL_BUF_COUNT (24) #endif #ifndef MYNEWT_VAL_BLE_ACL_BUF_SIZE @@ -1478,7 +1523,7 @@ #define MYNEWT_VAL_BLE_HCI_EVT_BUF_SIZE (70) #endif -/* Overridden by @apache-mynewt-nimble/targets/riot (defined by @apache-mynewt-nimble/nimble/transport/ram) */ +/* Overridden by @apache-mynewt-nimble/porting/targets/riot (defined by @apache-mynewt-nimble/nimble/transport/ram) */ #ifndef MYNEWT_VAL_BLE_HCI_EVT_HI_BUF_COUNT #define MYNEWT_VAL_BLE_HCI_EVT_HI_BUF_COUNT (2) #endif diff --git a/src/libs/mynewt-nimble/porting/npl/riot/include/sysflash/sysflash.h b/src/libs/mynewt-nimble/porting/npl/riot/include/sysflash/sysflash.h index 413cb267..ab1341b2 100644 --- a/src/libs/mynewt-nimble/porting/npl/riot/include/sysflash/sysflash.h +++ b/src/libs/mynewt-nimble/porting/npl/riot/include/sysflash/sysflash.h @@ -1,5 +1,5 @@ /** - * This file was generated by Apache newt version: 1.8.0-dev + * This file was generated by Apache newt version: 1.9.0-dev */ #ifndef H_MYNEWT_SYSFLASH_ -- cgit v1.2.3