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 2021/11/06 12:39:38 UTC

[incubator-nuttx] 01/03: arch:xtensa: make xtensa_abi.h global include and usage

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

commit 580d17cc02db481c3a8e8006398a73d7d2cdd603
Author: zhuyanlin <zh...@xiaomi.com>
AuthorDate: Thu Oct 28 20:22:09 2021 +0800

    arch:xtensa: make xtensa_abi.h global include and usage
    
    N/A
    
    Signed-off-by: zhuyanlin <zh...@xiaomi.com>
---
 arch/xtensa/{src/common => include/xtensa}/xtensa_abi.h | 0
 arch/xtensa/src/common/xtensa_context.S                 | 3 +--
 arch/xtensa/src/common/xtensa_coproc.S                  | 3 +--
 arch/xtensa/src/common/xtensa_cpuint.S                  | 2 +-
 arch/xtensa/src/common/xtensa_int_handlers.S            | 2 +-
 arch/xtensa/src/common/xtensa_loadstore.S               | 2 +-
 arch/xtensa/src/common/xtensa_sigtramp.S                | 2 +-
 arch/xtensa/src/common/xtensa_simcall.S                 | 2 +-
 arch/xtensa/src/common/xtensa_vectors.S                 | 2 +-
 arch/xtensa/src/common/xtensa_windowspill.S             | 3 +--
 arch/xtensa/src/esp32/esp32_cpuindex.S                  | 2 +-
 11 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/arch/xtensa/src/common/xtensa_abi.h b/arch/xtensa/include/xtensa/xtensa_abi.h
similarity index 100%
rename from arch/xtensa/src/common/xtensa_abi.h
rename to arch/xtensa/include/xtensa/xtensa_abi.h
diff --git a/arch/xtensa/src/common/xtensa_context.S b/arch/xtensa/src/common/xtensa_context.S
index 3ac5b77..08c13fb 100644
--- a/arch/xtensa/src/common/xtensa_context.S
+++ b/arch/xtensa/src/common/xtensa_context.S
@@ -63,10 +63,9 @@
 #include <arch/irq.h>
 #include <arch/chip/core-isa.h>
 #include <arch/chip/tie.h>
+#include <arch/xtensa/xtensa_abi.h>
 #include <arch/xtensa/xtensa_specregs.h>
 
-#include "xtensa_abi.h"
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
diff --git a/arch/xtensa/src/common/xtensa_coproc.S b/arch/xtensa/src/common/xtensa_coproc.S
index 3b2b6bf..0090004 100644
--- a/arch/xtensa/src/common/xtensa_coproc.S
+++ b/arch/xtensa/src/common/xtensa_coproc.S
@@ -40,14 +40,13 @@
 #include <nuttx/config.h>
 
 #include <arch/xtensa/core.h>
+#include <arch/xtensa/xtensa_abi.h>
 #include <arch/xtensa/xtensa_coproc.h>
 #include <arch/xtensa/xtensa_specregs.h>
 #include <arch/chip/core-isa.h>
 #include <arch/chip/tie.h>
 #include <arch/chip/tie-asm.h>
 
-#include "xtensa_abi.h"
-
 #if XCHAL_CP_NUM > 0
 
 /****************************************************************************
diff --git a/arch/xtensa/src/common/xtensa_cpuint.S b/arch/xtensa/src/common/xtensa_cpuint.S
index f875499..da60961 100644
--- a/arch/xtensa/src/common/xtensa_cpuint.S
+++ b/arch/xtensa/src/common/xtensa_cpuint.S
@@ -40,7 +40,7 @@
 #include <nuttx/config.h>
 #include <arch/chip/core-isa.h>
 
-#include "xtensa_abi.h"
+#include <arch/xtensa/xtensa_abi.h>
 
 #if XCHAL_HAVE_INTERRUPTS
 
diff --git a/arch/xtensa/src/common/xtensa_int_handlers.S b/arch/xtensa/src/common/xtensa_int_handlers.S
index 522c969..458cb78 100644
--- a/arch/xtensa/src/common/xtensa_int_handlers.S
+++ b/arch/xtensa/src/common/xtensa_int_handlers.S
@@ -61,11 +61,11 @@
 
 #include <arch/irq.h>
 #include <arch/chip/core-isa.h>
+#include <arch/xtensa/xtensa_abi.h>
 #include <arch/xtensa/xtensa_specregs.h>
 
 #include "chip.h"
 #include "xtensa.h"
-#include "xtensa_abi.h"
 #include "xtensa_timer.h"
 
 #if !defined(CONFIG_SMP) && CONFIG_ARCH_INTERRUPTSTACK > 15
diff --git a/arch/xtensa/src/common/xtensa_loadstore.S b/arch/xtensa/src/common/xtensa_loadstore.S
index b14fdfe..d979b4b 100644
--- a/arch/xtensa/src/common/xtensa_loadstore.S
+++ b/arch/xtensa/src/common/xtensa_loadstore.S
@@ -24,7 +24,7 @@
 
 #include <nuttx/config.h>
 
-#include "xtensa_abi.h"
+#include <arch/xtensa/xtensa_abi.h>
 
 /****************************************************************************
  * Public Functions
diff --git a/arch/xtensa/src/common/xtensa_sigtramp.S b/arch/xtensa/src/common/xtensa_sigtramp.S
index 9feebd7..6a1d330 100644
--- a/arch/xtensa/src/common/xtensa_sigtramp.S
+++ b/arch/xtensa/src/common/xtensa_sigtramp.S
@@ -26,7 +26,7 @@
 
 #include <nuttx/config.h>
 
-#include "xtensa_abi.h"
+#include <arch/xtensa/xtensa_abi.h>
 
 /****************************************************************************
  * Public Functions
diff --git a/arch/xtensa/src/common/xtensa_simcall.S b/arch/xtensa/src/common/xtensa_simcall.S
index 8361db4..7682856 100644
--- a/arch/xtensa/src/common/xtensa_simcall.S
+++ b/arch/xtensa/src/common/xtensa_simcall.S
@@ -24,7 +24,7 @@
 
 #include <nuttx/config.h>
 
-#include "xtensa_abi.h"
+#include <arch/xtensa/xtensa_abi.h>
 
 /****************************************************************************
  * Public Functions
diff --git a/arch/xtensa/src/common/xtensa_vectors.S b/arch/xtensa/src/common/xtensa_vectors.S
index fd0a662..8f1e893 100644
--- a/arch/xtensa/src/common/xtensa_vectors.S
+++ b/arch/xtensa/src/common/xtensa_vectors.S
@@ -40,10 +40,10 @@
 
 #include <arch/irq.h>
 #include <arch/chip/core-isa.h>
+#include <arch/xtensa/xtensa_abi.h>
 #include <arch/xtensa/xtensa_specregs.h>
 
 #include "xtensa.h"
-#include "xtensa_abi.h"
 
 /****************************************************************************
  * Public Functions
diff --git a/arch/xtensa/src/common/xtensa_windowspill.S b/arch/xtensa/src/common/xtensa_windowspill.S
index f2d3448..76dc81e 100644
--- a/arch/xtensa/src/common/xtensa_windowspill.S
+++ b/arch/xtensa/src/common/xtensa_windowspill.S
@@ -41,11 +41,10 @@
 
 #include <arch/chip/core-isa.h>
 #include <arch/xtensa/core.h>
+#include <arch/xtensa/xtensa_abi.h>
 #include <arch/xtensa/xtensa_specregs.h>
 #include <arch/xtensa/xtensa_corebits.h>
 
-#include "xtensa_abi.h"
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
diff --git a/arch/xtensa/src/esp32/esp32_cpuindex.S b/arch/xtensa/src/esp32/esp32_cpuindex.S
index 981fd3b..6951ba7 100644
--- a/arch/xtensa/src/esp32/esp32_cpuindex.S
+++ b/arch/xtensa/src/esp32/esp32_cpuindex.S
@@ -24,7 +24,7 @@
  * Included Files
  ****************************************************************************/
 
-#include "xtensa_abi.h"
+#include <arch/xtensa/xtensa_abi.h>
 #include "chip_macros.h"
 
 /****************************************************************************