sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

arch/xtensa/src/esp32/esp32_gpio.c: When configuring a pin pad, set the

Browse Source 
function first, if no function was assigned, fall back to the GPIO
function.

Signed-off-by: Abdelatif Guettouche <abdelatif.guettouche@espressif.com>
This commit is contained in:
Abdelatif Guettouche 2020-10-05 11:31:41 +01:00 committed by Alan Carvalho de Assis
parent 564237a602
commit 5593683552
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
arch/xtensa/src/esp32/esp32_gpio.c
View File

@ -161,7 +161,6 @@ int esp32_configgpio(int pin, gpio_pinattr_t attr)
uintptr_t regaddr;
uint32_t func;
uint32_t cntrl;
unsigned int pinmode;
DEBUGASSERT(pin >= 0 && pin <= ESP32_NGPIOS);
@ -213,15 +212,18 @@ int esp32_configgpio(int pin, gpio_pinattr_t attr)
func |= FUN_IE;
pinmode = (attr & PINMODE_MASK);
if (pinmode == INPUT || pinmode == OUTPUT)
{
func |= (uint32_t)(2 << MCU_SEL_S);
}
else /* if ((attr & FUNCTION) != 0) */
/* Select the pad's function. If no function was given, consider it a normal
* input or output (i.e. function2).
*/
if ((attr & FUNCTION) != 0)
{
func |= (uint32_t)((attr >> FUNCTION_SHIFT) << MCU_SEL_S);
}
else
{
func |= (uint32_t)((2 >> FUNCTION_SHIFT) << MCU_SEL_S);
}
if ((attr & OPEN_DRAIN) != 0)
{