This is an automated email from the ASF dual-hosted git repository. janc pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/mynewt-nimble.git
commit 4ac4eeca3ab17d46b2ab6565f8fdf9f2eee11f2c Author: Szymon Janc <[email protected]> AuthorDate: Tue Feb 8 15:17:38 2022 +0100 nimble/ports: Refresh syscfg --- porting/examples/linux/include/syscfg/syscfg.h | 87 ++++++++++++++++- .../examples/linux_blemesh/include/syscfg/syscfg.h | 89 ++++++++++++++++- porting/examples/nuttx/include/syscfg/syscfg.h | 88 ++++++++++++++++- porting/nimble/include/syscfg/syscfg.h | 87 ++++++++++++++++- porting/npl/riot/include/syscfg/syscfg.h | 107 +++++++++++++++++++-- 5 files changed, 439 insertions(+), 19 deletions(-) diff --git a/porting/examples/linux/include/syscfg/syscfg.h b/porting/examples/linux/include/syscfg/syscfg.h index fc9ef46..31d3835 100644 --- a/porting/examples/linux/include/syscfg/syscfg.h +++ b/porting/examples/linux/include/syscfg/syscfg.h @@ -443,6 +443,10 @@ #define MYNEWT_VAL_BLE_HCI_VS (0) #endif +#ifndef MYNEWT_VAL_BLE_HCI_VS_OCF_OFFSET +#define MYNEWT_VAL_BLE_HCI_VS_OCF_OFFSET (0) +#endif + #ifndef MYNEWT_VAL_BLE_ISO #define MYNEWT_VAL_BLE_ISO (0) #endif @@ -1003,31 +1007,104 @@ #define MYNEWT_VAL_BLE_SVC_TPS_SYSINIT_STAGE (303) #endif -/*** @apache-mynewt-nimble/nimble/transport/socket */ +/*** @apache-mynewt-nimble/nimble/transport */ +/* Overridden by @apache-mynewt-nimble/nimble/transport/socket (defined by @apache-mynewt-nimble/nimble/transport) */ #ifndef MYNEWT_VAL_BLE_ACL_BUF_COUNT #define MYNEWT_VAL_BLE_ACL_BUF_COUNT (24) #endif +/* Overridden by @apache-mynewt-nimble/nimble/transport/socket (defined by @apache-mynewt-nimble/nimble/transport) */ #ifndef MYNEWT_VAL_BLE_ACL_BUF_SIZE #define MYNEWT_VAL_BLE_ACL_BUF_SIZE (255) #endif -#ifndef MYNEWT_VAL_BLE_HCI_ACL_OUT_COUNT -#define MYNEWT_VAL_BLE_HCI_ACL_OUT_COUNT (12) +#ifndef MYNEWT_VAL_BLE_HCI_BRIDGE +#define MYNEWT_VAL_BLE_HCI_BRIDGE (0) #endif +#ifndef MYNEWT_VAL_BLE_HCI_BRIDGE_TRANSPORT__dialog_cmac +#define MYNEWT_VAL_BLE_HCI_BRIDGE_TRANSPORT__dialog_cmac (0) +#endif +#ifndef MYNEWT_VAL_BLE_HCI_BRIDGE_TRANSPORT__nrf5340 +#define MYNEWT_VAL_BLE_HCI_BRIDGE_TRANSPORT__nrf5340 (0) +#endif +#undef MYNEWT_VAL_BLE_HCI_BRIDGE_TRANSPORT + +/* Overridden by @apache-mynewt-nimble/nimble/transport/socket (defined by @apache-mynewt-nimble/nimble/transport) */ #ifndef MYNEWT_VAL_BLE_HCI_EVT_BUF_SIZE #define MYNEWT_VAL_BLE_HCI_EVT_BUF_SIZE (70) #endif +/* Overridden by @apache-mynewt-nimble/nimble/transport/socket (defined by @apache-mynewt-nimble/nimble/transport) */ #ifndef MYNEWT_VAL_BLE_HCI_EVT_HI_BUF_COUNT #define MYNEWT_VAL_BLE_HCI_EVT_HI_BUF_COUNT (8) #endif +/* Overridden by @apache-mynewt-nimble/nimble/transport/socket (defined by @apache-mynewt-nimble/nimble/transport) */ #ifndef MYNEWT_VAL_BLE_HCI_EVT_LO_BUF_COUNT #define MYNEWT_VAL_BLE_HCI_EVT_LO_BUF_COUNT (8) #endif +/* Overridden by @apache-mynewt-nimble/porting/targets/linux (defined by @apache-mynewt-nimble/nimble/transport) */ +#ifndef MYNEWT_VAL_BLE_HCI_TRANSPORT__builtin +#define MYNEWT_VAL_BLE_HCI_TRANSPORT__builtin (0) +#endif +#ifndef MYNEWT_VAL_BLE_HCI_TRANSPORT__custom +#define MYNEWT_VAL_BLE_HCI_TRANSPORT__custom (0) +#endif +#ifndef MYNEWT_VAL_BLE_HCI_TRANSPORT__da1469x +#define MYNEWT_VAL_BLE_HCI_TRANSPORT__da1469x (0) +#endif +#ifndef MYNEWT_VAL_BLE_HCI_TRANSPORT__dialog_cmac +#define MYNEWT_VAL_BLE_HCI_TRANSPORT__dialog_cmac (0) +#endif +#ifndef MYNEWT_VAL_BLE_HCI_TRANSPORT__emspi +#define MYNEWT_VAL_BLE_HCI_TRANSPORT__emspi (0) +#endif +#ifndef MYNEWT_VAL_BLE_HCI_TRANSPORT__nrf5340 +#define MYNEWT_VAL_BLE_HCI_TRANSPORT__nrf5340 (0) +#endif +#ifndef MYNEWT_VAL_BLE_HCI_TRANSPORT__ram +#define MYNEWT_VAL_BLE_HCI_TRANSPORT__ram (0) +#endif +#ifndef MYNEWT_VAL_BLE_HCI_TRANSPORT__socket +#define MYNEWT_VAL_BLE_HCI_TRANSPORT__socket (1) +#endif +#ifndef MYNEWT_VAL_BLE_HCI_TRANSPORT__uart +#define MYNEWT_VAL_BLE_HCI_TRANSPORT__uart (0) +#endif +#ifndef MYNEWT_VAL_BLE_HCI_TRANSPORT__usb +#define MYNEWT_VAL_BLE_HCI_TRANSPORT__usb (0) +#endif +#ifndef MYNEWT_VAL_BLE_HCI_TRANSPORT +#define MYNEWT_VAL_BLE_HCI_TRANSPORT (1) +#endif + +#ifndef MYNEWT_VAL_BLE_HCI_TRANSPORT_EMSPI +#define MYNEWT_VAL_BLE_HCI_TRANSPORT_EMSPI (0) +#endif + +#ifndef MYNEWT_VAL_BLE_HCI_TRANSPORT_NIMBLE_BUILTIN +#define MYNEWT_VAL_BLE_HCI_TRANSPORT_NIMBLE_BUILTIN (0) +#endif + +#ifndef MYNEWT_VAL_BLE_HCI_TRANSPORT_RAM +#define MYNEWT_VAL_BLE_HCI_TRANSPORT_RAM (0) +#endif + +#ifndef MYNEWT_VAL_BLE_HCI_TRANSPORT_SOCKET +#define MYNEWT_VAL_BLE_HCI_TRANSPORT_SOCKET (0) +#endif + +#ifndef MYNEWT_VAL_BLE_HCI_TRANSPORT_UART +#define MYNEWT_VAL_BLE_HCI_TRANSPORT_UART (0) +#endif + +/*** @apache-mynewt-nimble/nimble/transport/socket */ +#ifndef MYNEWT_VAL_BLE_HCI_ACL_OUT_COUNT +#define MYNEWT_VAL_BLE_HCI_ACL_OUT_COUNT (12) +#endif + #ifndef MYNEWT_VAL_BLE_SOCK_CLI_SYSINIT_STAGE #define MYNEWT_VAL_BLE_SOCK_CLI_SYSINIT_STAGE (500) #endif @@ -1055,6 +1132,10 @@ #define MYNEWT_VAL_BLE_SOCK_USE_LINUX_BLUE (1) #endif +#ifndef MYNEWT_VAL_BLE_SOCK_USE_NUTTX +#define MYNEWT_VAL_BLE_SOCK_USE_NUTTX (0) +#endif + /* Overridden by @apache-mynewt-nimble/porting/targets/linux (defined by @apache-mynewt-nimble/nimble/transport/socket) */ #ifndef MYNEWT_VAL_BLE_SOCK_USE_TCP #define MYNEWT_VAL_BLE_SOCK_USE_TCP (0) diff --git a/porting/examples/linux_blemesh/include/syscfg/syscfg.h b/porting/examples/linux_blemesh/include/syscfg/syscfg.h index 3f9258d..976151a 100644 --- a/porting/examples/linux_blemesh/include/syscfg/syscfg.h +++ b/porting/examples/linux_blemesh/include/syscfg/syscfg.h @@ -444,6 +444,10 @@ #define MYNEWT_VAL_BLE_HCI_VS (0) #endif +#ifndef MYNEWT_VAL_BLE_HCI_VS_OCF_OFFSET +#define MYNEWT_VAL_BLE_HCI_VS_OCF_OFFSET (0) +#endif + #ifndef MYNEWT_VAL_BLE_ISO #define MYNEWT_VAL_BLE_ISO (0) #endif @@ -1277,7 +1281,7 @@ /* Overridden by @apache-mynewt-nimble/nimble/host/mesh (defined by @apache-mynewt-nimble/nimble/host/mesh) */ #ifndef MYNEWT_VAL_BLE_MESH_PROXY_MSG_LEN -#define MYNEWT_VAL_BLE_MESH_PROXY_MSG_LEN (66) +#define MYNEWT_VAL_BLE_MESH_PROXY_MSG_LEN (33) #endif #ifndef MYNEWT_VAL_BLE_MESH_PROXY_USE_DEVICE_NAME @@ -1578,31 +1582,104 @@ #define MYNEWT_VAL_BLE_SVC_TPS_SYSINIT_STAGE (303) #endif -/*** @apache-mynewt-nimble/nimble/transport/socket */ +/*** @apache-mynewt-nimble/nimble/transport */ +/* Overridden by @apache-mynewt-nimble/nimble/transport/socket (defined by @apache-mynewt-nimble/nimble/transport) */ #ifndef MYNEWT_VAL_BLE_ACL_BUF_COUNT #define MYNEWT_VAL_BLE_ACL_BUF_COUNT (24) #endif +/* Overridden by @apache-mynewt-nimble/nimble/transport/socket (defined by @apache-mynewt-nimble/nimble/transport) */ #ifndef MYNEWT_VAL_BLE_ACL_BUF_SIZE #define MYNEWT_VAL_BLE_ACL_BUF_SIZE (255) #endif -#ifndef MYNEWT_VAL_BLE_HCI_ACL_OUT_COUNT -#define MYNEWT_VAL_BLE_HCI_ACL_OUT_COUNT (12) +#ifndef MYNEWT_VAL_BLE_HCI_BRIDGE +#define MYNEWT_VAL_BLE_HCI_BRIDGE (0) #endif +#ifndef MYNEWT_VAL_BLE_HCI_BRIDGE_TRANSPORT__dialog_cmac +#define MYNEWT_VAL_BLE_HCI_BRIDGE_TRANSPORT__dialog_cmac (0) +#endif +#ifndef MYNEWT_VAL_BLE_HCI_BRIDGE_TRANSPORT__nrf5340 +#define MYNEWT_VAL_BLE_HCI_BRIDGE_TRANSPORT__nrf5340 (0) +#endif +#undef MYNEWT_VAL_BLE_HCI_BRIDGE_TRANSPORT + +/* Overridden by @apache-mynewt-nimble/nimble/transport/socket (defined by @apache-mynewt-nimble/nimble/transport) */ #ifndef MYNEWT_VAL_BLE_HCI_EVT_BUF_SIZE #define MYNEWT_VAL_BLE_HCI_EVT_BUF_SIZE (70) #endif +/* Overridden by @apache-mynewt-nimble/nimble/transport/socket (defined by @apache-mynewt-nimble/nimble/transport) */ #ifndef MYNEWT_VAL_BLE_HCI_EVT_HI_BUF_COUNT #define MYNEWT_VAL_BLE_HCI_EVT_HI_BUF_COUNT (8) #endif +/* Overridden by @apache-mynewt-nimble/nimble/transport/socket (defined by @apache-mynewt-nimble/nimble/transport) */ #ifndef MYNEWT_VAL_BLE_HCI_EVT_LO_BUF_COUNT #define MYNEWT_VAL_BLE_HCI_EVT_LO_BUF_COUNT (8) #endif +/* Overridden by @apache-mynewt-nimble/porting/targets/linux_blemesh (defined by @apache-mynewt-nimble/nimble/transport) */ +#ifndef MYNEWT_VAL_BLE_HCI_TRANSPORT__builtin +#define MYNEWT_VAL_BLE_HCI_TRANSPORT__builtin (0) +#endif +#ifndef MYNEWT_VAL_BLE_HCI_TRANSPORT__custom +#define MYNEWT_VAL_BLE_HCI_TRANSPORT__custom (0) +#endif +#ifndef MYNEWT_VAL_BLE_HCI_TRANSPORT__da1469x +#define MYNEWT_VAL_BLE_HCI_TRANSPORT__da1469x (0) +#endif +#ifndef MYNEWT_VAL_BLE_HCI_TRANSPORT__dialog_cmac +#define MYNEWT_VAL_BLE_HCI_TRANSPORT__dialog_cmac (0) +#endif +#ifndef MYNEWT_VAL_BLE_HCI_TRANSPORT__emspi +#define MYNEWT_VAL_BLE_HCI_TRANSPORT__emspi (0) +#endif +#ifndef MYNEWT_VAL_BLE_HCI_TRANSPORT__nrf5340 +#define MYNEWT_VAL_BLE_HCI_TRANSPORT__nrf5340 (0) +#endif +#ifndef MYNEWT_VAL_BLE_HCI_TRANSPORT__ram +#define MYNEWT_VAL_BLE_HCI_TRANSPORT__ram (0) +#endif +#ifndef MYNEWT_VAL_BLE_HCI_TRANSPORT__socket +#define MYNEWT_VAL_BLE_HCI_TRANSPORT__socket (1) +#endif +#ifndef MYNEWT_VAL_BLE_HCI_TRANSPORT__uart +#define MYNEWT_VAL_BLE_HCI_TRANSPORT__uart (0) +#endif +#ifndef MYNEWT_VAL_BLE_HCI_TRANSPORT__usb +#define MYNEWT_VAL_BLE_HCI_TRANSPORT__usb (0) +#endif +#ifndef MYNEWT_VAL_BLE_HCI_TRANSPORT +#define MYNEWT_VAL_BLE_HCI_TRANSPORT (1) +#endif + +#ifndef MYNEWT_VAL_BLE_HCI_TRANSPORT_EMSPI +#define MYNEWT_VAL_BLE_HCI_TRANSPORT_EMSPI (0) +#endif + +#ifndef MYNEWT_VAL_BLE_HCI_TRANSPORT_NIMBLE_BUILTIN +#define MYNEWT_VAL_BLE_HCI_TRANSPORT_NIMBLE_BUILTIN (0) +#endif + +#ifndef MYNEWT_VAL_BLE_HCI_TRANSPORT_RAM +#define MYNEWT_VAL_BLE_HCI_TRANSPORT_RAM (0) +#endif + +#ifndef MYNEWT_VAL_BLE_HCI_TRANSPORT_SOCKET +#define MYNEWT_VAL_BLE_HCI_TRANSPORT_SOCKET (0) +#endif + +#ifndef MYNEWT_VAL_BLE_HCI_TRANSPORT_UART +#define MYNEWT_VAL_BLE_HCI_TRANSPORT_UART (0) +#endif + +/*** @apache-mynewt-nimble/nimble/transport/socket */ +#ifndef MYNEWT_VAL_BLE_HCI_ACL_OUT_COUNT +#define MYNEWT_VAL_BLE_HCI_ACL_OUT_COUNT (12) +#endif + #ifndef MYNEWT_VAL_BLE_SOCK_CLI_SYSINIT_STAGE #define MYNEWT_VAL_BLE_SOCK_CLI_SYSINIT_STAGE (500) #endif @@ -1630,6 +1707,10 @@ #define MYNEWT_VAL_BLE_SOCK_USE_LINUX_BLUE (1) #endif +#ifndef MYNEWT_VAL_BLE_SOCK_USE_NUTTX +#define MYNEWT_VAL_BLE_SOCK_USE_NUTTX (0) +#endif + /* Overridden by @apache-mynewt-nimble/porting/targets/linux_blemesh (defined by @apache-mynewt-nimble/nimble/transport/socket) */ #ifndef MYNEWT_VAL_BLE_SOCK_USE_TCP #define MYNEWT_VAL_BLE_SOCK_USE_TCP (0) diff --git a/porting/examples/nuttx/include/syscfg/syscfg.h b/porting/examples/nuttx/include/syscfg/syscfg.h index 1f5be13..9269e3a 100644 --- a/porting/examples/nuttx/include/syscfg/syscfg.h +++ b/porting/examples/nuttx/include/syscfg/syscfg.h @@ -443,6 +443,10 @@ #define MYNEWT_VAL_BLE_HCI_VS (0) #endif +#ifndef MYNEWT_VAL_BLE_HCI_VS_OCF_OFFSET +#define MYNEWT_VAL_BLE_HCI_VS_OCF_OFFSET (0) +#endif + #ifndef MYNEWT_VAL_BLE_ISO #define MYNEWT_VAL_BLE_ISO (0) #endif @@ -1005,31 +1009,104 @@ #define MYNEWT_VAL_BLE_SVC_TPS_SYSINIT_STAGE (303) #endif -/*** @apache-mynewt-nimble/nimble/transport/socket */ +/*** @apache-mynewt-nimble/nimble/transport */ +/* Overridden by @apache-mynewt-nimble/nimble/transport/socket (defined by @apache-mynewt-nimble/nimble/transport) */ #ifndef MYNEWT_VAL_BLE_ACL_BUF_COUNT #define MYNEWT_VAL_BLE_ACL_BUF_COUNT (24) #endif +/* Overridden by @apache-mynewt-nimble/nimble/transport/socket (defined by @apache-mynewt-nimble/nimble/transport) */ #ifndef MYNEWT_VAL_BLE_ACL_BUF_SIZE #define MYNEWT_VAL_BLE_ACL_BUF_SIZE (255) #endif -#ifndef MYNEWT_VAL_BLE_HCI_ACL_OUT_COUNT -#define MYNEWT_VAL_BLE_HCI_ACL_OUT_COUNT (12) +#ifndef MYNEWT_VAL_BLE_HCI_BRIDGE +#define MYNEWT_VAL_BLE_HCI_BRIDGE (0) #endif +#ifndef MYNEWT_VAL_BLE_HCI_BRIDGE_TRANSPORT__dialog_cmac +#define MYNEWT_VAL_BLE_HCI_BRIDGE_TRANSPORT__dialog_cmac (0) +#endif +#ifndef MYNEWT_VAL_BLE_HCI_BRIDGE_TRANSPORT__nrf5340 +#define MYNEWT_VAL_BLE_HCI_BRIDGE_TRANSPORT__nrf5340 (0) +#endif +#undef MYNEWT_VAL_BLE_HCI_BRIDGE_TRANSPORT + +/* Overridden by @apache-mynewt-nimble/nimble/transport/socket (defined by @apache-mynewt-nimble/nimble/transport) */ #ifndef MYNEWT_VAL_BLE_HCI_EVT_BUF_SIZE #define MYNEWT_VAL_BLE_HCI_EVT_BUF_SIZE (70) #endif +/* Overridden by @apache-mynewt-nimble/nimble/transport/socket (defined by @apache-mynewt-nimble/nimble/transport) */ #ifndef MYNEWT_VAL_BLE_HCI_EVT_HI_BUF_COUNT #define MYNEWT_VAL_BLE_HCI_EVT_HI_BUF_COUNT (8) #endif +/* Overridden by @apache-mynewt-nimble/nimble/transport/socket (defined by @apache-mynewt-nimble/nimble/transport) */ #ifndef MYNEWT_VAL_BLE_HCI_EVT_LO_BUF_COUNT #define MYNEWT_VAL_BLE_HCI_EVT_LO_BUF_COUNT (8) #endif +/* Overridden by @apache-mynewt-nimble/porting/targets/nuttx (defined by @apache-mynewt-nimble/nimble/transport) */ +#ifndef MYNEWT_VAL_BLE_HCI_TRANSPORT__builtin +#define MYNEWT_VAL_BLE_HCI_TRANSPORT__builtin (0) +#endif +#ifndef MYNEWT_VAL_BLE_HCI_TRANSPORT__custom +#define MYNEWT_VAL_BLE_HCI_TRANSPORT__custom (0) +#endif +#ifndef MYNEWT_VAL_BLE_HCI_TRANSPORT__da1469x +#define MYNEWT_VAL_BLE_HCI_TRANSPORT__da1469x (0) +#endif +#ifndef MYNEWT_VAL_BLE_HCI_TRANSPORT__dialog_cmac +#define MYNEWT_VAL_BLE_HCI_TRANSPORT__dialog_cmac (0) +#endif +#ifndef MYNEWT_VAL_BLE_HCI_TRANSPORT__emspi +#define MYNEWT_VAL_BLE_HCI_TRANSPORT__emspi (0) +#endif +#ifndef MYNEWT_VAL_BLE_HCI_TRANSPORT__nrf5340 +#define MYNEWT_VAL_BLE_HCI_TRANSPORT__nrf5340 (0) +#endif +#ifndef MYNEWT_VAL_BLE_HCI_TRANSPORT__ram +#define MYNEWT_VAL_BLE_HCI_TRANSPORT__ram (0) +#endif +#ifndef MYNEWT_VAL_BLE_HCI_TRANSPORT__socket +#define MYNEWT_VAL_BLE_HCI_TRANSPORT__socket (1) +#endif +#ifndef MYNEWT_VAL_BLE_HCI_TRANSPORT__uart +#define MYNEWT_VAL_BLE_HCI_TRANSPORT__uart (0) +#endif +#ifndef MYNEWT_VAL_BLE_HCI_TRANSPORT__usb +#define MYNEWT_VAL_BLE_HCI_TRANSPORT__usb (0) +#endif +#ifndef MYNEWT_VAL_BLE_HCI_TRANSPORT +#define MYNEWT_VAL_BLE_HCI_TRANSPORT (1) +#endif + +#ifndef MYNEWT_VAL_BLE_HCI_TRANSPORT_EMSPI +#define MYNEWT_VAL_BLE_HCI_TRANSPORT_EMSPI (0) +#endif + +#ifndef MYNEWT_VAL_BLE_HCI_TRANSPORT_NIMBLE_BUILTIN +#define MYNEWT_VAL_BLE_HCI_TRANSPORT_NIMBLE_BUILTIN (0) +#endif + +#ifndef MYNEWT_VAL_BLE_HCI_TRANSPORT_RAM +#define MYNEWT_VAL_BLE_HCI_TRANSPORT_RAM (0) +#endif + +#ifndef MYNEWT_VAL_BLE_HCI_TRANSPORT_SOCKET +#define MYNEWT_VAL_BLE_HCI_TRANSPORT_SOCKET (0) +#endif + +#ifndef MYNEWT_VAL_BLE_HCI_TRANSPORT_UART +#define MYNEWT_VAL_BLE_HCI_TRANSPORT_UART (0) +#endif + +/*** @apache-mynewt-nimble/nimble/transport/socket */ +#ifndef MYNEWT_VAL_BLE_HCI_ACL_OUT_COUNT +#define MYNEWT_VAL_BLE_HCI_ACL_OUT_COUNT (12) +#endif + #ifndef MYNEWT_VAL_BLE_SOCK_CLI_SYSINIT_STAGE #define MYNEWT_VAL_BLE_SOCK_CLI_SYSINIT_STAGE (500) #endif @@ -1057,6 +1134,11 @@ #endif /* Overridden by @apache-mynewt-nimble/porting/targets/nuttx (defined by @apache-mynewt-nimble/nimble/transport/socket) */ +#ifndef MYNEWT_VAL_BLE_SOCK_USE_NUTTX +#define MYNEWT_VAL_BLE_SOCK_USE_NUTTX (1) +#endif + +/* Overridden by @apache-mynewt-nimble/porting/targets/nuttx (defined by @apache-mynewt-nimble/nimble/transport/socket) */ #ifndef MYNEWT_VAL_BLE_SOCK_USE_TCP #define MYNEWT_VAL_BLE_SOCK_USE_TCP (0) #endif diff --git a/porting/nimble/include/syscfg/syscfg.h b/porting/nimble/include/syscfg/syscfg.h index a16c528..98c0775 100644 --- a/porting/nimble/include/syscfg/syscfg.h +++ b/porting/nimble/include/syscfg/syscfg.h @@ -442,6 +442,10 @@ #define MYNEWT_VAL_BLE_HCI_VS (0) #endif +#ifndef MYNEWT_VAL_BLE_HCI_VS_OCF_OFFSET +#define MYNEWT_VAL_BLE_HCI_VS_OCF_OFFSET (0) +#endif + #ifndef MYNEWT_VAL_BLE_ISO #define MYNEWT_VAL_BLE_ISO (0) #endif @@ -1002,31 +1006,104 @@ #define MYNEWT_VAL_BLE_SVC_TPS_SYSINIT_STAGE (303) #endif -/*** @apache-mynewt-nimble/nimble/transport/socket */ +/*** @apache-mynewt-nimble/nimble/transport */ +/* Overridden by @apache-mynewt-nimble/nimble/transport/socket (defined by @apache-mynewt-nimble/nimble/transport) */ #ifndef MYNEWT_VAL_BLE_ACL_BUF_COUNT #define MYNEWT_VAL_BLE_ACL_BUF_COUNT (24) #endif +/* Overridden by @apache-mynewt-nimble/nimble/transport/socket (defined by @apache-mynewt-nimble/nimble/transport) */ #ifndef MYNEWT_VAL_BLE_ACL_BUF_SIZE #define MYNEWT_VAL_BLE_ACL_BUF_SIZE (255) #endif -#ifndef MYNEWT_VAL_BLE_HCI_ACL_OUT_COUNT -#define MYNEWT_VAL_BLE_HCI_ACL_OUT_COUNT (12) +#ifndef MYNEWT_VAL_BLE_HCI_BRIDGE +#define MYNEWT_VAL_BLE_HCI_BRIDGE (0) #endif +#ifndef MYNEWT_VAL_BLE_HCI_BRIDGE_TRANSPORT__dialog_cmac +#define MYNEWT_VAL_BLE_HCI_BRIDGE_TRANSPORT__dialog_cmac (0) +#endif +#ifndef MYNEWT_VAL_BLE_HCI_BRIDGE_TRANSPORT__nrf5340 +#define MYNEWT_VAL_BLE_HCI_BRIDGE_TRANSPORT__nrf5340 (0) +#endif +#undef MYNEWT_VAL_BLE_HCI_BRIDGE_TRANSPORT + +/* Overridden by @apache-mynewt-nimble/nimble/transport/socket (defined by @apache-mynewt-nimble/nimble/transport) */ #ifndef MYNEWT_VAL_BLE_HCI_EVT_BUF_SIZE #define MYNEWT_VAL_BLE_HCI_EVT_BUF_SIZE (70) #endif +/* Overridden by @apache-mynewt-nimble/nimble/transport/socket (defined by @apache-mynewt-nimble/nimble/transport) */ #ifndef MYNEWT_VAL_BLE_HCI_EVT_HI_BUF_COUNT #define MYNEWT_VAL_BLE_HCI_EVT_HI_BUF_COUNT (8) #endif +/* Overridden by @apache-mynewt-nimble/nimble/transport/socket (defined by @apache-mynewt-nimble/nimble/transport) */ #ifndef MYNEWT_VAL_BLE_HCI_EVT_LO_BUF_COUNT #define MYNEWT_VAL_BLE_HCI_EVT_LO_BUF_COUNT (8) #endif +/* Overridden by @apache-mynewt-nimble/porting/targets/porting_default (defined by @apache-mynewt-nimble/nimble/transport) */ +#ifndef MYNEWT_VAL_BLE_HCI_TRANSPORT__builtin +#define MYNEWT_VAL_BLE_HCI_TRANSPORT__builtin (0) +#endif +#ifndef MYNEWT_VAL_BLE_HCI_TRANSPORT__custom +#define MYNEWT_VAL_BLE_HCI_TRANSPORT__custom (0) +#endif +#ifndef MYNEWT_VAL_BLE_HCI_TRANSPORT__da1469x +#define MYNEWT_VAL_BLE_HCI_TRANSPORT__da1469x (0) +#endif +#ifndef MYNEWT_VAL_BLE_HCI_TRANSPORT__dialog_cmac +#define MYNEWT_VAL_BLE_HCI_TRANSPORT__dialog_cmac (0) +#endif +#ifndef MYNEWT_VAL_BLE_HCI_TRANSPORT__emspi +#define MYNEWT_VAL_BLE_HCI_TRANSPORT__emspi (0) +#endif +#ifndef MYNEWT_VAL_BLE_HCI_TRANSPORT__nrf5340 +#define MYNEWT_VAL_BLE_HCI_TRANSPORT__nrf5340 (0) +#endif +#ifndef MYNEWT_VAL_BLE_HCI_TRANSPORT__ram +#define MYNEWT_VAL_BLE_HCI_TRANSPORT__ram (0) +#endif +#ifndef MYNEWT_VAL_BLE_HCI_TRANSPORT__socket +#define MYNEWT_VAL_BLE_HCI_TRANSPORT__socket (1) +#endif +#ifndef MYNEWT_VAL_BLE_HCI_TRANSPORT__uart +#define MYNEWT_VAL_BLE_HCI_TRANSPORT__uart (0) +#endif +#ifndef MYNEWT_VAL_BLE_HCI_TRANSPORT__usb +#define MYNEWT_VAL_BLE_HCI_TRANSPORT__usb (0) +#endif +#ifndef MYNEWT_VAL_BLE_HCI_TRANSPORT +#define MYNEWT_VAL_BLE_HCI_TRANSPORT (1) +#endif + +#ifndef MYNEWT_VAL_BLE_HCI_TRANSPORT_EMSPI +#define MYNEWT_VAL_BLE_HCI_TRANSPORT_EMSPI (0) +#endif + +#ifndef MYNEWT_VAL_BLE_HCI_TRANSPORT_NIMBLE_BUILTIN +#define MYNEWT_VAL_BLE_HCI_TRANSPORT_NIMBLE_BUILTIN (0) +#endif + +#ifndef MYNEWT_VAL_BLE_HCI_TRANSPORT_RAM +#define MYNEWT_VAL_BLE_HCI_TRANSPORT_RAM (0) +#endif + +#ifndef MYNEWT_VAL_BLE_HCI_TRANSPORT_SOCKET +#define MYNEWT_VAL_BLE_HCI_TRANSPORT_SOCKET (0) +#endif + +#ifndef MYNEWT_VAL_BLE_HCI_TRANSPORT_UART +#define MYNEWT_VAL_BLE_HCI_TRANSPORT_UART (0) +#endif + +/*** @apache-mynewt-nimble/nimble/transport/socket */ +#ifndef MYNEWT_VAL_BLE_HCI_ACL_OUT_COUNT +#define MYNEWT_VAL_BLE_HCI_ACL_OUT_COUNT (12) +#endif + #ifndef MYNEWT_VAL_BLE_SOCK_CLI_SYSINIT_STAGE #define MYNEWT_VAL_BLE_SOCK_CLI_SYSINIT_STAGE (500) #endif @@ -1052,6 +1129,10 @@ #define MYNEWT_VAL_BLE_SOCK_USE_LINUX_BLUE (1) #endif +#ifndef MYNEWT_VAL_BLE_SOCK_USE_NUTTX +#define MYNEWT_VAL_BLE_SOCK_USE_NUTTX (0) +#endif + /* Overridden by @apache-mynewt-nimble/porting/targets/porting_default (defined by @apache-mynewt-nimble/nimble/transport/socket) */ #ifndef MYNEWT_VAL_BLE_SOCK_USE_TCP #define MYNEWT_VAL_BLE_SOCK_USE_TCP (0) diff --git a/porting/npl/riot/include/syscfg/syscfg.h b/porting/npl/riot/include/syscfg/syscfg.h index 538c821..a581a6d 100644 --- a/porting/npl/riot/include/syscfg/syscfg.h +++ b/porting/npl/riot/include/syscfg/syscfg.h @@ -144,7 +144,7 @@ #define MYNEWT_VAL_MCU_ICACHE_ENABLED (0) #endif -/* Overridden by @apache-mynewt-core/hw/bsp/nordic_pca10056 (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_MCU_LFCLK_SOURCE__LFRC #define MYNEWT_VAL_MCU_LFCLK_SOURCE__LFRC (0) #endif @@ -451,9 +451,8 @@ #undef MYNEWT_VAL_UART_1_PIN_TX -/* 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) +#define MYNEWT_VAL_XTAL_32768 (0) #endif #ifndef MYNEWT_VAL_XTAL_32768_SYNTH @@ -798,6 +797,10 @@ #define MYNEWT_VAL_BLE_HCI_VS (1) #endif +#ifndef MYNEWT_VAL_BLE_HCI_VS_OCF_OFFSET +#define MYNEWT_VAL_BLE_HCI_VS_OCF_OFFSET (0) +#endif + #ifndef MYNEWT_VAL_BLE_ISO #define MYNEWT_VAL_BLE_ISO (0) #endif @@ -1011,10 +1014,19 @@ #define MYNEWT_VAL_BLE_LL_HCI_VS (1) #endif +/* Value copied from BLE_LL_VND_EVENT_ON_ASSERT */ #ifndef MYNEWT_VAL_BLE_LL_HCI_VS_EVENT_ON_ASSERT #define MYNEWT_VAL_BLE_LL_HCI_VS_EVENT_ON_ASSERT (0) #endif +#ifndef MYNEWT_VAL_BLE_LL_LNA +#define MYNEWT_VAL_BLE_LL_LNA (0) +#endif + +#ifndef MYNEWT_VAL_BLE_LL_LNA_GPIO +#define MYNEWT_VAL_BLE_LL_LNA_GPIO (-1) +#endif + #ifndef MYNEWT_VAL_BLE_LL_MASTER_SCA #define MYNEWT_VAL_BLE_LL_MASTER_SCA (4) #endif @@ -1043,6 +1055,14 @@ #define MYNEWT_VAL_BLE_LL_OUR_SCA (60) #endif +#ifndef MYNEWT_VAL_BLE_LL_PA +#define MYNEWT_VAL_BLE_LL_PA (0) +#endif + +#ifndef MYNEWT_VAL_BLE_LL_PA_GPIO +#define MYNEWT_VAL_BLE_LL_PA_GPIO (-1) +#endif + #ifndef MYNEWT_VAL_BLE_LL_PRIO #define MYNEWT_VAL_BLE_LL_PRIO (0) #endif @@ -1188,6 +1208,10 @@ #define MYNEWT_VAL_BLE_PHY_SYSVIEW (0) #endif +#ifndef MYNEWT_VAL_BLE_PHY_UBLOX_BMD345_PUBLIC_ADDR +#define MYNEWT_VAL_BLE_PHY_UBLOX_BMD345_PUBLIC_ADDR (0) +#endif + /*** @apache-mynewt-nimble/nimble/host */ #ifndef MYNEWT_VAL_BLE_ATT_PREFERRED_MTU #define MYNEWT_VAL_BLE_ATT_PREFERRED_MTU (256) @@ -1581,29 +1605,100 @@ #define MYNEWT_VAL_BLE_SVC_GATT_SYSINIT_STAGE (302) #endif -/*** @apache-mynewt-nimble/nimble/transport/ram */ -/* Overridden by @apache-mynewt-nimble/porting/targets/riot (defined by @apache-mynewt-nimble/nimble/transport/ram) */ +/*** @apache-mynewt-nimble/nimble/transport */ +/* Overridden by @apache-mynewt-nimble/porting/targets/riot (defined by @apache-mynewt-nimble/nimble/transport) */ #ifndef MYNEWT_VAL_BLE_ACL_BUF_COUNT #define MYNEWT_VAL_BLE_ACL_BUF_COUNT (24) #endif +/* Overridden by @apache-mynewt-nimble/nimble/transport/ram (defined by @apache-mynewt-nimble/nimble/transport) */ #ifndef MYNEWT_VAL_BLE_ACL_BUF_SIZE #define MYNEWT_VAL_BLE_ACL_BUF_SIZE (65535) #endif +#ifndef MYNEWT_VAL_BLE_HCI_BRIDGE +#define MYNEWT_VAL_BLE_HCI_BRIDGE (0) +#endif + +#ifndef MYNEWT_VAL_BLE_HCI_BRIDGE_TRANSPORT__dialog_cmac +#define MYNEWT_VAL_BLE_HCI_BRIDGE_TRANSPORT__dialog_cmac (0) +#endif +#ifndef MYNEWT_VAL_BLE_HCI_BRIDGE_TRANSPORT__nrf5340 +#define MYNEWT_VAL_BLE_HCI_BRIDGE_TRANSPORT__nrf5340 (0) +#endif +#undef MYNEWT_VAL_BLE_HCI_BRIDGE_TRANSPORT + +/* Overridden by @apache-mynewt-nimble/nimble/transport/ram (defined by @apache-mynewt-nimble/nimble/transport) */ #ifndef MYNEWT_VAL_BLE_HCI_EVT_BUF_SIZE #define MYNEWT_VAL_BLE_HCI_EVT_BUF_SIZE (70) #endif -/* Overridden by @apache-mynewt-nimble/porting/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) */ #ifndef MYNEWT_VAL_BLE_HCI_EVT_HI_BUF_COUNT #define MYNEWT_VAL_BLE_HCI_EVT_HI_BUF_COUNT (2) #endif +/* Overridden by @apache-mynewt-nimble/nimble/transport/ram (defined by @apache-mynewt-nimble/nimble/transport) */ #ifndef MYNEWT_VAL_BLE_HCI_EVT_LO_BUF_COUNT #define MYNEWT_VAL_BLE_HCI_EVT_LO_BUF_COUNT (8) #endif +/* Overridden by @apache-mynewt-nimble/porting/targets/riot (defined by @apache-mynewt-nimble/nimble/transport) */ +#ifndef MYNEWT_VAL_BLE_HCI_TRANSPORT__builtin +#define MYNEWT_VAL_BLE_HCI_TRANSPORT__builtin (0) +#endif +#ifndef MYNEWT_VAL_BLE_HCI_TRANSPORT__custom +#define MYNEWT_VAL_BLE_HCI_TRANSPORT__custom (0) +#endif +#ifndef MYNEWT_VAL_BLE_HCI_TRANSPORT__da1469x +#define MYNEWT_VAL_BLE_HCI_TRANSPORT__da1469x (0) +#endif +#ifndef MYNEWT_VAL_BLE_HCI_TRANSPORT__dialog_cmac +#define MYNEWT_VAL_BLE_HCI_TRANSPORT__dialog_cmac (0) +#endif +#ifndef MYNEWT_VAL_BLE_HCI_TRANSPORT__emspi +#define MYNEWT_VAL_BLE_HCI_TRANSPORT__emspi (0) +#endif +#ifndef MYNEWT_VAL_BLE_HCI_TRANSPORT__nrf5340 +#define MYNEWT_VAL_BLE_HCI_TRANSPORT__nrf5340 (0) +#endif +#ifndef MYNEWT_VAL_BLE_HCI_TRANSPORT__ram +#define MYNEWT_VAL_BLE_HCI_TRANSPORT__ram (1) +#endif +#ifndef MYNEWT_VAL_BLE_HCI_TRANSPORT__socket +#define MYNEWT_VAL_BLE_HCI_TRANSPORT__socket (0) +#endif +#ifndef MYNEWT_VAL_BLE_HCI_TRANSPORT__uart +#define MYNEWT_VAL_BLE_HCI_TRANSPORT__uart (0) +#endif +#ifndef MYNEWT_VAL_BLE_HCI_TRANSPORT__usb +#define MYNEWT_VAL_BLE_HCI_TRANSPORT__usb (0) +#endif +#ifndef MYNEWT_VAL_BLE_HCI_TRANSPORT +#define MYNEWT_VAL_BLE_HCI_TRANSPORT (1) +#endif + +#ifndef MYNEWT_VAL_BLE_HCI_TRANSPORT_EMSPI +#define MYNEWT_VAL_BLE_HCI_TRANSPORT_EMSPI (0) +#endif + +#ifndef MYNEWT_VAL_BLE_HCI_TRANSPORT_NIMBLE_BUILTIN +#define MYNEWT_VAL_BLE_HCI_TRANSPORT_NIMBLE_BUILTIN (0) +#endif + +#ifndef MYNEWT_VAL_BLE_HCI_TRANSPORT_RAM +#define MYNEWT_VAL_BLE_HCI_TRANSPORT_RAM (0) +#endif + +#ifndef MYNEWT_VAL_BLE_HCI_TRANSPORT_SOCKET +#define MYNEWT_VAL_BLE_HCI_TRANSPORT_SOCKET (0) +#endif + +#ifndef MYNEWT_VAL_BLE_HCI_TRANSPORT_UART +#define MYNEWT_VAL_BLE_HCI_TRANSPORT_UART (0) +#endif + +/*** @apache-mynewt-nimble/nimble/transport/ram */ #ifndef MYNEWT_VAL_BLE_TRANS_RAM_SYSINIT_STAGE #define MYNEWT_VAL_BLE_TRANS_RAM_SYSINIT_STAGE (100) #endif
