From a1e03722aee25f7756badc22a47091b04baeb68e Mon Sep 17 00:00:00 2001 From: Szymon Janc Date: Wed, 9 Feb 2022 08:46:12 +0100 Subject: [PATCH] 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 9c8fa583d..63b9cddff 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 c819a83c1..72018c87e 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 603e586c8..5778ee7d4 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 3cbe09a4b..14cb2d916 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 8ef797218..5e644d462 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 e105cd630..fb6c01451 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 fdfa7b592..d2c6de7bb 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 44a34ba09..8b7aab0e3 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 d0aff807f..3ffd4c279 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 7d1a3243b..e57c47c29 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 8359eaa7c..1d6939c1b 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