You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by ja...@apache.org on 2022/02/09 08:54:37 UTC
[mynewt-nimble] branch master updated (9f571c8 -> 4ac4eec)
This is an automated email from the ASF dual-hosted git repository.
janc pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-nimble.git.
from 9f571c8 nimble/phy/nrf53: Add PA/LNA support
new a82be4f nimble: Allow to define offset for HCI VS commands
new a1e0372 nimble/porting: Fix ports targets
new 4ac4eec nimble/ports: Refresh syscfg
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
nimble/include/nimble/hci_common.h | 4 +-
nimble/syscfg.yml | 7 ++
nimble/transport/socket/syscfg.yml | 4 +
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 +++++++++++++++++++--
porting/targets/linux/pkg.yml | 2 +-
porting/targets/linux/syscfg.yml | 1 +
porting/targets/linux_blemesh/pkg.yml | 2 +-
porting/targets/linux_blemesh/syscfg.yml | 1 +
porting/targets/nuttx/pkg.yml | 2 +-
porting/targets/nuttx/syscfg.yml | 2 +-
porting/targets/porting_default/pkg.yml | 2 +-
porting/targets/porting_default/syscfg.yml | 1 +
porting/targets/riot/pkg.yml | 2 +-
porting/targets/riot/syscfg.yml | 3 +-
18 files changed, 463 insertions(+), 28 deletions(-)
[mynewt-nimble] 02/03: nimble/porting: Fix ports targets
Posted by ja...@apache.org.
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 a1e03722aee25f7756badc22a47091b04baeb68e
Author: Szymon Janc <sz...@codecoup.pl>
AuthorDate: Wed Feb 9 08:46:12 2022 +0100
nimble/porting: Fix ports targets
Those are used to generate configurations for port so make sure all
MYNEWT_VAL are properly included.
---
nimble/transport/socket/syscfg.yml | 4 ++++
porting/targets/linux/pkg.yml | 2 +-
porting/targets/linux/syscfg.yml | 1 +
porting/targets/linux_blemesh/pkg.yml | 2 +-
porting/targets/linux_blemesh/syscfg.yml | 1 +
porting/targets/nuttx/pkg.yml | 2 +-
porting/targets/nuttx/syscfg.yml | 2 +-
porting/targets/porting_default/pkg.yml | 2 +-
porting/targets/porting_default/syscfg.yml | 1 +
porting/targets/riot/pkg.yml | 2 +-
porting/targets/riot/syscfg.yml | 3 ++-
11 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/nimble/transport/socket/syscfg.yml b/nimble/transport/socket/syscfg.yml
index 9c8fa58..63b9cdd 100644
--- a/nimble/transport/socket/syscfg.yml
+++ b/nimble/transport/socket/syscfg.yml
@@ -43,6 +43,10 @@ syscfg.defs:
description: 'linux kernel device'
value: 0
+ BLE_SOCK_USE_NUTTX:
+ description: 'Use NuttX socket'
+ value: 0
+
BLE_SOCK_TASK_PRIO:
description: 'Priority of the HCI socket task.'
type: task_priority
diff --git a/porting/targets/linux/pkg.yml b/porting/targets/linux/pkg.yml
index c819a83..72018c8 100644
--- a/porting/targets/linux/pkg.yml
+++ b/porting/targets/linux/pkg.yml
@@ -28,7 +28,7 @@ pkg.deps:
- "@apache-mynewt-core/sys/log/stub"
- "@apache-mynewt-core/sys/stats/stub"
- "@apache-mynewt-nimble/nimble/host"
- - "@apache-mynewt-nimble/nimble/transport/socket"
+ - "@apache-mynewt-nimble/nimble/transport"
- "@apache-mynewt-nimble/nimble/host/services/ans"
- "@apache-mynewt-nimble/nimble/host/services/bas"
- "@apache-mynewt-nimble/nimble/host/services/dis"
diff --git a/porting/targets/linux/syscfg.yml b/porting/targets/linux/syscfg.yml
index 603e586..5778ee7 100644
--- a/porting/targets/linux/syscfg.yml
+++ b/porting/targets/linux/syscfg.yml
@@ -17,6 +17,7 @@
#
syscfg.vals:
+ BLE_HCI_TRANSPORT: socket
BLE_SOCK_USE_TCP: 0
BLE_SOCK_USE_LINUX_BLUE: 1
BLE_SOCK_TASK_PRIO: 3
diff --git a/porting/targets/linux_blemesh/pkg.yml b/porting/targets/linux_blemesh/pkg.yml
index 3cbe09a..14cb2d9 100644
--- a/porting/targets/linux_blemesh/pkg.yml
+++ b/porting/targets/linux_blemesh/pkg.yml
@@ -28,7 +28,7 @@ pkg.deps:
- "@apache-mynewt-core/sys/log/stub"
- "@apache-mynewt-core/sys/stats/stub"
- "@apache-mynewt-nimble/nimble/host"
- - "@apache-mynewt-nimble/nimble/transport/socket"
+ - "@apache-mynewt-nimble/nimble/transport"
- "@apache-mynewt-nimble/nimble/host/services/ans"
- "@apache-mynewt-nimble/nimble/host/services/bas"
- "@apache-mynewt-nimble/nimble/host/services/dis"
diff --git a/porting/targets/linux_blemesh/syscfg.yml b/porting/targets/linux_blemesh/syscfg.yml
index 8ef7972..5e644d4 100644
--- a/porting/targets/linux_blemesh/syscfg.yml
+++ b/porting/targets/linux_blemesh/syscfg.yml
@@ -43,6 +43,7 @@ syscfg.vals:
BLE_MESH_SETTINGS: 0
CONFIG_NFFS: 0
+ BLE_HCI_TRANSPORT: socket
BLE_SOCK_USE_TCP: 0
BLE_SOCK_USE_LINUX_BLUE: 1
BLE_SOCK_TASK_PRIO: 3
diff --git a/porting/targets/nuttx/pkg.yml b/porting/targets/nuttx/pkg.yml
index e105cd6..fb6c014 100644
--- a/porting/targets/nuttx/pkg.yml
+++ b/porting/targets/nuttx/pkg.yml
@@ -28,7 +28,7 @@ pkg.deps:
- "@apache-mynewt-core/sys/log/stub"
- "@apache-mynewt-core/sys/stats/stub"
- "@apache-mynewt-nimble/nimble/host"
-- "@apache-mynewt-nimble/nimble/transport/socket"
+- "@apache-mynewt-nimble/nimble/transport"
- "@apache-mynewt-nimble/nimble/host/services/ans"
- "@apache-mynewt-nimble/nimble/host/services/bas"
- "@apache-mynewt-nimble/nimble/host/services/dis"
diff --git a/porting/targets/nuttx/syscfg.yml b/porting/targets/nuttx/syscfg.yml
index fdfa7b5..d2c6de7 100644
--- a/porting/targets/nuttx/syscfg.yml
+++ b/porting/targets/nuttx/syscfg.yml
@@ -17,6 +17,7 @@
#
syscfg.vals:
+ BLE_HCI_TRANSPORT: socket
BLE_SOCK_USE_TCP: 0
BLE_SOCK_USE_NUTTX: 1
BLE_SOCK_TASK_PRIO: 3
@@ -25,4 +26,3 @@ syscfg.vals:
LOG_LEVEL: 2
BLE_SM_LEGACY: 1
BLE_SM_SC: 1
-
diff --git a/porting/targets/porting_default/pkg.yml b/porting/targets/porting_default/pkg.yml
index 44a34ba..8b7aab0 100644
--- a/porting/targets/porting_default/pkg.yml
+++ b/porting/targets/porting_default/pkg.yml
@@ -28,7 +28,7 @@ pkg.deps:
- "@apache-mynewt-core/sys/log/stub"
- "@apache-mynewt-core/sys/stats/stub"
- "@apache-mynewt-nimble/nimble/host"
- - "@apache-mynewt-nimble/nimble/transport/socket"
+ - "@apache-mynewt-nimble/nimble/transport"
- "@apache-mynewt-nimble/nimble/host/services/ans"
- "@apache-mynewt-nimble/nimble/host/services/bas"
- "@apache-mynewt-nimble/nimble/host/services/dis"
diff --git a/porting/targets/porting_default/syscfg.yml b/porting/targets/porting_default/syscfg.yml
index d0aff80..3ffd4c2 100644
--- a/porting/targets/porting_default/syscfg.yml
+++ b/porting/targets/porting_default/syscfg.yml
@@ -1,3 +1,4 @@
syscfg.vals:
+ BLE_HCI_TRANSPORT: socket
BLE_SOCK_USE_TCP: 0
BLE_SOCK_USE_LINUX_BLUE: 1
diff --git a/porting/targets/riot/pkg.yml b/porting/targets/riot/pkg.yml
index 7d1a324..e57c47c 100644
--- a/porting/targets/riot/pkg.yml
+++ b/porting/targets/riot/pkg.yml
@@ -28,7 +28,7 @@ pkg.deps:
- "@apache-mynewt-core/sys/log/stub"
- "@apache-mynewt-core/sys/stats/stub"
- "@apache-mynewt-nimble/nimble/host"
+ - "@apache-mynewt-nimble/nimble/transport"
- "@apache-mynewt-nimble/nimble/controller"
- - "@apache-mynewt-nimble/nimble/transport/ram"
- "@apache-mynewt-nimble/nimble/host/services/gap"
- "@apache-mynewt-nimble/nimble/host/services/gatt"
diff --git a/porting/targets/riot/syscfg.yml b/porting/targets/riot/syscfg.yml
index 8359eaa..1d6939c 100644
--- a/porting/targets/riot/syscfg.yml
+++ b/porting/targets/riot/syscfg.yml
@@ -31,6 +31,7 @@ syscfg.vals:
BLE_SM_LEGACY: 0
BLE_SM_SC: 0
BLE_MAX_PERIODIC_SYNCS: 0
+ BLE_HCI_TRANSPORT: ram
MSYS_1_BLOCK_COUNT: 5
MSYS_1_BLOCK_SIZE: 88
- XTAL_32768: 1
+ MCU_LFCLK_SOURCE: LFXO
[mynewt-nimble] 03/03: nimble/ports: Refresh syscfg
Posted by ja...@apache.org.
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 <sz...@codecoup.pl>
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
[mynewt-nimble] 01/03: nimble: Allow to define offset for HCI VS commands
Posted by ja...@apache.org.
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 a82be4f1570a8eee42e04b243dd861286b24dc5f
Author: Szymon Janc <sz...@codecoup.pl>
AuthorDate: Tue Feb 8 12:44:41 2022 +0100
nimble: Allow to define offset for HCI VS commands
This allows to tune starting offset for NimBLE VS HCI commands.
---
nimble/include/nimble/hci_common.h | 4 ++--
nimble/syscfg.yml | 7 +++++++
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/nimble/include/nimble/hci_common.h b/nimble/include/nimble/hci_common.h
index e483083..32d06b6 100644
--- a/nimble/include/nimble/hci_common.h
+++ b/nimble/include/nimble/hci_common.h
@@ -1063,7 +1063,7 @@ struct ble_hci_le_set_host_feat_cp {
/* --- Vendor specific commands (OGF 0x003F) */
/* Read Random Static Address */
-#define BLE_HCI_OCF_VS_RD_STATIC_ADDR (0x0001)
+#define BLE_HCI_OCF_VS_RD_STATIC_ADDR (MYNEWT_VAL(BLE_HCI_VS_OCF_OFFSET) + (0x0001))
struct ble_hci_vs_rd_static_addr_rp {
uint8_t addr[6];
} __attribute__((packed));
@@ -1071,7 +1071,7 @@ struct ble_hci_vs_rd_static_addr_rp {
/* Set default transmit power. Actual selected TX power is returned
* in reply. Setting 0xff restores controller reset default.
*/
-#define BLE_HCI_OCF_VS_SET_TX_PWR (0x0002)
+#define BLE_HCI_OCF_VS_SET_TX_PWR (MYNEWT_VAL(BLE_HCI_VS_OCF_OFFSET) + (0x0002))
struct ble_hci_vs_set_tx_pwr_cp {
int8_t tx_power;
} __attribute__((packed));
diff --git a/nimble/syscfg.yml b/nimble/syscfg.yml
index 0e87c06..2d2d329 100644
--- a/nimble/syscfg.yml
+++ b/nimble/syscfg.yml
@@ -101,6 +101,13 @@ syscfg.defs:
Enables support for NimBLE specific vendor HCI commands
value: 0
+ BLE_HCI_VS_OCF_OFFSET:
+ description: >
+ This defines starting offset for NimBLE specific vendor HCI commands.
+ Purpose of this is to improve compatibility with other custom
+ implementations.
+ value: 0
+
# Allow periodic sync transfer only if 5.1 or higher
syscfg.restrictions:
- "'BLE_PERIODIC_ADV_SYNC_TRANSFER == 0' || 'BLE_VERSION >= 51'"