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:31 UTC
[incubator-nuttx] branch master updated (7b53a5f -> f3a6d80)
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/incubator-nuttx.git.
from 7b53a5f stm32_adc.c: rename a struct member in struct adccmn_data_s from 'initialized' to 'refcount'
new e24af20 esp32/hardware: Include files of the same level by their names only and remove unnecessary includes.
new f3a6d80 esp32c3/hardware: Include files of the same level by their names only and remove unnecessary includes.
The 2 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/risc-v/src/esp32c3/hardware/esp32c3_gpio.h | 2 +-
arch/risc-v/src/esp32c3/hardware/esp32c3_interrupt.h | 2 +-
arch/risc-v/src/esp32c3/hardware/esp32c3_memorymap.h | 6 ------
arch/risc-v/src/esp32c3/hardware/esp32c3_system.h | 2 +-
arch/risc-v/src/esp32c3/hardware/esp32c3_systimer.h | 2 +-
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 +-
11 files changed, 10 insertions(+), 17 deletions(-)
[incubator-nuttx] 01/02: esp32/hardware: Include files of the same
level by their names only and remove unnecessary includes.
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/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
[incubator-nuttx] 02/02: esp32c3/hardware: Include files of the
same level by their names only and remove unnecessary includes.
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/incubator-nuttx.git
commit f3a6d80c95cb7964b08387235f17c9c334845a24
Author: Abdelatif Guettouche <ab...@espressif.com>
AuthorDate: Tue May 4 18:27:12 2021 +0100
esp32c3/hardware: Include files of the same level by their names only and
remove unnecessary includes.
Signed-off-by: Abdelatif Guettouche <ab...@espressif.com>
---
arch/risc-v/src/esp32c3/hardware/esp32c3_gpio.h | 2 +-
arch/risc-v/src/esp32c3/hardware/esp32c3_interrupt.h | 2 +-
arch/risc-v/src/esp32c3/hardware/esp32c3_memorymap.h | 6 ------
arch/risc-v/src/esp32c3/hardware/esp32c3_system.h | 2 +-
arch/risc-v/src/esp32c3/hardware/esp32c3_systimer.h | 2 +-
5 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/arch/risc-v/src/esp32c3/hardware/esp32c3_gpio.h b/arch/risc-v/src/esp32c3/hardware/esp32c3_gpio.h
index d05c9da..588ed1b 100644
--- a/arch/risc-v/src/esp32c3/hardware/esp32c3_gpio.h
+++ b/arch/risc-v/src/esp32c3/hardware/esp32c3_gpio.h
@@ -25,7 +25,7 @@
* Included Files
****************************************************************************/
-#include "hardware/esp32c3_soc.h"
+#include "esp32c3_soc.h"
/****************************************************************************
* Pre-preprocessor Definitions
diff --git a/arch/risc-v/src/esp32c3/hardware/esp32c3_interrupt.h b/arch/risc-v/src/esp32c3/hardware/esp32c3_interrupt.h
index ce40a86..675a584 100644
--- a/arch/risc-v/src/esp32c3/hardware/esp32c3_interrupt.h
+++ b/arch/risc-v/src/esp32c3/hardware/esp32c3_interrupt.h
@@ -25,7 +25,7 @@
* Included Files
****************************************************************************/
-#include "hardware/esp32c3_soc.h"
+#include "esp32c3_soc.h"
/****************************************************************************
* Pre-processor Definitions
diff --git a/arch/risc-v/src/esp32c3/hardware/esp32c3_memorymap.h b/arch/risc-v/src/esp32c3/hardware/esp32c3_memorymap.h
index 51a8058..c9cf552 100644
--- a/arch/risc-v/src/esp32c3/hardware/esp32c3_memorymap.h
+++ b/arch/risc-v/src/esp32c3/hardware/esp32c3_memorymap.h
@@ -22,12 +22,6 @@
#define __ARCH_RISCV_SRC_ESP32C3_HARDWARE_ESP32C3_MEMORYMAP_H
/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-
-/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
diff --git a/arch/risc-v/src/esp32c3/hardware/esp32c3_system.h b/arch/risc-v/src/esp32c3/hardware/esp32c3_system.h
index 8e8dd9a..34ede26 100644
--- a/arch/risc-v/src/esp32c3/hardware/esp32c3_system.h
+++ b/arch/risc-v/src/esp32c3/hardware/esp32c3_system.h
@@ -25,7 +25,7 @@
* Included Files
****************************************************************************/
-#include "hardware/esp32c3_soc.h"
+#include "esp32c3_soc.h"
/****************************************************************************
* Pre-processor Definitions
diff --git a/arch/risc-v/src/esp32c3/hardware/esp32c3_systimer.h b/arch/risc-v/src/esp32c3/hardware/esp32c3_systimer.h
index 7d32e04..ef317cb 100644
--- a/arch/risc-v/src/esp32c3/hardware/esp32c3_systimer.h
+++ b/arch/risc-v/src/esp32c3/hardware/esp32c3_systimer.h
@@ -25,7 +25,7 @@
* Included Files
****************************************************************************/
-#include "hardware/esp32c3_soc.h"
+#include "esp32c3_soc.h"
/****************************************************************************
* Pre-processor Definitions