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/17 17:24:53 UTC
[incubator-nuttx] branch master updated (3eec9fc -> 26c7ec5)
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 3eec9fc ci: Use GitHub Actions concurrency for cancelling duplicate jobs
new ff25063 boards/arm/nrf52/nrf52840-dk: add procfs support
new 2bb01b25 boards/arm/nrf52/nrf52832-dk: add procfs support
new 4812f9f boards/arm/nrf52/nrf52840-dk: add sdc support
new 26c7ec5 boards/arm/nrf52/nrf52832-dk: add sdc support
The 4 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:
boards/arm/nrf52/nrf52832-dk/src/nrf52832-dk.h | 12 ++++++++++
boards/arm/nrf52/nrf52832-dk/src/nrf52_bringup.c | 28 ++++++++++++++++++++++++
boards/arm/nrf52/nrf52840-dk/src/nrf52840-dk.h | 12 ++++++++++
boards/arm/nrf52/nrf52840-dk/src/nrf52_bringup.c | 26 ++++++++++++++++++++++
4 files changed, 78 insertions(+)
[incubator-nuttx] 01/04: boards/arm/nrf52/nrf52840-dk: add procfs support
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 ff25063c621bd5597eae644a4ba55c7697d352b1
Author: raiden00pl <ra...@railab.me>
AuthorDate: Fri Dec 17 15:52:19 2021 +0100
boards/arm/nrf52/nrf52840-dk: add procfs support
---
boards/arm/nrf52/nrf52840-dk/src/nrf52840-dk.h | 12 ++++++++++++
boards/arm/nrf52/nrf52840-dk/src/nrf52_bringup.c | 13 +++++++++++++
2 files changed, 25 insertions(+)
diff --git a/boards/arm/nrf52/nrf52840-dk/src/nrf52840-dk.h b/boards/arm/nrf52/nrf52840-dk/src/nrf52840-dk.h
index 69cf23a..d7b22f9 100644
--- a/boards/arm/nrf52/nrf52840-dk/src/nrf52840-dk.h
+++ b/boards/arm/nrf52/nrf52840-dk/src/nrf52840-dk.h
@@ -34,6 +34,18 @@
* Pre-processor Definitions
****************************************************************************/
+/* Configuration ************************************************************/
+
+/* procfs File System */
+
+#ifdef CONFIG_FS_PROCFS
+# ifdef CONFIG_NSH_PROC_MOUNTPOINT
+# define NRF52_PROCFS_MOUNTPOINT CONFIG_NSH_PROC_MOUNTPOINT
+# else
+# define NRF52_PROCFS_MOUNTPOINT "/proc"
+# endif
+#endif
+
/* LED definitions **********************************************************/
/* Definitions to configure LED GPIO as outputs */
diff --git a/boards/arm/nrf52/nrf52840-dk/src/nrf52_bringup.c b/boards/arm/nrf52/nrf52840-dk/src/nrf52_bringup.c
index 4a96237..eb0d8c1 100644
--- a/boards/arm/nrf52/nrf52840-dk/src/nrf52_bringup.c
+++ b/boards/arm/nrf52/nrf52840-dk/src/nrf52_bringup.c
@@ -27,6 +27,8 @@
#include <sys/types.h>
#include <syslog.h>
+#include <nuttx/fs/fs.h>
+
#ifdef CONFIG_USERLED
# include <nuttx/leds/userled.h>
#endif
@@ -113,6 +115,17 @@ int nrf52_bringup(void)
{
int ret;
+#ifdef CONFIG_FS_PROCFS
+ /* Mount the procfs file system */
+
+ ret = nx_mount(NULL, NRF52_PROCFS_MOUNTPOINT, "procfs", 0, NULL);
+ if (ret < 0)
+ {
+ syslog(LOG_ERR,
+ "ERROR: Failed to mount the PROC filesystem: %d\n", ret);
+ }
+#endif /* CONFIG_FS_PROCFS */
+
#ifdef CONFIG_USERLED
/* Register the LED driver */
[incubator-nuttx] 02/04: boards/arm/nrf52/nrf52832-dk: add procfs support
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 2bb01b25bd1c26320a971d6becad95966e2ec9ac
Author: raiden00pl <ra...@railab.me>
AuthorDate: Fri Dec 17 15:53:10 2021 +0100
boards/arm/nrf52/nrf52832-dk: add procfs support
---
boards/arm/nrf52/nrf52832-dk/src/nrf52832-dk.h | 12 ++++++++++++
boards/arm/nrf52/nrf52832-dk/src/nrf52_bringup.c | 15 +++++++++++++++
2 files changed, 27 insertions(+)
diff --git a/boards/arm/nrf52/nrf52832-dk/src/nrf52832-dk.h b/boards/arm/nrf52/nrf52832-dk/src/nrf52832-dk.h
index e3a379b..bdf5c8f 100644
--- a/boards/arm/nrf52/nrf52832-dk/src/nrf52832-dk.h
+++ b/boards/arm/nrf52/nrf52832-dk/src/nrf52832-dk.h
@@ -34,6 +34,18 @@
* Pre-processor Definitions
****************************************************************************/
+/* Configuration ************************************************************/
+
+/* procfs File System */
+
+#ifdef CONFIG_FS_PROCFS
+# ifdef CONFIG_NSH_PROC_MOUNTPOINT
+# define NRF52_PROCFS_MOUNTPOINT CONFIG_NSH_PROC_MOUNTPOINT
+# else
+# define NRF52_PROCFS_MOUNTPOINT "/proc"
+# endif
+#endif
+
/* LED definitions **********************************************************/
/* Definitions to configure LED GPIO as outputs */
diff --git a/boards/arm/nrf52/nrf52832-dk/src/nrf52_bringup.c b/boards/arm/nrf52/nrf52832-dk/src/nrf52_bringup.c
index 43f7c76..5f37940 100644
--- a/boards/arm/nrf52/nrf52832-dk/src/nrf52_bringup.c
+++ b/boards/arm/nrf52/nrf52832-dk/src/nrf52_bringup.c
@@ -27,6 +27,8 @@
#include <sys/types.h>
#include <syslog.h>
+#include <nuttx/fs/fs.h>
+
#ifdef CONFIG_NRF52_WDT
# include "nrf52_wdt_lowerhalf.h"
#endif
@@ -35,6 +37,8 @@
# include <nuttx/leds/userled.h>
#endif
+#include "nrf52832-dk.h"
+
/****************************************************************************
* Public Functions
****************************************************************************/
@@ -57,6 +61,17 @@ int nrf52_bringup(void)
{
int ret;
+#ifdef CONFIG_FS_PROCFS
+ /* Mount the procfs file system */
+
+ ret = nx_mount(NULL, NRF52_PROCFS_MOUNTPOINT, "procfs", 0, NULL);
+ if (ret < 0)
+ {
+ syslog(LOG_ERR,
+ "ERROR: Failed to mount the PROC filesystem: %d\n", ret);
+ }
+#endif /* CONFIG_FS_PROCFS */
+
#ifdef CONFIG_NRF52_WDT
/* Start Watchdog timer */
[incubator-nuttx] 04/04: boards/arm/nrf52/nrf52832-dk: add sdc support
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 26c7ec5087074ad6f25f3fe51e5bba3300821ce5
Author: raiden00pl <ra...@railab.me>
AuthorDate: Fri Dec 17 15:54:01 2021 +0100
boards/arm/nrf52/nrf52832-dk: add sdc support
---
boards/arm/nrf52/nrf52832-dk/src/nrf52_bringup.c | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/boards/arm/nrf52/nrf52832-dk/src/nrf52_bringup.c b/boards/arm/nrf52/nrf52832-dk/src/nrf52_bringup.c
index 5f37940..d79ccff 100644
--- a/boards/arm/nrf52/nrf52832-dk/src/nrf52_bringup.c
+++ b/boards/arm/nrf52/nrf52832-dk/src/nrf52_bringup.c
@@ -37,6 +37,10 @@
# include <nuttx/leds/userled.h>
#endif
+#ifdef CONFIG_NRF52_SOFTDEVICE_CONTROLLER
+# include "nrf52_sdc.h"
+#endif
+
#include "nrf52832-dk.h"
/****************************************************************************
@@ -92,6 +96,15 @@ int nrf52_bringup(void)
}
#endif
+#ifdef CONFIG_NRF52_SOFTDEVICE_CONTROLLER
+ ret = nrf52_sdc_initialize();
+
+ if (ret < 0)
+ {
+ syslog(LOG_ERR, "ERROR: nrf52_sdc_initialize() failed: %d\n", ret);
+ }
+#endif
+
UNUSED(ret);
return OK;
}
[incubator-nuttx] 03/04: boards/arm/nrf52/nrf52840-dk: add sdc support
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 4812f9f39028d925df609d235444781daf33de3d
Author: raiden00pl <ra...@railab.me>
AuthorDate: Fri Dec 17 15:53:42 2021 +0100
boards/arm/nrf52/nrf52840-dk: add sdc support
---
boards/arm/nrf52/nrf52840-dk/src/nrf52_bringup.c | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/boards/arm/nrf52/nrf52840-dk/src/nrf52_bringup.c b/boards/arm/nrf52/nrf52840-dk/src/nrf52_bringup.c
index eb0d8c1..b055243 100644
--- a/boards/arm/nrf52/nrf52840-dk/src/nrf52_bringup.c
+++ b/boards/arm/nrf52/nrf52840-dk/src/nrf52_bringup.c
@@ -33,6 +33,10 @@
# include <nuttx/leds/userled.h>
#endif
+#ifdef CONFIG_NRF52_SOFTDEVICE_CONTROLLER
+# include "nrf52_sdc.h"
+#endif
+
#include "nrf52840-dk.h"
/****************************************************************************
@@ -214,6 +218,15 @@ int nrf52_bringup(void)
}
#endif
+#ifdef CONFIG_NRF52_SOFTDEVICE_CONTROLLER
+ ret = nrf52_sdc_initialize();
+
+ if (ret < 0)
+ {
+ syslog(LOG_ERR, "ERROR: nrf52_sdc_initialize() failed: %d\n", ret);
+ }
+#endif
+
UNUSED(ret);
return OK;
}