feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'bugfix/ulp_riscv_reg_ops_header_inclusion' into 'master'

Browse Source 
fix(ulp_riscv): Fixed the header inclusion dependency for ulp_riscv_register_ops.h

Closes IDFGH-10922

See merge request espressif/esp-idf!25599
This commit is contained in:
Sudeep Mohanty
2023-08-29 11:15:26 +08:00
parent cd9f48823d ac4a0649bb
commit abc89df287
5 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
components/ulp/cmake/CMakeLists.txt
View File

@@ -76,6 +76,7 @@ if(ULP_COCPU_IS_RISCV)
target_link_options(${ULP_APP_NAME} PRIVATE SHELL:-T ${IDF_PATH}/components/ulp/ld/${IDF_TARGET}.peripherals.ld) target_link_options(${ULP_APP_NAME} PRIVATE SHELL:-T ${IDF_PATH}/components/ulp/ld/${IDF_TARGET}.peripherals.ld)
target_link_options(${ULP_APP_NAME} PRIVATE "-Wl,--no-warn-rwx-segments") target_link_options(${ULP_APP_NAME} PRIVATE "-Wl,--no-warn-rwx-segments")
target_compile_definitions(${ULP_APP_NAME} PRIVATE IS_ULP_COCPU) target_compile_definitions(${ULP_APP_NAME} PRIVATE IS_ULP_COCPU)
target_compile_definitions(${ULP_APP_NAME} PRIVATE ULP_RISCV_REGISTER_OPS)
elseif(ULP_COCPU_IS_LP_CORE) elseif(ULP_COCPU_IS_LP_CORE)
list(APPEND ULP_S_SOURCES list(APPEND ULP_S_SOURCES

1
components/ulp/ulp_riscv/ulp_core/include/ulp_riscv_adc_ulp_core.h
View File

@@ -6,6 +6,7 @@
#pragma once #pragma once
#include "ulp_riscv_register_ops.h"
#include "hal/adc_ll.h" #include "hal/adc_ll.h"
#ifdef __cplusplus #ifdef __cplusplus

2
components/ulp/ulp_riscv/ulp_core/include/ulp_riscv_gpio.h
View File

@@ -12,7 +12,7 @@ extern "C" {
#include "soc/rtc_io_reg.h" #include "soc/rtc_io_reg.h"
#include "soc/sens_reg.h" #include "soc/sens_reg.h"
#include "ulp_riscv_register_ops.h"
typedef enum { typedef enum {
GPIO_NUM_0 = 0, /*!< GPIO0, input and output */ GPIO_NUM_0 = 0, /*!< GPIO0, input and output */

2
components/ulp/ulp_riscv/ulp_core/include/ulp_riscv_register_ops.h
View File

@@ -5,13 +5,11 @@
*/ */
#pragma once #pragma once
#define ULP_RISCV_REGISTER_OPS
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
//Registers Operation {{ //Registers Operation {{
/* /*

1
components/ulp/ulp_riscv/ulp_core/include/ulp_riscv_touch_ulp_core.h
View File

@@ -7,6 +7,7 @@
#pragma once #pragma once
#include "esp_err.h" #include "esp_err.h"
#include "ulp_riscv_register_ops.h"
#include "hal/touch_sensor_types.h" #include "hal/touch_sensor_types.h"
#ifdef __cplusplus #ifdef __cplusplus