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

fix(gpio): fix pu, pd, drv value incorrect from gpio_dump_io_configuration on esp32

Browse Source 
Closes https://github.com/espressif/esp-idf/issues/14931
This commit is contained in:
Song Ruo Jing
2024-12-13 17:40:31 +08:00
parent 4d9d164541
commit c749ec66f6
21 changed files with 564 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
components/hal/esp32p4/include/hal/gpio_ll.h
View File

@@ -64,15 +64,33 @@ static inline void gpio_ll_get_io_config(gpio_dev_t *hw, uint32_t gpio_num,
{
uint32_t bit_shift = (gpio_num < 32) ? gpio_num : (gpio_num - 32);
uint32_t bit_mask = 1 << bit_shift;
*pu = IO_MUX.gpio[gpio_num].fun_wpu;
*pd = IO_MUX.gpio[gpio_num].fun_wpd;
*ie = IO_MUX.gpio[gpio_num].fun_ie;
*oe = (((gpio_num < 32) ? hw->enable.val : hw->enable1.val) & bit_mask) >> bit_shift;
*od = hw->pin[gpio_num].pad_driver;
*drv = IO_MUX.gpio[gpio_num].fun_drv;
*fun_sel = IO_MUX.gpio[gpio_num].mcu_sel;
*sig_out = hw->func_out_sel_cfg[gpio_num].out_sel;
*slp_sel = IO_MUX.gpio[gpio_num].slp_sel;
if (pu) {
*pu = IO_MUX.gpio[gpio_num].fun_wpu;
}
if (pd) {
*pd = IO_MUX.gpio[gpio_num].fun_wpd;
}
if (ie) {
*ie = IO_MUX.gpio[gpio_num].fun_ie;
}
if (oe) {
*oe = (((gpio_num < 32) ? hw->enable.val : hw->enable1.val) & bit_mask) >> bit_shift;
}
if (od) {
*od = hw->pin[gpio_num].pad_driver;
}
if (drv) {
*drv = IO_MUX.gpio[gpio_num].fun_drv;
}
if (fun_sel) {
*fun_sel = IO_MUX.gpio[gpio_num].mcu_sel;
}
if (sig_out) {
*sig_out = hw->func_out_sel_cfg[gpio_num].out_sel;
}
if (slp_sel) {
*slp_sel = IO_MUX.gpio[gpio_num].slp_sel;
}
}
/**

22
components/hal/esp32p4/include/hal/rtc_io_ll.h
View File

@@ -267,6 +267,17 @@ static inline void rtcio_ll_pullup_disable(int rtcio_num)
LP_IOMUX.pad[rtcio_num].rue = 0;
}
/**
* @brief Get RTC GPIO pad pullup status.
*
* @param rtcio_num The index of rtcio. 0 ~ MAX(rtcio).
* @return Whether the pullup of the pad is enabled or not.
*/
static inline bool rtcio_ll_is_pullup_enabled(int rtcio_num)
{
return LP_IOMUX.pad[rtcio_num].rue;
}
/**
* @brief RTC GPIO pulldown enable.
*
@@ -289,6 +300,17 @@ static inline void rtcio_ll_pulldown_disable(int rtcio_num)
LP_IOMUX.pad[rtcio_num].rde = 0;
}
/**
* @brief Get RTC GPIO pad pulldown status.
*
* @param rtcio_num The index of rtcio. 0 ~ MAX(rtcio).
* @return Whether the pulldown of the pad is enabled or not.
*/
static inline bool rtcio_ll_is_pulldown_enabled(int rtcio_num)
{
return LP_IOMUX.pad[rtcio_num].rde;
}
/**
* @brief Enable force hold function for an RTC IO pad.
*