fix(hal): check the public header files and fix violations

fix(hal/include): fix header violations in hal component
fix(hal/include): Move type definitions from `xx_hal.h` to `xx_types.h`
fix(hal/include): Move type definitions from `xx_hal.h` to `xx_types.h`
fix(hal/include): Add comment for a far away `#endif`
fix(hal/include): change scope for cpp guard
ci: Remove components/hal/ comment from public headers check exceptions
Add missing include macro sdkconfig.h for header files
Add missing include macro stdbool.h for header files
Add missing include macro stdint.h for header files
Add missing capability guard macro for header files
Add missing cpp guard macro for header files
Remove some useless include macros
Add some missing `inline` attribute for functions defined in header files
Remove components/hal/ from public headers check exceptions
fix(hal/include): fix invalid licenses
fix(hal/include): fix invalid licenses
fix(hal/include): add missing soc_caps.h
fix(hal): include soc_caps.h before cap macro is used
fix(hal): Remove unnecessary target check
fix(hal): fix header and macro problems
Add missing include macro
Remove loop dependency in hal
Add comment for far-away endif
fix(hal): Add missing soc_caps.h
ci: update check_copyright_ignore.txt
Change the sequence of `#include` macro, cpp guard macro
Change the wrap scope of capacity macro

fix(hal): Change position of C++ guard to pass test

components/hal/aes_hal.c

@@ -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-2023 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 
 // The HAL layer for AES
 

components/hal/ds_hal.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-2023 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 
 #include "hal/systimer_hal.h"
 #include "hal/ds_hal.h"

components/hal/esp32/include/hal/aes_ll.h

@@ -1,16 +1,8 @@
-// Copyright 2020-2021 Espressif Systems (Shanghai) CO 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-2023 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 
 #pragma once
 

components/hal/esp32/include/hal/dac_ll.h

@@ -13,6 +13,7 @@
 #pragma once
 
 #include <stdlib.h>
+#include <stdbool.h>
 #include "hal/misc.h"
 #include "soc/dac_periph.h"
 #include "soc/rtc_io_struct.h"

components/hal/esp32/include/hal/emac_ll.h

@@ -15,6 +15,7 @@
 #pragma once
 
 #include <stdint.h>
+#include <stdbool.h>
 #include "hal/misc.h"
 #include "hal/eth_types.h"
 #include "soc/emac_dma_struct.h"

components/hal/esp32/include/hal/mmu_ll.h

@@ -8,6 +8,7 @@
 
 #pragma once
 
+#include <stdbool.h>
 #include "soc/ext_mem_defs.h"
 #include "soc/dport_reg.h"
 #include "soc/dport_access.h"

components/hal/esp32/include/hal/mpi_ll.h

@@ -8,6 +8,7 @@
 #include <stdbool.h>
 #include <string.h>
 #include "hal/assert.h"
+#include "hal/mpi_types.h"
 #include "soc/dport_reg.h"
 #include "soc/hwcrypto_periph.h"
 #include "soc/mpi_periph.h"

components/hal/esp32/include/hal/mpu_ll.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-2023 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 
 #include <stdint.h>
 

components/hal/esp32/include/hal/sdio_slave_ll.h

@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "hal/sdio_slave_hal.h"
+#include "hal/sdio_slave_types.h"
 #include "soc/slc_struct.h"
 #include "soc/slc_reg.h"
 #include "soc/host_struct.h"
@@ -24,6 +24,10 @@
 #include "soc/hinf_struct.h"
 #include "soc/lldesc.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /// Get address of the only SLC registers for ESP32
 #define sdio_slave_ll_get_slc(ID)   (&SLC)
 /// Get address of the only HOST registers for ESP32
@@ -507,3 +511,7 @@ static inline void sdio_slave_ll_slvint_fetch_clear(slc_dev_t *slc, sdio_slave_l
     *out_slv_int = slv_int;
     slc->slc0_int_clr.val = slv_int;
 }
+
+#ifdef __cplusplus
+}
+#endif

components/hal/esp32/include/hal/spi_flash_encrypted_ll.h

@@ -1,16 +1,8 @@
-// Copyright 2015-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.
+/*
+ * SPDX-FileCopyrightText: 2015-2023 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 
 /*******************************************************************************
  * NOTICE

components/hal/esp32/include/hal/touch_sensor_hal.h

@@ -1,16 +1,8 @@
-// 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-2023 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 
 /*******************************************************************************
  * NOTICE

components/hal/esp32/include/hal/trace_ll.h

@@ -1,21 +1,18 @@
-// 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-2023 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 
 #pragma once
 
+#include <stdbool.h>
 #include "soc/dport_reg.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 static inline void trace_ll_mem_enable(int cpu, bool enable)
 {
     int reg[] = {DPORT_PRO_TRACEMEM_ENA_REG, DPORT_APP_TRACEMEM_ENA_REG};
@@ -26,3 +23,7 @@ static inline void trace_ll_set_mode(int mode)
 {
     DPORT_WRITE_PERI_REG(DPORT_TRACEMEM_MUX_MODE_REG, mode);
 }
+
+#ifdef __cplusplus
+}
+#endif

components/hal/esp32c2/include/hal/clk_gate_ll.h

@@ -115,7 +115,7 @@ static inline uint32_t periph_ll_get_rst_en_mask(periph_module_t periph, bool en
     }
 }
 
-static uint32_t periph_ll_get_clk_en_reg(periph_module_t periph)
+static inline uint32_t periph_ll_get_clk_en_reg(periph_module_t periph)
 {
     switch (periph) {
     case PERIPH_RNG_MODULE:
@@ -140,7 +140,7 @@ static uint32_t periph_ll_get_clk_en_reg(periph_module_t periph)
     }
 }
 
-static uint32_t periph_ll_get_rst_en_reg(periph_module_t periph)
+static inline uint32_t periph_ll_get_rst_en_reg(periph_module_t periph)
 {
     switch (periph) {
     case PERIPH_RNG_MODULE:

components/hal/esp32c2/include/hal/ecc_ll.h

@@ -8,6 +8,7 @@
 #include <stdbool.h>
 #include <string.h>
 #include "hal/assert.h"
+#include "hal/ecc_types.h"
 #include "soc/ecc_mult_reg.h"
 
 #ifdef __cplusplus

components/hal/esp32c2/include/hal/memprot_ll.h

@@ -1,564 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#pragma once
-
-#include "soc/sensitive_reg.h"
-#include "soc/ext_mem_defs.h"
-#include "hal/assert.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* ******************************************************************************************************
- * *** GLOBALS ***
- * NOTE: in this version, all the configurations apply only to WORLD_0
- */
-
-#define IRAM_SRAM_START             0x4037C000
-#define DRAM_SRAM_START             0x3FC7C000
-
-/* ICache size is fixed to 16KB on ESP32-C2 */
-#ifndef ICACHE_SIZE
-#define ICACHE_SIZE                 0x4000
-#endif
-
-#ifndef I_D_SRAM_SEGMENT_SIZE
-#define I_D_SRAM_SEGMENT_SIZE       0x20000
-#endif
-
-#define I_D_SPLIT_LINE_SHIFT        0x9
-#define I_D_FAULT_ADDR_SHIFT        0x2
-
-static inline void memprot_ll_set_iram0_dram0_split_line_lock(void)
-{
-    REG_WRITE(SENSITIVE_CORE_X_IRAM0_DRAM0_DMA_SPLIT_LINE_CONSTRAIN_0_REG, 1);
-}
-
-static inline bool memprot_ll_get_iram0_dram0_split_line_lock(void)
-{
-    return REG_READ(SENSITIVE_CORE_X_IRAM0_DRAM0_DMA_SPLIT_LINE_CONSTRAIN_0_REG) == 1;
-}
-
-static inline void* memprot_ll_get_split_addr_from_reg(uint32_t regval, uint32_t base)
-{
-    return (void*)
-        (base + ((regval & SENSITIVE_CORE_X_IRAM0_DRAM0_DMA_SRAM_SPLITADDR_M)
-        >> (SENSITIVE_CORE_X_IRAM0_DRAM0_DMA_SRAM_SPLITADDR_S - I_D_SPLIT_LINE_SHIFT)));
-}
-
-/* ******************************************************************************************************
- * *** IRAM0 ***
- */
-
-//16kB (CACHE)
-#define IRAM0_SRAM_LEVEL_0_LOW      IRAM_SRAM_START //0x40370000
-#define IRAM0_SRAM_LEVEL_0_HIGH     (IRAM0_SRAM_LEVEL_0_LOW + ICACHE_SIZE - 0x1) //0x4037FFFF
-
-//128kB (LEVEL 1)
-#define IRAM0_SRAM_LEVEL_1_LOW      (IRAM0_SRAM_LEVEL_0_HIGH + 0x1) //0x40380000
-#define IRAM0_SRAM_LEVEL_1_HIGH     (IRAM0_SRAM_LEVEL_1_LOW + I_D_SRAM_SEGMENT_SIZE - 0x1) //0x4039FFFF
-
-//128kB (LEVEL 2)
-#define IRAM0_SRAM_LEVEL_2_LOW      (IRAM0_SRAM_LEVEL_1_HIGH + 0x1) //0x403A0000
-#define IRAM0_SRAM_LEVEL_2_HIGH     (IRAM0_SRAM_LEVEL_2_LOW + I_D_SRAM_SEGMENT_SIZE - 0x1) //0x403BFFFF
-
-//128kB (LEVEL 3)
-#define IRAM0_SRAM_LEVEL_3_LOW      (IRAM0_SRAM_LEVEL_2_HIGH + 0x1) //0x403C0000
-#define IRAM0_SRAM_LEVEL_3_HIGH     (IRAM0_SRAM_LEVEL_3_LOW + I_D_SRAM_SEGMENT_SIZE - 0x1) //0x403DFFFF
-
-//permission bits
-#define SENSITIVE_CORE_X_IRAM0_PMS_CONSTRAIN_SRAM_WORLD_0_R  0x1
-#define SENSITIVE_CORE_X_IRAM0_PMS_CONSTRAIN_SRAM_WORLD_0_W  0x2
-#define SENSITIVE_CORE_X_IRAM0_PMS_CONSTRAIN_SRAM_WORLD_0_F  0x4
-
-static inline uint32_t memprot_ll_iram0_get_intr_source_num(void)
-{
-    return ETS_CORE0_IRAM0_PMS_INTR_SOURCE;
-}
-
-
-///////////////////////////////////
-// IRAM0 - SPLIT LINES
-///////////////////////////////////
-
-static inline void memprot_ll_set_iram0_split_line(const void *line_addr, uint32_t sensitive_reg)
-{
-    uint32_t addr = (uint32_t)line_addr;
-    HAL_ASSERT(addr >= IRAM0_SRAM_LEVEL_1_LOW && addr <= IRAM0_SRAM_LEVEL_3_HIGH);
-
-    uint32_t category[3] = {0};
-    if (addr <= IRAM0_SRAM_LEVEL_1_HIGH) {
-        category[0] = 0x2;
-        category[1] = category[2] = 0x3;
-    } else if (addr >= IRAM0_SRAM_LEVEL_2_LOW && addr <= IRAM0_SRAM_LEVEL_2_HIGH) {
-        category[1] = 0x2;
-        category[2] = 0x3;
-    } else {
-        category[2] = 0x2;
-    }
-
-    //NOTE: category & split line address bits are the same for all the areas
-    uint32_t category_bits =
-        (category[0] << SENSITIVE_CORE_X_IRAM0_DRAM0_DMA_SRAM_CATEGORY_0_S) |
-        (category[1] << SENSITIVE_CORE_X_IRAM0_DRAM0_DMA_SRAM_CATEGORY_1_S) |
-        (category[2] << SENSITIVE_CORE_X_IRAM0_DRAM0_DMA_SRAM_CATEGORY_2_S);
-
-    uint32_t conf_addr = ((addr >> I_D_SPLIT_LINE_SHIFT) & SENSITIVE_CORE_X_IRAM0_DRAM0_DMA_SRAM_SPLITADDR_V) << SENSITIVE_CORE_X_IRAM0_DRAM0_DMA_SRAM_SPLITADDR_S;
-
-    uint32_t reg_cfg = conf_addr | category_bits;
-
-    REG_WRITE(sensitive_reg, reg_cfg);
-}
-
-/* can be both IRAM0/DRAM0 address */
-static inline void memprot_ll_set_iram0_split_line_main_I_D(const void *line_addr)
-{
-    memprot_ll_set_iram0_split_line(line_addr, SENSITIVE_CORE_X_IRAM0_DRAM0_DMA_SPLIT_LINE_CONSTRAIN_1_REG);
-}
-
-static inline void memprot_ll_set_iram0_split_line_I_0(const void *line_addr)
-{
-    memprot_ll_set_iram0_split_line(line_addr, SENSITIVE_CORE_X_IRAM0_DRAM0_DMA_SPLIT_LINE_CONSTRAIN_2_REG);
-}
-
-static inline void memprot_ll_set_iram0_split_line_I_1(const void *line_addr)
-{
-    memprot_ll_set_iram0_split_line(line_addr, SENSITIVE_CORE_X_IRAM0_DRAM0_DMA_SPLIT_LINE_CONSTRAIN_3_REG);
-}
-
-static inline void* memprot_ll_get_iram0_split_line_main_I_D(void)
-{
-    return memprot_ll_get_split_addr_from_reg(REG_READ(SENSITIVE_CORE_X_IRAM0_DRAM0_DMA_SPLIT_LINE_CONSTRAIN_1_REG), SOC_DIRAM_IRAM_LOW);
-}
-
-static inline void* memprot_ll_get_iram0_split_line_I_0(void)
-{
-    return memprot_ll_get_split_addr_from_reg(REG_READ(SENSITIVE_CORE_X_IRAM0_DRAM0_DMA_SPLIT_LINE_CONSTRAIN_2_REG), SOC_DIRAM_IRAM_LOW);
-}
-
-static inline void* memprot_ll_get_iram0_split_line_I_1(void)
-{
-    return memprot_ll_get_split_addr_from_reg(REG_READ(SENSITIVE_CORE_X_IRAM0_DRAM0_DMA_SPLIT_LINE_CONSTRAIN_3_REG), SOC_DIRAM_IRAM_LOW);
-}
-
-
-///////////////////////////////////
-// IRAM0 - PMS CONFIGURATION
-///////////////////////////////////
-
-// lock
-static inline void memprot_ll_iram0_set_pms_lock(void)
-{
-    REG_WRITE(SENSITIVE_CORE_X_IRAM0_PMS_CONSTRAIN_0_REG, 1);
-}
-
-static inline bool memprot_ll_iram0_get_pms_lock(void)
-{
-    return REG_READ(SENSITIVE_CORE_X_IRAM0_PMS_CONSTRAIN_0_REG) == 1;
-}
-
-// permission settings
-static inline uint32_t memprot_ll_iram0_set_permissions(bool r, bool w, bool x)
-{
-    uint32_t permissions = 0;
-    if ( r ) {
-        permissions |= SENSITIVE_CORE_X_IRAM0_PMS_CONSTRAIN_SRAM_WORLD_0_R;
-    }
-    if ( w ) {
-        permissions |= SENSITIVE_CORE_X_IRAM0_PMS_CONSTRAIN_SRAM_WORLD_0_W;
-    }
-    if ( x ) {
-        permissions |= SENSITIVE_CORE_X_IRAM0_PMS_CONSTRAIN_SRAM_WORLD_0_F;
-    }
-
-    return permissions;
-}
-
-static inline void memprot_ll_iram0_set_pms_area_0(bool r, bool w, bool x)
-{
-    REG_SET_FIELD(SENSITIVE_CORE_X_IRAM0_PMS_CONSTRAIN_2_REG, SENSITIVE_CORE_X_IRAM0_PMS_CONSTRAIN_SRAM_WORLD_0_PMS_0, memprot_ll_iram0_set_permissions(r, w, x));
-}
-
-static inline void memprot_ll_iram0_set_pms_area_1(bool r, bool w, bool x)
-{
-    REG_SET_FIELD(SENSITIVE_CORE_X_IRAM0_PMS_CONSTRAIN_2_REG, SENSITIVE_CORE_X_IRAM0_PMS_CONSTRAIN_SRAM_WORLD_0_PMS_1, memprot_ll_iram0_set_permissions(r, w, x));
-}
-
-static inline void memprot_ll_iram0_set_pms_area_2(bool r, bool w, bool x)
-{
-    REG_SET_FIELD(SENSITIVE_CORE_X_IRAM0_PMS_CONSTRAIN_2_REG, SENSITIVE_CORE_X_IRAM0_PMS_CONSTRAIN_SRAM_WORLD_0_PMS_2, memprot_ll_iram0_set_permissions(r, w, x));
-}
-
-static inline void memprot_ll_iram0_set_pms_area_3(bool r, bool w, bool x)
-{
-    REG_SET_FIELD(SENSITIVE_CORE_X_IRAM0_PMS_CONSTRAIN_2_REG, SENSITIVE_CORE_X_IRAM0_PMS_CONSTRAIN_SRAM_WORLD_0_PMS_3, memprot_ll_iram0_set_permissions(r, w, x));
-}
-
-static inline void memprot_ll_iram0_get_permissions(uint32_t perms, bool *r, bool *w, bool *x)
-{
-    *r = perms & SENSITIVE_CORE_X_IRAM0_PMS_CONSTRAIN_SRAM_WORLD_0_R;
-    *w = perms & SENSITIVE_CORE_X_IRAM0_PMS_CONSTRAIN_SRAM_WORLD_0_W;
-    *x = perms & SENSITIVE_CORE_X_IRAM0_PMS_CONSTRAIN_SRAM_WORLD_0_F;
-}
-
-static inline void memprot_ll_iram0_get_pms_area_0(bool *r, bool *w, bool *x)
-{
-    uint32_t permissions = REG_GET_FIELD(SENSITIVE_CORE_X_IRAM0_PMS_CONSTRAIN_2_REG, SENSITIVE_CORE_X_IRAM0_PMS_CONSTRAIN_SRAM_WORLD_0_PMS_0);
-    memprot_ll_iram0_get_permissions( permissions, r, w, x);
-}
-
-static inline void memprot_ll_iram0_get_pms_area_1(bool *r, bool *w, bool *x)
-{
-    uint32_t permissions = REG_GET_FIELD(SENSITIVE_CORE_X_IRAM0_PMS_CONSTRAIN_2_REG, SENSITIVE_CORE_X_IRAM0_PMS_CONSTRAIN_SRAM_WORLD_0_PMS_1);
-    memprot_ll_iram0_get_permissions( permissions, r, w, x);
-}
-
-static inline void memprot_ll_iram0_get_pms_area_2(bool *r, bool *w, bool *x)
-{
-    uint32_t permissions = REG_GET_FIELD(SENSITIVE_CORE_X_IRAM0_PMS_CONSTRAIN_2_REG, SENSITIVE_CORE_X_IRAM0_PMS_CONSTRAIN_SRAM_WORLD_0_PMS_2);
-    memprot_ll_iram0_get_permissions( permissions, r, w, x);
-}
-
-static inline void memprot_ll_iram0_get_pms_area_3(bool *r, bool *w, bool *x)
-{
-    uint32_t permissions = REG_GET_FIELD(SENSITIVE_CORE_X_IRAM0_PMS_CONSTRAIN_2_REG, SENSITIVE_CORE_X_IRAM0_PMS_CONSTRAIN_SRAM_WORLD_0_PMS_3);
-    memprot_ll_iram0_get_permissions( permissions, r, w, x);
-}
-
-
-///////////////////////////////////
-// IRAM0 - MONITOR
-///////////////////////////////////
-
-// lock
-static inline void memprot_ll_iram0_set_monitor_lock(void)
-{
-    REG_WRITE(SENSITIVE_CORE_0_IRAM0_PMS_MONITOR_0_REG, 1);
-}
-
-static inline bool memprot_ll_iram0_get_monitor_lock(void)
-{
-    return REG_READ(SENSITIVE_CORE_0_IRAM0_PMS_MONITOR_0_REG) == 1;
-}
-
-// interrupt enable/clear
-static inline void memprot_ll_iram0_set_monitor_en(bool enable)
-{
-    if ( enable ) {
-        REG_SET_BIT( SENSITIVE_CORE_0_IRAM0_PMS_MONITOR_1_REG, SENSITIVE_CORE_0_IRAM0_PMS_MONITOR_VIOLATE_EN );
-    } else {
-        REG_CLR_BIT( SENSITIVE_CORE_0_IRAM0_PMS_MONITOR_1_REG, SENSITIVE_CORE_0_IRAM0_PMS_MONITOR_VIOLATE_EN );
-    }
-}
-
-static inline bool memprot_ll_iram0_get_monitor_en(void)
-{
-    return REG_GET_FIELD( SENSITIVE_CORE_0_IRAM0_PMS_MONITOR_1_REG, SENSITIVE_CORE_0_IRAM0_PMS_MONITOR_VIOLATE_EN ) == 1;
-}
-
-static inline void memprot_ll_iram0_clear_monitor_intr(void)
-{
-    REG_SET_BIT( SENSITIVE_CORE_0_IRAM0_PMS_MONITOR_1_REG, SENSITIVE_CORE_0_IRAM0_PMS_MONITOR_VIOLATE_CLR );
-}
-
-static inline void memprot_ll_iram0_reset_clear_monitor_intr(void)
-{
-    REG_CLR_BIT( SENSITIVE_CORE_0_IRAM0_PMS_MONITOR_1_REG, SENSITIVE_CORE_0_IRAM0_PMS_MONITOR_VIOLATE_CLR );
-}
-
-static inline uint32_t memprot_ll_iram0_get_monitor_enable_register(void)
-{
-    return REG_READ(SENSITIVE_CORE_0_IRAM0_PMS_MONITOR_1_REG);
-}
-
-// // permission violation status
-static inline uint32_t memprot_ll_iram0_get_monitor_status_intr(void)
-{
-    return REG_GET_FIELD( SENSITIVE_CORE_0_IRAM0_PMS_MONITOR_2_REG, SENSITIVE_CORE_0_IRAM0_PMS_MONITOR_VIOLATE_INTR );
-}
-
-static inline uint32_t memprot_ll_iram0_get_monitor_status_fault_wr(void)
-{
-    return REG_GET_FIELD( SENSITIVE_CORE_0_IRAM0_PMS_MONITOR_2_REG, SENSITIVE_CORE_0_IRAM0_PMS_MONITOR_VIOLATE_STATUS_WR );
-}
-
-static inline uint32_t memprot_ll_iram0_get_monitor_status_fault_loadstore(void)
-{
-    return REG_GET_FIELD( SENSITIVE_CORE_0_IRAM0_PMS_MONITOR_2_REG, SENSITIVE_CORE_0_IRAM0_PMS_MONITOR_VIOLATE_STATUS_LOADSTORE );
-}
-
-static inline uint32_t memprot_ll_iram0_get_monitor_status_fault_world(void)
-{
-    return REG_GET_FIELD( SENSITIVE_CORE_0_IRAM0_PMS_MONITOR_2_REG, SENSITIVE_CORE_0_IRAM0_PMS_MONITOR_VIOLATE_STATUS_WORLD );
-}
-
-static inline uint32_t memprot_ll_iram0_get_monitor_status_fault_addr(void)
-{
-    uint32_t addr = REG_GET_FIELD( SENSITIVE_CORE_0_IRAM0_PMS_MONITOR_2_REG, SENSITIVE_CORE_0_IRAM0_PMS_MONITOR_VIOLATE_STATUS_ADDR );
-    return addr > 0 ? (addr << I_D_FAULT_ADDR_SHIFT) + IRAM0_ADDRESS_LOW : 0;
-}
-
-static inline uint32_t memprot_ll_iram0_get_monitor_status_register(void)
-{
-    return REG_READ(SENSITIVE_CORE_0_IRAM0_PMS_MONITOR_2_REG);
-}
-
-
-/* ******************************************************************************************************
- * *** DRAM0 ***
- */
-
-//cache not available from DRAM (!)
-#define DRAM0_SRAM_LEVEL_0_LOW      DRAM_SRAM_START //0x3FC7C000
-#define DRAM0_SRAM_LEVEL_0_HIGH     (DRAM0_SRAM_LEVEL_0_LOW + ICACHE_SIZE - 0x1) //0x3FC7FFFF
-
-//128kB
-#define DRAM0_SRAM_LEVEL_1_LOW      (DRAM0_SRAM_LEVEL_0_HIGH + 0x1) //0x3FC80000
-#define DRAM0_SRAM_LEVEL_1_HIGH     (DRAM0_SRAM_LEVEL_1_LOW + I_D_SRAM_SEGMENT_SIZE - 0x1) //0x3FC9FFFF
-
-//128kB
-#define DRAM0_SRAM_LEVEL_2_LOW      (DRAM0_SRAM_LEVEL_1_HIGH + 0x1) //0x3FCA0000
-#define DRAM0_SRAM_LEVEL_2_HIGH     (DRAM0_SRAM_LEVEL_2_LOW + I_D_SRAM_SEGMENT_SIZE - 0x1) //0x3FCBFFFF
-
-//128kB
-#define DRAM0_SRAM_LEVEL_3_LOW      (DRAM0_SRAM_LEVEL_2_HIGH + 0x1) //0x3FCC0000
-#define DRAM0_SRAM_LEVEL_3_HIGH     (DRAM0_SRAM_LEVEL_3_LOW  + I_D_SRAM_SEGMENT_SIZE - 0x1) //0x3FCDFFFF
-
-#define SENSITIVE_CORE_X_DRAM0_PMS_CONSTRAIN_SRAM_WORLD_0_W  0x2
-#define SENSITIVE_CORE_X_DRAM0_PMS_CONSTRAIN_SRAM_WORLD_0_R  0x1
-
-
-static inline uint32_t memprot_ll_dram0_get_intr_source_num(void)
-{
-    return ETS_CORE0_DRAM0_PMS_INTR_SOURCE;
-}
-
-
-///////////////////////////////////
-// DRAM0 - SPLIT LINES
-///////////////////////////////////
-
-static inline void memprot_ll_set_dram0_split_line(const void *line_addr, uint32_t sensitive_reg)
-{
-    uint32_t addr = (uint32_t)line_addr;
-    HAL_ASSERT(addr >= DRAM0_SRAM_LEVEL_1_LOW && addr <= DRAM0_SRAM_LEVEL_3_HIGH);
-
-    uint32_t category[3] = {0};
-    if (addr <= DRAM0_SRAM_LEVEL_1_HIGH) {
-        category[0] = 0x2;
-        category[1] = category[2] = 0x3;
-    } else if (addr >= DRAM0_SRAM_LEVEL_2_LOW && addr <= DRAM0_SRAM_LEVEL_2_HIGH) {
-        category[1] = 0x2;
-        category[2] = 0x3;
-    } else {
-        category[2] = 0x2;
-    }
-
-    //NOTE: line address & category bits, shifts and masks are the same for all the areas
-    uint32_t category_bits =
-        (category[0] << SENSITIVE_CORE_X_IRAM0_DRAM0_DMA_SRAM_CATEGORY_0_S) |
-        (category[1] << SENSITIVE_CORE_X_IRAM0_DRAM0_DMA_SRAM_CATEGORY_1_S) |
-        (category[2] << SENSITIVE_CORE_X_IRAM0_DRAM0_DMA_SRAM_CATEGORY_2_S);
-
-    uint32_t conf_addr = ((addr >> I_D_SPLIT_LINE_SHIFT) & SENSITIVE_CORE_X_IRAM0_DRAM0_DMA_SRAM_SPLITADDR_V) << SENSITIVE_CORE_X_IRAM0_DRAM0_DMA_SRAM_SPLITADDR_S;
-
-    uint32_t reg_cfg = conf_addr | category_bits;
-
-    REG_WRITE(sensitive_reg, reg_cfg);
-}
-
-static inline void memprot_ll_set_dram0_split_line_D_0(const void *line_addr)
-{
-    memprot_ll_set_dram0_split_line(line_addr, SENSITIVE_CORE_X_IRAM0_DRAM0_DMA_SPLIT_LINE_CONSTRAIN_2_REG);
-}
-
-static inline void memprot_ll_set_dram0_split_line_D_1(const void *line_addr)
-{
-    memprot_ll_set_dram0_split_line(line_addr, SENSITIVE_CORE_X_IRAM0_DRAM0_DMA_SPLIT_LINE_CONSTRAIN_3_REG);
-}
-
-static inline void* memprot_ll_get_dram0_split_line_D_0(void)
-{
-    return memprot_ll_get_split_addr_from_reg(REG_READ(SENSITIVE_CORE_X_IRAM0_DRAM0_DMA_SPLIT_LINE_CONSTRAIN_2_REG), SOC_DIRAM_DRAM_LOW);
-}
-
-static inline void* memprot_ll_get_dram0_split_line_D_1(void)
-{
-    return memprot_ll_get_split_addr_from_reg(REG_READ(SENSITIVE_CORE_X_IRAM0_DRAM0_DMA_SPLIT_LINE_CONSTRAIN_3_REG), SOC_DIRAM_DRAM_LOW);
-}
-
-
-///////////////////////////////////
-// DRAM0 - PMS CONFIGURATION
-///////////////////////////////////
-
-// lock
-static inline void memprot_ll_dram0_set_pms_lock(void)
-{
-    REG_WRITE(SENSITIVE_CORE_X_DRAM0_PMS_CONSTRAIN_0_REG, 1);
-}
-
-static inline bool memprot_ll_dram0_get_pms_lock(void)
-{
-    return REG_READ(SENSITIVE_CORE_X_DRAM0_PMS_CONSTRAIN_0_REG) == 1;
-}
-
-// permission settings
-static inline uint32_t memprot_ll_dram0_set_permissions(bool r, bool w)
-{
-    uint32_t permissions = 0;
-    if ( r ) {
-        permissions |= SENSITIVE_CORE_X_IRAM0_PMS_CONSTRAIN_SRAM_WORLD_0_R;
-    }
-    if ( w ) {
-        permissions |= SENSITIVE_CORE_X_IRAM0_PMS_CONSTRAIN_SRAM_WORLD_0_W;
-    }
-
-    return permissions;
-}
-
-static inline void memprot_ll_dram0_set_pms_area_0(bool r, bool w)
-{
-    REG_SET_FIELD(SENSITIVE_CORE_X_DRAM0_PMS_CONSTRAIN_1_REG, SENSITIVE_CORE_X_DRAM0_PMS_CONSTRAIN_SRAM_WORLD_0_PMS_0, memprot_ll_dram0_set_permissions(r, w));
-}
-
-static inline void memprot_ll_dram0_set_pms_area_1(bool r, bool w)
-{
-    REG_SET_FIELD(SENSITIVE_CORE_X_DRAM0_PMS_CONSTRAIN_1_REG, SENSITIVE_CORE_X_DRAM0_PMS_CONSTRAIN_SRAM_WORLD_0_PMS_1, memprot_ll_dram0_set_permissions(r, w));
-}
-
-static inline void memprot_ll_dram0_set_pms_area_2(bool r, bool w)
-{
-    REG_SET_FIELD(SENSITIVE_CORE_X_DRAM0_PMS_CONSTRAIN_1_REG, SENSITIVE_CORE_X_DRAM0_PMS_CONSTRAIN_SRAM_WORLD_0_PMS_2, memprot_ll_dram0_set_permissions(r, w));
-}
-
-static inline void memprot_ll_dram0_set_pms_area_3(bool r, bool w)
-{
-    REG_SET_FIELD(SENSITIVE_CORE_X_DRAM0_PMS_CONSTRAIN_1_REG, SENSITIVE_CORE_X_DRAM0_PMS_CONSTRAIN_SRAM_WORLD_0_PMS_3, memprot_ll_dram0_set_permissions(r, w));
-}
-
-static inline void memprot_ll_dram0_get_permissions(uint32_t perms, bool *r, bool *w )
-{
-    *r = perms & SENSITIVE_CORE_X_DRAM0_PMS_CONSTRAIN_SRAM_WORLD_0_R;
-    *w = perms & SENSITIVE_CORE_X_DRAM0_PMS_CONSTRAIN_SRAM_WORLD_0_W;
-}
-
-static inline void memprot_ll_dram0_get_pms_area_0(bool *r, bool *w)
-{
-    uint32_t permissions = REG_GET_FIELD(SENSITIVE_CORE_X_DRAM0_PMS_CONSTRAIN_1_REG, SENSITIVE_CORE_X_DRAM0_PMS_CONSTRAIN_SRAM_WORLD_0_PMS_0);
-    memprot_ll_dram0_get_permissions( permissions, r, w);
-}
-
-static inline void memprot_ll_dram0_get_pms_area_1(bool *r, bool *w)
-{
-    uint32_t permissions = REG_GET_FIELD(SENSITIVE_CORE_X_DRAM0_PMS_CONSTRAIN_1_REG, SENSITIVE_CORE_X_DRAM0_PMS_CONSTRAIN_SRAM_WORLD_0_PMS_1);
-    memprot_ll_dram0_get_permissions( permissions, r, w);
-}
-
-static inline void memprot_ll_dram0_get_pms_area_2(bool *r, bool *w)
-{
-    uint32_t permissions = REG_GET_FIELD(SENSITIVE_CORE_X_DRAM0_PMS_CONSTRAIN_1_REG, SENSITIVE_CORE_X_DRAM0_PMS_CONSTRAIN_SRAM_WORLD_0_PMS_2);
-    memprot_ll_dram0_get_permissions( permissions, r, w);
-}
-
-static inline void memprot_ll_dram0_get_pms_area_3(bool *r, bool *w)
-{
-    uint32_t permissions = REG_GET_FIELD(SENSITIVE_CORE_X_DRAM0_PMS_CONSTRAIN_1_REG, SENSITIVE_CORE_X_DRAM0_PMS_CONSTRAIN_SRAM_WORLD_0_PMS_3);
-    memprot_ll_dram0_get_permissions( permissions, r, w);
-}
-
-///////////////////////////////////
-// DRAM0 - MONITOR
-///////////////////////////////////
-
-// lock
-static inline void memprot_ll_dram0_set_monitor_lock(void)
-{
-    REG_WRITE(SENSITIVE_CORE_0_DRAM0_PMS_MONITOR_0_REG, 1);
-}
-
-static inline bool memprot_ll_dram0_get_monitor_lock(void)
-{
-    return REG_READ(SENSITIVE_CORE_0_DRAM0_PMS_MONITOR_0_REG) == 1;
-}
-
-// interrupt enable/clear
-static inline void memprot_ll_dram0_set_monitor_en(bool enable)
-{
-    if ( enable ) {
-        REG_SET_BIT( SENSITIVE_CORE_0_DRAM0_PMS_MONITOR_1_REG, SENSITIVE_CORE_0_DRAM0_PMS_MONITOR_VIOLATE_EN );
-    } else {
-        REG_CLR_BIT( SENSITIVE_CORE_0_DRAM0_PMS_MONITOR_1_REG, SENSITIVE_CORE_0_DRAM0_PMS_MONITOR_VIOLATE_EN );
-    }
-}
-
-static inline bool memprot_ll_dram0_get_monitor_en(void)
-{
-    return REG_GET_BIT( SENSITIVE_CORE_0_DRAM0_PMS_MONITOR_1_REG, SENSITIVE_CORE_0_DRAM0_PMS_MONITOR_VIOLATE_EN ) == 1;
-}
-
-static inline void memprot_ll_dram0_clear_monitor_intr(void)
-{
-    REG_SET_BIT( SENSITIVE_CORE_0_DRAM0_PMS_MONITOR_1_REG, SENSITIVE_CORE_0_DRAM0_PMS_MONITOR_VIOLATE_CLR );
-}
-
-static inline void memprot_ll_dram0_reset_clear_monitor_intr(void)
-{
-    REG_CLR_BIT( SENSITIVE_CORE_0_DRAM0_PMS_MONITOR_1_REG, SENSITIVE_CORE_0_DRAM0_PMS_MONITOR_VIOLATE_CLR );
-}
-
-static inline uint32_t memprot_ll_dram0_get_monitor_enable_register(void)
-{
-    return REG_READ(SENSITIVE_CORE_0_DRAM0_PMS_MONITOR_1_REG);
-}
-
-// permission violation status
-static inline uint32_t memprot_ll_dram0_get_monitor_status_intr(void)
-{
-    return REG_GET_FIELD( SENSITIVE_CORE_0_DRAM0_PMS_MONITOR_2_REG, SENSITIVE_CORE_0_DRAM0_PMS_MONITOR_VIOLATE_INTR );
-}
-
-static inline uint32_t memprot_ll_dram0_get_monitor_status_fault_lock(void)
-{
-    return REG_GET_FIELD( SENSITIVE_CORE_0_DRAM0_PMS_MONITOR_2_REG, SENSITIVE_CORE_0_DRAM0_PMS_MONITOR_VIOLATE_STATUS_LOCK );
-}
-
-static inline uint32_t memprot_ll_dram0_get_monitor_status_fault_world(void)
-{
-    return REG_GET_FIELD( SENSITIVE_CORE_0_DRAM0_PMS_MONITOR_2_REG, SENSITIVE_CORE_0_DRAM0_PMS_MONITOR_VIOLATE_STATUS_WORLD );
-}
-
-static inline uint32_t memprot_ll_dram0_get_monitor_status_fault_addr(void)
-{
-    uint32_t addr = REG_GET_FIELD( SENSITIVE_CORE_0_DRAM0_PMS_MONITOR_2_REG, SENSITIVE_CORE_0_DRAM0_PMS_MONITOR_VIOLATE_STATUS_ADDR );
-    return addr > 0 ? (addr << I_D_FAULT_ADDR_SHIFT) + DRAM0_ADDRESS_LOW : 0;
-}
-
-static inline uint32_t memprot_ll_dram0_get_monitor_status_fault_wr(void)
-{
-    return REG_GET_FIELD( SENSITIVE_CORE_0_DRAM0_PMS_MONITOR_3_REG, SENSITIVE_CORE_0_DRAM0_PMS_MONITOR_VIOLATE_STATUS_WR );
-}
-
-static inline uint32_t memprot_ll_dram0_get_monitor_status_fault_byte_en(void)
-{
-    return REG_GET_FIELD( SENSITIVE_CORE_0_DRAM0_PMS_MONITOR_2_REG, SENSITIVE_CORE_0_DRAM0_PMS_MONITOR_VIOLATE_STATUS_BYTEEN );
-}
-
-static inline uint32_t memprot_ll_dram0_get_monitor_status_register_1(void)
-{
-    return REG_READ(SENSITIVE_CORE_0_DRAM0_PMS_MONITOR_2_REG);
-}
-
-static inline uint32_t memprot_ll_dram0_get_monitor_status_register_2(void)
-{
-    return REG_READ(SENSITIVE_CORE_0_DRAM0_PMS_MONITOR_3_REG);
-}
-
-#ifdef __cplusplus
-}
-#endif

components/hal/esp32c2/include/hal/regi2c_ctrl_ll.h

@@ -7,6 +7,7 @@
 #pragma once
 
 #include <stdint.h>
+#include <stdbool.h>
 #include "soc/soc.h"
 #include "soc/regi2c_defs.h"
 

components/hal/esp32c3/include/hal/clk_gate_ll.h

@@ -159,7 +159,7 @@ static inline uint32_t periph_ll_get_rst_en_mask(periph_module_t periph, bool en
     }
 }
 
-static uint32_t periph_ll_get_clk_en_reg(periph_module_t periph)
+static inline uint32_t periph_ll_get_clk_en_reg(periph_module_t periph)
 {
     switch (periph) {
     case PERIPH_RNG_MODULE:
@@ -187,7 +187,7 @@ static uint32_t periph_ll_get_clk_en_reg(periph_module_t periph)
     }
 }
 
-static uint32_t periph_ll_get_rst_en_reg(periph_module_t periph)
+static inline uint32_t periph_ll_get_rst_en_reg(periph_module_t periph)
 {
     switch (periph) {
     case PERIPH_RNG_MODULE:

components/hal/esp32c3/include/hal/ds_ll.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-2023 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 
 /*******************************************************************************
  * NOTICE
@@ -25,6 +17,7 @@
 
 #include "soc/hwcrypto_reg.h"
 #include "soc/soc_caps.h"
+#include "hal/ds_types.h"
 
 #ifdef __cplusplus
 extern "C" {

components/hal/esp32c3/include/hal/hmac_ll.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-2023 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 
 /*******************************************************************************
  * NOTICE
@@ -24,7 +16,7 @@
 
 #include "soc/system_reg.h"
 #include "soc/hwcrypto_reg.h"
-#include "hal/hmac_hal.h"
+#include "hal/hmac_types.h"
 
 #define SHA256_BLOCK_SZ 64
 #define SHA256_DIGEST_SZ 32

components/hal/esp32c3/include/hal/memprot_ll.h

@@ -6,8 +6,10 @@
 
 #pragma once
 
+#include <stdbool.h>
 #include "soc/ext_mem_defs.h"
 #include "soc/memprot_defs.h"
+#include "soc/periph_defs.h"
 #include "hal/memprot_types.h"
 
 #ifdef __cplusplus

components/hal/esp32c3/include/hal/mpi_ll.h

@@ -8,6 +8,7 @@
 #include <stdbool.h>
 #include <string.h>
 #include "hal/assert.h"
+#include "hal/mpi_types.h"
 #include "soc/hwcrypto_periph.h"
 #include "soc/system_reg.h"
 #include "soc/mpi_periph.h"

components/hal/esp32c3/include/hal/mpu_ll.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-2023 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 
 #include <stdint.h>
 

components/hal/esp32c3/include/hal/sha_ll.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-2023 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 #pragma once
 
 #include <stdbool.h>

components/hal/esp32c3/include/hal/spimem_flash_ll.h

@@ -24,6 +24,7 @@
 #include "hal/assert.h"
 #include "hal/spi_types.h"
 #include "hal/spi_flash_types.h"
+#include "hal/misc.h"
 
 #ifdef __cplusplus
 extern "C" {

components/hal/esp32c3/include/hal/uhci_ll.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-2023 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 
 // The LL layer for UHCI register operations.
 // Note that most of the register operations in this layer are non-atomic operations.

components/hal/esp32c3/rtc_cntl_hal.c

@@ -1,16 +1,8 @@
-// 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-2023 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 
 // The HAL layer for RTC CNTL (common part)
 

components/hal/esp32c6/include/hal/clk_gate_ll.h

@@ -168,7 +168,7 @@ static inline uint32_t periph_ll_get_rst_en_mask(periph_module_t periph, bool en
     }
 }
 
-static uint32_t periph_ll_get_clk_en_reg(periph_module_t periph)
+static inline uint32_t periph_ll_get_clk_en_reg(periph_module_t periph)
 {
     switch (periph) {
         case PERIPH_SARADC_MODULE:
@@ -236,7 +236,7 @@ static uint32_t periph_ll_get_clk_en_reg(periph_module_t periph)
     }
 }
 
-static uint32_t periph_ll_get_rst_en_reg(periph_module_t periph)
+static inline uint32_t periph_ll_get_rst_en_reg(periph_module_t periph)
 {
     switch (periph) {
         case PERIPH_SARADC_MODULE:

components/hal/esp32c6/include/hal/ds_ll.h

@@ -17,6 +17,8 @@
 
 #include "soc/hwcrypto_reg.h"
 #include "soc/soc_caps.h"
+#include "hal/ds_types.h"
+
 
 #ifdef __cplusplus
 extern "C" {

components/hal/esp32c6/include/hal/ecc_ll.h

@@ -8,6 +8,7 @@
 #include <stdbool.h>
 #include <string.h>
 #include "hal/assert.h"
+#include "hal/ecc_types.h"
 #include "soc/ecc_mult_reg.h"
 
 #ifdef __cplusplus

components/hal/esp32c6/include/hal/hmac_ll.h

@@ -16,7 +16,7 @@
 
 #include "soc/system_reg.h"
 #include "soc/hwcrypto_reg.h"
-#include "hal/hmac_hal.h"
+#include "hal/hmac_types.h"
 
 #define SHA256_BLOCK_SZ 64
 #define SHA256_DIGEST_SZ 32

components/hal/esp32c6/include/hal/lp_periph_clk_ctrl_ll.h

@@ -17,7 +17,7 @@
 extern "C" {
 #endif
 
-static uint32_t lp_periph_ll_get_clk_en_mask(lp_periph_module_t lp_periph)
+static inline uint32_t lp_periph_ll_get_clk_en_mask(lp_periph_module_t lp_periph)
 {
     switch (lp_periph) {
     case LP_PERIPH_I2C0_MODULE:
@@ -30,7 +30,7 @@ static uint32_t lp_periph_ll_get_clk_en_mask(lp_periph_module_t lp_periph)
     }
 }
 
-static uint32_t lp_periph_ll_get_rst_en_mask(lp_periph_module_t lp_periph)
+static inline uint32_t lp_periph_ll_get_rst_en_mask(lp_periph_module_t lp_periph)
 {
     switch (lp_periph) {
     case LP_PERIPH_I2C0_MODULE:

components/hal/esp32c6/include/hal/modem_lpcon_ll.h

@@ -9,6 +9,7 @@
 #pragma once
 
 #include <stdlib.h>
+#include <stdbool.h>
 #include "soc/soc.h"
 #include "hal/assert.h"
 #include "modem/modem_lpcon_struct.h"

components/hal/esp32c6/include/hal/modem_syscon_ll.h

@@ -9,6 +9,7 @@
 #pragma once
 
 #include <stdlib.h>
+#include <stdbool.h>
 #include "soc/soc.h"
 #include "hal/assert.h"
 #include "modem/modem_syscon_struct.h"

components/hal/esp32c6/include/hal/mpi_ll.h

@@ -8,6 +8,7 @@
 #include <stdbool.h>
 #include <string.h>
 #include "hal/assert.h"
+#include "hal/mpi_types.h"
 #include "soc/pcr_reg.h"
 #include "soc/rsa_reg.h"
 #include "soc/mpi_periph.h"

components/hal/esp32c6/include/hal/sdio_slave_ll.h

@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "hal/sdio_slave_hal.h"
+#include "hal/sdio_slave_types.h"
 #include "soc/slc_struct.h"
 #include "soc/slc_reg.h"
 #include "soc/host_struct.h"
@@ -24,6 +24,10 @@
 #include "soc/hinf_struct.h"
 #include "soc/lldesc.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /// Get address of the only SLC registers
 #define sdio_slave_ll_get_slc(ID)   (&SLC)
 /// Get address of the only HOST registers
@@ -507,3 +511,7 @@ static inline void sdio_slave_ll_slvint_fetch_clear(slc_dev_t *slc, sdio_slave_l
     *out_slv_int = slv_int;
     slc->slc0int_clr.val = slv_int;
 }
+
+#ifdef __cplusplus
+}
+#endif

components/hal/esp32c6/include/hal/spimem_flash_ll.h

@@ -22,6 +22,7 @@
 #include "soc/spi_periph.h"
 #include "soc/spi_mem_struct.h"
 #include "hal/assert.h"
+#include "hal/misc.h"
 #include "hal/spi_types.h"
 #include "hal/spi_flash_types.h"
 #include "soc/pcr_struct.h"

components/hal/esp32c6/include/hal/twai_ll.h

@@ -17,6 +17,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdlib.h>
+#include "esp_assert.h"
 #include "hal/misc.h"
 #include "hal/assert.h"
 #include "hal/twai_types.h"
@@ -82,7 +83,7 @@ typedef union {
     uint8_t bytes[13];
 } __attribute__((packed)) twai_ll_frame_buffer_t;
 
-_Static_assert(sizeof(twai_ll_frame_buffer_t) == 13, "TX/RX buffer type should be 13 bytes");
+ESP_STATIC_ASSERT(sizeof(twai_ll_frame_buffer_t) == 13, "TX/RX buffer type should be 13 bytes");
 
 /* ---------------------------- Peripheral Control Register ----------------- */
 

components/hal/esp32h2/include/hal/clk_gate_ll.h

@@ -198,7 +198,7 @@ static inline uint32_t periph_ll_get_rst_en_mask(periph_module_t periph, bool en
     }
 }
 
-static uint32_t periph_ll_get_clk_en_reg(periph_module_t periph)
+static inline uint32_t periph_ll_get_clk_en_reg(periph_module_t periph)
 {// ESP32H2-TODO: IDF-6400
     switch (periph) {
     // case PERIPH_RNG_MODULE:
@@ -274,7 +274,7 @@ static uint32_t periph_ll_get_clk_en_reg(periph_module_t periph)
     }
 }
 
-static uint32_t periph_ll_get_rst_en_reg(periph_module_t periph)
+static inline uint32_t periph_ll_get_rst_en_reg(periph_module_t periph)
 {
     // ESP32H2-TODO: IDF-6400
     switch (periph) {

components/hal/esp32h2/include/hal/ds_ll.h

@@ -17,6 +17,7 @@
 
 #include "soc/hwcrypto_reg.h"
 #include "soc/soc_caps.h"
+#include "hal/ds_types.h"
 
 #ifdef __cplusplus
 extern "C" {

components/hal/esp32h2/include/hal/ecc_ll.h

@@ -8,6 +8,7 @@
 #include <stdbool.h>
 #include <string.h>
 #include "hal/assert.h"
+#include "hal/ecc_types.h"
 #include "soc/ecc_mult_reg.h"
 
 #ifdef __cplusplus

components/hal/esp32h2/include/hal/hmac_ll.h

@@ -16,7 +16,7 @@
 
 #include "soc/system_reg.h"
 #include "soc/hwcrypto_reg.h"
-#include "hal/hmac_hal.h"
+#include "hal/hmac_types.h"
 
 #define SHA256_BLOCK_SZ 64
 #define SHA256_DIGEST_SZ 32

components/hal/esp32h2/include/hal/lp_clkrst_ll.h

@@ -8,6 +8,7 @@
 
 #pragma once
 
+#include <stdbool.h>
 #include <stdlib.h>
 #include "soc/soc.h"
 #include "soc/lp_clkrst_struct.h"

components/hal/esp32h2/include/hal/lp_timer_ll.h

@@ -14,6 +14,7 @@
 #include "soc/lp_timer_struct.h"
 #include "soc/lp_aon_reg.h"
 #include "hal/lp_timer_types.h"
+#include "esp_attr.h"
 
 #ifdef __cplusplus
 extern "C" {

components/hal/esp32h2/include/hal/modem_lpcon_ll.h

@@ -9,6 +9,7 @@
 #pragma once
 
 #include <stdlib.h>
+#include <stdbool.h>
 #include "soc/soc.h"
 #include "hal/assert.h"
 #include "modem/modem_lpcon_struct.h"

components/hal/esp32h2/include/hal/modem_syscon_ll.h

@@ -9,6 +9,7 @@
 #pragma once
 
 #include <stdlib.h>
+#include <stdbool.h>
 #include "soc/soc.h"
 #include "hal/assert.h"
 #include "modem/modem_syscon_struct.h"

components/hal/esp32h2/include/hal/mpi_ll.h

@@ -8,6 +8,7 @@
 #include <stdbool.h>
 #include <string.h>
 #include "hal/assert.h"
+#include "hal/mpi_types.h"
 #include "soc/pcr_reg.h"
 #include "soc/rsa_reg.h"
 #include "soc/mpi_periph.h"

components/hal/esp32h2/include/hal/mwdt_ll.h

@@ -27,19 +27,19 @@ extern "C" {
 #define MWDT_LL_DEFAULT_CLK_PRESCALER 24000
 
 //Type check wdt_stage_action_t
-_Static_assert(WDT_STAGE_ACTION_OFF == TIMG_WDT_STG_SEL_OFF, "Add mapping to LL watchdog timeout behavior, since it's no longer naturally compatible with wdt_stage_action_t");
-_Static_assert(WDT_STAGE_ACTION_INT == TIMG_WDT_STG_SEL_INT, "Add mapping to LL watchdog timeout behavior, since it's no longer naturally compatible with wdt_stage_action_t");
-_Static_assert(WDT_STAGE_ACTION_RESET_CPU == TIMG_WDT_STG_SEL_RESET_CPU, "Add mapping to LL watchdog timeout behavior, since it's no longer naturally compatible with wdt_stage_action_t");
-_Static_assert(WDT_STAGE_ACTION_RESET_SYSTEM == TIMG_WDT_STG_SEL_RESET_SYSTEM, "Add mapping to LL watchdog timeout behavior, since it's no longer naturally compatible with wdt_stage_action_t");
+ESP_STATIC_ASSERT(WDT_STAGE_ACTION_OFF == TIMG_WDT_STG_SEL_OFF, "Add mapping to LL watchdog timeout behavior, since it's no longer naturally compatible with wdt_stage_action_t");
+ESP_STATIC_ASSERT(WDT_STAGE_ACTION_INT == TIMG_WDT_STG_SEL_INT, "Add mapping to LL watchdog timeout behavior, since it's no longer naturally compatible with wdt_stage_action_t");
+ESP_STATIC_ASSERT(WDT_STAGE_ACTION_RESET_CPU == TIMG_WDT_STG_SEL_RESET_CPU, "Add mapping to LL watchdog timeout behavior, since it's no longer naturally compatible with wdt_stage_action_t");
+ESP_STATIC_ASSERT(WDT_STAGE_ACTION_RESET_SYSTEM == TIMG_WDT_STG_SEL_RESET_SYSTEM, "Add mapping to LL watchdog timeout behavior, since it's no longer naturally compatible with wdt_stage_action_t");
 //Type check wdt_reset_sig_length_t
-_Static_assert(WDT_RESET_SIG_LENGTH_100ns == TIMG_WDT_RESET_LENGTH_100_NS, "Add mapping to LL watchdog timeout behavior, since it's no longer naturally compatible with wdt_reset_sig_length_t");
-_Static_assert(WDT_RESET_SIG_LENGTH_200ns == TIMG_WDT_RESET_LENGTH_200_NS, "Add mapping to LL watchdog timeout behavior, since it's no longer naturally compatible with wdt_reset_sig_length_t");
-_Static_assert(WDT_RESET_SIG_LENGTH_300ns == TIMG_WDT_RESET_LENGTH_300_NS, "Add mapping to LL watchdog timeout behavior, since it's no longer naturally compatible with wdt_reset_sig_length_t");
-_Static_assert(WDT_RESET_SIG_LENGTH_400ns == TIMG_WDT_RESET_LENGTH_400_NS, "Add mapping to LL watchdog timeout behavior, since it's no longer naturally compatible with wdt_reset_sig_length_t");
-_Static_assert(WDT_RESET_SIG_LENGTH_500ns == TIMG_WDT_RESET_LENGTH_500_NS, "Add mapping to LL watchdog timeout behavior, since it's no longer naturally compatible with wdt_reset_sig_length_t");
-_Static_assert(WDT_RESET_SIG_LENGTH_800ns == TIMG_WDT_RESET_LENGTH_800_NS, "Add mapping to LL watchdog timeout behavior, since it's no longer naturally compatible with wdt_reset_sig_length_t");
-_Static_assert(WDT_RESET_SIG_LENGTH_1_6us == TIMG_WDT_RESET_LENGTH_1600_NS, "Add mapping to LL watchdog timeout behavior, since it's no longer naturally compatible with wdt_reset_sig_length_t");
-_Static_assert(WDT_RESET_SIG_LENGTH_3_2us == TIMG_WDT_RESET_LENGTH_3200_NS, "Add mapping to LL watchdog timeout behavior, since it's no longer naturally compatible with wdt_reset_sig_length_t");
+ESP_STATIC_ASSERT(WDT_RESET_SIG_LENGTH_100ns == TIMG_WDT_RESET_LENGTH_100_NS, "Add mapping to LL watchdog timeout behavior, since it's no longer naturally compatible with wdt_reset_sig_length_t");
+ESP_STATIC_ASSERT(WDT_RESET_SIG_LENGTH_200ns == TIMG_WDT_RESET_LENGTH_200_NS, "Add mapping to LL watchdog timeout behavior, since it's no longer naturally compatible with wdt_reset_sig_length_t");
+ESP_STATIC_ASSERT(WDT_RESET_SIG_LENGTH_300ns == TIMG_WDT_RESET_LENGTH_300_NS, "Add mapping to LL watchdog timeout behavior, since it's no longer naturally compatible with wdt_reset_sig_length_t");
+ESP_STATIC_ASSERT(WDT_RESET_SIG_LENGTH_400ns == TIMG_WDT_RESET_LENGTH_400_NS, "Add mapping to LL watchdog timeout behavior, since it's no longer naturally compatible with wdt_reset_sig_length_t");
+ESP_STATIC_ASSERT(WDT_RESET_SIG_LENGTH_500ns == TIMG_WDT_RESET_LENGTH_500_NS, "Add mapping to LL watchdog timeout behavior, since it's no longer naturally compatible with wdt_reset_sig_length_t");
+ESP_STATIC_ASSERT(WDT_RESET_SIG_LENGTH_800ns == TIMG_WDT_RESET_LENGTH_800_NS, "Add mapping to LL watchdog timeout behavior, since it's no longer naturally compatible with wdt_reset_sig_length_t");
+ESP_STATIC_ASSERT(WDT_RESET_SIG_LENGTH_1_6us == TIMG_WDT_RESET_LENGTH_1600_NS, "Add mapping to LL watchdog timeout behavior, since it's no longer naturally compatible with wdt_reset_sig_length_t");
+ESP_STATIC_ASSERT(WDT_RESET_SIG_LENGTH_3_2us == TIMG_WDT_RESET_LENGTH_3200_NS, "Add mapping to LL watchdog timeout behavior, since it's no longer naturally compatible with wdt_reset_sig_length_t");
 
 /**
  * @brief Enable the MWDT

components/hal/esp32s2/include/hal/crypto_dma_ll.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-2023 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 
 /*******************************************************************************
  * NOTICE
@@ -23,7 +15,9 @@
 extern "C" {
 #endif
 
+#include <stdbool.h>
 #include "soc/hwcrypto_reg.h"
+#include "soc/crypto_dma_reg.h"
 #include "soc/dport_reg.h"
 
 typedef enum {

components/hal/esp32s2/include/hal/dac_ll.h

@@ -13,6 +13,7 @@
 #pragma once
 
 #include <stdlib.h>
+#include <stdbool.h>
 #include "hal/misc.h"
 #include "soc/dac_periph.h"
 #include "hal/dac_types.h"

components/hal/esp32s2/include/hal/dedic_gpio_ll.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-2023 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 #pragma once
 
 #ifdef __cplusplus

components/hal/esp32s2/include/hal/memprot_ll.h

@@ -10,6 +10,8 @@
 #include "soc/memprot_defs.h"
 #include "hal/memprot_types.h"
 #include "soc/dport_reg.h"
+#include "soc/dport_access.h"
+#include "soc/periph_defs.h"
 
 #ifdef __cplusplus
 extern "C" {

components/hal/esp32s2/include/hal/memprot_peri_ll.h

@@ -8,6 +8,8 @@
 
 #include <stdbool.h>
 #include "soc/memprot_defs.h"
+#include "soc/dport_access.h"
+#include "soc/periph_defs.h"
 #include "hal/memprot_types.h"
 
 #ifdef __cplusplus

components/hal/esp32s2/include/hal/mmu_ll.h

@@ -8,7 +8,8 @@
 
 #pragma once
 
-#include "stdint.h"
+#include <stdint.h>
+#include <stdbool.h>
 #include "soc/extmem_reg.h"
 #include "soc/ext_mem_defs.h"
 #include "hal/assert.h"

components/hal/esp32s2/include/hal/mpi_ll.h

@@ -8,6 +8,7 @@
 #include <stdbool.h>
 #include <string.h>
 #include "hal/assert.h"
+#include "hal/mpi_types.h"
 #include "soc/hwcrypto_periph.h"
 #include "soc/dport_reg.h"
 #include "soc/mpi_periph.h"

components/hal/esp32s2/include/hal/mpu_ll.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-2023 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 
 #include <stdint.h>
 

components/hal/esp32s2/include/hal/sha_ll.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-2023 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 #pragma once
 
 #include <stdbool.h>

components/hal/esp32s2/include/hal/spi_flash_encrypted_ll.h

@@ -1,16 +1,8 @@
-// Copyright 2015-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.
+/*
+ * SPDX-FileCopyrightText: 2015-2023 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 
 /*******************************************************************************
  * NOTICE

components/hal/esp32s2/include/hal/spimem_flash_ll.h

@@ -24,6 +24,7 @@
 #include "hal/assert.h"
 #include "hal/spi_types.h"
 #include "hal/spi_flash_types.h"
+#include "hal/misc.h"
 
 #ifdef __cplusplus
 extern "C" {

components/hal/esp32s2/include/hal/trace_ll.h

@@ -1,23 +1,23 @@
-// 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-2023 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 
 #pragma once
 
 #include "esp_bit_defs.h"
 #include "soc/dport_reg.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 static inline void trace_ll_set_mem_block(int block)
 {
     DPORT_WRITE_PERI_REG(DPORT_PMS_OCCUPY_3_REG, BIT(block-4));
 }
+
+#ifdef __cplusplus
+}
+#endif

components/hal/esp32s2/include/hal/usb_ll.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-2023 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 
 
 #include "soc/soc.h"
@@ -18,6 +10,10 @@
 #include "soc/gpio_sig_map.h"
 #include "soc/usb_periph.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 static inline void usb_ll_int_phy_enable(void)
 {
     USB_WRAP.otg_conf.pad_enable = 1;
@@ -40,3 +36,7 @@ static inline void usb_ll_int_phy_pullup_conf(bool dp_pu, bool dp_pd, bool dm_pu
     conf.dm_pulldown = dm_pd;
     USB_WRAP.otg_conf = conf;
 }
+
+#ifdef __cplusplus
+}
+#endif

components/hal/esp32s3/include/hal/clk_gate_ll.h

@@ -196,7 +196,7 @@ static inline uint32_t periph_ll_get_rst_en_mask(periph_module_t periph, bool en
     }
 }
 
-static uint32_t periph_ll_get_clk_en_reg(periph_module_t periph)
+static inline uint32_t periph_ll_get_clk_en_reg(periph_module_t periph)
 {
     switch (periph) {
     case PERIPH_DEDIC_GPIO_MODULE:
@@ -223,7 +223,7 @@ static uint32_t periph_ll_get_clk_en_reg(periph_module_t periph)
     }
 }
 
-static uint32_t periph_ll_get_rst_en_reg(periph_module_t periph)
+static inline uint32_t periph_ll_get_rst_en_reg(periph_module_t periph)
 {
     switch (periph) {
     case PERIPH_DEDIC_GPIO_MODULE:

components/hal/esp32s3/include/hal/ds_ll.h

@@ -12,6 +12,7 @@
 
 #include "soc/hwcrypto_reg.h"
 #include "soc/soc_caps.h"
+#include "hal/ds_types.h"
 
 #ifdef __cplusplus
 extern "C" {

components/hal/esp32s3/include/hal/hmac_ll.h

@@ -14,6 +14,7 @@
 
 #include <stddef.h> /* For size_t type */
 #include "soc/hwcrypto_reg.h"
+#include "hal/hmac_types.h"
 
 #define SHA256_BLOCK_SZ 64
 #define SHA256_DIGEST_SZ 32

components/hal/esp32s3/include/hal/memprot_ll.h

@@ -6,10 +6,12 @@
 
 #pragma once
 
+#include <stdbool.h>
 #include "soc/ext_mem_defs.h"
 #include "soc/memprot_defs.h"
 #include "hal/memprot_types.h"
 #include "soc/sensitive_reg.h"
+#include "soc/periph_defs.h"
 
 /* Uncomment to enable MPS debug assertions on false register writes.
  * It irregularly happens the PMS registers cannot be written which causes unpredictable malfunction of the Memprot feature
@@ -27,15 +29,14 @@ extern "C" {
 
 //highest address of each Level slot in the SRAM's 3rd memory region (I/D access, 416kB)
 //quick resolver of split-address category bits
-static const intptr_t sram_rg3_level_hlimits[] = {
-        0x4037FFFF, //level 2 (32KB)
-        0x4038FFFF, //level 3 (64KB)
-        0x4039FFFF, //level 4 (64KB)
-        0x403AFFFF, //level 5 (64KB)
-        0x403BFFFF, //level 6 (64KB)
-        0x403CFFFF, //level 7 (64KB)
-        0x403DFFFF  //level 8 (64KB)
-};
+//         0x4037FFFF   level 2 (32KB)
+//         0x4038FFFF   level 3 (64KB)
+//         0x4039FFFF   level 4 (64KB)
+//         0x403AFFFF   level 5 (64KB)
+//         0x403BFFFF   level 6 (64KB)
+//         0x403CFFFF   level 7 (64KB)
+//         0x403DFFFF   level 8 (64KB)
+#define SRAM_RG3_LEVEL_HLIMITS(level) ((intptr_t[]) {0x4037FFFF,0x4038FFFF,0x4039FFFF,0x403AFFFF,0x403BFFFF,0x403CFFFF,0x403DFFFF} [(level)])
 
 /* ******************************************************************************************************
  * *** COMMON ***
@@ -178,7 +179,7 @@ static inline void memprot_ll_prepare_iram0_split_line_regval(const uint32_t add
     //set category bits for given split line
     uint32_t cat[7] = {[0 ... 6]=MEMP_HAL_CORE_X_IRAM0_DRAM0_DMA_SRAM_CATEGORY_BITS_ABOVE_SA};
     for (size_t x=0; x<7; x++) {
-        if (addr <= sram_rg3_level_hlimits[x]) {
+        if (addr <= SRAM_RG3_LEVEL_HLIMITS(x)) {
             cat[x] = MEMP_HAL_CORE_X_IRAM0_DRAM0_DMA_SRAM_CATEGORY_BITS_EQUAL_SA;
             break;
         } else {
@@ -1252,7 +1253,7 @@ static inline void memprot_ll_prepare_dram0_split_line_regval(const uint32_t add
     //set category bits for given split line
     uint32_t cat[7] = {[0 ... 6]=MEMP_HAL_CORE_X_IRAM0_DRAM0_DMA_SRAM_CATEGORY_BITS_ABOVE_SA};
     for (size_t x=0; x<7; x++) {
-        if (addr <= MAP_IRAM_TO_DRAM(sram_rg3_level_hlimits[x])) {
+        if (addr <= MAP_IRAM_TO_DRAM(SRAM_RG3_LEVEL_HLIMITS(x))) {
             cat[x] = MEMP_HAL_CORE_X_IRAM0_DRAM0_DMA_SRAM_CATEGORY_BITS_EQUAL_SA;
             break;
         } else {

components/hal/esp32s3/include/hal/mpi_ll.h

@@ -8,6 +8,7 @@
 #include <stdbool.h>
 #include <string.h>
 #include "hal/assert.h"
+#include "hal/mpi_types.h"
 #include "soc/hwcrypto_periph.h"
 #include "soc/dport_reg.h"
 #include "soc/mpi_periph.h"

components/hal/esp32s3/include/hal/mpu_ll.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-2023 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 
 #include <stdint.h>
 

components/hal/esp32s3/include/hal/regi2c_ctrl_ll.h

@@ -7,6 +7,7 @@
 #pragma once
 
 #include <stdint.h>
+#include <stdbool.h>
 #include "soc/soc.h"
 #include "soc/regi2c_defs.h"
 

components/hal/esp32s3/include/hal/rwdt_ll.h

@@ -16,6 +16,7 @@ extern "C" {
 #include <stdlib.h>
 #include <stdbool.h>
 #include "hal/wdt_types.h"
+#include "hal/misc.h"
 #include "soc/rtc_cntl_periph.h"
 #include "soc/rtc_cntl_struct.h"
 #include "soc/efuse_reg.h"

components/hal/esp32s3/include/hal/sha_ll.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-2023 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 #pragma once
 
 #include <stdbool.h>

components/hal/esp32s3/include/hal/spi_flash_encrypted_ll.h

@@ -1,16 +1,8 @@
-// Copyright 2015-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.
+/*
+ * SPDX-FileCopyrightText: 2015-2023 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 
 /*******************************************************************************
  * NOTICE

components/hal/esp32s3/include/hal/spimem_flash_ll.h

@@ -24,6 +24,7 @@
 #include "soc/spi_mem_struct.h"
 #include "hal/spi_types.h"
 #include "hal/spi_flash_types.h"
+#include "hal/misc.h"
 
 #ifdef __cplusplus
 extern "C" {

components/hal/esp32s3/include/hal/trace_ll.h

@@ -10,6 +10,10 @@
 #include "soc/dport_reg.h"
 #include "soc/tracemem_config.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 static inline void trace_ll_set_mem_block(int cpu, int block)
 {
     uint32_t block_bits = 0;
@@ -21,3 +25,7 @@ static inline void trace_ll_set_mem_block(int cpu, int block)
     }
     DPORT_SET_PERI_REG_MASK(SENSITIVE_INTERNAL_SRAM_USAGE_2_REG, block_bits);
 }
+
+#ifdef __cplusplus
+}
+#endif

components/hal/esp32s3/include/hal/uhci_ll.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-2023 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 
 // The LL layer for UHCI register operations.
 // Note that most of the register operations in this layer are non-atomic operations.

components/hal/esp32s3/include/hal/usb_ll.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-2023 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 
 
 #include "soc/soc.h"
@@ -19,6 +11,10 @@
 #include "soc/usb_periph.h"
 #include "soc/rtc_cntl_struct.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 static inline void usb_ll_int_phy_enable(void)
 {
     USB_WRAP.otg_conf.pad_enable = 1;
@@ -51,3 +47,7 @@ static inline void usb_ll_int_phy_pullup_conf(bool dp_pu, bool dp_pd, bool dm_pu
     conf.dm_pulldown = dm_pd;
     USB_WRAP.otg_conf = conf;
 }
+
+#ifdef __cplusplus
+}
+#endif

components/hal/include/hal/adc_types.h

@@ -12,6 +12,10 @@
 #include "soc/clk_tree_defs.h"
 #include "esp_attr.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @brief ADC unit
  */
@@ -241,3 +245,7 @@ typedef struct {
     uint32_t div_a;     /*!<Division factor. Range: 0 ~ 63. */
 } adc_digi_clk_t;
 #endif
+
+#ifdef __cplusplus
+}
+#endif

components/hal/include/hal/aes_hal.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-2023 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 
 /*******************************************************************************
  * NOTICE

components/hal/include/hal/aes_types.h

@@ -1,18 +1,14 @@
-// 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-2023 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 #pragma once
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* padlock.c and aesni.c rely on these values! */
 #define ESP_AES_ENCRYPT     1
 #define ESP_AES_DECRYPT     0
@@ -46,3 +42,7 @@ typedef enum {
 #define AES_128_KEY_BYTES   (128/8)
 #define AES_192_KEY_BYTES   (192/8)
 #define AES_256_KEY_BYTES   (256/8)
+
+#ifdef __cplusplus
+}
+#endif

components/hal/include/hal/apm_hal.h

@@ -5,12 +5,14 @@
  */
 #pragma once
 
-#include "hal/apm_ll.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+#include "soc/soc_caps.h"
+#if SOC_APM_SUPPORTED
+#include "hal/apm_ll.h"
+
 /**
  * @brief Region configuration data.
  */
@@ -129,6 +131,8 @@ void apm_hp_hal_master_sec_mode_config(apm_hp_secure_mode_config_t *sec_mode_dat
  */
 void apm_hp_hal_reset_event_enable(bool enable);
 
+#endif
+
 #ifdef __cplusplus
 }
 #endif

components/hal/include/hal/assist_debug_hal.h

@@ -8,7 +8,10 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include "esp_attr.h"
+#include "soc/soc_caps.h"
+#if SOC_ASSIST_DEBUG_SUPPORTED
 #include "hal/assist_debug_ll.h"
+#endif
 
 #ifdef __cplusplus
 extern "C" {

components/hal/include/hal/cache_hal.h

@@ -8,6 +8,7 @@
 #pragma once
 
 #include <stdbool.h>
+#include <stdint.h>
 #include "hal/cache_types.h"
 
 #ifdef __cplusplus

components/hal/include/hal/ds_hal.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-2023 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 
 /*******************************************************************************
  * NOTICE
@@ -20,34 +12,15 @@
 
 #pragma once
 
-#if CONFIG_IDF_TARGET_ESP32
-#error "ESP32 doesn't have a DS peripheral"
-#endif
-
 #include <stdint.h>
 #include <stddef.h>
 #include <stdbool.h>
+#include "hal/ds_types.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-/**
- * The result when checking whether the key to decrypt the RSA parameters is ready.
- */
-typedef enum {
-    DS_KEY_INPUT_OK = 0, /**< The decryption key is ready. */
-    DS_NO_KEY_INPUT,     /**< Dependent peripheral providing key hasn't been activated. */
-    DS_OTHER_WRONG,      /**< Dependent peripheral running but problem receiving the key. */
-} ds_key_check_t;
-
-typedef enum {
-    DS_SIGNATURE_OK = 0,                    /**< Signature is valid and can be read. */
-    DS_SIGNATURE_PADDING_FAIL = 1,          /**< Padding invalid, signature can be read if user wants it. */
-    DS_SIGNATURE_MD_FAIL = 2,               /**< Message digest check failed, signature invalid. */
-    DS_SIGNATURE_PADDING_AND_MD_FAIL = 3,   /**< Both padding and MD check failed. */
-} ds_signature_check_t;
-
 /**
  * @brief Start the whole signing process after the input key is ready.
  *

components/hal/include/hal/ds_types.h

@@ -0,0 +1,30 @@
+/*
+ * SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#pragma once
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * The result when checking whether the key to decrypt the RSA parameters is ready.
+ */
+typedef enum {
+    DS_KEY_INPUT_OK = 0, /**< The decryption key is ready. */
+    DS_NO_KEY_INPUT,     /**< Dependent peripheral providing key hasn't been activated. */
+    DS_OTHER_WRONG,      /**< Dependent peripheral running but problem receiving the key. */
+} ds_key_check_t;
+
+typedef enum {
+    DS_SIGNATURE_OK = 0,                    /**< Signature is valid and can be read. */
+    DS_SIGNATURE_PADDING_FAIL = 1,          /**< Padding invalid, signature can be read if user wants it. */
+    DS_SIGNATURE_MD_FAIL = 2,               /**< Message digest check failed, signature invalid. */
+    DS_SIGNATURE_PADDING_AND_MD_FAIL = 3,   /**< Both padding and MD check failed. */
+} ds_signature_check_t;
+
+#ifdef __cplusplus
+}
+#endif

components/hal/include/hal/ecc_types.h

@@ -5,6 +5,10 @@
  */
 #pragma once
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef enum {
     ECC_MODE_POINT_MUL       = 0x0,         // (Rx, Ry) = K * (Px, Py)
     ECC_MODE_INVERSE_MUL,                   // R = K^(-1) * Py
@@ -28,3 +32,7 @@ typedef enum {
     ECC_MOD_N,                  // Order of the curve
     ECC_MOD_P,                  // Prime modulus
 } ecc_mod_base_t;
+
+#ifdef __cplusplus
+}
+#endif

components/hal/include/hal/emac_hal.h

@@ -6,17 +6,22 @@
 
 #pragma once
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+
 
 #include <stdint.h>
 #include <stdbool.h>
 #include "esp_assert.h"
 #include "esp_err.h"
 #include "hal/eth_types.h"
+#include "soc/soc_caps.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
+#if SOC_EMAC_SUPPORTED
 #include "hal/emac_ll.h"
 
+
+
 /**
  * @brief Indicate to ::emac_hal_receive_frame that receive frame buffer was allocated by ::emac_hal_alloc_recv_buf
  *
@@ -377,6 +382,8 @@ static inline void emac_hal_clear_all_intr(emac_hal_context_t *hal)
     emac_ll_clear_all_pending_intr(hal->dma_regs);
 }
 
+#endif  // SOC_EMAC_SUPPORTED
+
 #ifdef __cplusplus
 }
 #endif

components/hal/include/hal/esp_flash_err.h

@@ -1,16 +1,8 @@
-// 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-2023 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 
 #pragma once
 

components/hal/include/hal/eth_types.h

@@ -5,6 +5,10 @@
  */
 #pragma once
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
 * @brief Ethernet interface
 *
@@ -61,3 +65,7 @@ typedef enum {
     ETH_DMA_BURST_LEN_2,
     ETH_DMA_BURST_LEN_1,
 } eth_mac_dma_burst_len_t;
+
+#ifdef __cplusplus
+}
+#endif

components/hal/include/hal/gdma_hal.h

@@ -16,6 +16,10 @@
 extern "C" {
 #endif
 
+#include "soc/soc_caps.h"
+
+#if SOC_GDMA_SUPPORTED
+
 #include "soc/gdma_struct.h"
 
 typedef struct {
@@ -24,6 +28,8 @@ typedef struct {
 
 void gdma_hal_init(gdma_hal_context_t *hal, int group_id);
 
+#endif
+
 #ifdef __cplusplus
 }
 #endif

components/hal/include/hal/hmac_hal.h

@@ -14,22 +14,12 @@
 
 #include <stdint.h>
 #include <stdbool.h>
+#include "hal/hmac_types.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-/**
- * The HMAC peripheral can be configured to deliver its output to the user directly, or to deliver
- * the output directly to another peripheral instead, e.g. the Digital Signature peripheral.
- */
-typedef enum {
-    HMAC_OUTPUT_USER = 0,           /**< Let user provide a message and read the HMAC result */
-    HMAC_OUTPUT_DS = 1,             /**< HMAC is provided to the DS peripheral to decrypt DS private key parameters */
-    HMAC_OUTPUT_JTAG_ENABLE = 2,    /**< HMAC is used to enable JTAG after soft-disabling it */
-    HMAC_OUTPUT_ALL = 3             /**< HMAC is used for both as DS input for or enabling JTAG */
-} hmac_hal_output_t;
-
 /**
  * @brief Make the peripheral ready for use.
  *

components/hal/include/hal/hmac_types.h

@@ -0,0 +1,25 @@
+/*
+ * SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#pragma once
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * The HMAC peripheral can be configured to deliver its output to the user directly, or to deliver
+ * the output directly to another peripheral instead, e.g. the Digital Signature peripheral.
+ */
+typedef enum {
+    HMAC_OUTPUT_USER = 0,           /**< Let user provide a message and read the HMAC result */
+    HMAC_OUTPUT_DS = 1,             /**< HMAC is provided to the DS peripheral to decrypt DS private key parameters */
+    HMAC_OUTPUT_JTAG_ENABLE = 2,    /**< HMAC is used to enable JTAG after soft-disabling it */
+    HMAC_OUTPUT_ALL = 3             /**< HMAC is used for both as DS input for or enabling JTAG */
+} hmac_hal_output_t;
+
+#ifdef __cplusplus
+}
+#endif

components/hal/include/hal/i2s_hal.h

@@ -16,13 +16,16 @@
 #pragma once
 
 #include "soc/soc_caps.h"
+#if SOC_I2S_SUPPORTED
 #include "hal/i2s_types.h"
 #include "hal/i2s_ll.h"
+#endif
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+#if SOC_I2S_SUPPORTED
 /**
  * @brief General slot configuration information
  * @note It is a general purpose struct, not supposed to be used directly by user
@@ -454,6 +457,8 @@ void i2s_hal_tdm_enable_rx_channel(i2s_hal_context_t *hal);
 #define i2s_hal_get_in_eof_des_addr(hal, addr) i2s_ll_rx_get_eof_des_addr((hal)->dev, addr)
 #endif
 
+#endif // SOC_I2S_SUPPORTED
+
 #ifdef __cplusplus
 }
 #endif

components/hal/include/hal/ieee802154_common_ll.h

@@ -8,14 +8,20 @@
 
 #include <stdbool.h>
 #include <stdint.h>
+#include "soc/soc_caps.h"
+
+#if SOC_IEEE802154_SUPPORTED
 #include "soc/ieee802154_reg.h"
 #include "soc/ieee802154_struct.h"
 #include "esp_attr.h"
+#endif
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+#if SOC_IEEE802154_SUPPORTED
+
 /**
  * @brief IEEE802154 opcode.
  */
@@ -449,6 +455,8 @@ static inline void ieee802154_ll_disable_coex(void)
     IEEE802154.pti.hw_ack_pti = 1;
 }
 
+#endif
+
 #ifdef __cplusplus
 }
 #endif

components/hal/include/hal/ledc_hal.h

@@ -19,6 +19,10 @@
 #include "hal/ledc_types.h"
 #include "soc/soc_caps.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * Context that should be maintained by both the driver and the HAL
  */
@@ -434,3 +438,7 @@ void ledc_hal_clear_fade_end_intr_status(ledc_hal_context_t *hal, ledc_channel_t
  * @return None
  */
 void ledc_hal_get_clk_cfg(ledc_hal_context_t *hal, ledc_timer_t timer_sel, ledc_clk_cfg_t *clk_cfg);
+
+#ifdef __cplusplus
+}
+#endif

components/hal/include/hal/lp_timer_hal.h

@@ -9,13 +9,17 @@
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
+#include "soc/soc_caps.h"
 #include "soc/soc.h"
+#if SOC_LP_TIMER_SUPPORTED
 #include "hal/lp_timer_types.h"
+#endif
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+#if SOC_LP_TIMER_SUPPORTED
 /*
  * @brief set alarm target value
  *
@@ -40,6 +44,8 @@ void lp_timer_hal_clear_alarm_intr_status(void);
  */
 void lp_timer_hal_clear_overflow_intr_status(void);
 
+#endif
+
 #ifdef __cplusplus
 }
 #endif

components/hal/include/hal/lp_timer_types.h

@@ -16,6 +16,7 @@ extern "C" {
 /**
  * @brief The structure of the counter value in lower power timer
  */
+#if SOC_LP_TIMER_SUPPORTED
 typedef struct {
     union {
         struct {
@@ -26,6 +27,7 @@ typedef struct {
         uint64_t val; /*!< counter value */
     };
 } lp_timer_counter_value_t;
+#endif
 
 #ifdef __cplusplus
 }

components/hal/include/hal/memprot_types.h

@@ -7,12 +7,17 @@
 #pragma once
 
 #include "soc/soc.h"
+#include "soc/soc_caps.h"
+#if SOC_MEMPROT_SUPPORTED
 #include "soc/memprot_defs.h"
+#endif
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+#if SOC_MEMPROT_SUPPORTED
+
 /**
  * @brief Memprot LL error codes
  *
@@ -59,6 +64,8 @@ typedef enum {
 #define MEMP_HAL_CORE_X_IRAM0_DRAM0_DMA_SRAM_CATEGORY_BITS_EQUAL_SA  0x2 //0b10
 #define MEMP_HAL_CORE_X_IRAM0_DRAM0_DMA_SRAM_CATEGORY_BITS_ABOVE_SA  0x3 //0b11
 
+#endif
+
 #ifdef __cplusplus
 }
 #endif

components/hal/include/hal/modem_clock_hal.h

@@ -8,15 +8,16 @@
 
 #pragma once
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include "soc/soc_caps.h"
+#if SOC_MODEM_CLOCK_IS_INDEPENDENT
 #include "hal/modem_syscon_ll.h"
 #include "hal/modem_lpcon_ll.h"
 #include "hal/modem_clock_types.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef struct {
     modem_syscon_dev_t *syscon_dev;
     modem_lpcon_dev_t  *lpcon_dev;
@@ -46,3 +47,5 @@ void modem_clock_hal_deselect_all_wifi_lpclk_source(modem_clock_hal_context_t *h
 #ifdef __cplusplus
 }
 #endif
+
+#endif  // SOC_MODEM_CLOCK_IS_INDEPENDENT

components/hal/include/hal/mpi_hal.h

@@ -13,10 +13,11 @@
 #pragma once
 
 #include <stdbool.h>
+#include <stdint.h>
 #include <sys/param.h>
 #include "hal/mpi_types.h"
+#include "sdkconfig.h"
 
-#include "stdint.h"
 
 #ifdef __cplusplus
 extern "C" {

components/hal/include/hal/mpi_types.h

@@ -5,6 +5,11 @@
  */
 #pragma once
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
 typedef enum {
     MPI_MULT = 0x0,             // (X * Y)
     MPI_MODMULT,                // (X * Y) Mod M
@@ -17,3 +22,7 @@ typedef enum {
     MPI_PARAM_Z,
     MPI_PARAM_M,
 } mpi_param_t;
+
+#ifdef __cplusplus
+}
+#endif

components/hal/include/hal/mpu_hal.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-2023 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 
 #include <stdint.h>
 

components/hal/include/hal/mpu_types.h

@@ -1,21 +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.
+/*
+ * SPDX-FileCopyrightText: 2020-2023 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 #pragma once
 
 #include <stdint.h>
 #include "soc/soc_caps.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #if SOC_MPU_CONFIGURABLE_REGIONS_SUPPORTED
 typedef void** mpu_region_table_t;
 #endif
@@ -32,3 +28,7 @@ typedef enum {
     MPU_REGION_X,       // executable
     MPU_REGION_RWX      // read-write-executable
 } mpu_access_t;
+
+#ifdef __cplusplus
+}
+#endif