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/05/05 08:28:32 UTC

[incubator-nuttx] 01/02: esp32/hardware: Include files of the same level by their names only and remove unnecessary includes.

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 e24af207f8954ef7e24d8191c17c6ebcc077ee27
Author: Abdelatif Guettouche <ab...@espressif.com>
AuthorDate: Tue May 4 18:24:51 2021 +0100

    esp32/hardware: Include files of the same level by their names only and
    remove unnecessary includes.
    
    Signed-off-by: Abdelatif Guettouche <ab...@espressif.com>
---
 arch/xtensa/src/esp32/hardware/esp32_dport.h   | 2 +-
 arch/xtensa/src/esp32/hardware/esp32_gpio.h    | 2 +-
 arch/xtensa/src/esp32/hardware/esp32_iomux.h   | 2 +-
 arch/xtensa/src/esp32/hardware/esp32_rtccntl.h | 2 +-
 arch/xtensa/src/esp32/hardware/esp32_tim.h     | 3 +--
 arch/xtensa/src/esp32/hardware/esp32_uart.h    | 2 +-
 6 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/arch/xtensa/src/esp32/hardware/esp32_dport.h b/arch/xtensa/src/esp32/hardware/esp32_dport.h
index 16fbb04..de9e160 100644
--- a/arch/xtensa/src/esp32/hardware/esp32_dport.h
+++ b/arch/xtensa/src/esp32/hardware/esp32_dport.h
@@ -25,7 +25,7 @@
  * Included Files
  ****************************************************************************/
 
-#include "hardware/esp32_soc.h"
+#include "esp32_soc.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/xtensa/src/esp32/hardware/esp32_gpio.h b/arch/xtensa/src/esp32/hardware/esp32_gpio.h
index bbb65a3..f86e4c1 100644
--- a/arch/xtensa/src/esp32/hardware/esp32_gpio.h
+++ b/arch/xtensa/src/esp32/hardware/esp32_gpio.h
@@ -25,7 +25,7 @@
  * Included Files
  ****************************************************************************/
 
-#include "hardware/esp32_soc.h"
+#include "esp32_soc.h"
 
 /****************************************************************************
  * Pre-preprocessor Definitions
diff --git a/arch/xtensa/src/esp32/hardware/esp32_iomux.h b/arch/xtensa/src/esp32/hardware/esp32_iomux.h
index 6587514..faffffa 100644
--- a/arch/xtensa/src/esp32/hardware/esp32_iomux.h
+++ b/arch/xtensa/src/esp32/hardware/esp32_iomux.h
@@ -25,7 +25,7 @@
  * Included Files
  ****************************************************************************/
 
-#include "hardware/esp32_soc.h"
+#include "esp32_soc.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/xtensa/src/esp32/hardware/esp32_rtccntl.h b/arch/xtensa/src/esp32/hardware/esp32_rtccntl.h
index c5368d4..640fab1 100644
--- a/arch/xtensa/src/esp32/hardware/esp32_rtccntl.h
+++ b/arch/xtensa/src/esp32/hardware/esp32_rtccntl.h
@@ -25,7 +25,7 @@
  * Included Files
  ****************************************************************************/
 
-#include "hardware/esp32_soc.h"
+#include "esp32_soc.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/xtensa/src/esp32/hardware/esp32_tim.h b/arch/xtensa/src/esp32/hardware/esp32_tim.h
index 4f8b0fc..dca6de9 100644
--- a/arch/xtensa/src/esp32/hardware/esp32_tim.h
+++ b/arch/xtensa/src/esp32/hardware/esp32_tim.h
@@ -25,8 +25,7 @@
  * Included Files
  ************************************************************************************/
 
-#include <nuttx/config.h>
-#include "hardware/esp32_soc.h"
+#include "esp32_soc.h"
 
 /* Offsets relative to each timer instance memory base */
 
diff --git a/arch/xtensa/src/esp32/hardware/esp32_uart.h b/arch/xtensa/src/esp32/hardware/esp32_uart.h
index ba14d1b..73cfd87 100644
--- a/arch/xtensa/src/esp32/hardware/esp32_uart.h
+++ b/arch/xtensa/src/esp32/hardware/esp32_uart.h
@@ -25,7 +25,7 @@
  * Included Files
  ****************************************************************************/
 
-#include "hardware/esp32_soc.h"
+#include "esp32_soc.h"
 
 /****************************************************************************
  * Pre-processor Macros