You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2021/12/18 15:13:40 UTC

[incubator-nuttx] branch master updated (fd9ef2f -> f3fdd5a)

This is an automated email from the ASF dual-hosted git repository.

xiaoxiang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git.


    from fd9ef2f  fix: Correct issues with userled support on the Nucleo F4x1RE.
     new a6c6479  arch/arm/src/nrf52/nrf52_sdc.c: raise error if BT device not selected
     new f3fdd5a  arch/arm/src/nrf52/Kconfig: select IRQPRIO for SoftDevice

The 2 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:
 arch/arm/src/nrf52/Kconfig     | 1 +
 arch/arm/src/nrf52/nrf52_sdc.c | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

[incubator-nuttx] 01/02: arch/arm/src/nrf52/nrf52_sdc.c: raise error if BT device not selected

Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git

commit a6c64795f40de62e5f76866abc3f17369df3f8b5
Author: raiden00pl <ra...@railab.me>
AuthorDate: Sat Dec 18 15:06:05 2021 +0100

    arch/arm/src/nrf52/nrf52_sdc.c: raise error if BT device not selected
---
 arch/arm/src/nrf52/nrf52_sdc.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/arch/arm/src/nrf52/nrf52_sdc.c b/arch/arm/src/nrf52/nrf52_sdc.c
index 8ade87a..6e414f2 100644
--- a/arch/arm/src/nrf52/nrf52_sdc.c
+++ b/arch/arm/src/nrf52/nrf52_sdc.c
@@ -694,7 +694,7 @@ int nrf52_sdc_initialize(void)
       wlerr("bt_bth4_register error: %d\n", ret);
       return ret;
     }
-#else
+#elif defined(CONFIG_NET_BLUETOOTH)
   /* Register network device */
 
   ret = bt_netdev_register(&g_bt_driver);
@@ -703,6 +703,8 @@ int nrf52_sdc_initialize(void)
       wlerr("bt_netdev_register error: %d\n", ret);
       return ret;
     }
+#else
+#  error
 #endif
 
   return ret;

[incubator-nuttx] 02/02: arch/arm/src/nrf52/Kconfig: select IRQPRIO for SoftDevice

Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git

commit f3fdd5a0193d94f01e9c1b4549c16befcee0007e
Author: raiden00pl <ra...@railab.me>
AuthorDate: Sat Dec 18 15:04:50 2021 +0100

    arch/arm/src/nrf52/Kconfig: select IRQPRIO for SoftDevice
---
 arch/arm/src/nrf52/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/src/nrf52/Kconfig b/arch/arm/src/nrf52/Kconfig
index 3205806..048b976 100644
--- a/arch/arm/src/nrf52/Kconfig
+++ b/arch/arm/src/nrf52/Kconfig
@@ -664,6 +664,7 @@ menuconfig NRF52_SOFTDEVICE_CONTROLLER
 	depends on ALLOW_BSDNORDIC_COMPONENTS
 	select ARMV7M_USEBASEPRI
 	select ARCH_RAMVECTORS
+	select ARCH_IRQPRIO
 	select NRF52_USE_LFCLK
 	select NRF52_LFCLK_XTAL
 	---help---