mirror of
https://github.com/espressif/esp-idf.git
synced 2025-08-03 12:44:33 +02:00
Merge branch 'bugfix/soc_caps_implicit_inc' into 'master'
HAL: explicitly include soc_caps.h Closes IDFGH-4547 See merge request espressif/esp-idf!11895
This commit is contained in:
@@ -16,6 +16,7 @@
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
#include "soc/i2c_periph.h"
|
#include "soc/i2c_periph.h"
|
||||||
|
#include "soc/soc_caps.h"
|
||||||
#include "hal/i2c_types.h"
|
#include "hal/i2c_types.h"
|
||||||
#include "soc/rtc_cntl_reg.h"
|
#include "soc/rtc_cntl_reg.h"
|
||||||
#include "esp_rom_sys.h"
|
#include "esp_rom_sys.h"
|
||||||
|
@@ -25,6 +25,7 @@
|
|||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
#include "soc/touch_sensor_periph.h"
|
#include "soc/touch_sensor_periph.h"
|
||||||
|
#include "soc/soc_caps.h"
|
||||||
#include "hal/touch_sensor_types.h"
|
#include "hal/touch_sensor_types.h"
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
|
@@ -16,6 +16,7 @@
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
#include "soc/i2c_periph.h"
|
#include "soc/i2c_periph.h"
|
||||||
|
#include "soc/soc_caps.h"
|
||||||
#include "hal/i2c_types.h"
|
#include "hal/i2c_types.h"
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
|
@@ -25,6 +25,7 @@
|
|||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
#include "soc/touch_sensor_periph.h"
|
#include "soc/touch_sensor_periph.h"
|
||||||
|
#include "soc/soc_caps.h"
|
||||||
#include "hal/touch_sensor_types.h"
|
#include "hal/touch_sensor_types.h"
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
|
@@ -30,6 +30,7 @@ extern "C" {
|
|||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
#include "hal/twai_types.h"
|
#include "hal/twai_types.h"
|
||||||
#include "soc/twai_periph.h"
|
#include "soc/twai_periph.h"
|
||||||
|
#include "soc/soc_caps.h"
|
||||||
|
|
||||||
/* ------------------------- Defines and Typedefs --------------------------- */
|
/* ------------------------- Defines and Typedefs --------------------------- */
|
||||||
|
|
||||||
|
@@ -16,6 +16,7 @@
|
|||||||
|
|
||||||
#include "hal/touch_sensor_hal.h"
|
#include "hal/touch_sensor_hal.h"
|
||||||
#include "hal/touch_sensor_types.h"
|
#include "hal/touch_sensor_types.h"
|
||||||
|
#include "soc/soc_caps.h"
|
||||||
|
|
||||||
void touch_hal_init(void)
|
void touch_hal_init(void)
|
||||||
{
|
{
|
||||||
|
@@ -15,6 +15,7 @@
|
|||||||
// The HAL layer for I2S (common part)
|
// The HAL layer for I2S (common part)
|
||||||
|
|
||||||
#include "soc/soc.h"
|
#include "soc/soc.h"
|
||||||
|
#include "soc/soc_caps.h"
|
||||||
#include "hal/i2s_hal.h"
|
#include "hal/i2s_hal.h"
|
||||||
|
|
||||||
#define I2S_TX_PDM_FP_DEF 960 // Set to the recommended value(960) in TRM
|
#define I2S_TX_PDM_FP_DEF 960 // Set to the recommended value(960) in TRM
|
||||||
|
@@ -23,6 +23,7 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "soc/gpio_periph.h"
|
#include "soc/gpio_periph.h"
|
||||||
|
#include "soc/soc_caps.h"
|
||||||
#include "hal/gpio_ll.h"
|
#include "hal/gpio_ll.h"
|
||||||
#include "hal/gpio_types.h"
|
#include "hal/gpio_types.h"
|
||||||
|
|
||||||
|
@@ -14,6 +14,7 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
|
#include "soc/soc_caps.h"
|
||||||
|
|
||||||
#if SOC_MPU_CONFIGURABLE_REGIONS_SUPPORTED
|
#if SOC_MPU_CONFIGURABLE_REGIONS_SUPPORTED
|
||||||
typedef void** mpu_region_table_t;
|
typedef void** mpu_region_table_t;
|
||||||
|
@@ -18,6 +18,8 @@
|
|||||||
extern "C" {
|
extern "C" {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#include "soc/soc_caps.h"
|
||||||
|
|
||||||
#define PCNT_PIN_NOT_USED (-1) /*!< When selected for a pin, this pin will not be used */
|
#define PCNT_PIN_NOT_USED (-1) /*!< When selected for a pin, this pin will not be used */
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -37,6 +37,7 @@
|
|||||||
#include "hal/spi_ll.h"
|
#include "hal/spi_ll.h"
|
||||||
#include <esp_err.h>
|
#include <esp_err.h>
|
||||||
#include "soc/lldesc.h"
|
#include "soc/lldesc.h"
|
||||||
|
#include "soc/soc_caps.h"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Input parameters to the ``spi_hal_cal_clock_conf`` to calculate the timing configuration
|
* Input parameters to the ``spi_hal_cal_clock_conf`` to calculate the timing configuration
|
||||||
|
@@ -13,6 +13,7 @@
|
|||||||
// limitations under the License.
|
// limitations under the License.
|
||||||
|
|
||||||
#include "hal/interrupt_controller_hal.h"
|
#include "hal/interrupt_controller_hal.h"
|
||||||
|
#include "soc/soc_caps.h"
|
||||||
|
|
||||||
#if __riscv
|
#if __riscv
|
||||||
#include "riscv/instruction_decode.h"
|
#include "riscv/instruction_decode.h"
|
||||||
|
@@ -16,6 +16,7 @@
|
|||||||
|
|
||||||
#include "esp_attr.h"
|
#include "esp_attr.h"
|
||||||
#include "hal/ledc_hal.h"
|
#include "hal/ledc_hal.h"
|
||||||
|
#include "soc/soc_caps.h"
|
||||||
|
|
||||||
void ledc_hal_init(ledc_hal_context_t *hal, ledc_mode_t speed_mode)
|
void ledc_hal_init(ledc_hal_context_t *hal, ledc_mode_t speed_mode)
|
||||||
{
|
{
|
||||||
|
@@ -15,6 +15,7 @@
|
|||||||
// The HAL layer for MCPWM (common part)
|
// The HAL layer for MCPWM (common part)
|
||||||
|
|
||||||
#include "hal/mcpwm_hal.h"
|
#include "hal/mcpwm_hal.h"
|
||||||
|
#include "soc/soc_caps.h"
|
||||||
|
|
||||||
void mcpwm_hal_init(mcpwm_hal_context_t *hal, const mcpwm_hal_init_config_t *init_config)
|
void mcpwm_hal_init(mcpwm_hal_context_t *hal, const mcpwm_hal_init_config_t *init_config)
|
||||||
{
|
{
|
||||||
|
@@ -13,6 +13,7 @@
|
|||||||
// limitations under the License.
|
// limitations under the License.
|
||||||
#include "hal/rmt_hal.h"
|
#include "hal/rmt_hal.h"
|
||||||
#include "hal/rmt_ll.h"
|
#include "hal/rmt_ll.h"
|
||||||
|
#include "soc/soc_caps.h"
|
||||||
|
|
||||||
void rmt_hal_init(rmt_hal_context_t *hal)
|
void rmt_hal_init(rmt_hal_context_t *hal)
|
||||||
{
|
{
|
||||||
|
@@ -15,6 +15,7 @@
|
|||||||
// The HAL layer for RTC IO (common part)
|
// The HAL layer for RTC IO (common part)
|
||||||
|
|
||||||
#include "hal/rtc_io_hal.h"
|
#include "hal/rtc_io_hal.h"
|
||||||
|
#include "soc/soc_caps.h"
|
||||||
|
|
||||||
#if SOC_RTCIO_INPUT_OUTPUT_SUPPORTED
|
#if SOC_RTCIO_INPUT_OUTPUT_SUPPORTED
|
||||||
|
|
||||||
|
@@ -16,6 +16,7 @@
|
|||||||
|
|
||||||
#include "hal/touch_sensor_hal.h"
|
#include "hal/touch_sensor_hal.h"
|
||||||
#include "hal/touch_sensor_types.h"
|
#include "hal/touch_sensor_types.h"
|
||||||
|
#include "soc/soc_caps.h"
|
||||||
|
|
||||||
void touch_hal_config(touch_pad_t touch_num)
|
void touch_hal_config(touch_pad_t touch_num)
|
||||||
{
|
{
|
||||||
|
@@ -14,6 +14,7 @@
|
|||||||
|
|
||||||
#include <stddef.h>
|
#include <stddef.h>
|
||||||
#include "hal/twai_hal.h"
|
#include "hal/twai_hal.h"
|
||||||
|
#include "soc/soc_caps.h"
|
||||||
|
|
||||||
//Default values written to various registers on initialization
|
//Default values written to various registers on initialization
|
||||||
#define TWAI_HAL_INIT_TEC 0
|
#define TWAI_HAL_INIT_TEC 0
|
||||||
|
Reference in New Issue
Block a user