global: make periph enable/disable APIs private

peripheral enable/disable usually should be managed by driver itself,
so make it as espressif private APIs, not recommended for user to use it
in application code.
However, if user want to re-write the driver or ports to other platform,
this is still possible by including the header in this way:
"esp_private/peripheral_ctrl.h"

components/bootloader_support/src/bootloader_random.c

@@ -10,7 +10,7 @@
 
 #ifndef BOOTLOADER_BUILD
 #include "esp_system.h"
-#include "driver/periph_ctrl.h"
+#include "esp_private/periph_ctrl.h"
 
  __attribute__((weak)) void bootloader_fill_random(void *buffer, size_t length)
 {

components/bootloader_support/src/bootloader_random_esp32.c

@@ -14,7 +14,7 @@
 #include "soc/io_mux_reg.h"
 
 #ifndef BOOTLOADER_BUILD
-#include "driver/periph_ctrl.h"
+#include "esp_private/periph_ctrl.h"
 #endif
 
 void bootloader_random_enable(void)

components/bootloader_support/src/bootloader_random_esp32s2.c

@@ -17,7 +17,7 @@
 #include "hal/adc_ll.h"
 
 #ifndef BOOTLOADER_BUILD
-#include "driver/periph_ctrl.h"
+#include "esp_private/periph_ctrl.h"
 #endif
 
 void bootloader_random_enable(void)

components/bt/controller/esp32/bt.c

@@ -29,7 +29,7 @@
 #include "esp_err.h"
 #include "esp_log.h"
 #include "esp_pm.h"
-#include "driver/periph_ctrl.h"
+#include "esp_private/periph_ctrl.h"
 #include "soc/rtc.h"
 #include "soc/soc_memory_layout.h"
 #include "soc/dport_reg.h"

components/bt/controller/esp32c3/bt.c

@@ -28,7 +28,7 @@
 #include "esp_log.h"
 #include "esp_pm.h"
 #include "esp_ipc.h"
-#include "driver/periph_ctrl.h"
+#include "esp_private/periph_ctrl.h"
 #include "soc/rtc.h"
 #include "soc/rtc_cntl_reg.h"
 #include "soc/soc_memory_layout.h"

components/bt/controller/esp32s3/bt.c

@@ -29,7 +29,7 @@
 #include "esp_log.h"
 #include "esp_pm.h"
 #include "esp_ipc.h"
-#include "driver/periph_ctrl.h"
+#include "esp_private/periph_ctrl.h"
 #include "soc/rtc.h"
 #include "soc/rtc_cntl_reg.h"
 #include "soc/soc_memory_layout.h"

components/driver/CMakeLists.txt

@@ -18,7 +18,7 @@ set(srcs
     "timer.c"
     "uart.c")
 
-set(includes "include" "${target}/include")
+set(includes "include" "${target}/include" "deprecated")
 
 if(${target} STREQUAL "esp32")
     # SDMMC and MCPWM are in ESP32 only.

components/driver/dedic_gpio.c

@@ -21,7 +21,7 @@
 #include "hal/cpu_hal.h"
 #include "hal/cpu_ll.h"
 #include "hal/gpio_hal.h"
-#include "driver/periph_ctrl.h"
+#include "esp_private/periph_ctrl.h"
 #include "esp_rom_gpio.h"
 #include "freertos/FreeRTOS.h"
 #include "driver/dedic_gpio.h"

components/driver/deprecated/driver/periph_ctrl.h

@@ -0,0 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#pragma once
+#warning driver/periph_ctrl.h header is no longer used, and will be removed in future versions.
+#include "esp_private/periph_ctrl.h"

components/driver/esp32c3/adc.c

@@ -18,7 +18,7 @@
 #include "freertos/timers.h"
 #include "freertos/ringbuf.h"
 #include "esp32c3/rom/ets_sys.h"
-#include "driver/periph_ctrl.h"
+#include "esp_private/periph_ctrl.h"
 #include "driver/gpio.h"
 #include "driver/adc.h"
 #include "hal/adc_types.h"

components/driver/esp32h2/adc.c

@@ -18,7 +18,7 @@
 #include "freertos/timers.h"
 #include "freertos/ringbuf.h"
 #include "esp32h2/rom/ets_sys.h"
-#include "driver/periph_ctrl.h"
+#include "esp_private/periph_ctrl.h"
 #include "driver/gpio.h"
 #include "driver/adc.h"
 #include "hal/adc_types.h"

components/driver/esp32s2/adc.c

@@ -16,7 +16,7 @@
 #include "freertos/timers.h"
 #include "esp_pm.h"
 #include "esp_intr_alloc.h"
-#include "driver/periph_ctrl.h"
+#include "esp_private/periph_ctrl.h"
 #include "driver/rtc_io.h"
 #include "driver/rtc_cntl.h"
 #include "driver/gpio.h"

components/driver/gdma.c

@@ -15,7 +15,7 @@
 #include "esp_intr_alloc.h"
 #include "esp_log.h"
 #include "esp_check.h"
-#include "driver/periph_ctrl.h"
+#include "esp_private/periph_ctrl.h"
 #include "esp_private/gdma.h"
 #include "hal/gdma_hal.h"
 #include "hal/gdma_ll.h"

components/driver/i2c.c

@@ -22,7 +22,7 @@
 #include "hal/gpio_hal.h"
 #include "soc/i2c_periph.h"
 #include "driver/i2c.h"
-#include "driver/periph_ctrl.h"
+#include "esp_private/periph_ctrl.h"
 #include "esp_rom_gpio.h"
 #include "esp_rom_sys.h"
 #include <sys/param.h>

components/driver/i2s.c

@@ -41,6 +41,7 @@
 #include "esp_efuse.h"
 #include "esp_rom_gpio.h"
 #include "esp_private/i2s_platform.h"
+#include "esp_private/periph_ctrl.h"
 
 #include "sdkconfig.h"
 

components/driver/include/driver/i2s.h

@@ -14,7 +14,6 @@
 #include "soc/rtc_periph.h"
 #include "soc/soc_caps.h"
 #include "hal/i2s_types.h"
-#include "driver/periph_ctrl.h"
 #include "esp_intr_alloc.h"
 
 #if SOC_I2S_SUPPORTS_ADC

components/driver/include/driver/ledc.h

@@ -11,7 +11,6 @@
 #include "soc/soc.h"
 #include "hal/ledc_types.h"
 #include "driver/gpio.h"
-#include "driver/periph_ctrl.h"
 
 #ifdef __cplusplus
 extern "C" {

components/driver/include/driver/periph_ctrl.h

@@ -1,109 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef _DRIVER_PERIPH_CTRL_H_
-#define _DRIVER_PERIPH_CTRL_H_
-
-#include "soc/periph_defs.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * @brief      enable peripheral module
- *
- * @param[in]  periph    :  Peripheral module name
- *
- * Clock for the module will be ungated, and reset de-asserted.
- *
- * @note If periph_module_enable is called a number of times,
- *       periph_module_disable has to be called the same number of times
- *       in order to put the peripheral into disabled state.
- *
- * @return     NULL
- *
- */
-void periph_module_enable(periph_module_t periph);
-
-/**
- * @brief      disable peripheral module
- *
- * @param[in]  periph    :  Peripheral module name
- *
- * Clock for the module will be gated, reset asserted.
- *
- * @note If periph_module_enable is called a number of times,
- *       periph_module_disable has to be called the same number of times
- *       in order to put the peripheral into disabled state.
- *
- * @return     NULL
- *
- */
-void periph_module_disable(periph_module_t periph);
-
-/**
- * @brief      reset peripheral module
- *
- * @param[in]  periph    :  Peripheral module name
- *
- * Reset will asserted then de-assrted for the peripheral.
- *
- * Calling this function does not enable or disable the clock for the module.
- *
- * @return     NULL
- *
- */
-void periph_module_reset(periph_module_t periph);
-
-/**
- * @brief      enable wifi bt common module
- *
- * @note If wifi_bt_common_module_enable is called a number of times,
- *       wifi_bt_common_module_disable has to be called the same number of times
- *       in order to put the peripheral into disabled state.
- *
- * @return     NULL
- *
- */
-void wifi_bt_common_module_enable(void);
-
-/**
- * @brief      disable wifi bt common module
- *
- * @note If wifi_bt_common_module_enable is called a number of times,
- *       wifi_bt_common_module_disable has to be called the same number of times
- *       in order to put the peripheral into disabled state.
- *
- * @return     NULL
- *
- */
-void wifi_bt_common_module_disable(void);
-
-/**
- * @brief      enable wifi module
- *
- * @note Enable wifi module only.
- *
- * @return     NULL
- *
- */
-void wifi_module_enable(void);
-
-/**
- * @brief      disable wifi module
- *
- * @note Disable wifi module only.
- *
- * @return     NULL
- *
- */
-void wifi_module_disable(void);
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _DRIVER_PERIPH_CTRL_H_ */

components/driver/include/esp_private/periph_ctrl.h

@@ -0,0 +1,79 @@
+/*
+ * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#pragma once
+
+#include "soc/periph_defs.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * @brief Enable peripheral module by un-gating the clock and de-asserting the reset signal.
+ *
+ * @param[in] periph Peripheral module
+ *
+ * @note If @c periph_module_enable() is called a number of times,
+ *       @c periph_module_disable() has to be called the same number of times,
+ *       in order to put the peripheral into disabled state.
+ */
+void periph_module_enable(periph_module_t periph);
+
+/**
+ * @brief Disable peripheral module by gating the clock and asserting the reset signal.
+ *
+ * @param[in] periph Peripheral module
+ *
+ * @note If @c periph_module_enable() is called a number of times,
+ *       @c periph_module_disable() has to be called the same number of times,
+ *       in order to put the peripheral into disabled state.
+ */
+void periph_module_disable(periph_module_t periph);
+
+/**
+ * @brief Reset peripheral module by asserting and de-asserting the reset signal.
+ *
+ * @param[in] periph Peripheral module
+ *
+ * @note Calling this function does not enable or disable the clock for the module.
+ */
+void periph_module_reset(periph_module_t periph);
+
+/**
+ * @brief Enable Wi-Fi and BT common module
+ *
+ * @note If @c wifi_bt_common_module_enable() is called a number of times,
+ *       @c wifi_bt_common_module_disable() has to be called the same number of times,
+ *       in order to put the peripheral into disabled state.
+ */
+void wifi_bt_common_module_enable(void);
+
+/**
+ * @brief Disable Wi-Fi and BT common module
+ *
+ * @note If @c wifi_bt_common_module_enable() is called a number of times,
+ *       @c wifi_bt_common_module_disable() has to be called the same number of times,
+ *       in order to put the peripheral into disabled state.
+ */
+void wifi_bt_common_module_disable(void);
+
+/**
+ * @brief Enable Wi-Fi module
+ *
+ * @note Calling this function will only enable Wi-Fi module.
+ */
+void wifi_module_enable(void);
+
+/**
+ * @brief Disable Wi-Fi module
+ *
+ * @note Calling this function will only disable Wi-Fi module.
+ */
+void wifi_module_disable(void);
+
+#ifdef __cplusplus
+}
+#endif

components/driver/ledc.c

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 #include <string.h>
-#include <esp_types.h>
+#include "esp_types.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/semphr.h"
 #include "esp_log.h"
@@ -19,6 +19,7 @@
 #include "esp_rom_gpio.h"
 #include "esp_rom_sys.h"
 #include "soc/clk_ctrl_os.h"
+#include "esp_private/periph_ctrl.h"
 
 static const char *LEDC_TAG = "ledc";
 

components/driver/mcpwm.c

@@ -20,7 +20,7 @@
 #include "hal/gpio_hal.h"
 #include "hal/mcpwm_ll.h"
 #include "driver/mcpwm.h"
-#include "driver/periph_ctrl.h"
+#include "esp_private/periph_ctrl.h"
 
 static const char *TAG = "mcpwm";
 

components/driver/pcnt.c

@@ -8,7 +8,7 @@
 #include "esp_check.h"
 #include "soc/soc_caps.h"
 #if SOC_PCNT_SUPPORTED
-#include "driver/periph_ctrl.h"
+#include "esp_private/periph_ctrl.h"
 #include "driver/pcnt.h"
 #include "hal/pcnt_hal.h"
 #include "hal/pcnt_ll.h"

components/driver/periph_ctrl.c

@@ -6,7 +6,7 @@
 #include "freertos/FreeRTOS.h"
 #include "hal/clk_gate_ll.h"
 #include "esp_attr.h"
-#include "driver/periph_ctrl.h"
+#include "esp_private/periph_ctrl.h"
 
 static portMUX_TYPE periph_spinlock = portMUX_INITIALIZER_UNLOCKED;
 

components/driver/rmt.c

@@ -12,7 +12,7 @@
 #include "esp_log.h"
 #include "esp_check.h"
 #include "driver/gpio.h"
-#include "driver/periph_ctrl.h"
+#include "esp_private/periph_ctrl.h"
 #include "driver/rmt.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"

components/driver/sdio_slave.c

@@ -86,7 +86,7 @@ The driver of FIFOs works as below:
 #include "soc/gpio_periph.h"
 #include "hal/cpu_hal.h"
 #include "freertos/semphr.h"
-#include "driver/periph_ctrl.h"
+#include "esp_private/periph_ctrl.h"
 #include "driver/gpio.h"
 #include "hal/sdio_slave_hal.h"
 #include "hal/gpio_hal.h"

components/driver/sdmmc_host.c

@@ -16,7 +16,7 @@
 #include "esp_rom_sys.h"
 #include "driver/gpio.h"
 #include "driver/sdmmc_host.h"
-#include "driver/periph_ctrl.h"
+#include "esp_private/periph_ctrl.h"
 #include "sdmmc_private.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/semphr.h"

components/driver/spi_common.c

@@ -18,7 +18,7 @@
 #include "soc/soc_pins.h"
 #include "soc/lldesc.h"
 #include "driver/gpio.h"
-#include "driver/periph_ctrl.h"
+#include "esp_private/periph_ctrl.h"
 #include "esp_heap_caps.h"
 #include "driver/spi_common_internal.h"
 #include "stdatomic.h"

components/driver/test/test_i2c.c

@@ -20,7 +20,7 @@
 #include "soc/i2c_periph.h"
 #include "esp_system.h"
 #include "soc/uart_struct.h"
-#include "driver/periph_ctrl.h"
+#include "esp_private/periph_ctrl.h"
 #include "esp_rom_gpio.h"
 #include "hal/gpio_hal.h"
 #include "hal/uart_ll.h"

components/driver/test/test_pcnt.c

@@ -21,7 +21,6 @@
 #include "freertos/queue.h"
 #include "soc/soc_caps.h"
 #if SOC_PCNT_SUPPORTED
-#include "driver/periph_ctrl.h"
 #include "driver/gpio.h"
 #include "driver/pcnt.h"
 #include "driver/ledc.h"

components/driver/timer.c

@@ -11,7 +11,7 @@
 #include "esp_intr_alloc.h"
 #include "freertos/FreeRTOS.h"
 #include "driver/timer.h"
-#include "driver/periph_ctrl.h"
+#include "esp_private/periph_ctrl.h"
 #include "hal/timer_hal.h"
 #include "hal/timer_ll.h"
 #include "hal/check.h"

components/driver/twai.c

@@ -17,7 +17,7 @@
 #include "esp_attr.h"
 #include "esp_heap_caps.h"
 #include "driver/gpio.h"
-#include "driver/periph_ctrl.h"
+#include "esp_private/periph_ctrl.h"
 #include "driver/twai.h"
 #include "soc/soc_caps.h"
 #include "soc/twai_periph.h"

components/driver/uart.c

@@ -21,7 +21,7 @@
 #include "driver/uart.h"
 #include "driver/gpio.h"
 #include "driver/uart_select.h"
-#include "driver/periph_ctrl.h"
+#include "esp_private/periph_ctrl.h"
 #include "sdkconfig.h"
 #include "esp_rom_gpio.h"
 

components/esp_eth/src/esp_eth_mac_esp.c

@@ -1,20 +1,12 @@
-// Copyright 2019 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: 2019-2021 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 #include <string.h>
 #include <stdlib.h>
 #include <sys/cdefs.h>
-#include "driver/periph_ctrl.h"
+#include "esp_private/periph_ctrl.h"
 #include "driver/gpio.h"
 #include "esp_attr.h"
 #include "esp_log.h"

components/esp_event/test/test_default_loop.c

@@ -8,7 +8,7 @@
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
 #include "esp_log.h"
-#include "driver/periph_ctrl.h"
+#include "esp_private/periph_ctrl.h"
 #include "driver/timer.h"
 
 #include "esp_event.h"

components/esp_event/test/test_event.c

@@ -7,7 +7,7 @@
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
 #include "esp_log.h"
-#include "driver/periph_ctrl.h"
+#include "esp_private/periph_ctrl.h"
 #include "driver/timer.h"
 
 #include "esp_event.h"

components/esp_hw_support/port/async_memcpy_impl_gdma.c

@@ -10,7 +10,7 @@
 #include "soc/soc_caps.h"
 #include "hal/gdma_ll.h"
 #include "hal/gdma_hal.h"
-#include "driver/periph_ctrl.h"
+#include "esp_private/periph_ctrl.h"
 #include "esp_log.h"
 #include "esp_attr.h"
 #include "esp_err.h"

components/esp_hw_support/port/esp32/spiram_psram.c

@@ -27,7 +27,7 @@
 #include "driver/gpio.h"
 #include "hal/gpio_hal.h"
 #include "driver/spi_common_internal.h"
-#include "driver/periph_ctrl.h"
+#include "esp_private/periph_ctrl.h"
 #include "bootloader_common.h"
 #include "esp_rom_gpio.h"
 #include "bootloader_flash_config.h"

components/esp_hw_support/port/esp32c3/esp_ds.c

@@ -10,7 +10,7 @@
 
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
-#include "driver/periph_ctrl.h"
+#include "esp_private/periph_ctrl.h"
 #include "esp_crypto_lock.h"
 #include "hal/ds_hal.h"
 #include "hal/ds_ll.h"

components/esp_hw_support/port/esp32c3/esp_hmac.c

@@ -5,7 +5,7 @@
  */
 
 #include <string.h>
-#include "driver/periph_ctrl.h"
+#include "esp_private/periph_ctrl.h"
 #include "esp32c3/rom/hmac.h"
 #include "esp32c3/rom/ets_sys.h"
 #include "esp_efuse.h"

components/esp_hw_support/port/esp32h2/esp_ds.c

@@ -10,7 +10,7 @@
 
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
-#include "driver/periph_ctrl.h"
+#include "esp_private/periph_ctrl.h"
 #include "esp_crypto_lock.h"
 #include "hal/ds_hal.h"
 #include "hal/ds_ll.h"

components/esp_hw_support/port/esp32h2/esp_hmac.c

@@ -5,7 +5,7 @@
  */
 
 #include <string.h>
-#include "driver/periph_ctrl.h"
+#include "esp_private/periph_ctrl.h"
 #include "esp32c3/rom/hmac.h"
 #include "esp32c3/rom/ets_sys.h"
 #include "esp_efuse.h"

components/esp_hw_support/port/esp32s2/spiram_psram.c

@@ -31,7 +31,7 @@
 #include "driver/gpio.h"
 #include "driver/spi_common_internal.h"
 #include "driver/spi_common.h"
-#include "driver/periph_ctrl.h"
+#include "esp_private/periph_ctrl.h"
 #include "bootloader_common.h"
 
 #if CONFIG_SPIRAM

components/esp_hw_support/port/esp32s3/esp_ds.c

@@ -10,7 +10,7 @@
 
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
-#include "driver/periph_ctrl.h"
+#include "esp_private/periph_ctrl.h"
 #include "esp_crypto_lock.h"
 #include "hal/ds_hal.h"
 #include "hal/ds_ll.h"

components/esp_hw_support/port/esp32s3/esp_hmac.c

@@ -5,7 +5,7 @@
  */
 
 #include <string.h>
-#include "driver/periph_ctrl.h"
+#include "esp_private/periph_ctrl.h"
 #include "esp32s3/rom/efuse.h"
 #include "esp32s3/rom/hmac.h"
 #include "esp32s3/rom/ets_sys.h"

components/esp_hw_support/port/esp32s3/opiram_psram.c

@@ -23,7 +23,7 @@
 #include "soc/efuse_reg.h"
 #include "driver/gpio.h"
 #include "driver/spi_common.h"
-#include "driver/periph_ctrl.h"
+#include "esp_private/periph_ctrl.h"
 
 #if CONFIG_SPIRAM_MODE_OCT
 #include "soc/rtc.h"

components/esp_hw_support/port/esp32s3/spiram_psram.c

@@ -34,7 +34,7 @@
 #include "hal/gpio_hal.h"
 #include "driver/spi_common_internal.h"
 #include "driver/spi_common.h"
-#include "driver/periph_ctrl.h"
+#include "esp_private/periph_ctrl.h"
 #include "bootloader_common.h"
 
 #if CONFIG_SPIRAM_MODE_QUAD

components/esp_hw_support/test/test_ahb_arb.c

@@ -12,7 +12,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "esp32/rom/lldesc.h"
-#include "driver/periph_ctrl.h"
+#include "esp_private/periph_ctrl.h"
 #include "hal/gpio_hal.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"

components/esp_hw_support/test/test_intr_alloc.c

@@ -16,7 +16,7 @@
 #include "freertos/queue.h"
 #include "unity.h"
 #include "esp_intr_alloc.h"
-#include "driver/periph_ctrl.h"
+#include "esp_private/periph_ctrl.h"
 #include "driver/timer.h"
 #include "soc/soc_caps.h"
 #include "soc/spi_periph.h"

components/esp_hw_support/test/test_unal_dma.c

@@ -12,7 +12,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "esp32/rom/lldesc.h"
-#include "driver/periph_ctrl.h"
+#include "esp_private/periph_ctrl.h"
 #include "hal/gpio_hal.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"

components/esp_lcd/src/esp_lcd_panel_io_i2s.c

@@ -32,7 +32,7 @@
 #include "hal/dma_types.h"
 #include "hal/gpio_hal.h"
 #include "driver/gpio.h"
-#include "driver/periph_ctrl.h"
+#include "esp_private/periph_ctrl.h"
 #if SOC_I2S_LCD_I80_VARIANT
 #include "esp_private/i2s_platform.h"
 #include "soc/lcd_periph.h"

components/esp_lcd/src/esp_lcd_panel_io_i80.c

@@ -27,7 +27,7 @@
 #include "hal/gpio_hal.h"
 #include "esp_private/gdma.h"
 #include "driver/gpio.h"
-#include "driver/periph_ctrl.h"
+#include "esp_private/periph_ctrl.h"
 #if SOC_LCDCAM_SUPPORTED
 #include "esp_lcd_common.h"
 #include "soc/lcd_periph.h"

components/esp_lcd/src/esp_lcd_rgb_panel.c

@@ -29,7 +29,7 @@
 #include "hal/gpio_hal.h"
 #include "esp_private/gdma.h"
 #include "driver/gpio.h"
-#include "driver/periph_ctrl.h"
+#include "esp_private/periph_ctrl.h"
 #if CONFIG_SPIRAM
 #include "spiram.h"
 #endif

components/esp_phy/src/phy_init.c

@@ -23,7 +23,7 @@
 #include "phy.h"
 #include "phy_init_data.h"
 #include "esp_coexist_internal.h"
-#include "driver/periph_ctrl.h"
+#include "esp_private/periph_ctrl.h"
 #include "esp_private/wifi.h"
 #include "esp_rom_crc.h"
 #include "esp_rom_sys.h"

components/esp_serial_slave_link/essl_spi.c

@@ -1,23 +1,15 @@
-// Copyright 2015-2020 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: 2015-2021 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 
 #include <string.h>
 #include <sys/param.h>
 #include "esp_log.h"
 #include "esp_check.h"
 #include "driver/spi_master.h"
-#include "driver/periph_ctrl.h"
+#include "esp_private/periph_ctrl.h"
 #include "essl_internal.h"
 #include "essl_spi.h"
 #include "essl_spi/esp32s2_defs.h"

components/esp_system/int_wdt.c

@@ -18,7 +18,7 @@
 #include "esp_log.h"
 #include "esp_freertos_hooks.h"
 #include "soc/timer_periph.h"
-#include "driver/periph_ctrl.h"
+#include "esp_private/periph_ctrl.h"
 #include "esp_int_wdt.h"
 #include "esp_private/system_internal.h"
 #include "hal/cpu_hal.h"

components/esp_system/port/soc/esp32/clk.c

@@ -1,24 +1,16 @@
 
-// Copyright 2015-2017 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: 2015-2021 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 
 #include "soc/rtc.h"
 #include "soc/dport_reg.h"
 #include "soc/dport_access.h"
 #include "soc/i2s_reg.h"
 #include "hal/cpu_hal.h"
-#include "driver/periph_ctrl.h"
+#include "esp_private/periph_ctrl.h"
 #include "bootloader_clock.h"
 #include "hal/wdt_hal.h"
 

components/esp_system/port/soc/esp32c3/clk.c

@@ -1,16 +1,8 @@
-// Copyright 2015-2020 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: 2015-2021 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 
 #include <stdint.h>
 #include <sys/cdefs.h>
@@ -31,7 +23,7 @@
 #include "soc/i2s_reg.h"
 #include "hal/cpu_hal.h"
 #include "hal/wdt_hal.h"
-#include "driver/periph_ctrl.h"
+#include "esp_private/periph_ctrl.h"
 #include "bootloader_clock.h"
 #include "soc/syscon_reg.h"
 #include "esp_rom_uart.h"

components/esp_system/port/soc/esp32h2/clk.c

@@ -1,16 +1,8 @@
-// Copyright 2015-2020 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: 2015-2021 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 
 #include <stdint.h>
 #include <sys/cdefs.h>
@@ -32,7 +24,7 @@
 #include "soc/i2s_reg.h"
 #include "hal/cpu_hal.h"
 #include "hal/wdt_hal.h"
-#include "driver/periph_ctrl.h"
+#include "esp_private/periph_ctrl.h"
 #include "bootloader_clock.h"
 #include "soc/syscon_reg.h"
 #include "esp_rom_uart.h"

components/esp_system/port/soc/esp32s2/clk.c

@@ -1,17 +1,9 @@
 
-// Copyright 2015-2017 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: 2015-2021 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 
 #include <stdint.h>
 #include <sys/cdefs.h>
@@ -32,7 +24,7 @@
 #include "soc/i2s_reg.h"
 #include "hal/cpu_hal.h"
 #include "hal/wdt_hal.h"
-#include "driver/periph_ctrl.h"
+#include "esp_private/periph_ctrl.h"
 #include "bootloader_clock.h"
 #include "soc/syscon_reg.h"
 #include "hal/clk_gate_ll.h"

components/esp_system/port/soc/esp32s3/clk.c

@@ -1,17 +1,9 @@
 
-// Copyright 2015-2020 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: 2015-2021 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 
 #include <stdint.h>
 #include <sys/cdefs.h>
@@ -32,7 +24,7 @@
 #include "soc/i2s_reg.h"
 #include "hal/cpu_hal.h"
 #include "hal/wdt_hal.h"
-#include "driver/periph_ctrl.h"
+#include "esp_private/periph_ctrl.h"
 #include "bootloader_clock.h"
 #include "soc/syscon_reg.h"
 

components/esp_system/port/soc/esp8684/clk.c

@@ -23,7 +23,7 @@
 #include "soc/rtc_periph.h"
 #include "hal/cpu_hal.h"
 #include "hal/wdt_hal.h"
-#include "driver/periph_ctrl.h"
+#include "esp_private/periph_ctrl.h"
 #include "bootloader_clock.h"
 #include "soc/syscon_reg.h"
 #include "esp_rom_uart.h"

components/esp_system/task_wdt.c

@@ -22,7 +22,7 @@
 #include "esp_freertos_hooks.h"
 #include "soc/timer_periph.h"
 #include "esp_log.h"
-#include "driver/periph_ctrl.h"
+#include "esp_private/periph_ctrl.h"
 #include "esp_task_wdt.h"
 #include "esp_private/system_internal.h"
 #include "esp_private/crosscore_int.h"

components/esp_timer/src/esp_timer_impl_lac.c

@@ -14,7 +14,7 @@
 #include "esp_intr_alloc.h"
 #include "esp_log.h"
 #include "esp32/clk.h"
-#include "driver/periph_ctrl.h"
+#include "esp_private/periph_ctrl.h"
 #include "soc/soc.h"
 #include "soc/timer_group_reg.h"
 #include "soc/rtc.h"

components/esp_wifi/esp32/esp_adapter.c

@@ -1,16 +1,8 @@
-// Copyright 2015-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: 2015-2021 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 
 #include <stddef.h>
 #include <stdlib.h>
@@ -42,7 +34,7 @@
 #include "soc/syscon_reg.h"
 #include "hal/interrupt_controller_hal.h"
 #include "phy_init_data.h"
-#include "driver/periph_ctrl.h"
+#include "esp_private/periph_ctrl.h"
 #include "nvs.h"
 #include "os.h"
 #include "esp_smartconfig.h"

components/esp_wifi/esp32c3/esp_adapter.c

@@ -36,7 +36,7 @@
 #include "soc/rtc.h"
 #include "soc/syscon_reg.h"
 #include "phy_init_data.h"
-#include "driver/periph_ctrl.h"
+#include "esp_private/periph_ctrl.h"
 #include "nvs.h"
 #include "os.h"
 #include "esp_smartconfig.h"

components/esp_wifi/esp32s2/esp_adapter.c

@@ -36,7 +36,7 @@
 #include "soc/syscon_reg.h"
 #include "hal/interrupt_controller_hal.h"
 #include "phy_init_data.h"
-#include "driver/periph_ctrl.h"
+#include "esp_private/periph_ctrl.h"
 #include "nvs.h"
 #include "os.h"
 #include "esp_smartconfig.h"

components/esp_wifi/esp32s3/esp_adapter.c

@@ -1,16 +1,8 @@
-// Copyright 2015-2020 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: 2015-2021 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 
 #include <stddef.h>
 #include <stdlib.h>
@@ -44,7 +36,7 @@
 #include "soc/syscon_reg.h"
 #include "hal/interrupt_controller_hal.h"
 #include "phy_init_data.h"
-#include "driver/periph_ctrl.h"
+#include "esp_private/periph_ctrl.h"
 #include "nvs.h"
 #include "os.h"
 #include "esp_smartconfig.h"

components/mbedtls/port/aes/block/esp_aes.c

@@ -38,7 +38,7 @@
 
 #include "soc/cpu.h"
 #include <stdio.h>
-#include "driver/periph_ctrl.h"
+#include "esp_private/periph_ctrl.h"
 
 
 /* AES uses a spinlock mux not a lock as the underlying block operation

components/mbedtls/port/aes/dma/esp_aes.c

@@ -29,7 +29,7 @@
 #include <string.h>
 #include "mbedtls/aes.h"
 #include "esp_intr_alloc.h"
-#include "driver/periph_ctrl.h"
+#include "esp_private/periph_ctrl.h"
 #include "esp_log.h"
 #include "soc/lldesc.h"
 #include "esp_heap_caps.h"

components/mbedtls/port/esp32/bignum.c

@@ -23,7 +23,7 @@
 
 #include "soc/hwcrypto_periph.h"
 #include "soc/dport_reg.h"
-#include "driver/periph_ctrl.h"
+#include "esp_private/periph_ctrl.h"
 #include <mbedtls/bignum.h>
 #include "bignum_impl.h"
 #include <sys/param.h>

components/mbedtls/port/esp32c3/bignum.c

@@ -23,7 +23,7 @@
 #include <string.h>
 #include <sys/param.h>
 #include "soc/hwcrypto_periph.h"
-#include "driver/periph_ctrl.h"
+#include "esp_private/periph_ctrl.h"
 #include "mbedtls/bignum.h"
 #include "bignum_impl.h"
 #include "soc/system_reg.h"

components/mbedtls/port/esp32h2/bignum.c

@@ -23,7 +23,7 @@
 #include <string.h>
 #include <sys/param.h>
 #include "soc/hwcrypto_periph.h"
-#include "driver/periph_ctrl.h"
+#include "esp_private/periph_ctrl.h"
 #include "mbedtls/bignum.h"
 #include "bignum_impl.h"
 #include "soc/system_reg.h"

components/mbedtls/port/esp32s2/bignum.c

@@ -21,7 +21,7 @@
  *
  */
 #include "soc/hwcrypto_periph.h"
-#include "driver/periph_ctrl.h"
+#include "esp_private/periph_ctrl.h"
 #include <mbedtls/bignum.h>
 #include "bignum_impl.h"
 #include "soc/dport_reg.h"

components/mbedtls/port/esp32s3/bignum.c

@@ -21,7 +21,7 @@
  *
  */
 #include "soc/hwcrypto_periph.h"
-#include "driver/periph_ctrl.h"
+#include "esp_private/periph_ctrl.h"
 #include <mbedtls/bignum.h>
 #include "bignum_impl.h"
 #include "soc/dport_reg.h"

components/mbedtls/port/sha/dma/sha.c

@@ -38,7 +38,7 @@
 #include "freertos/FreeRTOS.h"
 #include "freertos/semphr.h"
 
-#include "driver/periph_ctrl.h"
+#include "esp_private/periph_ctrl.h"
 #include "sys/param.h"
 
 #include "sha/sha_dma.h"

components/mbedtls/port/sha/parallel_engine/sha.c

@@ -37,7 +37,7 @@
 #include "hal/sha_types.h"
 #include "sha/sha_parallel_engine.h"
 #include "soc/hwcrypto_periph.h"
-#include "driver/periph_ctrl.h"
+#include "esp_private/periph_ctrl.h"
 
 /*
      Single spinlock for SHA engine memory block

components/tinyusb/additions/src/tinyusb.c

@@ -1,20 +1,12 @@
-// Copyright 2020 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: 2020-2021 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 
 #include "sdkconfig.h"
 #include "driver/gpio.h"
-#include "driver/periph_ctrl.h"
+#include "esp_private/periph_ctrl.h"
 #include "esp_log.h"
 #include "esp_check.h"
 #include "esp_rom_gpio.h"

components/usb/hcd.c

@@ -19,7 +19,7 @@
 #include "hal/usb_types_private.h"
 #include "soc/gpio_pins.h"
 #include "soc/gpio_sig_map.h"
-#include "driver/periph_ctrl.h"
+#include "esp_private/periph_ctrl.h"
 #include "hcd.h"
 #include "usb_private.h"
 #include "usb/usb_types_ch9.h"

components/usb/usb_phy.c

@@ -9,7 +9,7 @@
 #include "freertos/FreeRTOS.h"
 #include "esp_log.h"
 #include "esp_check.h"
-#include "driver/periph_ctrl.h"
+#include "esp_private/periph_ctrl.h"
 #include "esp_private/usb_phy.h"
 #include "soc/usb_phy_periph.h"
 #include "hal/usb_phy_hal.h"

examples/bluetooth/esp_ble_mesh/common_components/light_driver/iot_light.c

@@ -14,7 +14,6 @@
 #include "soc/ledc_reg.h"
 #include "soc/timer_group_struct.h"
 #include "soc/ledc_struct.h"
-#include "driver/periph_ctrl.h"
 #include "driver/timer.h"
 #include "driver/ledc.h"
 #include "iot_light.h"

examples/bluetooth/hci/controller_hci_uart_esp32/main/controller_hci_uart_demo.c

@@ -10,7 +10,7 @@
 #include "esp_bt.h"
 #include "soc/uhci_periph.h"
 #include "driver/uart.h"
-#include "driver/periph_ctrl.h"
+#include "esp_private/periph_ctrl.h" // for enabling UHCI module, remove it after UHCI driver is released
 #include "esp_log.h"
 
 static const char *tag = "CONTROLLER_UART_HCI";

examples/bluetooth/hci/controller_hci_uart_esp32c3/main/uhci_uart_demo.c

@@ -7,7 +7,7 @@
 */
 
 #include <string.h>
-#include "driver/periph_ctrl.h"
+#include "esp_private/periph_ctrl.h" // for enabling UHCI module, remove it after UHCI driver is released
 #include "driver/gpio.h"
 #include "driver/uart.h"
 #include "soc/lldesc.h"

tools/ci/check_copyright_ignore.txt

@@ -592,7 +592,6 @@ components/esp_eth/include/eth_phy_regs_struct.h
 components/esp_eth/src/dm9051.h
 components/esp_eth/src/esp_eth.c
 components/esp_eth/src/esp_eth_mac_dm9051.c
-components/esp_eth/src/esp_eth_mac_esp.c
 components/esp_eth/src/esp_eth_mac_openeth.c
 components/esp_eth/src/esp_eth_mac_w5500.c
 components/esp_eth/src/esp_eth_netif_glue.c
@@ -906,7 +905,6 @@ components/esp_rom/test/test_tjpgd.c
 components/esp_serial_slave_link/essl.c
 components/esp_serial_slave_link/essl_internal.h
 components/esp_serial_slave_link/essl_sdio.c
-components/esp_serial_slave_link/essl_spi.c
 components/esp_serial_slave_link/include/esp_serial_slave_link/essl.h
 components/esp_serial_slave_link/include/esp_serial_slave_link/essl_sdio.h
 components/esp_serial_slave_link/include/esp_serial_slave_link/essl_spi.h
@@ -941,30 +939,25 @@ components/esp_system/port/public_compat/cache_err_int.h
 components/esp_system/port/public_compat/trax.h
 components/esp_system/port/soc/esp32/cache_err_int.c
 components/esp_system/port/soc/esp32/cache_err_int.h
-components/esp_system/port/soc/esp32/clk.c
 components/esp_system/port/soc/esp32/intr.c
 components/esp_system/port/soc/esp32/reset_reason.c
 components/esp_system/port/soc/esp32/system_internal.c
 components/esp_system/port/soc/esp32c3/apb_backup_dma.c
 components/esp_system/port/soc/esp32c3/cache_err_int.c
 components/esp_system/port/soc/esp32c3/cache_err_int.h
-components/esp_system/port/soc/esp32c3/clk.c
 components/esp_system/port/soc/esp32c3/reset_reason.c
 components/esp_system/port/soc/esp32c3/system_internal.c
 components/esp_system/port/soc/esp32h2/apb_backup_dma.c
 components/esp_system/port/soc/esp32h2/cache_err_int.c
 components/esp_system/port/soc/esp32h2/cache_err_int.h
-components/esp_system/port/soc/esp32h2/clk.c
 components/esp_system/port/soc/esp32h2/reset_reason.c
 components/esp_system/port/soc/esp32h2/system_internal.c
 components/esp_system/port/soc/esp32s2/cache_err_int.c
 components/esp_system/port/soc/esp32s2/cache_err_int.h
-components/esp_system/port/soc/esp32s2/clk.c
 components/esp_system/port/soc/esp32s2/reset_reason.c
 components/esp_system/port/soc/esp32s2/system_internal.c
 components/esp_system/port/soc/esp32s2/usb_console.c
 components/esp_system/port/soc/esp32s3/cache_err_int.h
-components/esp_system/port/soc/esp32s3/clk.c
 components/esp_system/port/soc/esp32s3/reset_reason.c
 components/esp_system/port/soc/esp32s3/system_internal.c
 components/esp_system/port/soc/esp32s3/usb_console.c
@@ -987,8 +980,6 @@ components/esp_timer/test/test_ets_timer.c
 components/esp_websocket_client/esp_websocket_client.c
 components/esp_websocket_client/include/esp_websocket_client.h
 components/esp_websocket_client/test/test_websocket_client.c
-components/esp_wifi/esp32/esp_adapter.c
-components/esp_wifi/esp32s3/esp_adapter.c
 components/esp_wifi/include/esp_coexist_adapter.h
 components/esp_wifi/include/esp_mesh.h
 components/esp_wifi/include/esp_mesh_internal.h
@@ -2434,7 +2425,6 @@ components/tinyusb/additions/include_private/descriptors_control.h
 components/tinyusb/additions/include_private/usb_descriptors.h
 components/tinyusb/additions/src/cdc.c
 components/tinyusb/additions/src/descriptors_control.c
-components/tinyusb/additions/src/tinyusb.c
 components/tinyusb/additions/src/tusb_cdc_acm.c
 components/tinyusb/additions/src/tusb_console.c
 components/tinyusb/additions/src/tusb_tasks.c
@@ -3753,7 +3743,6 @@ tools/unit-test-app/components/test_utils/ccomp_timer_impl_xtensa.c
 tools/unit-test-app/components/test_utils/include/ccomp_timer.h
 tools/unit-test-app/components/test_utils/include/test_utils.h
 tools/unit-test-app/components/test_utils/private_include/ccomp_timer_impl.h
-tools/unit-test-app/components/test_utils/ref_clock_impl_rmt_pcnt.c
 tools/unit-test-app/components/test_utils/test/ccomp_timer_test_api.c
 tools/unit-test-app/components/test_utils/test/ccomp_timer_test_data.c
 tools/unit-test-app/components/test_utils/test/ccomp_timer_test_inst.c

tools/unit-test-app/components/test_utils/ref_clock_impl_rmt_pcnt.c

@@ -1,16 +1,8 @@
-// Copyright 2017-2020 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-2021 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 
 /**
  * Some unit test cases need to have access to reliable timestamps even when CPU and APB clock frequencies change over time.
@@ -31,7 +23,7 @@
 #include "test_utils.h"
 #include "freertos/FreeRTOS.h"
 #include "esp_intr_alloc.h"
-#include "driver/periph_ctrl.h"
+#include "esp_private/periph_ctrl.h"
 #include "soc/gpio_sig_map.h"
 #include "soc/gpio_periph.h"
 #include "soc/soc_caps.h"

tools/unit-test-app/components/test_utils/ref_clock_impl_timergroup.c

@@ -5,7 +5,7 @@
  */
 
 #include "test_utils.h"
-#include "driver/periph_ctrl.h"
+#include "esp_private/periph_ctrl.h"
 #include "soc/periph_defs.h"
 #include "hal/timer_hal.h"
 #include "hal/timer_ll.h"