[incubator-nuttx] branch master updated: arch:xtensa:include chip/irq.h instead of depend on chip config.

[aguettouche]

This is an automated email from the ASF dual-hosted git repository.

aguettouche 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 ec17cad  arch:xtensa:include chip/irq.h instead of depend on chip 
config.
ec17cad is described below

commit ec17cad69da11243487e22d1aee0b9a8e05cbea4
Author: zhuyanlin <zhuyanl...@xiaomi.com>
AuthorDate: Wed Aug 4 18:29:01 2021 +0800

    arch:xtensa:include chip/irq.h instead of depend on chip config.
    
    Many duplicate code when more chips add-in,
    follow arch/arm/include/irq.h method, use chip/irq.h instead.
    
    Change-Id: I42f516c1dda68e973939c669f627c457cd0bc65e
---
 arch/xtensa/include/irq.h | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/arch/xtensa/include/irq.h b/arch/xtensa/include/irq.h
index 08b009b..2a2cdff 100644
--- a/arch/xtensa/include/irq.h
+++ b/arch/xtensa/include/irq.h
@@ -42,30 +42,18 @@
 #include <arch/xtensa/xtensa_corebits.h>
 #include <arch/xtensa/xtensa_coproc.h>
 
+/* Include chip-specific IRQ definitions (including IRQ numbers) */
+
+#include <arch/chip/irq.h>
+
 /* Include architecture-specific IRQ definitions */
 
 #ifdef CONFIG_ARCH_FAMILY_LX6
 #  include <arch/lx6/irq.h>
 
-/* Include implementation-specific IRQ definitions (including IRQ numbers) */
-
-#  ifdef CONFIG_ARCH_CHIP_ESP32
-#    include <arch/esp32/irq.h>
-#  else
-#    error Unknown LX6 implementation
-#  endif
-
 #elif CONFIG_ARCH_FAMILY_LX7
 #  include <arch/lx7/irq.h>
 
-/* Include implementation-specific IRQ definitions (including IRQ numbers) */
-
-#  ifdef CONFIG_ARCH_CHIP_ESP32S2
-#    include <arch/esp32s2/irq.h>
-#  else
-#    error Unknown LX7 implementation
-#  endif
-
 #else
 #  error Unknown XTENSA architecture
 #endif