From e7460c1f0002612822876c79ab0a2f61fcc6668c Mon Sep 17 00:00:00 2001 From: Renz Bagaporo Date: Thu, 3 Sep 2020 18:18:33 +0800 Subject: [PATCH] soc: remove unecessary headers in dport_access.h --- components/esp32/include/esp32/dport_access.h | 3 +++ components/hal/esp32/include/hal/clk_gate_ll.h | 1 + components/hal/esp32s2/include/hal/clk_gate_ll.h | 1 + components/hal/esp32s3/include/hal/clk_gate_ll.h | 1 + components/soc/soc/esp32/include/soc/dport_access.h | 6 +++--- components/soc/soc/esp32s2/include/soc/dport_access.h | 5 +---- components/soc/soc/esp32s3/include/soc/dport_access.h | 6 +----- components/xtensa/include/esp_debug_helpers.h | 2 +- components/xtensa/include/xtensa-debug-module.h | 2 +- 9 files changed, 13 insertions(+), 14 deletions(-) diff --git a/components/esp32/include/esp32/dport_access.h b/components/esp32/include/esp32/dport_access.h index 8ea60c4cdb..0833cae869 100644 --- a/components/esp32/include/esp32/dport_access.h +++ b/components/esp32/include/esp32/dport_access.h @@ -11,12 +11,15 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. +#include #include #ifndef _ESP_DPORT_ACCESS_H_ #define _ESP_DPORT_ACCESS_H_ +#include "xtensa/xtruntime.h" + #ifdef __cplusplus extern "C" { #endif diff --git a/components/hal/esp32/include/hal/clk_gate_ll.h b/components/hal/esp32/include/hal/clk_gate_ll.h index bedfc6e770..9c332dafe7 100644 --- a/components/hal/esp32/include/hal/clk_gate_ll.h +++ b/components/hal/esp32/include/hal/clk_gate_ll.h @@ -20,6 +20,7 @@ extern "C" { #include #include +#include "esp_attr.h" #include "soc/periph_defs.h" #include "soc/dport_reg.h" #include "soc/dport_access.h" diff --git a/components/hal/esp32s2/include/hal/clk_gate_ll.h b/components/hal/esp32s2/include/hal/clk_gate_ll.h index 9724171163..041081c113 100644 --- a/components/hal/esp32s2/include/hal/clk_gate_ll.h +++ b/components/hal/esp32s2/include/hal/clk_gate_ll.h @@ -20,6 +20,7 @@ extern "C" { #include #include +#include "esp_attr.h" #include "soc/periph_defs.h" #include "soc/system_reg.h" #include "soc/syscon_reg.h" diff --git a/components/hal/esp32s3/include/hal/clk_gate_ll.h b/components/hal/esp32s3/include/hal/clk_gate_ll.h index 7c073b8e69..5b37d008d9 100644 --- a/components/hal/esp32s3/include/hal/clk_gate_ll.h +++ b/components/hal/esp32s3/include/hal/clk_gate_ll.h @@ -20,6 +20,7 @@ extern "C" { #include #include +#include "esp_attr.h" #include "soc/periph_defs.h" #include "soc/system_reg.h" #include "soc/syscon_reg.h" diff --git a/components/soc/soc/esp32/include/soc/dport_access.h b/components/soc/soc/esp32/include/soc/dport_access.h index fe7e70ebc0..7ce525dcda 100644 --- a/components/soc/soc/esp32/include/soc/dport_access.h +++ b/components/soc/soc/esp32/include/soc/dport_access.h @@ -16,11 +16,11 @@ #define _DPORT_ACCESS_H_ #include + #include "esp_attr.h" #include "esp32/dport_access.h" -#include "soc.h" -#include "uart_reg.h" -#include "xtensa/xtruntime.h" + +#include "sdkconfig.h" #ifdef __cplusplus extern "C" { diff --git a/components/soc/soc/esp32s2/include/soc/dport_access.h b/components/soc/soc/esp32s2/include/soc/dport_access.h index e5dfeda836..d6d9bfffb6 100644 --- a/components/soc/soc/esp32s2/include/soc/dport_access.h +++ b/components/soc/soc/esp32s2/include/soc/dport_access.h @@ -16,11 +16,8 @@ #define _DPORT_ACCESS_H_ #include -#include "esp_attr.h" + #include "esp32s2/dport_access.h" -#include "soc.h" -#include "uart_reg.h" -#include "xtensa/xtruntime.h" #ifdef __cplusplus extern "C" { diff --git a/components/soc/soc/esp32s3/include/soc/dport_access.h b/components/soc/soc/esp32s3/include/soc/dport_access.h index 2f8b1d48d9..1223fb8b3a 100644 --- a/components/soc/soc/esp32s3/include/soc/dport_access.h +++ b/components/soc/soc/esp32s3/include/soc/dport_access.h @@ -15,12 +15,8 @@ #pragma once #include -#include "esp_attr.h" -#include "esp_attr.h" + #include "esp32s3/dport_access.h" -#include "soc.h" -#include "uart_reg.h" -#include "xtensa/xtruntime.h" #ifdef __cplusplus extern "C" { diff --git a/components/xtensa/include/esp_debug_helpers.h b/components/xtensa/include/esp_debug_helpers.h index d088ddeef1..5bdc028c61 100644 --- a/components/xtensa/include/esp_debug_helpers.h +++ b/components/xtensa/include/esp_debug_helpers.h @@ -22,7 +22,7 @@ extern "C" { #include #include "esp_err.h" -#include "soc/soc.h" +#include "soc/soc.h" // [refactor-todo] IDF-2297 #define ESP_WATCHPOINT_LOAD 0x40000000 #define ESP_WATCHPOINT_STORE 0x80000000 diff --git a/components/xtensa/include/xtensa-debug-module.h b/components/xtensa/include/xtensa-debug-module.h index 6e44d78261..8ac47a9ca8 100644 --- a/components/xtensa/include/xtensa-debug-module.h +++ b/components/xtensa/include/xtensa-debug-module.h @@ -1,6 +1,6 @@ #ifndef XTENSA_DEBUG_MODULE_H #define XTENSA_DEBUG_MODULE_H -#include "soc/cpu.h" + /* ERI registers / OCD offsets and field definitions */