This is an automated email from the ASF dual-hosted git repository.
masayuki pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new fe8122e arch/risc-v: Remove duplicated declaration for up_irq_save
and up_irq_restore
fe8122e is described below
commit fe8122ee2b5e94261c5ca568c0cd2c8334645dfe
Author: Xiang Xiao <xiaoxi...@xiaomi.com>
AuthorDate: Fri Dec 18 02:52:43 2020 +0800
arch/risc-v: Remove duplicated declaration for up_irq_save and
up_irq_restore
Signed-off-by: Xiang Xiao <xiaoxi...@xiaomi.com>
---
arch/risc-v/include/fe310/irq.h | 32 --------------------------------
arch/risc-v/include/gap8/irq.h | 12 ++++++------
arch/risc-v/include/irq.h | 33 +++++++++++++++++++++++++++++++++
arch/risc-v/include/k210/irq.h | 32 --------------------------------
arch/risc-v/include/litex/irq.h | 32 --------------------------------
arch/risc-v/include/nr5m100/irq.h | 16 ----------------
6 files changed, 39 insertions(+), 118 deletions(-)
diff --git a/arch/risc-v/include/fe310/irq.h b/arch/risc-v/include/fe310/irq.h
index d8e14c3..9356f6c 100644
--- a/arch/risc-v/include/fe310/irq.h
+++ b/arch/risc-v/include/fe310/irq.h
@@ -121,36 +121,4 @@
#define NR_IRQS (FE310_IRQ_GPIO31 + 1)
-/****************************************************************************
- * Public Types
- ****************************************************************************/
-
-#ifndef __ASSEMBLY__
-
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-#undef EXTERN
-#if defined(__cplusplus)
-#define EXTERN extern "C"
-extern "C"
-{
-#else
-#define EXTERN extern
-#endif
-
-/****************************************************************************
- * Public Function Prototypes
- ****************************************************************************/
-
-EXTERN irqstate_t up_irq_save(void);
-EXTERN void up_irq_restore(irqstate_t);
-EXTERN irqstate_t up_irq_enable(void);
-
-#undef EXTERN
-#if defined(__cplusplus)
-}
-#endif
-#endif /* __ASSEMBLY__ */
#endif /* __ARCH_RISCV_INCLUDE_FE310_IRQ_H */
diff --git a/arch/risc-v/include/gap8/irq.h b/arch/risc-v/include/gap8/irq.h
index 0c70b24..c366765 100644
--- a/arch/risc-v/include/gap8/irq.h
+++ b/arch/risc-v/include/gap8/irq.h
@@ -347,10 +347,10 @@ static inline uint32_t _current_privilege(void)
*
****************************************************************************/
-static inline uint32_t up_irq_save(void)
+static inline irqstate_t up_irq_save(void)
{
- uint32_t oldstat;
- uint32_t newstat;
+ irqstate_t oldstat;
+ irqstate_t newstat;
if (_current_privilege())
{
@@ -404,10 +404,10 @@ static inline void up_irq_restore(uint32_t pri)
*
****************************************************************************/
-static inline uint32_t up_irq_enable(void)
+static inline irqstate_t up_irq_enable(void)
{
- uint32_t oldstat;
- uint32_t newstat;
+ irqstate_t oldstat;
+ irqstate_t newstat;
if (_current_privilege())
{
diff --git a/arch/risc-v/include/irq.h b/arch/risc-v/include/irq.h
index 816eaef..bb3567c 100644
--- a/arch/risc-v/include/irq.h
+++ b/arch/risc-v/include/irq.h
@@ -57,4 +57,37 @@
# include <arch/rv64gc/irq.h>
#endif
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
+#ifndef __ASSEMBLY__
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+#undef EXTERN
+#if defined(__cplusplus)
+#define EXTERN extern "C"
+extern "C"
+{
+#else
+#define EXTERN extern
+#endif
+
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+EXTERN irqstate_t up_irq_save(void);
+EXTERN void up_irq_restore(irqstate_t);
+EXTERN irqstate_t up_irq_enable(void);
+
+#undef EXTERN
+#if defined(__cplusplus)
+}
+#endif
+#endif /* __ASSEMBLY__ */
+
#endif /* __ARCH_RISCV_INCLUDE_IRQ_H */
diff --git a/arch/risc-v/include/k210/irq.h b/arch/risc-v/include/k210/irq.h
index 1da9252..43d120c 100644
--- a/arch/risc-v/include/k210/irq.h
+++ b/arch/risc-v/include/k210/irq.h
@@ -92,36 +92,4 @@
#define NR_IRQS (K210_IRQ_UART0 + 1)
-/****************************************************************************
- * Public Types
- ****************************************************************************/
-
-#ifndef __ASSEMBLY__
-
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-#undef EXTERN
-#if defined(__cplusplus)
-#define EXTERN extern "C"
-extern "C"
-{
-#else
-#define EXTERN extern
-#endif
-
-/****************************************************************************
- * Public Function Prototypes
- ****************************************************************************/
-
-EXTERN irqstate_t up_irq_save(void);
-EXTERN void up_irq_restore(irqstate_t);
-EXTERN irqstate_t up_irq_enable(void);
-
-#undef EXTERN
-#if defined(__cplusplus)
-}
-#endif
-#endif /* __ASSEMBLY__ */
#endif /* __ARCH_RISCV_INCLUDE_K210_IRQ_H */
diff --git a/arch/risc-v/include/litex/irq.h b/arch/risc-v/include/litex/irq.h
index c2f5e0c..75a9c4e 100644
--- a/arch/risc-v/include/litex/irq.h
+++ b/arch/risc-v/include/litex/irq.h
@@ -78,36 +78,4 @@
#define NR_IRQS (LITEX_IRQ_TIMER0 + 1)
-/****************************************************************************
- * Public Types
- ****************************************************************************/
-
-#ifndef __ASSEMBLY__
-
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-#undef EXTERN
-#if defined(__cplusplus)
-#define EXTERN extern "C"
-extern "C"
-{
-#else
-#define EXTERN extern
-#endif
-
-/****************************************************************************
- * Public Function Prototypes
- ****************************************************************************/
-
-EXTERN irqstate_t up_irq_save(void);
-EXTERN void up_irq_restore(irqstate_t);
-EXTERN irqstate_t up_irq_enable(void);
-
-#undef EXTERN
-#if defined(__cplusplus)
-}
-#endif
-#endif /* __ASSEMBLY__ */
#endif /* __ARCH_RISCV_INCLUDE_LITEX_IRQ_H */
diff --git a/arch/risc-v/include/nr5m100/irq.h
b/arch/risc-v/include/nr5m100/irq.h
index 8fc6c75..47de66e 100644
--- a/arch/risc-v/include/nr5m100/irq.h
+++ b/arch/risc-v/include/nr5m100/irq.h
@@ -52,20 +52,4 @@
#define EPIC_STATUS_INT_PRI_MASK 0x01C0
#define EPIC_STATUS_INT_PRI1 0x0040
-/****************************************************************************
- * Public Types
- ****************************************************************************/
-
-/****************************************************************************
- * Public Variables
- ****************************************************************************/
-
-/****************************************************************************
- * Public Function Prototypes
- ****************************************************************************/
-
-irqstate_t up_irq_save(void);
-void up_irq_restore(irqstate_t irqstate);
-irqstate_t up_irq_enable(void);
-
#endif /* __ARCH_RISCV_INCLUDE_NR5M100_IRQ_H */
