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

change(esp_rom): comment out conflict gpio functions

Browse Source 
The GPIO function names has conflict with the public API used by
esp_driver_gpio component.

For now, we simply comment out the conflict ones.

Later, we should consider reusing the GPIO rom APIs.
This commit is contained in:
morris 2024-10-10 15:56:55 +08:00
parent 611fb654ce
commit d6ac628f7a
9 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/esp_rom/esp32c2/ld/esp32c2.rom.ld
View File

@ -361,8 +361,8 @@ ets_get_xtal_freq = 0x40000784;
gpio_input_get = 0x40000788;
gpio_matrix_in = 0x4000078c;
gpio_matrix_out = 0x40000790;
gpio_output_disable = 0x40000794;
gpio_output_enable = 0x40000798;
/* gpio_output_disable = 0x40000794; */
/* gpio_output_enable = 0x40000798; */
gpio_output_set = 0x4000079c;
gpio_pad_hold = 0x400007a0;
gpio_pad_input_disable = 0x400007a4;

4
components/esp_rom/esp32c3/ld/esp32c3.rom.ld
View File

@ -366,8 +366,8 @@ ets_get_xtal_freq = 0x40000598;
gpio_input_get = 0x4000059c;
gpio_matrix_in = 0x400005a0;
gpio_matrix_out = 0x400005a4;
gpio_output_disable = 0x400005a8;
gpio_output_enable = 0x400005ac;
/* gpio_output_disable = 0x400005a8; */
/* gpio_output_enable = 0x400005ac; */
gpio_output_set = 0x400005b0;
gpio_pad_hold = 0x400005b4;
gpio_pad_input_disable = 0x400005b8;

4
components/esp_rom/esp32c5/ld/esp32c5.rom.ld
View File

@ -258,8 +258,8 @@ gpio_get_input_level = 0x4000070c;
gpio_matrix_in = 0x40000710;
gpio_matrix_out = 0x40000714;
gpio_bypass_matrix_in = 0x40000718;
gpio_output_disable = 0x4000071c;
gpio_output_enable = 0x40000720;
/* gpio_output_disable = 0x4000071c; */
/* gpio_output_enable = 0x40000720; */
gpio_pad_input_disable = 0x40000724;
gpio_pad_input_enable = 0x40000728;
gpio_pad_pulldown = 0x4000072c;

4
components/esp_rom/esp32c6/ld/esp32c6.rom.ld
View File

@ -238,8 +238,8 @@ ets_clk_mspi_apb_wait_ready = 0x400006d0;
gpio_input_get = 0x400006d4;
gpio_matrix_in = 0x400006d8;
gpio_matrix_out = 0x400006dc;
gpio_output_disable = 0x400006e0;
gpio_output_enable = 0x400006e4;
/* gpio_output_disable = 0x400006e0; */
/* gpio_output_enable = 0x400006e4; */
gpio_output_set = 0x400006e8;
gpio_pad_hold = 0x400006ec;
gpio_pad_input_disable = 0x400006f0;

4
components/esp_rom/esp32c61/ld/esp32c61.rom.ld
View File

@ -260,8 +260,8 @@ gpio_get_input_level = 0x400006f0;
gpio_matrix_in = 0x400006f4;
gpio_matrix_out = 0x400006f8;
gpio_bypass_matrix_in = 0x400006fc;
gpio_output_disable = 0x40000700;
gpio_output_enable = 0x40000704;
/* gpio_output_disable = 0x40000700; */
/* gpio_output_enable = 0x40000704; */
gpio_pad_input_disable = 0x40000708;
gpio_pad_input_enable = 0x4000070c;
gpio_pad_pulldown = 0x40000710;

4
components/esp_rom/esp32h2/ld/esp32h2.rom.ld
View File

@ -226,8 +226,8 @@ ets_clk_get_cpu_freq = 0x4000069c;
gpio_input_get = 0x400006a0;
gpio_matrix_in = 0x400006a4;
gpio_matrix_out = 0x400006a8;
gpio_output_disable = 0x400006ac;
gpio_output_enable = 0x400006b0;
/* gpio_output_disable = 0x400006ac; */
/* gpio_output_enable = 0x400006b0; */
gpio_output_set = 0x400006b4;
gpio_pad_hold = 0x400006b8;
gpio_pad_input_disable = 0x400006bc;

4
components/esp_rom/esp32p4/ld/esp32p4.rom.ld
View File

@ -301,8 +301,8 @@ gpio_get_input_level = 0x4fc00568;
gpio_matrix_in = 0x4fc0056c;
gpio_matrix_out = 0x4fc00570;
gpio_bypass_matrix_in = 0x4fc00574;
gpio_output_disable = 0x4fc00578;
gpio_output_enable = 0x4fc0057c;
/* gpio_output_disable = 0x4fc00578; */
/* gpio_output_enable = 0x4fc0057c; */
gpio_pad_input_disable = 0x4fc00580;
gpio_pad_input_enable = 0x4fc00584;
gpio_pad_pulldown = 0x4fc00588;

4
components/esp_rom/esp32p4/ld/esp32p4lp.rom.ld
View File

@ -44,8 +44,8 @@ gpio_matrix_in = 0x501000d4;
gpio_matrix_out = 0x501000d8;
gpio_bypass_matrix_in = 0x501000dc;
gpio_output_disable = 0x501000e0;
gpio_output_enable = 0x501000e4;
gpio_pad_input_disable = 0x501000e8;
/* gpio_output_enable = 0x501000e4; */
/* gpio_pad_input_disable = 0x501000e8; */
gpio_pad_input_enable = 0x501000ec;
gpio_pad_pulldown = 0x501000f0;
gpio_pad_pullup = 0x501000f4;

4
components/esp_rom/esp32s3/ld/esp32s3.rom.ld
View File

@ -458,8 +458,8 @@ ets_get_xtal_freq = 0x40001a7c;
gpio_input_get = 0x40001a88;
gpio_matrix_in = 0x40001a94;
gpio_matrix_out = 0x40001aa0;
gpio_output_disable = 0x40001aac;
gpio_output_enable = 0x40001ab8;
/* gpio_output_disable = 0x40001aac; */
/* gpio_output_enable = 0x40001ab8; */
gpio_output_set = 0x40001ac4;
gpio_pad_hold = 0x40001ad0;
gpio_pad_input_disable = 0x40001adc;