You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by pk...@apache.org on 2023/03/15 21:34:14 UTC
[nuttx] branch master updated (38631bd560 -> af21bb4889)
This is an automated email from the ASF dual-hosted git repository.
pkarashchenko pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
from 38631bd560 boards/nrf5340-dk: add PWM configuration
new 33b19e967c arch/nrf52/nrf52_tickless_rtc.c: check configuration
new 0976cddd03 arch/nrf52/nrf52_tickless_rtc.c: fix tickless operations - ostest fail without this change
new 405f6a5d37 boards/nrf52832-dk: add ostest_tickless configuration
new af21bb4889 boards/nrf52840-dk: add ostest_tickless configuration
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:
arch/arm/src/nrf52/nrf52_tickless_rtc.c | 31 ++++++++++++----------
.../configs/{buttons => ostest_tickless}/defconfig | 13 +++++----
.../configs/{timer => ostest_tickless}/defconfig | 8 ++++--
3 files changed, 29 insertions(+), 23 deletions(-)
copy boards/arm/nrf52/nrf52832-dk/configs/{buttons => ostest_tickless}/defconfig (87%)
copy boards/arm/nrf52/nrf52840-dk/configs/{timer => ostest_tickless}/defconfig (89%)
[nuttx] 03/04: boards/nrf52832-dk: add ostest_tickless configuration
Posted by pk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 405f6a5d372dac09c1c27e70265a42ca426e4e66
Author: raiden00pl <ra...@railab.me>
AuthorDate: Wed Mar 15 12:12:26 2023 +0100
boards/nrf52832-dk: add ostest_tickless configuration
---
.../nrf52832-dk/configs/ostest_tickless/defconfig | 50 ++++++++++++++++++++++
1 file changed, 50 insertions(+)
diff --git a/boards/arm/nrf52/nrf52832-dk/configs/ostest_tickless/defconfig b/boards/arm/nrf52/nrf52832-dk/configs/ostest_tickless/defconfig
new file mode 100644
index 0000000000..1b15d7d44f
--- /dev/null
+++ b/boards/arm/nrf52/nrf52832-dk/configs/ostest_tickless/defconfig
@@ -0,0 +1,50 @@
+#
+# This file is autogenerated: PLEASE DO NOT EDIT IT.
+#
+# You can use "make menuconfig" to make any modifications to the installed .config file.
+# You can then do "make savedefconfig" to generate a new defconfig file that includes your
+# modifications.
+#
+# CONFIG_ARCH_FPU is not set
+# CONFIG_NSH_DISABLE_IFCONFIG is not set
+# CONFIG_NSH_DISABLE_PS is not set
+CONFIG_ARCH="arm"
+CONFIG_ARCH_BOARD="nrf52832-dk"
+CONFIG_ARCH_BOARD_NRF52832_DK=y
+CONFIG_ARCH_CHIP="nrf52"
+CONFIG_ARCH_CHIP_NRF52832=y
+CONFIG_ARCH_CHIP_NRF52=y
+CONFIG_ARCH_STACKDUMP=y
+CONFIG_ARCH_STDARG_H=y
+CONFIG_ARMV7M_SYSTICK=y
+CONFIG_BOARD_LOOPSPERMSEC=5500
+CONFIG_BUILTIN=y
+CONFIG_FAT_LCNAMES=y
+CONFIG_FAT_LFN=y
+CONFIG_FS_FAT=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
+CONFIG_INTELHEX_BINARY=y
+CONFIG_MM_REGIONS=2
+CONFIG_NRF52_RTC0=y
+CONFIG_NRF52_SYSTIMER_RTC=y
+CONFIG_NRF52_UART0=y
+CONFIG_NSH_ARCHINIT=y
+CONFIG_NSH_BUILTIN_APPS=y
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_READLINE=y
+CONFIG_PREALLOC_TIMERS=4
+CONFIG_RAM_SIZE=65535
+CONFIG_RAM_START=0x20000000
+CONFIG_RAW_BINARY=y
+CONFIG_RR_INTERVAL=200
+CONFIG_SCHED_WAITPID=y
+CONFIG_START_DAY=26
+CONFIG_START_MONTH=3
+CONFIG_SYMTAB_ORDEREDBYNAME=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_TASK_NAME_SIZE=0
+CONFIG_TESTING_OSTEST=y
+CONFIG_TIMER=y
+CONFIG_UART0_SERIAL_CONSOLE=y
+CONFIG_USEC_PER_TICK=10000
[nuttx] 02/04: arch/nrf52/nrf52_tickless_rtc.c: fix tickless operations - ostest fail without this change
Posted by pk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 0976cddd030b209871a54868ceae3e35e3a495a7
Author: raiden00pl <ra...@railab.me>
AuthorDate: Wed Mar 15 12:45:33 2023 +0100
arch/nrf52/nrf52_tickless_rtc.c: fix tickless operations - ostest fail without this change
---
arch/arm/src/nrf52/nrf52_tickless_rtc.c | 25 +++++++++++--------------
1 file changed, 11 insertions(+), 14 deletions(-)
diff --git a/arch/arm/src/nrf52/nrf52_tickless_rtc.c b/arch/arm/src/nrf52/nrf52_tickless_rtc.c
index a82a8622fa..7404c3e4a3 100644
--- a/arch/arm/src/nrf52/nrf52_tickless_rtc.c
+++ b/arch/arm/src/nrf52/nrf52_tickless_rtc.c
@@ -245,22 +245,19 @@ static int rtc_handler(int irq, void *context, void *arg)
int up_alarm_cancel(struct timespec *ts)
{
- if (g_tickless_dev.alarm_set)
- {
- uint32_t counter;
- irqstate_t flags;
+ uint32_t counter;
+ irqstate_t flags;
- flags = enter_critical_section();
+ flags = enter_critical_section();
- NRF52_RTC_DISABLEINT(g_tickless_dev.rtc, NRF52_RTC_EVT_COMPARE0);
- NRF52_RTC_GETCOUNTER(g_tickless_dev.rtc, &counter);
- rtc_counter_to_ts(counter, ts);
+ NRF52_RTC_DISABLEINT(g_tickless_dev.rtc, NRF52_RTC_EVT_COMPARE0);
+ NRF52_RTC_GETCOUNTER(g_tickless_dev.rtc, &counter);
+ rtc_counter_to_ts(counter, ts);
- NRF52_RTC_ACKINT(g_tickless_dev.rtc, NRF52_RTC_EVT_COMPARE0);
- g_tickless_dev.alarm_set = false;
+ NRF52_RTC_ACKINT(g_tickless_dev.rtc, NRF52_RTC_EVT_COMPARE0);
+ g_tickless_dev.alarm_set = false;
- leave_critical_section(flags);
- }
+ leave_critical_section(flags);
return OK;
}
@@ -313,9 +310,9 @@ void up_timer_initialize(void)
{
struct timespec ts;
+ memset(&g_tickless_dev, 0, sizeof(struct nrf52_tickless_dev_s));
+
g_tickless_dev.rtc = nrf52_rtc_init(CONFIG_NRF52_SYSTIMER_RTC_INSTANCE);
- g_tickless_dev.periods = 0;
- g_tickless_dev.alarm_set = false;
/* Ensure we have support for the selected RTC instance */
[nuttx] 04/04: boards/nrf52840-dk: add ostest_tickless configuration
Posted by pk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit af21bb488943245e416ba362d9949304b436721f
Author: raiden00pl <ra...@railab.me>
AuthorDate: Wed Mar 15 13:34:57 2023 +0100
boards/nrf52840-dk: add ostest_tickless configuration
---
.../nrf52840-dk/configs/ostest_tickless/defconfig | 50 ++++++++++++++++++++++
1 file changed, 50 insertions(+)
diff --git a/boards/arm/nrf52/nrf52840-dk/configs/ostest_tickless/defconfig b/boards/arm/nrf52/nrf52840-dk/configs/ostest_tickless/defconfig
new file mode 100644
index 0000000000..b056c3b246
--- /dev/null
+++ b/boards/arm/nrf52/nrf52840-dk/configs/ostest_tickless/defconfig
@@ -0,0 +1,50 @@
+#
+# This file is autogenerated: PLEASE DO NOT EDIT IT.
+#
+# You can use "make menuconfig" to make any modifications to the installed .config file.
+# You can then do "make savedefconfig" to generate a new defconfig file that includes your
+# modifications.
+#
+# CONFIG_ARCH_FPU is not set
+# CONFIG_NSH_DISABLE_IFCONFIG is not set
+# CONFIG_NSH_DISABLE_PS is not set
+CONFIG_ARCH="arm"
+CONFIG_ARCH_BOARD="nrf52840-dk"
+CONFIG_ARCH_BOARD_NRF52840_DK=y
+CONFIG_ARCH_CHIP="nrf52"
+CONFIG_ARCH_CHIP_NRF52840=y
+CONFIG_ARCH_CHIP_NRF52=y
+CONFIG_ARCH_STACKDUMP=y
+CONFIG_ARCH_STDARG_H=y
+CONFIG_ARMV7M_SYSTICK=y
+CONFIG_BOARD_LOOPSPERMSEC=5500
+CONFIG_BUILTIN=y
+CONFIG_FAT_LCNAMES=y
+CONFIG_FAT_LFN=y
+CONFIG_FS_FAT=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
+CONFIG_INTELHEX_BINARY=y
+CONFIG_MM_REGIONS=2
+CONFIG_NRF52_RTC0=y
+CONFIG_NRF52_SYSTIMER_RTC=y
+CONFIG_NRF52_UART0=y
+CONFIG_NSH_ARCHINIT=y
+CONFIG_NSH_BUILTIN_APPS=y
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_READLINE=y
+CONFIG_PREALLOC_TIMERS=4
+CONFIG_RAM_SIZE=65535
+CONFIG_RAM_START=0x20000000
+CONFIG_RAW_BINARY=y
+CONFIG_RR_INTERVAL=200
+CONFIG_SCHED_WAITPID=y
+CONFIG_START_DAY=26
+CONFIG_START_MONTH=3
+CONFIG_SYMTAB_ORDEREDBYNAME=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_TASK_NAME_SIZE=0
+CONFIG_TESTING_OSTEST=y
+CONFIG_TIMER=y
+CONFIG_UART0_SERIAL_CONSOLE=y
+CONFIG_USEC_PER_TICK=10000
[nuttx] 01/04: arch/nrf52/nrf52_tickless_rtc.c: check configuration
Posted by pk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 33b19e967c5ece1c12ebfdc4e6478b5a588a7fb4
Author: raiden00pl <ra...@railab.me>
AuthorDate: Wed Mar 15 12:09:50 2023 +0100
arch/nrf52/nrf52_tickless_rtc.c: check configuration
---
arch/arm/src/nrf52/nrf52_tickless_rtc.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/arch/arm/src/nrf52/nrf52_tickless_rtc.c b/arch/arm/src/nrf52/nrf52_tickless_rtc.c
index 76d37fc033..a82a8622fa 100644
--- a/arch/arm/src/nrf52/nrf52_tickless_rtc.c
+++ b/arch/arm/src/nrf52/nrf52_tickless_rtc.c
@@ -41,6 +41,12 @@
* Pre-processor Definitions
****************************************************************************/
+/* Check configuration */
+
+#ifdef CONFIG_TIMER_ARCH
+# error CONFIG_TIMER_ARCH must be not set
+#endif
+
/* Check corresponding RTC support */
#if (CONFIG_NRF52_SYSTIMER_RTC_INSTANCE == 0) && !defined(CONFIG_NRF52_RTC0)