alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

esp_hw_support: create component

Browse Source
This commit is contained in:
Renz Bagaporo 2020-09-30 15:24:04 +08:00
parent b6e763ac86
commit 988be69466
17 changed files with 43 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitlab/CODEOWNERS
View File

@ -80,6 +80,7 @@
/components/esp_http_server/ @esp-idf-codeowners/app-utilities
/components/esp_https_ota/ @esp-idf-codeowners/app-utilities
/components/esp_https_server/ @esp-idf-codeowners/app-utilities
/components/esp_hw_support/ @esp-idf-codeowners/system
/components/esp_ipc/ @esp-idf-codeowners/system
/components/esp_local_ctrl/ @esp-idf-codeowners/app-utilities
/components/esp_netif/ @esp-idf-codeowners/network

4
components/bootloader/subproject/CMakeLists.txt
View File

@ -15,10 +15,10 @@ if(NOT IDF_TARGET)
"in by the parent build process.")
endif()
set(COMPONENTS bootloader esptool_py partition_table soc bootloader_support log spi_flash micro-ecc main efuse)
set(COMPONENTS bootloader esptool_py esp_hw_support hal partition_table soc bootloader_support log spi_flash micro-ecc main efuse)
set(BOOTLOADER_BUILD 1)
include("${IDF_PATH}/tools/cmake/project.cmake")
set(common_req log esp_rom esp_common xtensa)
set(common_req log esp_rom esp_common esp_hw_support hal xtensa)
if(LEGACY_INCLUDE_COMMON_HEADERS)
list(APPEND common_req soc hal)
endif()

2
components/bootloader/subproject/Makefile
View File

@ -8,7 +8,7 @@ endif
PROJECT_NAME := bootloader
COMPONENTS := esptool_py bootloader_support log spi_flash micro-ecc soc main efuse esp_rom hal
COMPONENTS := esp_hw_support esptool_py bootloader_support log spi_flash micro-ecc soc main efuse esp_rom hal
# Clear C and CXX from top level project
CFLAGS =

2
components/esp_common/CMakeLists.txt
View File

@ -25,7 +25,7 @@ else()
# Note: esp_ipc, esp_pm added as a public requirement to keep compatibility as to be located here.
idf_component_register(SRCS "${srcs}"
INCLUDE_DIRS include
REQUIRES ${target} espcoredump esp_timer esp_ipc esp_pm
REQUIRES ${target} espcoredump esp_timer esp_ipc esp_pm esp_hw_support
PRIV_REQUIRES soc
LDFRAGMENTS "linker.lf")

4
components/esp_hw_support/CMakeLists.txt Normal file
View File

@ -0,0 +1,4 @@
idf_component_register(SRCS "compare_set.c"
"cpu_util.c"
INCLUDE_DIRS include
REQUIRES soc)

7
components/esp_hw_support/README.md Normal file
View File

@ -0,0 +1,7 @@
## `esp_hw_support` ##
This component contains hardware-related operations for supporting the system. These operations
are one level above that of `hal` in that these(1) use system services such as memory allocation, logging, scheduling
or (2) may be multi-step operations involving/affecting multiple parts of the SoC.
Implementations that don't fit other components cleanly, but are not worth creating a new component for (yet) may also be placed here as long as they don't pull dependencies other than the core system components.

0
components/soc/src/compare_set.c → components/esp_hw_support/compare_set.c
View File

2
components/esp_hw_support/component.mk Normal file
View File

@ -0,0 +1,2 @@
COMPONENT_SRCDIRS := .
COMPONENT_ADD_INCLUDEDIRS := . include

0
components/soc/src/cpu_util.c → components/esp_hw_support/cpu_util.c
View File

7
components/soc/include/soc/compare_set.h → components/esp_hw_support/include/soc/compare_set.h
View File

@ -21,6 +21,9 @@
#include "soc/soc_memory_layout.h"
#include "xtensa/xtruntime.h"
#ifdef __cplusplus
extern "C" {
#endif
static inline void __attribute__((always_inline)) compare_and_set_native(volatile uint32_t *addr, uint32_t compare, uint32_t *set)
{
@ -53,4 +56,8 @@ static inline void __attribute__((always_inline)) compare_and_set_native(volatil
void compare_and_set_extram(volatile uint32_t *addr, uint32_t compare, uint32_t *set);
#ifdef __cplusplus
}
#endif
#endif

0
components/soc/include/soc/cpu.h → components/esp_hw_support/include/soc/cpu.h
View File

7
components/soc/include/soc/spinlock.h → components/esp_hw_support/include/soc/spinlock.h
View File

@ -21,6 +21,9 @@
#include "soc/compare_set.h"
#include "xtensa/xtruntime.h"
#ifdef __cplusplus
extern "C" {
#endif
#ifdef CONFIG_SPIRAM_WORKAROUND_NEED_VOLATILE_SPINLOCK
#define NEED_VOLATILE_MUX volatile
@ -154,5 +157,9 @@ static inline void __attribute__((always_inline)) spinlock_release(spinlock_t *l
#endif
}
#ifdef __cplusplus
}
#endif
#endif

9
components/soc/CMakeLists.txt
View File

@ -1,13 +1,10 @@
idf_build_get_property(target IDF_TARGET)
idf_component_register(SRCS "src/cpu_util.c"
"src/memory_layout_utils.c"
"src/lldesc.c"
idf_component_register(SRCS "src/lldesc.c"
"src/soc_include_legacy_warn.c"
"src/compare_set.c"
REQUIRES hal #cpu.h directly includes HAL header
"src/memory_layout_utils.c"
INCLUDE_DIRS include
PRIV_REQUIRES ${target}
PRIV_REQUIRES hal # [refactor-todo] soc dependency on hal for rtc sources
LDFRAGMENTS linker.lf)
add_subdirectory(soc)

0
components/soc/src/memory_layout_utils.c → components/soc/memory_layout_utils.c
View File

10
docs/Doxyfile
View File

@ -138,11 +138,11 @@ INPUT = \
$(IDF_PATH)/components/hal/include/hal/adc_types.h \
$(IDF_PATH)/components/hal/include/hal/twai_types.h \
$(IDF_PATH)/components/hal/include/hal/touch_sensor_types.h \
$(IDF_PATH)/components/soc/soc/esp32/include/soc/adc_channel.h \
$(IDF_PATH)/components/soc/soc/esp32/include/soc/dac_channel.h \
$(IDF_PATH)/components/soc/soc/esp32/include/soc/touch_sensor_channel.h \
$(IDF_PATH)/components/soc/soc/esp32/include/soc/uart_channel.h \
$(IDF_PATH)/components/soc/soc/esp32/include/soc/rtc_io_channel.h \
$(IDF_PATH)/components/soc/esp32/include/soc/adc_channel.h \
$(IDF_PATH)/components/soc/esp32/include/soc/dac_channel.h \
$(IDF_PATH)/components/soc/esp32/include/soc/touch_sensor_channel.h \
$(IDF_PATH)/components/soc/esp32/include/soc/uart_channel.h \
$(IDF_PATH)/components/soc/esp32/include/soc/rtc_io_channel.h \
## esp_netif - API Reference
$(IDF_PATH)/components/esp_netif/include/esp_netif.h \
$(IDF_PATH)/components/esp_netif/include/esp_netif_net_stack.h \

2
docs/en/api-guides/freertos-smp.rst
View File

@ -327,7 +327,7 @@ The ESP-IDF FreeRTOS critical section functions have been modified as follows…
section functions (``port*_CRITICAL`` in Non-ISR and ``port*_CRITICAL_ISR`` in ISR)
in order to be in compliance with Vanilla FreeRTOS.
For more details see :component_file:`soc/include/soc/spinlock.h`
For more details see :component_file:`esp_hw_support/include/soc/spinlock.h`
and :component_file:`freertos/tasks.c`
It should be noted that when modifying vanilla FreeRTOS code to be ESP-IDF

3
tools/cmake/build.cmake
View File

@ -154,7 +154,8 @@ function(__build_init idf_path)
# Set components required by all other components in the build
#
# - lwip is here so that #include <sys/socket.h> works without any special provisions
set(requires_common cxx newlib freertos heap log lwip soc hal esp_rom esp_common esp_system xtensa)
# - esp_hw_support is here for backward compatibility
set(requires_common cxx newlib freertos esp_hw_support heap log lwip soc hal esp_rom esp_common esp_system xtensa)
idf_build_set_property(__COMPONENT_REQUIRES_COMMON "${requires_common}")
__build_get_idf_git_revision()