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:
Michael (XIAO Xufeng)
2021-01-11 14:18:10 +08:00
18 changed files with 19 additions and 0 deletions

View File

@@ -16,6 +16,7 @@
#pragma once
#include "soc/i2c_periph.h"
#include "soc/soc_caps.h"
#include "hal/i2c_types.h"
#include "soc/rtc_cntl_reg.h"
#include "esp_rom_sys.h"

View File

@@ -25,6 +25,7 @@
#include <stdlib.h>
#include <stdbool.h>
#include "soc/touch_sensor_periph.h"
#include "soc/soc_caps.h"
#include "hal/touch_sensor_types.h"
#ifdef __cplusplus

View File

@@ -16,6 +16,7 @@
#pragma once
#include "soc/i2c_periph.h"
#include "soc/soc_caps.h"
#include "hal/i2c_types.h"
#ifdef __cplusplus

View File

@@ -25,6 +25,7 @@
#include <stdlib.h>
#include <stdbool.h>
#include "soc/touch_sensor_periph.h"
#include "soc/soc_caps.h"
#include "hal/touch_sensor_types.h"
#ifdef __cplusplus

View File

@@ -30,6 +30,7 @@ extern "C" {
#include <stdbool.h>
#include "hal/twai_types.h"
#include "soc/twai_periph.h"
#include "soc/soc_caps.h"
/* ------------------------- Defines and Typedefs --------------------------- */

View File

@@ -16,6 +16,7 @@
#include "hal/touch_sensor_hal.h"
#include "hal/touch_sensor_types.h"
#include "soc/soc_caps.h"
void touch_hal_init(void)
{

View File

@@ -15,6 +15,7 @@
// The HAL layer for I2S (common part)
#include "soc/soc.h"
#include "soc/soc_caps.h"
#include "hal/i2s_hal.h"
#define I2S_TX_PDM_FP_DEF 960 // Set to the recommended value(960) in TRM

View File

@@ -23,6 +23,7 @@
#pragma once
#include "soc/gpio_periph.h"
#include "soc/soc_caps.h"
#include "hal/gpio_ll.h"
#include "hal/gpio_types.h"

View File

@@ -14,6 +14,7 @@
#pragma once
#include <stdint.h>
#include "soc/soc_caps.h"
#if SOC_MPU_CONFIGURABLE_REGIONS_SUPPORTED
typedef void** mpu_region_table_t;

View File

@@ -18,6 +18,8 @@
extern "C" {
#endif
#include "soc/soc_caps.h"
#define PCNT_PIN_NOT_USED (-1) /*!< When selected for a pin, this pin will not be used */
/**

View File

@@ -37,6 +37,7 @@
#include "hal/spi_ll.h"
#include <esp_err.h>
#include "soc/lldesc.h"
#include "soc/soc_caps.h"
/**
* Input parameters to the ``spi_hal_cal_clock_conf`` to calculate the timing configuration

View File

@@ -13,6 +13,7 @@
// limitations under the License.
#include "hal/interrupt_controller_hal.h"
#include "soc/soc_caps.h"
#if __riscv
#include "riscv/instruction_decode.h"

View File

@@ -16,6 +16,7 @@
#include "esp_attr.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)
{

View File

@@ -15,6 +15,7 @@
// The HAL layer for MCPWM (common part)
#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)
{

View File

@@ -13,6 +13,7 @@
// limitations under the License.
#include "hal/rmt_hal.h"
#include "hal/rmt_ll.h"
#include "soc/soc_caps.h"
void rmt_hal_init(rmt_hal_context_t *hal)
{

View File

@@ -15,6 +15,7 @@
// The HAL layer for RTC IO (common part)
#include "hal/rtc_io_hal.h"
#include "soc/soc_caps.h"
#if SOC_RTCIO_INPUT_OUTPUT_SUPPORTED

View File

@@ -16,6 +16,7 @@
#include "hal/touch_sensor_hal.h"
#include "hal/touch_sensor_types.h"
#include "soc/soc_caps.h"
void touch_hal_config(touch_pad_t touch_num)
{

View File

@@ -14,6 +14,7 @@
#include <stddef.h>
#include "hal/twai_hal.h"
#include "soc/soc_caps.h"
//Default values written to various registers on initialization
#define TWAI_HAL_INIT_TEC 0