espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-02 04:04:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

refactor(system): removed dependency on driver from g1 components

Browse Source 
esp-system and esp-hw-support, and the rest of the g1 components, now only depend on
esp_driver_spi and esp_driver_gpio. Removing the rest of the driver components from g1 builds.
This commit is contained in:
Marius Vikhammer
2023-11-06 16:18:33 +08:00
parent ed6ede696e
commit 74887d81c9
4 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
components/esp_hw_support/CMakeLists.txt
View File

@@ -51,8 +51,7 @@ if(NOT BOOTLOADER_BUILD)
endif() endif()
# [refactor-todo] # [refactor-todo]
list(APPEND priv_requires driver # for UART (by sleep_modes) list(APPEND priv_requires esp_driver_gpio # for GPIO and RTC (by sleep_gpio and sleep_modes)
esp_driver_gpio # for GPIO and RTC (by sleep_gpio and sleep_modes)
esp_timer esp_timer
esp_pm) esp_pm)

9
components/esp_hw_support/sleep_modes.c
View File

@@ -37,8 +37,6 @@
#include "hal/rtc_hal.h" #include "hal/rtc_hal.h"
#endif #endif
#include "driver/uart.h"
#include "soc/rtc.h" #include "soc/rtc.h"
#include "soc/soc_caps.h" #include "soc/soc_caps.h"
#include "regi2c_ctrl.h" //For `REGI2C_ANA_CALI_PD_WORKAROUND`, temp #include "regi2c_ctrl.h" //For `REGI2C_ANA_CALI_PD_WORKAROUND`, temp
@@ -49,8 +47,6 @@
#include "hal/uart_hal.h" #include "hal/uart_hal.h"
#if SOC_TOUCH_SENSOR_SUPPORTED #if SOC_TOUCH_SENSOR_SUPPORTED
#include "hal/touch_sensor_hal.h" #include "hal/touch_sensor_hal.h"
#include "driver/touch_sensor.h"
#include "driver/touch_sensor_common.h"
#endif #endif
#include "hal/clk_gate_ll.h" #include "hal/clk_gate_ll.h"
@@ -1423,9 +1419,8 @@ touch_pad_t esp_sleep_get_touchpad_wakeup_status(void)
return TOUCH_PAD_MAX; return TOUCH_PAD_MAX;
} }
touch_pad_t pad_num; touch_pad_t pad_num;
esp_err_t ret = touch_pad_get_wakeup_status(&pad_num); //TODO 723diff commit id:fda9ada1b touch_hal_get_wakeup_status(&pad_num);
assert(ret == ESP_OK && "wakeup reason is RTC_TOUCH_TRIG_EN but SENS_TOUCH_MEAS_EN is zero"); return pad_num;
return (ret == ESP_OK) ? pad_num : TOUCH_PAD_MAX;
} }
#endif // SOC_TOUCH_SENSOR_SUPPORTED #endif // SOC_TOUCH_SENSOR_SUPPORTED

4
components/esp_system/CMakeLists.txt
View File

@@ -63,11 +63,11 @@ else()
# [refactor-todo] requirements due to init code, # [refactor-todo] requirements due to init code,
# should be removable once using component init functions # should be removable once using component init functions
# link-time registration is used. # link-time registration is used.
# [refactor-todo] requires "driver" for headers: # [refactor-todo] requires "esp_driver_spi" for headers:
# - spi_common_internal.h # - spi_common_internal.h
# [refactor-todo] esp_partition required for virtual efuse # [refactor-todo] esp_partition required for virtual efuse
# init code. Move to esp_efuse component. # init code. Move to esp_efuse component.
pthread bootloader_support efuse driver esp_partition pthread bootloader_support efuse esp_driver_spi esp_partition
LDFRAGMENTS "linker.lf" "app.lf") LDFRAGMENTS "linker.lf" "app.lf")
add_subdirectory(port) add_subdirectory(port)

2
tools/test_apps/system/g1_components/CMakeLists.txt
View File

@@ -35,7 +35,7 @@ set(extra_components_which_shouldnt_be_included
cxx cxx
# [refactor-todo]: driver is a dependency of esp_pm, spi_flash, vfs, esp_wifi # [refactor-todo]: driver is a dependency of esp_pm, spi_flash, vfs, esp_wifi
# all of these should be removed from G1 except for spi_flash. # all of these should be removed from G1 except for spi_flash.
driver esp_driver_gpio esp_driver_pcnt esp_driver_gptimer esp_driver_spi esp_driver_mcpwm esp_driver_gpio esp_driver_spi
# esp_app_format is dependency of bootloader_support, app_update # esp_app_format is dependency of bootloader_support, app_update
esp_app_format esp_app_format
# esp_bootloader_format is dependency of bootloader_support, app_update # esp_bootloader_format is dependency of bootloader_support, app_update