espressif/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-04-27 19:13:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(gpio): derive ETM registers from GPIO_EXT

Browse Source 
Use GPIO_EXT.etm as the ETM register base and remove standalone GPIO_ETM symbols to avoid manual offset address maintenance errors across targets.
This commit is contained in:
morris
2026-04-08 14:46:29 +08:00
parent b79cf6d8eb
commit 572e732aca
26 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/esp_driver_gpio/src/gpio_etm.c
+1 -1
View File
@@ -52,7 +52,7 @@ struct gpio_etm_task_t {
};
static gpio_etm_group_t s_gpio_etm_group = {
.dev = &GPIO_ETM,
.dev = GPIO_LL_ETM_GET_HW(),
.spinlock = portMUX_INITIALIZER_UNLOCKED,
};
components/esp_hal_gpio/esp32c5/include/hal/gpio_etm_ll.h
+2
View File
@@ -22,6 +22,8 @@
#define GPIO_LL_ETM_TASK_ID_CLR(ch) (GPIO_TASK_CH0_CLEAR + (ch))
#define GPIO_LL_ETM_TASK_ID_TOG(ch) (GPIO_TASK_CH0_TOGGLE + (ch))
#define GPIO_LL_ETM_GET_HW() ((gpio_etm_dev_t *)(void *)&GPIO_EXT.etm)
#ifdef __cplusplus
extern "C" {
#endif
components/esp_hal_gpio/esp32c6/include/hal/gpio_etm_ll.h
+2
View File
@@ -22,6 +22,8 @@
#define GPIO_LL_ETM_TASK_ID_CLR(ch) (GPIO_TASK_CH0_CLEAR + (ch))
#define GPIO_LL_ETM_TASK_ID_TOG(ch) (GPIO_TASK_CH0_TOGGLE + (ch))
#define GPIO_LL_ETM_GET_HW() ((gpio_etm_dev_t *)(void *)&GPIO_EXT.etm)
#ifdef __cplusplus
extern "C" {
#endif
components/esp_hal_gpio/esp32c61/include/hal/gpio_etm_ll.h
+2
View File
@@ -22,6 +22,8 @@
#define GPIO_LL_ETM_TASK_ID_CLR(ch) (GPIO_TASK_CH0_CLEAR + (ch))
#define GPIO_LL_ETM_TASK_ID_TOG(ch) (GPIO_TASK_CH0_TOGGLE + (ch))
#define GPIO_LL_ETM_GET_HW() ((gpio_etm_dev_t *)(void *)&GPIO_EXT.etm)
#ifdef __cplusplus
extern "C" {
#endif
components/esp_hal_gpio/esp32h2/include/hal/gpio_etm_ll.h
+2
View File
@@ -22,6 +22,8 @@
#define GPIO_LL_ETM_TASK_ID_CLR(ch) (GPIO_TASK_CH0_CLEAR + (ch))
#define GPIO_LL_ETM_TASK_ID_TOG(ch) (GPIO_TASK_CH0_TOGGLE + (ch))
#define GPIO_LL_ETM_GET_HW() ((gpio_etm_dev_t *)(void *)&GPIO_EXT.etm)
#ifdef __cplusplus
extern "C" {
#endif
components/esp_hal_gpio/esp32h21/include/hal/gpio_etm_ll.h
+2
View File
@@ -22,6 +22,8 @@
#define GPIO_LL_ETM_TASK_ID_CLR(ch) (GPIO_TASK_CH0_CLEAR + (ch))
#define GPIO_LL_ETM_TASK_ID_TOG(ch) (GPIO_TASK_CH0_TOGGLE + (ch))
#define GPIO_LL_ETM_GET_HW() ((gpio_etm_dev_t *)(void *)&GPIO_EXT.etm)
#ifdef __cplusplus
extern "C" {
#endif
components/esp_hal_gpio/esp32h4/include/hal/gpio_etm_ll.h
+2
View File
@@ -22,6 +22,8 @@
#define GPIO_LL_ETM_TASK_ID_CLR(ch) (GPIO_TASK_CH0_CLEAR + (ch))
#define GPIO_LL_ETM_TASK_ID_TOG(ch) (GPIO_TASK_CH0_TOGGLE + (ch))
#define GPIO_LL_ETM_GET_HW() ((gpio_etm_dev_t *)(void *)&GPIO_EXT.etm)
#ifdef __cplusplus
extern "C" {
#endif
components/esp_hal_gpio/esp32p4/include/hal/gpio_etm_ll.h
+2
View File
@@ -22,6 +22,8 @@
#define GPIO_LL_ETM_TASK_ID_CLR(ch) (GPIO_TASK_CH0_CLEAR + (ch))
#define GPIO_LL_ETM_TASK_ID_TOG(ch) (GPIO_TASK_CH0_TOGGLE + (ch))
#define GPIO_LL_ETM_GET_HW() ((gpio_etm_dev_t *)(void *)&GPIO_EXT.etm)
#ifdef __cplusplus
extern "C" {
#endif
components/esp_hal_gpio/esp32s31/include/hal/gpio_etm_ll.h
+2
View File
@@ -22,6 +22,8 @@
#define GPIO_LL_ETM_TASK_ID_CLR(ch) (GPIO_TASK_CH0_CLEAR + (ch))
#define GPIO_LL_ETM_TASK_ID_TOG(ch) (GPIO_TASK_CH0_TOGGLE + (ch))
#define GPIO_LL_ETM_GET_HW() ((gpio_etm_dev_t *)(void *)&GPIO_EXT.etm)
#ifdef __cplusplus
extern "C" {
#endif
components/soc/esp32c5/ld/esp32c5.peripherals.ld
-1
View File
@@ -47,7 +47,6 @@ PROVIDE ( IO_MUX = 0x60090000 );
PROVIDE ( GPIO = 0x60091000 );
PROVIDE ( GPIO_EXT = 0x60091e00 );
PROVIDE ( SDM = 0x60091e00 );
PROVIDE ( GPIO_ETM = 0x60091f18 );
PROVIDE ( MEM_MONITOR = 0x60092000 );
PROVIDE ( PAU = 0x60093000 );
PROVIDE ( HP_SYSTEM = 0x60095000 );
components/soc/esp32c5/register/soc/gpio_ext_struct.h
-1
View File
@@ -416,7 +416,6 @@ typedef struct {
} gpio_ext_dev_t;
extern gpio_sd_dev_t SDM;
extern gpio_etm_dev_t GPIO_ETM;
extern gpio_ext_dev_t GPIO_EXT;
#ifndef __cplusplus
components/soc/esp32c6/ld/esp32c6.peripherals.ld
-1
View File
@@ -48,7 +48,6 @@ PROVIDE ( IO_MUX = 0x60090000 );
PROVIDE ( GPIO = 0x60091000 );
PROVIDE ( GPIO_EXT = 0x60091f00 );
PROVIDE ( SDM = 0x60091f00 );
PROVIDE ( GPIO_ETM = 0x60091f60 );
PROVIDE ( MEM_MONITOR = 0x60092000 );
PROVIDE ( PAU = 0x60093000 );
components/soc/esp32c6/register/soc/gpio_ext_struct.h
-1
View File
@@ -201,7 +201,6 @@ typedef struct gpio_ext_dev_t {
} gpio_ext_dev_t;
extern gpio_sd_dev_t SDM;
extern gpio_etm_dev_t GPIO_ETM;
extern gpio_ext_dev_t GPIO_EXT;
#ifndef __cplusplus
components/soc/esp32c61/ld/esp32c61.peripherals.ld
-1
View File
@@ -32,7 +32,6 @@ PROVIDE ( ECDSA = 0x6008E000 );
PROVIDE ( IO_MUX = 0x60090000 );
PROVIDE ( GPIO = 0x60091000 );
PROVIDE ( GPIO_EXT = 0x60091e00 );
PROVIDE ( GPIO_ETM = 0x60091f18 );
PROVIDE ( MEM_MONITOR = 0x60092000 );
PROVIDE ( PAU = 0x60093000 );
PROVIDE ( HP_SYSTEM = 0x60095000 );
components/soc/esp32c61/register/soc/gpio_ext_struct.h
-1
View File
@@ -551,7 +551,6 @@ typedef struct {
volatile gpio_ext_version_reg_t version;
} gpio_ext_dev_t;
extern gpio_etm_dev_t GPIO_ETM;
extern gpio_ext_dev_t GPIO_EXT;
#ifndef __cplusplus
components/soc/esp32h2/ld/esp32h2.peripherals.ld
-1
View File
@@ -45,7 +45,6 @@ PROVIDE ( IO_MUX = 0x60090000 );
PROVIDE ( GPIO = 0x60091000 );
PROVIDE ( GPIO_EXT = 0x60091f00 );
PROVIDE ( SDM = 0x60091f00 );
PROVIDE ( GPIO_ETM = 0x60091f60 );
PROVIDE ( MEM_ACS_MONITOR = 0x60092000 );
PROVIDE ( PAU = 0x60093000 );
components/soc/esp32h2/register/soc/gpio_ext_struct.h
-1
View File
@@ -306,7 +306,6 @@ typedef struct {
} gpio_ext_dev_t;
extern gpio_sd_dev_t SDM;
extern gpio_etm_dev_t GPIO_ETM;
extern gpio_ext_dev_t GPIO_EXT;
#ifndef __cplusplus
components/soc/esp32h21/ld/esp32h21.peripherals.ld
-1
View File
@@ -40,7 +40,6 @@ PROVIDE ( IO_MUX = 0x60090000 );
PROVIDE ( GPIO = 0x60091000 );
PROVIDE ( GPIO_EXT = 0x60091E00 );
PROVIDE ( SDM = 0x60091E04 );
PROVIDE ( GPIO_ETM = 0x60091F18 );
PROVIDE ( MEM_MONITOR = 0x60092000 );
PROVIDE ( PAU = 0x60093000 );
PROVIDE ( HP_SYSTEM = 0x60095000 );
components/soc/esp32h21/register/soc/gpio_ext_struct.h
-1
View File
@@ -592,7 +592,6 @@ typedef struct {
} gpio_ext_dev_t;
extern gpio_sd_dev_t SDM;
extern gpio_etm_dev_t GPIO_ETM;
extern gpio_ext_dev_t GPIO_EXT;
#ifndef __cplusplus
components/soc/esp32h4/ld/esp32h4.peripherals.ld
-1
View File
@@ -46,7 +46,6 @@ PROVIDE ( IO_MUX = 0x60092000 );
PROVIDE ( GPIO = 0x60093000 );
PROVIDE ( GPIO_EXT = 0x60093E00 );
PROVIDE ( SDM = 0x60093E00 );
PROVIDE ( GPIO_ETM = 0x60093F18 );
PROVIDE ( PCR = 0x60094000 );
PROVIDE ( SPIMEM0 = 0x60098000 );
PROVIDE ( SPIMEM1 = 0x60099000 );
components/soc/esp32h4/register/soc/gpio_ext_struct.h
-1
View File
@@ -271,7 +271,6 @@ typedef struct {
} gpio_ext_dev_t;
extern gpio_sd_dev_t SDM;
extern gpio_etm_dev_t GPIO_ETM;
extern gpio_ext_dev_t GPIO_EXT;
#ifndef __cplusplus
components/soc/esp32p4/ld/esp32p4.peripherals.ld
-1
View File
@@ -63,7 +63,6 @@ PROVIDE ( ECDSA = 0x50096000 );
PROVIDE ( GPIO = 0x500E0000 );
PROVIDE ( GPIO_EXT = 0x500E0F00 );
PROVIDE ( SDM = 0x500E0F00 );
PROVIDE ( GPIO_ETM = 0x500E0F60 );
PROVIDE ( IO_MUX = 0x500E1000 );
PROVIDE ( MSPI_IOMUX = 0x500E1200 );
components/soc/esp32p4/register/hw_ver1/soc/gpio_ext_struct.h
-1
View File
@@ -181,7 +181,6 @@ typedef struct {
} gpio_ext_dev_t;
extern gpio_sd_dev_t SDM;
extern gpio_etm_dev_t GPIO_ETM;
extern gpio_ext_dev_t GPIO_EXT;
#ifndef __cplusplus
components/soc/esp32p4/register/hw_ver3/soc/gpio_ext_struct.h
-1
View File
@@ -181,7 +181,6 @@ typedef struct {
} gpio_ext_dev_t;
extern gpio_sd_dev_t SDM;
extern gpio_etm_dev_t GPIO_ETM;
extern gpio_ext_dev_t GPIO_EXT;
#ifndef __cplusplus
components/soc/esp32s31/ld/esp32s31.peripherals.ld
-1
View File
@@ -73,7 +73,6 @@ PROVIDE ( IO_MUX = 0x20582000 );
PROVIDE ( GPIO = 0x20583000 );
PROVIDE ( GPIO_EXT = 0x20583E00 );
PROVIDE ( SDM = 0x20583E04 );
PROVIDE ( GPIO_ETM = 0x20583F18 );
PROVIDE ( MSPI_IOMUX = 0x20584000 );
PROVIDE ( HP_SYSTEM = 0x20586000 );
PROVIDE ( HP_SYS_CLKRST = 0x20587000 );
components/soc/esp32s31/register/soc/gpio_ext_struct.h
-1
View File
@@ -242,7 +242,6 @@ typedef struct {
} gpio_ext_dev_t;
extern gpio_sd_dev_t SDM;
extern gpio_etm_dev_t GPIO_ETM;
extern gpio_ext_dev_t GPIO_EXT;
#ifndef __cplusplus