blackbeard420/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf synced 2025-03-13 11:09:12 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'bugfix/soc_caps_implicit_inc_v4.2' into 'release/v4.2'

Browse Source 
HAL: explicitly include soc_caps.h  (v4.2)

See merge request espressif/esp-idf!11896
This commit is contained in:
Michael (XIAO Xufeng) 2021-01-27 10:33:42 +08:00
commit 10f16c5d72
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
components/soc/include/hal/mpu_types.h
View File

@ -14,6 +14,7 @@
#pragma once #pragma once
#include <stdint.h> #include <stdint.h>
#include "soc/mpu_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;

4
components/soc/include/hal/pcnt_types.h
View File

@ -18,6 +18,8 @@
extern "C" { extern "C" {
#endif #endif
#include "soc/pcnt_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 */
/** /**
@ -43,7 +45,7 @@ typedef enum {
PCNT_UNIT_7 = 7, /*!< PCNT unit 7 */ PCNT_UNIT_7 = 7, /*!< PCNT unit 7 */
#endif #endif
PCNT_UNIT_MAX, PCNT_UNIT_MAX,
} pcnt_unit_t; } pcnt_unit_t;
/** /**
* @brief Selection of available modes that determine the counter's action depending on the state of the control signal's input GPIO * @brief Selection of available modes that determine the counter's action depending on the state of the control signal's input GPIO

1
components/soc/include/hal/spi_hal.h
View File

@ -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/spi_caps.h"
/** /**
* Timing configuration structure that should be calculated by * Timing configuration structure that should be calculated by