(nuttx) branch master updated (3479622fec -> c4f82c1f66)

[xi...@apache.org]

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/nuttx.git


    from 3479622fec serial: use nxsig_tgkill instead of nxsig_kill
     new 9ea38368ad goldfish_timer: fix interrupt not cleared
     new c4f82c1f66 drivers/timer: fix goldfish timer did not included in cmake

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:
 drivers/timers/CMakeLists.txt   | 4 ++++
 drivers/timers/goldfish_timer.c | 1 +
 2 files changed, 5 insertions(+)

(nuttx) 01/02: goldfish_timer: fix interrupt not cleared

[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/nuttx.git

commit 9ea38368ad3f66bb18315d72219a829edb82ad84
Author: buxiasen <bu...@xiaomi.com>
AuthorDate: Tue Aug 6 15:34:29 2024 +0800

    goldfish_timer: fix interrupt not cleared
    
    will cause a loop interrupt handler, in some new version qemu
    
    Signed-off-by: buxiasen <bu...@xiaomi.com>
---
 drivers/timers/goldfish_timer.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/timers/goldfish_timer.c b/drivers/timers/goldfish_timer.c
index 7645c9204e..843d6d6da0 100644
--- a/drivers/timers/goldfish_timer.c
+++ b/drivers/timers/goldfish_timer.c
@@ -203,6 +203,7 @@ static int goldfish_timer_interrupt(int irq,
   flags = spin_lock_irqsave(&lower->lock);
 
   putreg32(1, lower->base + GOLDFISH_TIMER_CLEAR_ALARM);
+  putreg32(1, lower->base + GOLDFISH_TIMER_CLEAR_INTERRUPT);
 
   if (lower->callback != NULL)
     {

(nuttx) 02/02: drivers/timer: fix goldfish timer did not included in cmake

[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/nuttx.git

commit c4f82c1f6671fa9745ce913e850c76f8a90f8721
Author: buxiasen <bu...@xiaomi.com>
AuthorDate: Tue Aug 6 15:49:15 2024 +0800

    drivers/timer: fix goldfish timer did not included in cmake
    
    Signed-off-by: buxiasen <bu...@xiaomi.com>
---
 drivers/timers/CMakeLists.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/timers/CMakeLists.txt b/drivers/timers/CMakeLists.txt
index 371f1f8e59..e4bd3deff7 100644
--- a/drivers/timers/CMakeLists.txt
+++ b/drivers/timers/CMakeLists.txt
@@ -85,4 +85,8 @@ if(CONFIG_CAPTURE)
   list(APPEND SRCS capture.c)
 endif()
 
+if(CONFIG_GOLDFISH_TIMER)
+  list(APPEND SRCS goldfish_timer.c)
+endif()
+
 target_sources(drivers PRIVATE ${SRCS})