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 2026/01/07 18:23:45 UTC
(nuttx) branch master updated (e6a0c6c3773 -> 6b5d2fa3b18)
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 e6a0c6c3773 Documentation: Add mquickjs documentation
new e46c2348cea kinetis: edma compile fix
new ca9a597af08 s32k3xx: edma compile fix
new afa1fccffe1 s32k3xx: emac compile fix
new 6b5d2fa3b18 kinetis: fix flexcan header typo
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/kinetis/hardware/kinetis_flexcan.h | 8 ++++----
arch/arm/src/kinetis/kinetis_edma.c | 3 +--
arch/arm/src/s32k3xx/s32k3xx_edma.c | 1 +
arch/arm/src/s32k3xx/s32k3xx_emac.c | 1 +
4 files changed, 7 insertions(+), 6 deletions(-)
(nuttx) 04/04: kinetis: fix flexcan header typo
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/nuttx.git
commit 6b5d2fa3b18a6614361ef72a4df298f799f8d9be
Author: Peter van der Perk <pe...@nxp.com>
AuthorDate: Mon Jan 5 18:45:14 2026 +0100
kinetis: fix flexcan header typo
Fix PROSEG -> PROPSEG typo
Signed-off-by: Peter van der Perk <pe...@nxp.com>
---
arch/arm/src/kinetis/hardware/kinetis_flexcan.h | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/src/kinetis/hardware/kinetis_flexcan.h b/arch/arm/src/kinetis/hardware/kinetis_flexcan.h
index 72817caeba1..7849050b827 100644
--- a/arch/arm/src/kinetis/hardware/kinetis_flexcan.h
+++ b/arch/arm/src/kinetis/hardware/kinetis_flexcan.h
@@ -151,9 +151,9 @@
/* Control 1 Register */
-#define CAN_CTRL1_PROSEG_SHIFT (0) /* Bits 0-2: Propagation Segment */
-#define CAN_CTRL1_PROSEG_MASK (7 << CAN_CTRL1_PROSEG_SHIFT)
-#define CAN_CTRL1_PROPSEG(x) (((uint32_t)(((uint32_t)(x)) << CAN_CTRL1_PROPSEG_SHIFT)) & CAN_CTRL1_PROSEG_MASK)
+#define CAN_CTRL1_PROPSEG_SHIFT (0) /* Bits 0-2: Propagation Segment */
+#define CAN_CTRL1_PROPSEG_MASK (7 << CAN_CTRL1_PROPSEG_SHIFT)
+#define CAN_CTRL1_PROPSEG(x) (((uint32_t)(((uint32_t)(x)) << CAN_CTRL1_PROPSEG_SHIFT)) & CAN_CTRL1_PROPSEG_MASK)
#define CAN_CTRL1_LOM (1 << 3) /* Bit 3: Listen-Only Mode */
#define CAN_CTRL1_LBUF (1 << 4) /* Bit 4: Lowest Buffer Transmitted First */
#define CAN_CTRL1_TSYN (1 << 5) /* Bit 5: Timer Sync */
@@ -166,7 +166,7 @@
#define CAN_CTRL1_CLKSRC (1 << 13) /* Bit 13: CAN Engine Clock Source */
#define CAN_CTRL1_ERRMSK (1 << 14) /* Bit 14: Error Mask */
#define CAN_CTRL1_BOFFMSK (1 << 15) /* Bit 15: Bus Off Mask */
-#define CAN_CTRL1_TIMINGMSK ((0xFFFF << 16) | CAN_CTRL1_PROSEG_MASK)
+#define CAN_CTRL1_TIMINGMSK ((0xFFFF << 16) | CAN_CTRL1_PROPSEG_MASK)
/* Bitmask for propseg, pseg1/2, rjw & presdiv */
/* Bits 16-31: Timing Mask */
#define CAN_CTRL1_PSEG2_SHIFT (16) /* Bits 16-18: Phase Segment 2 */
(nuttx) 02/04: s32k3xx: edma compile fix
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/nuttx.git
commit ca9a597af0895ff15d852bbb17f3203b6c061e5b
Author: Peter van der Perk <pe...@nxp.com>
AuthorDate: Mon Jan 5 13:39:12 2026 +0100
s32k3xx: edma compile fix
Refactoring didn't add the required spinlock
Signed-off-by: Peter van der Perk <pe...@nxp.com>
---
arch/arm/src/s32k3xx/s32k3xx_edma.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/src/s32k3xx/s32k3xx_edma.c b/arch/arm/src/s32k3xx/s32k3xx_edma.c
index 9ad23261dc5..03049b4364e 100644
--- a/arch/arm/src/s32k3xx/s32k3xx_edma.c
+++ b/arch/arm/src/s32k3xx/s32k3xx_edma.c
@@ -156,6 +156,7 @@ struct s32k3xx_edma_s
/* This array describes each DMA channel */
struct s32k3xx_dmach_s dmach[S32K3XX_EDMA_NCHANNELS];
+ spinlock_t lock;
};
/****************************************************************************
(nuttx) 01/04: kinetis: edma compile fix
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/nuttx.git
commit e46c2348ceae7628ec1d7130e0c405c3595cf5aa
Author: Peter van der Perk <pe...@nxp.com>
AuthorDate: Mon Jan 5 13:38:52 2026 +0100
kinetis: edma compile fix
Refactoring didn't add the required spinlock
Signed-off-by: Peter van der Perk <pe...@nxp.com>
---
arch/arm/src/kinetis/kinetis_edma.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/arch/arm/src/kinetis/kinetis_edma.c b/arch/arm/src/kinetis/kinetis_edma.c
index a44cbc0be5a..699e4dd4c8c 100644
--- a/arch/arm/src/kinetis/kinetis_edma.c
+++ b/arch/arm/src/kinetis/kinetis_edma.c
@@ -144,6 +144,7 @@ struct kinetis_edma_s
/* This array describes each DMA channel */
struct kinetis_dmach_s dmach[KINETIS_EDMA_NCHANNELS];
+ spinlock_t lock;
};
/****************************************************************************
@@ -223,8 +224,6 @@ static struct kinetis_edmatcd_s *kinetis_tcd_alloc(void)
#if CONFIG_KINETIS_EDMA_NTCD > 0
static void kinetis_tcd_free_nolock(struct kinetis_edmatcd_s *tcd)
{
- irqstate_t flags;
-
/* Add the the TCD to the end of the free list and post the 'dsem',
* possibly waking up another thread that might be waiting for
* a TCD.
(nuttx) 03/04: s32k3xx: emac compile fix
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/nuttx.git
commit afa1fccffe10947c1e0aca01739aca19c4f69c4e
Author: Peter van der Perk <pe...@nxp.com>
AuthorDate: Mon Jan 5 13:39:35 2026 +0100
s32k3xx: emac compile fix
Fix compile error with undefined barrier function
Signed-off-by: Peter van der Perk <pe...@nxp.com>
---
arch/arm/src/s32k3xx/s32k3xx_emac.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/src/s32k3xx/s32k3xx_emac.c b/arch/arm/src/s32k3xx/s32k3xx_emac.c
index 459367f07a3..4288d1a013a 100644
--- a/arch/arm/src/s32k3xx/s32k3xx_emac.c
+++ b/arch/arm/src/s32k3xx/s32k3xx_emac.c
@@ -36,6 +36,7 @@
#include <errno.h>
#include <sys/param.h>
+#include <arch/barriers.h>
#include <arpa/inet.h>