Merge branch 'feature/adds_efuse_hdr' into 'master'

efuse: Adds missing header

Closes IDF-5734

See merge request espressif/esp-idf!19328

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.',

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.

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.

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.

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.

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.

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.

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" {

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 \

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

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"

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.

tools/ci/check_copyright_ignore.txt

@@ -1908,8 +1908,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

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