Merge branch 'refactor/add_missing_include_path_for_soc_struct_files' into 'master'

Fix check_public_headers violations for soc component

Closes IDF-5397

See merge request espressif/esp-idf!19158

components/esp_rom/include/esp32/rom/ets_sys.h

@@ -3,9 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-
-#ifndef _ROM_ETS_SYS_H_
-#define _ROM_ETS_SYS_H_
+#pragma once
 
 #include <stdint.h>
 #include <stdbool.h>
@@ -638,5 +636,3 @@ typedef enum {
 #ifdef __cplusplus
 }
 #endif
-
-#endif /* _ROM_ETS_SYS_H_ */

components/esp_rom/include/esp32/rom/rtc.h

@@ -1,19 +1,9 @@
-// Copyright 2010-2016 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.
-
-#ifndef _ROM_RTC_H_
-#define _ROM_RTC_H_
+/*
+ * SPDX-FileCopyrightText: 2010-2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#pragma once
 
 #include "ets_sys.h"
 
@@ -247,5 +237,3 @@ void software_reset_cpu(int cpu_no);
 #ifdef __cplusplus
 }
 #endif
-
-#endif /* _ROM_RTC_H_ */

components/esp_rom/include/esp32/rom/uart.h

@@ -1,19 +1,9 @@
-// Copyright 2010-2016 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.
-
-#ifndef _ROM_UART_H_
-#define _ROM_UART_H_
+/*
+ * SPDX-FileCopyrightText: 2010-2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#pragma once
 
 #include "esp_types.h"
 #include "esp_attr.h"
@@ -416,5 +406,3 @@ extern UartDevice UartDev;
 #ifdef __cplusplus
 }
 #endif
-
-#endif /* _ROM_UART_H_ */

components/hal/esp32s2/touch_sensor_hal.c

@@ -1,20 +1,13 @@
-// Copyright 2015-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: 2015-2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 
 // The HAL layer for Touch Sensor (common part)
 
 #include "soc/soc_pins.h"
+#include "soc/touch_sensor_pins.h"
 #include "hal/touch_sensor_hal.h"
 #include "hal/touch_sensor_types.h"
 

components/soc/esp32c2/include/soc/rtc_cntl_struct.h

@@ -3,9 +3,9 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef _SOC_RTC_CNTL_STRUCT_H_
-#define _SOC_RTC_CNTL_STRUCT_H_
+#pragma once
 
+#include <stdint.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -706,7 +706,3 @@ extern rtc_cntl_dev_t RTCCNTL;
 #ifdef __cplusplus
 }
 #endif
-
-
-
-#endif /*_SOC_RTC_CNTL_STRUCT_H_ */

components/soc/esp32c2/include/soc/spi_mem_struct.h

@@ -3,9 +3,9 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef _SOC_SPI_MEM_STRUCT_H_
-#define _SOC_SPI_MEM_STRUCT_H_
+#pragma once
 
+#include <stdint.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -570,7 +570,3 @@ _Static_assert(sizeof(spi_mem_dev_t) == 0x400, "spi_mem_dev_t size error!");
 #ifdef __cplusplus
 }
 #endif
-
-
-
-#endif /*_SOC_SPI_MEM_STRUCT_H_ */

components/soc/esp32c2/include/soc/syscon_struct.h

@@ -3,9 +3,9 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef _SOC_SYSCON_STRUCT_H_
-#define _SOC_SYSCON_STRUCT_H_
+#pragma once
 
+#include <stdint.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -474,7 +474,3 @@ extern syscon_dev_t SYSCON;
 #ifdef __cplusplus
 }
 #endif
-
-
-
-#endif /*_SOC_SYSCON_STRUCT_H_ */

components/soc/esp32c3/include/soc/apb_ctrl_struct.h

@@ -1,22 +1,17 @@
-// 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.
-#ifndef _SOC_APB_CTRL_STRUCT_H_
-#define _SOC_APB_CTRL_STRUCT_H_
+/*
+ * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#pragma once
+
+#include <stdint.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+
 typedef volatile struct apb_ctrl_dev_s {
     union {
         struct {
@@ -478,5 +473,3 @@ extern apb_ctrl_dev_t APB_CTRL;
 #ifdef __cplusplus
 }
 #endif
-
-#endif  /* _SOC_APB_CTRL_STRUCT_H_ */

components/soc/esp32c3/include/soc/apb_saradc_struct.h

@@ -3,7 +3,6 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-
 #pragma once
 
 #include <stdint.h>

components/soc/esp32c3/include/soc/efuse_struct.h

@@ -3,8 +3,10 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef _SOC_EFUSE_STRUCT_H_
-#define _SOC_EFUSE_STRUCT_H_
+#pragma once
+
+#include <stdint.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -515,5 +517,3 @@ extern efuse_dev_t EFUSE;
 #ifdef __cplusplus
 }
 #endif
-
-#endif  /* _SOC_EFUSE_STRUCT_H_ */

components/soc/esp32c3/include/soc/ledc_struct.h

@@ -3,9 +3,9 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
+#pragma once
 
-#ifndef _SOC_LEDC_STRUCT_H_
-#define _SOC_LEDC_STRUCT_H_
+#include <stdint.h>
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -209,5 +209,3 @@ extern ledc_dev_t LEDC;
 #ifdef __cplusplus
 }
 #endif
-
-#endif  /* _SOC_LEDC_STRUCT_H_ */

components/soc/esp32c3/include/soc/rtc_cntl_struct.h

@@ -3,8 +3,9 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef _SOC_RTC_CNTL_STRUCT_H_
-#define _SOC_RTC_CNTL_STRUCT_H_
+#pragma once
+
+#include <stdint.h>
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -831,5 +832,3 @@ extern rtc_cntl_dev_t RTCCNTL;
 #ifdef __cplusplus
 }
 #endif
-
-#endif  /* _SOC_RTC_CNTL_STRUCT_H_ */

components/soc/esp32c3/include/soc/rtc_i2c_struct.h

@@ -1,18 +1,11 @@
-// 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.
-#ifndef _SOC_RTC_I2C_STRUCT_H_
-#define _SOC_RTC_I2C_STRUCT_H_
+/*
+ * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#pragma once
+
+#include <stdint.h>
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -223,5 +216,3 @@ extern rtc_i2c_dev_t RTC_I2C;
 #ifdef __cplusplus
 }
 #endif
-
-#endif  /* _SOC_RTC_I2C_STRUCT_H_ */

components/soc/esp32c3/include/soc/spi_mem_struct.h

@@ -1,18 +1,11 @@
-// 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.
-#ifndef _SOC_SPI_MEM_STRUCT_H_
-#define _SOC_SPI_MEM_STRUCT_H_
+/*
+ * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#pragma once
+
+#include <stdint.h>
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -565,5 +558,3 @@ _Static_assert(sizeof(spi_mem_dev_t) == 0x400, "spi_mem_dev_t size error!");
 #ifdef __cplusplus
 }
 #endif
-
-#endif  /* _SOC_SPI_MEM_STRUCT_H_ */

components/soc/esp32c3/include/soc/spi_struct.h

@@ -1,20 +1,11 @@
-// 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.
-#ifndef _SOC_SPI_STRUCT_H_
-#define _SOC_SPI_STRUCT_H_
-
+/*
+ * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#pragma once
 
+#include <stdint.h>
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -375,7 +366,3 @@ extern spi_dev_t GPSPI2;
 #ifdef __cplusplus
 }
 #endif
-
-
-
-#endif /*_SOC_SPI_STRUCT_H_ */

components/soc/esp32c3/include/soc/syscon_struct.h

@@ -1,18 +1,11 @@
-// 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.
-#ifndef _SOC_SYSCON_STRUCT_H_
-#define _SOC_SYSCON_STRUCT_H_
+/*
+ * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#pragma once
+
+#include <stdint.h>
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -478,5 +471,3 @@ extern syscon_dev_t SYSCON;
 #ifdef __cplusplus
 }
 #endif
-
-#endif  /* _SOC_SYSCON_STRUCT_H_ */

components/soc/esp32c3/include/soc/uart_struct.h

@@ -1,18 +1,11 @@
-// 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.
-#ifndef _SOC_UART_STRUCT_H_
-#define _SOC_UART_STRUCT_H_
+/*
+ * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#pragma once
+
+#include <stdint.h>
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -402,5 +395,3 @@ extern uart_dev_t UART1;
 #ifdef __cplusplus
 }
 #endif
-
-#endif  /* _SOC_UART_STRUCT_H_ */

components/soc/esp32c3/include/soc/uhci_struct.h

@@ -1,18 +1,11 @@
-// 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.
-#ifndef _SOC_UHCI_STRUCT_H_
-#define _SOC_UHCI_STRUCT_H_
+/*
+ * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#pragma once
+
+#include <stdint.h>
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -226,5 +219,3 @@ extern uhci_dev_t UHCI1;
 #ifdef __cplusplus
 }
 #endif
-
-#endif  /* _SOC_UHCI_STRUCT_H_ */

components/soc/esp32s2/include/soc/apb_ctrl_struct.h

@@ -1,18 +1,12 @@
-// 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.
-#ifndef _SOC_APB_CTRL_STRUCT_H_
-#define _SOC_APB_CTRL_STRUCT_H_
+/*
+ * SPDX-FileCopyrightText: 2017-2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#pragma once
+
+#include <stdint.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -459,5 +453,3 @@ extern apb_ctrl_dev_t APB_CTRL;
 #ifdef __cplusplus
 }
 #endif
-
-#endif  /* _SOC_APB_CTRL_STRUCT_H_ */

components/soc/esp32s2/include/soc/apb_saradc_struct.h

@@ -3,7 +3,6 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-
 #pragma once
 
 #include <stdint.h>

components/soc/esp32s2/include/soc/efuse_struct.h

@@ -3,8 +3,10 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef _SOC_EFUSE_STRUCT_H_
-#define _SOC_EFUSE_STRUCT_H_
+#pragma once
+
+#include <stdint.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -536,5 +538,3 @@ extern efuse_dev_t EFUSE;
 #ifdef __cplusplus
 }
 #endif
-
-#endif  /* _SOC_EFUSE_STRUCT_H_ */

components/soc/esp32s2/include/soc/gpio_struct.h

@@ -1,18 +1,12 @@
-// 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.
-#ifndef _SOC_GPIO_STRUCT_H_
-#define _SOC_GPIO_STRUCT_H_
+/*
+ * SPDX-FileCopyrightText: 2017-2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#pragma once
+
+#include <stdint.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -248,5 +242,3 @@ extern gpio_dev_t GPIO;
 #ifdef __cplusplus
 }
 #endif
-
-#endif  /* _SOC_GPIO_STRUCT_H_ */

components/soc/esp32s2/include/soc/i2c_struct.h

@@ -3,7 +3,6 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-
 #pragma once
 
 #include <stdint.h>

components/soc/esp32s2/include/soc/ledc_struct.h

@@ -1,18 +1,12 @@
-// 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.
-#ifndef _SOC_LEDC_STRUCT_H_
-#define _SOC_LEDC_STRUCT_H_
+/*
+ * SPDX-FileCopyrightText: 2017-2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#pragma once
+
+#include <stdint.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -218,5 +212,3 @@ extern ledc_dev_t LEDC;
 #ifdef __cplusplus
 }
 #endif
-
-#endif  /* _SOC_LEDC_STRUCT_H_ */

components/soc/esp32s2/include/soc/rtc_i2c_struct.h

@@ -1,18 +1,12 @@
-// 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.
-#ifndef _SOC_RTC_I2C_STRUCT_H_
-#define _SOC_RTC_I2C_STRUCT_H_
+/*
+ * SPDX-FileCopyrightText: 2017-2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#pragma once
+
+#include <stdint.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -223,5 +217,3 @@ extern rtc_i2c_dev_t RTC_I2C;
 #ifdef __cplusplus
 }
 #endif
-
-#endif  /* _SOC_RTC_I2C_STRUCT_H_ */

components/soc/esp32s2/include/soc/rtc_io_struct.h

@@ -1,18 +1,12 @@
-// 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.
-#ifndef _SOC_RTC_IO_STRUCT_H_
-#define _SOC_RTC_IO_STRUCT_H_
+/*
+ * SPDX-FileCopyrightText: 2017-2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#pragma once
+
+#include <stdint.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -348,5 +342,3 @@ extern rtc_io_dev_t RTCIO;
 #ifdef __cplusplus
 }
 #endif
-
-#endif  /* _SOC_RTC_IO_STRUCT_H_ */

components/soc/esp32s2/include/soc/sens_struct.h

@@ -1,18 +1,12 @@
-// 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.
-#ifndef _SOC_SENS_STRUCT_H_
-#define _SOC_SENS_STRUCT_H_
+/*
+ * SPDX-FileCopyrightText: 2017-2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#pragma once
+
+#include <stdint.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -441,5 +435,3 @@ extern sens_dev_t SENS;
 #ifdef __cplusplus
 }
 #endif
-
-#endif  /* _SOC_SENS_STRUCT_H_ */

components/soc/esp32s2/include/soc/soc_pins.h

@@ -1,21 +1,7 @@
-// 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.
-
 /*
- * Pin definition header file. The long term plan is to have a single soc_pins.h for all
- * peripherals. Now we temporarily separate these information into periph_pins/channels.h for each
- * peripheral and include them here to avoid developing conflicts in those header files.
+ * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #pragma once

components/soc/esp32s2/include/soc/spi_mem_struct.h

@@ -3,7 +3,6 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-
 #pragma once
 
 #include <stdint.h>

components/soc/esp32s2/include/soc/spi_struct.h

@@ -3,7 +3,6 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-
 #pragma once
 
 #include <stdint.h>

components/soc/esp32s2/include/soc/syscon_struct.h

@@ -1,18 +1,12 @@
-// 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.
-#ifndef _SOC_SYSCON_STRUCT_H_
-#define _SOC_SYSCON_STRUCT_H_
+/*
+ * SPDX-FileCopyrightText: 2017-2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#pragma once
+
+#include <stdint.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -459,5 +453,3 @@ extern syscon_dev_t SYSCON;
 #ifdef __cplusplus
 }
 #endif
-
-#endif  /* _SOC_SYSCON_STRUCT_H_ */

components/soc/esp32s2/include/soc/uart_struct.h

@@ -1,18 +1,12 @@
-// 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.
-#ifndef _SOC_UART_STRUCT_H_
-#define _SOC_UART_STRUCT_H_
+/*
+ * SPDX-FileCopyrightText: 2017-2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#pragma once
+
+#include <stdint.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -372,5 +366,3 @@ extern uart_dev_t UART1;
 #ifdef __cplusplus
 }
 #endif
-
-#endif  /* _SOC_UART_STRUCT_H_ */

components/soc/esp32s2/include/soc/uhci_struct.h

@@ -1,18 +1,12 @@
-// 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.
-#ifndef _SOC_UHCI_STRUCT_H_
-#define _SOC_UHCI_STRUCT_H_
+/*
+ * SPDX-FileCopyrightText: 2017-2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#pragma once
+
+#include <stdint.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -361,5 +355,3 @@ extern uhci_dev_t UHCI1;
 #ifdef __cplusplus
 }
 #endif
-
-#endif  /* _SOC_UHCI_STRUCT_H_ */

components/soc/esp32s3/include/soc/world_controller_struct.h

@@ -1,19 +1,9 @@
-// Copyright 2017-2021 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.
-#ifndef _SOC_WORLD_CONTROLLER_STRUCT_H_
-#define _SOC_WORLD_CONTROLLER_STRUCT_H_
-
+/*
+ * SPDX-FileCopyrightText: 2017-2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#pragma once
 
 #include <stdint.h>
 #ifdef __cplusplus
@@ -790,7 +780,3 @@ extern world_controller_dev_t WORLD_CONTROLLER;
 #ifdef __cplusplus
 }
 #endif
-
-
-
-#endif /*_SOC_WORLD_CONTROLLER_STRUCT_H_ */

components/soc/include/soc/spi_periph.h

@@ -1,18 +1,11 @@
-// 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-2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 
 #pragma once
+
 #include <stdint.h>
 #include "sdkconfig.h"
 #include "soc/soc.h"
@@ -23,6 +16,7 @@
 #include "soc/soc_pins.h"
 #include "soc/spi_reg.h"
 #include "soc/spi_struct.h"
+#include "soc/spi_pins.h"
 #include "soc/gpio_sig_map.h"
 #if SOC_MEMSPI_IS_INDEPENDENT
 #include "soc/spi_mem_struct.h"

components/soc/include/soc/usb_periph.h

@@ -1,16 +1,8 @@
-// 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-2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 
 #pragma once
 
@@ -24,6 +16,10 @@
 #include "soc/usb_wrap_reg.h"
 #include "soc/usb_wrap_struct.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @brief A pin descriptor for init
  */
@@ -35,3 +31,7 @@ typedef struct {
 } usb_iopin_dsc_t;
 
 extern const usb_iopin_dsc_t usb_periph_iopins[];
+
+#ifdef __cplusplus
+}
+#endif

tools/ci/check_copyright_ignore.txt

@@ -522,11 +522,9 @@ components/esp_rom/include/esp32/rom/libc_stubs.h
 components/esp_rom/include/esp32/rom/md5_hash.h
 components/esp_rom/include/esp32/rom/miniz.h
 components/esp_rom/include/esp32/rom/rsa_pss.h
-components/esp_rom/include/esp32/rom/rtc.h
 components/esp_rom/include/esp32/rom/sha.h
 components/esp_rom/include/esp32/rom/tbconsole.h
 components/esp_rom/include/esp32/rom/tjpgd.h
-components/esp_rom/include/esp32/rom/uart.h
 components/esp_rom/include/esp32c2/rom/md5_hash.h
 components/esp_rom/include/esp32c3/rom/aes.h
 components/esp_rom/include/esp32c3/rom/bigint.h
@@ -773,7 +771,6 @@ components/hal/esp32s2/include/hal/sha_ll.h
 components/hal/esp32s2/include/hal/spi_flash_encrypted_ll.h
 components/hal/esp32s2/include/hal/trace_ll.h
 components/hal/esp32s2/include/hal/usb_ll.h
-components/hal/esp32s2/touch_sensor_hal.c
 components/hal/esp32s3/include/hal/aes_ll.h
 components/hal/esp32s3/include/hal/mpu_ll.h
 components/hal/esp32s3/include/hal/rwdt_ll.h
@@ -1057,7 +1054,6 @@ components/soc/esp32/uart_periph.c
 components/soc/esp32c3/i2c_bbpll.h
 components/soc/esp32c3/i2c_periph.c
 components/soc/esp32c3/include/soc/apb_ctrl_reg.h
-components/soc/esp32c3/include/soc/apb_ctrl_struct.h
 components/soc/esp32c3/include/soc/apb_saradc_reg.h
 components/soc/esp32c3/include/soc/assist_debug_reg.h
 components/soc/esp32c3/include/soc/bb_reg.h
@@ -1077,16 +1073,12 @@ components/soc/esp32c3/include/soc/ledc_reg.h
 components/soc/esp32c3/include/soc/nrx_reg.h
 components/soc/esp32c3/include/soc/reset_reasons.h
 components/soc/esp32c3/include/soc/rtc_i2c_reg.h
-components/soc/esp32c3/include/soc/rtc_i2c_struct.h
 components/soc/esp32c3/include/soc/sensitive_reg.h
 components/soc/esp32c3/include/soc/sensitive_struct.h
 components/soc/esp32c3/include/soc/soc_pins.h
 components/soc/esp32c3/include/soc/spi_mem_reg.h
-components/soc/esp32c3/include/soc/spi_mem_struct.h
 components/soc/esp32c3/include/soc/spi_pins.h
 components/soc/esp32c3/include/soc/spi_reg.h
-components/soc/esp32c3/include/soc/spi_struct.h
-components/soc/esp32c3/include/soc/syscon_struct.h
 components/soc/esp32c3/include/soc/system_reg.h
 components/soc/esp32c3/include/soc/system_struct.h
 components/soc/esp32c3/include/soc/systimer_reg.h
@@ -1094,9 +1086,7 @@ components/soc/esp32c3/include/soc/systimer_struct.h
 components/soc/esp32c3/include/soc/twai_struct.h
 components/soc/esp32c3/include/soc/uart_pins.h
 components/soc/esp32c3/include/soc/uart_reg.h
-components/soc/esp32c3/include/soc/uart_struct.h
 components/soc/esp32c3/include/soc/uhci_reg.h
-components/soc/esp32c3/include/soc/uhci_struct.h
 components/soc/esp32c3/include/soc/usb_serial_jtag_reg.h
 components/soc/esp32c3/include/soc/usb_serial_jtag_struct.h
 components/soc/esp32c3/include/soc/wdev_reg.h
@@ -1148,7 +1138,6 @@ components/soc/esp32s2/dac_periph.c
 components/soc/esp32s2/dedic_gpio_periph.c
 components/soc/esp32s2/i2c_periph.c
 components/soc/esp32s2/include/soc/apb_ctrl_reg.h
-components/soc/esp32s2/include/soc/apb_ctrl_struct.h
 components/soc/esp32s2/include/soc/apb_saradc_reg.h
 components/soc/esp32s2/include/soc/assist_debug_reg.h
 components/soc/esp32s2/include/soc/bb_reg.h
@@ -1163,33 +1152,26 @@ components/soc/esp32s2/include/soc/fe_reg.h
 components/soc/esp32s2/include/soc/gpio_pins.h
 components/soc/esp32s2/include/soc/gpio_reg.h
 components/soc/esp32s2/include/soc/gpio_sig_map.h
-components/soc/esp32s2/include/soc/gpio_struct.h
 components/soc/esp32s2/include/soc/hwcrypto_reg.h
 components/soc/esp32s2/include/soc/i2c_reg.h
 components/soc/esp32s2/include/soc/interrupt_reg.h
 components/soc/esp32s2/include/soc/ledc_reg.h
-components/soc/esp32s2/include/soc/ledc_struct.h
 components/soc/esp32s2/include/soc/memprot_defs.h
 components/soc/esp32s2/include/soc/nrx_reg.h
 components/soc/esp32s2/include/soc/rtc_cntl_reg.h
 components/soc/esp32s2/include/soc/rtc_cntl_struct.h
 components/soc/esp32s2/include/soc/rtc_i2c_reg.h
-components/soc/esp32s2/include/soc/rtc_i2c_struct.h
 components/soc/esp32s2/include/soc/rtc_io_channel.h
 components/soc/esp32s2/include/soc/rtc_io_reg.h
-components/soc/esp32s2/include/soc/rtc_io_struct.h
 components/soc/esp32s2/include/soc/sdio_slave_pins.h
 components/soc/esp32s2/include/soc/sdmmc_pins.h
 components/soc/esp32s2/include/soc/sens_reg.h
-components/soc/esp32s2/include/soc/sens_struct.h
 components/soc/esp32s2/include/soc/sensitive_reg.h
-components/soc/esp32s2/include/soc/soc_pins.h
 components/soc/esp32s2/include/soc/soc_ulp.h
 components/soc/esp32s2/include/soc/spi_mem_reg.h
 components/soc/esp32s2/include/soc/spi_pins.h
 components/soc/esp32s2/include/soc/spi_reg.h
 components/soc/esp32s2/include/soc/syscon_reg.h
-components/soc/esp32s2/include/soc/syscon_struct.h
 components/soc/esp32s2/include/soc/systimer_reg.h
 components/soc/esp32s2/include/soc/systimer_struct.h
 components/soc/esp32s2/include/soc/touch_sensor_channel.h
@@ -1197,9 +1179,7 @@ components/soc/esp32s2/include/soc/touch_sensor_pins.h
 components/soc/esp32s2/include/soc/twai_struct.h
 components/soc/esp32s2/include/soc/uart_pins.h
 components/soc/esp32s2/include/soc/uart_reg.h
-components/soc/esp32s2/include/soc/uart_struct.h
 components/soc/esp32s2/include/soc/uhci_reg.h
-components/soc/esp32s2/include/soc/uhci_struct.h
 components/soc/esp32s2/include/soc/usb_reg.h
 components/soc/esp32s2/include/soc/usb_struct.h
 components/soc/esp32s2/include/soc/usb_types.h
@@ -1292,7 +1272,6 @@ components/soc/esp32s3/include/soc/usb_wrap_struct.h
 components/soc/esp32s3/include/soc/usbh_struct.h
 components/soc/esp32s3/include/soc/wdev_reg.h
 components/soc/esp32s3/include/soc/world_controller_reg.h
-components/soc/esp32s3/include/soc/world_controller_struct.h
 components/soc/esp32s3/interrupts.c
 components/soc/esp32s3/ledc_periph.c
 components/soc/esp32s3/rtc_io_periph.c
@@ -1301,7 +1280,6 @@ components/soc/esp32s3/sdmmc_periph.c
 components/soc/esp32s3/spi_periph.c
 components/soc/esp32s3/uart_periph.c
 components/soc/esp32s3/usb_periph.c
-components/soc/esp32s3/usb_periph.h
 components/soc/include/soc/adc_periph.h
 components/soc/include/soc/dac_periph.h
 components/soc/include/soc/dedic_gpio_periph.h
@@ -1315,12 +1293,10 @@ components/soc/include/soc/rtc_periph.h
 components/soc/include/soc/sdio_slave_periph.h
 components/soc/include/soc/sdmmc_periph.h
 components/soc/include/soc/sens_periph.h
-components/soc/include/soc/spi_periph.h
 components/soc/include/soc/syscon_periph.h
 components/soc/include/soc/twai_periph.h
 components/soc/include/soc/uart_periph.h
 components/soc/include/soc/uhci_periph.h
-components/soc/include/soc/usb_periph.h
 components/soc/lldesc.c
 components/soc/soc_include_legacy_warn.c
 components/spi_flash/cache_utils.h

tools/ci/check_public_headers_exceptions.txt

@@ -151,22 +151,14 @@ components/esp_psram/include/esp32/himem.h
 components/esp_rom/include/esp32/rom/ets_sys.h
 components/esp_rom/include/esp32/rom/rtc.h
 components/esp_rom/include/esp32/rom/uart.h
-components/soc/esp32s2/include/soc/apb_ctrl_struct.h
-components/soc/esp32s2/include/soc/efuse_struct.h
-components/soc/esp32s2/include/soc/gpio_struct.h
-components/soc/esp32s2/include/soc/ledc_struct.h
-components/soc/esp32s2/include/soc/rtc_i2c_struct.h
-components/soc/esp32s2/include/soc/rtc_io_struct.h
-components/soc/esp32s2/include/soc/sens_struct.h
-components/soc/esp32s2/include/soc/syscon_struct.h
-components/soc/esp32s2/include/soc/uart_struct.h
-components/soc/esp32s2/include/soc/uhci_struct.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
@@ -175,20 +167,8 @@ components/espcoredump/include/port/xtensa/esp_core_dump_summary_port.h
 components/riscv/include/esp_private/panic_reason.h
 components/riscv/include/riscv/interrupt.h
 components/riscv/include/riscv/rvruntime-frames.h
-components/soc/esp32c3/include/soc/apb_ctrl_struct.h
-components/soc/esp32c3/include/soc/efuse_struct.h
-components/soc/esp32c3/include/soc/ledc_struct.h
-components/soc/esp32c3/include/soc/rtc_cntl_struct.h
-components/soc/esp32c3/include/soc/rtc_i2c_struct.h
-components/soc/esp32c3/include/soc/spi_mem_struct.h
-components/soc/esp32c3/include/soc/spi_struct.h
-components/soc/esp32c3/include/soc/syscon_struct.h
-components/soc/esp32c3/include/soc/uart_struct.h
-components/soc/esp32c3/include/soc/uhci_struct.h
+
 
 ### To be fixed: files which don't compile for esp32c2 target:
 
 components/efuse/esp32c2/include/esp_efuse_table.h
-components/soc/esp32c2/include/soc/rtc_cntl_struct.h
-components/soc/esp32c2/include/soc/spi_mem_struct.h
-components/soc/esp32c2/include/soc/syscon_struct.h