From 3f6a1625bb09a10a66d04107eaab3dac387aac73 Mon Sep 17 00:00:00 2001 From: KonstantinKondrashov Date: Mon, 1 Aug 2022 21:19:38 +0800 Subject: [PATCH] efuse: Adds missing header --- components/efuse/efuse_table_gen.py | 1 + .../include/{esp_efuse.h => esp_efuse_chip.h} | 0 .../efuse/esp32/include/esp_efuse_table.h | 1 + .../include/{esp_efuse.h => esp_efuse_chip.h} | 0 .../efuse/esp32c2/include/esp_efuse_table.h | 1 + .../include/{esp_efuse.h => esp_efuse_chip.h} | 0 .../efuse/esp32c3/include/esp_efuse_table.h | 1 + .../include/{esp_efuse.h => esp_efuse_chip.h} | 0 .../efuse/esp32h2/include/esp_efuse_table.h | 1 + .../include/{esp_efuse.h => esp_efuse_chip.h} | 0 .../efuse/esp32s2/include/esp_efuse_table.h | 1 + .../include/{esp_efuse.h => esp_efuse_chip.h} | 0 .../efuse/esp32s3/include/esp_efuse_table.h | 1 + components/efuse/include/esp_efuse.h | 2 +- docs/doxygen/Doxyfile | 2 +- docs/en/api-reference/system/efuse.rst | 4 ++-- .../efuse/main/esp_efuse_custom_table.c | 18 +++++------------- .../main/include/esp_efuse_custom_table.h | 19 ++++++------------- tools/ci/check_copyright_ignore.txt | 2 -- tools/ci/check_public_headers_exceptions.txt | 5 ----- 20 files changed, 22 insertions(+), 37 deletions(-) rename components/efuse/esp32/include/{esp_efuse.h => esp_efuse_chip.h} (100%) rename components/efuse/esp32c2/include/{esp_efuse.h => esp_efuse_chip.h} (100%) rename components/efuse/esp32c3/include/{esp_efuse.h => esp_efuse_chip.h} (100%) rename components/efuse/esp32h2/include/{esp_efuse.h => esp_efuse_chip.h} (100%) rename components/efuse/esp32s2/include/{esp_efuse.h => esp_efuse_chip.h} (100%) rename components/efuse/esp32s3/include/{esp_efuse.h => esp_efuse_chip.h} (100%) diff --git a/components/efuse/efuse_table_gen.py b/components/efuse/efuse_table_gen.py index 24d600cd7e..0d6ea61394 100755 --- a/components/efuse/efuse_table_gen.py +++ b/components/efuse/efuse_table_gen.py @@ -248,6 +248,7 @@ class FuseTable(list): 'extern "C" {', '#endif', '', + '#include "esp_efuse.h"', '', '// md5_digest_table ' + self.md5_digest_table, '// This file was generated from the file ' + file_name + '.csv. DO NOT CHANGE THIS FILE MANUALLY.', diff --git a/components/efuse/esp32/include/esp_efuse.h b/components/efuse/esp32/include/esp_efuse_chip.h similarity index 100% rename from components/efuse/esp32/include/esp_efuse.h rename to components/efuse/esp32/include/esp_efuse_chip.h diff --git a/components/efuse/esp32/include/esp_efuse_table.h b/components/efuse/esp32/include/esp_efuse_table.h index 3c0a01d125..ab896d1b9c 100644 --- a/components/efuse/esp32/include/esp_efuse_table.h +++ b/components/efuse/esp32/include/esp_efuse_table.h @@ -8,6 +8,7 @@ extern "C" { #endif +#include "esp_efuse.h" // md5_digest_table 6256f9b7c6783e0b651bf52b5b162aa8 // This file was generated from the file esp_efuse_table.csv. DO NOT CHANGE THIS FILE MANUALLY. diff --git a/components/efuse/esp32c2/include/esp_efuse.h b/components/efuse/esp32c2/include/esp_efuse_chip.h similarity index 100% rename from components/efuse/esp32c2/include/esp_efuse.h rename to components/efuse/esp32c2/include/esp_efuse_chip.h diff --git a/components/efuse/esp32c2/include/esp_efuse_table.h b/components/efuse/esp32c2/include/esp_efuse_table.h index c121bdbdcf..ac64e1d74f 100644 --- a/components/efuse/esp32c2/include/esp_efuse_table.h +++ b/components/efuse/esp32c2/include/esp_efuse_table.h @@ -8,6 +8,7 @@ extern "C" { #endif +#include "esp_efuse.h" // md5_digest_table ef050bc1e4bf0d8384aa3e4c0256d7d3 // This file was generated from the file esp_efuse_table.csv. DO NOT CHANGE THIS FILE MANUALLY. diff --git a/components/efuse/esp32c3/include/esp_efuse.h b/components/efuse/esp32c3/include/esp_efuse_chip.h similarity index 100% rename from components/efuse/esp32c3/include/esp_efuse.h rename to components/efuse/esp32c3/include/esp_efuse_chip.h diff --git a/components/efuse/esp32c3/include/esp_efuse_table.h b/components/efuse/esp32c3/include/esp_efuse_table.h index 9f432c9142..05afdbc155 100644 --- a/components/efuse/esp32c3/include/esp_efuse_table.h +++ b/components/efuse/esp32c3/include/esp_efuse_table.h @@ -8,6 +8,7 @@ extern "C" { #endif +#include "esp_efuse.h" // md5_digest_table d006c80095638b5dbdc8649bf7e04dce // This file was generated from the file esp_efuse_table.csv. DO NOT CHANGE THIS FILE MANUALLY. diff --git a/components/efuse/esp32h2/include/esp_efuse.h b/components/efuse/esp32h2/include/esp_efuse_chip.h similarity index 100% rename from components/efuse/esp32h2/include/esp_efuse.h rename to components/efuse/esp32h2/include/esp_efuse_chip.h diff --git a/components/efuse/esp32h2/include/esp_efuse_table.h b/components/efuse/esp32h2/include/esp_efuse_table.h index cbe719714f..6f5cb33591 100644 --- a/components/efuse/esp32h2/include/esp_efuse_table.h +++ b/components/efuse/esp32h2/include/esp_efuse_table.h @@ -8,6 +8,7 @@ extern "C" { #endif +#include "esp_efuse.h" // md5_digest_table 4ff665f7ab2f32b83f2b5b232bcdeac8 // This file was generated from the file esp_efuse_table.csv. DO NOT CHANGE THIS FILE MANUALLY. diff --git a/components/efuse/esp32s2/include/esp_efuse.h b/components/efuse/esp32s2/include/esp_efuse_chip.h similarity index 100% rename from components/efuse/esp32s2/include/esp_efuse.h rename to components/efuse/esp32s2/include/esp_efuse_chip.h diff --git a/components/efuse/esp32s2/include/esp_efuse_table.h b/components/efuse/esp32s2/include/esp_efuse_table.h index fdab261ce6..6e0404f31f 100644 --- a/components/efuse/esp32s2/include/esp_efuse_table.h +++ b/components/efuse/esp32s2/include/esp_efuse_table.h @@ -8,6 +8,7 @@ extern "C" { #endif +#include "esp_efuse.h" // md5_digest_table 3ac9188bf7eb0a27f3f636085a260743 // This file was generated from the file esp_efuse_table.csv. DO NOT CHANGE THIS FILE MANUALLY. diff --git a/components/efuse/esp32s3/include/esp_efuse.h b/components/efuse/esp32s3/include/esp_efuse_chip.h similarity index 100% rename from components/efuse/esp32s3/include/esp_efuse.h rename to components/efuse/esp32s3/include/esp_efuse_chip.h diff --git a/components/efuse/esp32s3/include/esp_efuse_table.h b/components/efuse/esp32s3/include/esp_efuse_table.h index 4ea36be577..2f347c4341 100644 --- a/components/efuse/esp32s3/include/esp_efuse_table.h +++ b/components/efuse/esp32s3/include/esp_efuse_table.h @@ -8,6 +8,7 @@ extern "C" { #endif +#include "esp_efuse.h" // md5_digest_table 8c7a031bb0def28f2123ac5ee2a48d43 // This file was generated from the file esp_efuse_table.csv. DO NOT CHANGE THIS FILE MANUALLY. diff --git a/components/efuse/include/esp_efuse.h b/components/efuse/include/esp_efuse.h index 1240fe2ede..3842fd4551 100644 --- a/components/efuse/include/esp_efuse.h +++ b/components/efuse/include/esp_efuse.h @@ -13,7 +13,7 @@ #include "esp_log.h" #include "soc/soc_caps.h" #include "sdkconfig.h" -#include_next "esp_efuse.h" +#include "esp_efuse_chip.h" #ifdef __cplusplus extern "C" { diff --git a/docs/doxygen/Doxyfile b/docs/doxygen/Doxyfile index f67c53cb86..56d0cb7f7e 100644 --- a/docs/doxygen/Doxyfile +++ b/docs/doxygen/Doxyfile @@ -80,7 +80,7 @@ INPUT = \ $(PROJECT_PATH)/components/driver/include/driver/touch_sensor_common.h \ $(PROJECT_PATH)/components/driver/include/driver/twai.h \ $(PROJECT_PATH)/components/driver/include/driver/uart.h \ - $(PROJECT_PATH)/components/efuse/$(IDF_TARGET)/include/esp_efuse.h \ + $(PROJECT_PATH)/components/efuse/$(IDF_TARGET)/include/esp_efuse_chip.h \ $(PROJECT_PATH)/components/efuse/include/esp_efuse.h \ $(PROJECT_PATH)/components/esp_adc/include/esp_adc/adc_cali_scheme.h \ $(PROJECT_PATH)/components/esp_adc/include/esp_adc/adc_cali.h \ diff --git a/docs/en/api-reference/system/efuse.rst b/docs/en/api-reference/system/efuse.rst index 70d8431a73..3e28e20f2b 100644 --- a/docs/en/api-reference/system/efuse.rst +++ b/docs/en/api-reference/system/efuse.rst @@ -419,5 +419,5 @@ esptool includes a useful tool for reading/writing {IDF_TARGET_NAME} eFuse bits .. include:: inc/espefuse_summary_{IDF_TARGET_NAME}.rst -.. include-build-file:: inc/components/efuse/{IDF_TARGET_PATH_NAME}/include/esp_efuse.inc -.. include-build-file:: inc/components/efuse/include/esp_efuse.inc +.. include-build-file:: inc/esp_efuse_chip.inc +.. include-build-file:: inc/esp_efuse.inc diff --git a/examples/system/efuse/main/esp_efuse_custom_table.c b/examples/system/efuse/main/esp_efuse_custom_table.c index 8ad6c4d586..2f1ba8b6d1 100644 --- a/examples/system/efuse/main/esp_efuse_custom_table.c +++ b/examples/system/efuse/main/esp_efuse_custom_table.c @@ -1,16 +1,8 @@ -// Copyright 2017-2018 Espressif Systems (Shanghai) PTE LTD -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at", -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// 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 +/* + * SPDX-FileCopyrightText: 2017-2022 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ #include "sdkconfig.h" #include "esp_efuse.h" diff --git a/examples/system/efuse/main/include/esp_efuse_custom_table.h b/examples/system/efuse/main/include/esp_efuse_custom_table.h index e72d8e5994..8dde29b1d9 100644 --- a/examples/system/efuse/main/include/esp_efuse_custom_table.h +++ b/examples/system/efuse/main/include/esp_efuse_custom_table.h @@ -1,21 +1,14 @@ -// Copyright 2017-2018 Espressif Systems (Shanghai) PTE LTD -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at", -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// 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 +/* + * SPDX-FileCopyrightText: 2017-2022 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ #ifdef __cplusplus extern "C" { #endif +#include "esp_efuse.h" // md5_digest_table 584317af6a850ee16ef6206c139d6cf5 // This file was generated from the file esp_efuse_custom_table.csv. DO NOT CHANGE THIS FILE MANUALLY. diff --git a/tools/ci/check_copyright_ignore.txt b/tools/ci/check_copyright_ignore.txt index 412824c4f3..6052eb1124 100644 --- a/tools/ci/check_copyright_ignore.txt +++ b/tools/ci/check_copyright_ignore.txt @@ -1909,8 +1909,6 @@ examples/system/deep_sleep/example_test.py examples/system/deep_sleep/main/deep_sleep_example_main.c examples/system/efuse/example_test.py examples/system/efuse/main/efuse_main.c -examples/system/efuse/main/esp_efuse_custom_table.c -examples/system/efuse/main/include/esp_efuse_custom_table.h examples/system/esp_event/default_event_loop/example_test.py examples/system/esp_event/default_event_loop/main/event_source.h examples/system/esp_event/default_event_loop/main/main.c diff --git a/tools/ci/check_public_headers_exceptions.txt b/tools/ci/check_public_headers_exceptions.txt index a48276a5b1..71b5cd3f5d 100644 --- a/tools/ci/check_public_headers_exceptions.txt +++ b/tools/ci/check_public_headers_exceptions.txt @@ -85,7 +85,6 @@ components/unity/include/unity_test_runner.h components/cmock/CMock/src/cmock.h components/cmock/CMock/src/cmock_internals.h -components/efuse/include/esp_efuse.h components/openthread/openthread/ @@ -120,7 +119,6 @@ components/esp32/include/esp32/dport_access.h components/esp32/include/rom/sha.h components/esp32/include/rom/secure_boot.h components/esp_ringbuf/include/freertos/ringbuf.h -components/efuse/esp32/include/esp_efuse_table.h components/esp_wifi/include/esp_wifi_crypto_types.h components/esp_wifi/include/esp_coexist_internal.h components/esp_wifi/include/esp_wifi_netif.h @@ -146,7 +144,6 @@ components/usb/include/usb/usb_types_stack.h ### To be fixed: files which don't compile for esp32s2 target: -components/efuse/esp32s2/include/esp_efuse_table.h components/esp_psram/include/esp32/himem.h components/esp_rom/include/esp32/rom/ets_sys.h components/esp_rom/include/esp32/rom/rtc.h @@ -155,13 +152,11 @@ components/esp_rom/include/esp32/rom/uart.h ### To be fixed: files which don't compile for esp32s3 target: -components/efuse/esp32s3/include/esp_efuse_table.h components/soc/esp32s3/include/soc/world_controller_struct.h ### To be fixed: files which don't compile for esp32c3 target: -components/efuse/esp32c3/include/esp_efuse_table.h components/esp_system/port/include/private/esp_private/trax.h components/espcoredump/include/port/xtensa/esp_core_dump_summary_port.h components/riscv/include/esp_private/panic_reason.h