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

arch/xtensa/src/esp/esp32/esp32_gpio.c: Fix the function's mask test

Browse Source 
condition and the functions' values.

Signed-off-by: Abdelatif Guettouche <abdelatif.guettouche@espressif.com>
This commit is contained in:
Abdelatif Guettouche 2020-10-08 00:47:34 +01:00 committed by Masayuki Ishikawa
parent 0fdf9c7368
commit 605a49e9af
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -213,12 +213,12 @@ int esp32_configgpio(int pin, gpio_pinattr_t attr)
func |= FUN_IE;
/* Select the pad's function. If no function was given, consider it a
* normal input or output (i.e. function2).
* normal input or output (i.e. function3).
*/
if ((attr & FUNCTION) != 0)
if ((attr & FUNCTION_MASK) != 0)
{
func |= (uint32_t)((attr >> FUNCTION_SHIFT) << MCU_SEL_S);
func |= (uint32_t)(((attr >> FUNCTION_SHIFT) - 1) << MCU_SEL_S);
}
else
{

12
arch/xtensa/src/esp32/esp32_gpio.h
View File

@ -60,12 +60,12 @@
#define OPEN_DRAIN (1 << 5)
#define FUNCTION_SHIFT 6
#define FUNCTION_MASK (7 << FUNCTION_SHIFT)
# define FUNCTION_1 (0 << FUNCTION_SHIFT)
# define FUNCTION_2 (1 << FUNCTION_SHIFT)
# define FUNCTION_3 (2 << FUNCTION_SHIFT)
# define FUNCTION_4 (3 << FUNCTION_SHIFT)
# define FUNCTION_5 (4 << FUNCTION_SHIFT)
# define FUNCTION_6 (5 << FUNCTION_SHIFT)
# define FUNCTION_1 (1 << FUNCTION_SHIFT)
# define FUNCTION_2 (2 << FUNCTION_SHIFT)
# define FUNCTION_3 (3 << FUNCTION_SHIFT)
# define FUNCTION_4 (4 << FUNCTION_SHIFT)
# define FUNCTION_5 (5 << FUNCTION_SHIFT)
# define FUNCTION_6 (6 << FUNCTION_SHIFT)
#define INPUT_PULLUP (INPUT | PULLUP)
#define INPUT_PULLDOWN (INPUT | PULLDOWN)

8
arch/xtensa/src/esp32/esp32_psram.c
View File

@ -1205,10 +1205,10 @@ static void IRAM_ATTR psram_gpio_config(psram_io_t *psram_io,
esp32_configgpio(psram_io->psram_clk_io, OUTPUT | FUNCTION_3);
esp32_configgpio(psram_io->psram_spiq_sd0_io, OUTPUT | INPUT | FUNCTION_3);
esp32_configgpio(psram_io->psram_spid_sd1_io, OUTPUT | INPUT | FUNCTION_3);
esp32_configgpio(psram_io->psram_spihd_sd2_io, OUTPUT | INPUT | \
FUNCTION_3);
esp32_configgpio(psram_io->psram_spiwp_sd3_io, OUTPUT | INPUT | \
FUNCTION_3);
esp32_configgpio(psram_io->psram_spihd_sd2_io,
OUTPUT | INPUT | FUNCTION_3);
esp32_configgpio(psram_io->psram_spiwp_sd3_io,
OUTPUT | INPUT | FUNCTION_3);
#if 0
uint32_t flash_id = g_rom_flashchip.device_id;