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 2024/10/08 15:54:04 UTC
(nuttx) branch releases/12.7 updated (21501f65b1 -> 77d1f78996)
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a change to branch releases/12.7
in repository https://gitbox.apache.org/repos/asf/nuttx.git
from 21501f65b1 sim: add link option /LARGEADDRESSAWARE:NO for windows64
new 431b848c79 board/arm/nrf52: fix use up_interrupt_context to is_nesting_interrupt
new 77d1f78996 board/arm/stm32: highpri up_interrupt_context to is_nesting_interrupt
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:
boards/arm/nrf52/nrf52840-dk/src/nrf52_highpri.c | 7 ++++++-
boards/arm/stm32/viewtool-stm32f107/src/stm32_highpri.c | 7 ++++++-
2 files changed, 12 insertions(+), 2 deletions(-)
(nuttx) 02/02: board/arm/stm32: highpri up_interrupt_context to is_nesting_interrupt
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch releases/12.7
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 77d1f78996d50f07bb0762afeee30bff06ca253a
Author: buxiasen <bu...@xiaomi.com>
AuthorDate: Tue Oct 8 16:47:30 2024 +0800
board/arm/stm32: highpri up_interrupt_context to is_nesting_interrupt
up_interrupt_context indicates that we self inside interrupt/handler mode,
replaced to private function is_nesting_interrupt to make less confused.
Signed-off-by: buxiasen <bu...@xiaomi.com>
---
boards/arm/stm32/viewtool-stm32f107/src/stm32_highpri.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/boards/arm/stm32/viewtool-stm32f107/src/stm32_highpri.c b/boards/arm/stm32/viewtool-stm32f107/src/stm32_highpri.c
index 07c1c5262a..c095fc3284 100644
--- a/boards/arm/stm32/viewtool-stm32f107/src/stm32_highpri.c
+++ b/boards/arm/stm32/viewtool-stm32f107/src/stm32_highpri.c
@@ -103,6 +103,11 @@ static struct highpri_s g_highpri;
* Private Functions
****************************************************************************/
+static inline_function bool is_nesting_interrupt(void)
+{
+ return up_current_regs() != NULL;
+}
+
/****************************************************************************
* Name: tim6_handler
*
@@ -128,7 +133,7 @@ void tim6_handler(void)
/* Check if we are in an interrupt handle */
- if (up_interrupt_context())
+ if (is_nesting_interrupt())
{
g_highpri.handler++;
}
(nuttx) 01/02: board/arm/nrf52: fix use up_interrupt_context to is_nesting_interrupt
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch releases/12.7
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 431b848c79e1b14246b3a8eacd4e2b476a6ab62a
Author: buxiasen <bu...@xiaomi.com>
AuthorDate: Tue Oct 8 12:22:09 2024 +0800
board/arm/nrf52: fix use up_interrupt_context to is_nesting_interrupt
The case want to determine if a interrupt with higher priority and the
interrupt preemption occurred, but up_interrupt_context indicates that we
self inside interrupt/handler mode. As we previously did not handle the
ramvector interrupt correctly, after update breaked the case. We should
use a more clear private function is_nesting_interrupt.
Signed-off-by: buxiasen <bu...@xiaomi.com>
---
boards/arm/nrf52/nrf52840-dk/src/nrf52_highpri.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/boards/arm/nrf52/nrf52840-dk/src/nrf52_highpri.c b/boards/arm/nrf52/nrf52840-dk/src/nrf52_highpri.c
index f926bccf7e..9036c79caf 100644
--- a/boards/arm/nrf52/nrf52840-dk/src/nrf52_highpri.c
+++ b/boards/arm/nrf52/nrf52840-dk/src/nrf52_highpri.c
@@ -96,6 +96,11 @@ static struct highpri_s g_highpri;
* Private Functions
****************************************************************************/
+static inline_function bool is_nesting_interrupt(void)
+{
+ return up_current_regs() != NULL;
+}
+
/****************************************************************************
* Name: timer_handler
*
@@ -126,7 +131,7 @@ void timer_handler(void)
/* Check if we are in an interrupt handle */
- if (up_interrupt_context())
+ if (is_nesting_interrupt())
{
g_highpri.handler++;
}