Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-03 22:20:31 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

xtensa/esp32: Make output readable and rmv unnecessary var.

Browse Source
This commit is contained in:
Sara Souza
2021-07-15 18:01:19 -03:00
committed by Alan Carvalho de Assis
parent 81e881c8c0
commit c47faa7120
2 changed files with 10 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
boards/xtensa/esp32/esp32-devkitc/src/esp32_gpio.c
+5 -15
View File
@@ -327,7 +327,6 @@ static int gpint_enable(FAR struct gpio_dev_s *dev, bool enable)
int esp32_gpio_init(void) int esp32_gpio_init(void)
{ {
int i; int i;
int pincount = 0;
#if BOARD_NGPIOOUT > 0 #if BOARD_NGPIOOUT > 0
for (i = 0; i < BOARD_NGPIOOUT; i++) for (i = 0; i < BOARD_NGPIOOUT; i++)
@@ -337,20 +336,17 @@ int esp32_gpio_init(void)
g_gpout[i].gpio.gp_pintype = GPIO_OUTPUT_PIN; g_gpout[i].gpio.gp_pintype = GPIO_OUTPUT_PIN;
g_gpout[i].gpio.gp_ops = &gpout_ops; g_gpout[i].gpio.gp_ops = &gpout_ops;
g_gpout[i].id = i; g_gpout[i].id = i;
gpio_pin_register(&g_gpout[i].gpio, pincount); gpio_pin_register(&g_gpout[i].gpio, i);
/* Configure the pins that will be used as output */ /* Configure the pins that will be used as output */
esp32_gpio_matrix_out(g_gpiooutputs[i], SIG_GPIO_OUT_IDX, 0, 0); esp32_gpio_matrix_out(g_gpiooutputs[i], SIG_GPIO_OUT_IDX, 0, 0);
esp32_configgpio(g_gpiooutputs[i], OUTPUT_FUNCTION_3); esp32_configgpio(g_gpiooutputs[i], OUTPUT_FUNCTION_3 |
INPUT_FUNCTION_3);
esp32_gpiowrite(g_gpiooutputs[i], 0); esp32_gpiowrite(g_gpiooutputs[i], 0);
pincount++;
} }
#endif #endif
pincount = 0;
#if BOARD_NGPIOIN > 0 #if BOARD_NGPIOIN > 0
for (i = 0; i < BOARD_NGPIOIN; i++) for (i = 0; i < BOARD_NGPIOIN; i++)
{ {
@@ -359,18 +355,14 @@ int esp32_gpio_init(void)
g_gpin[i].gpio.gp_pintype = GPIO_INPUT_PIN; g_gpin[i].gpio.gp_pintype = GPIO_INPUT_PIN;
g_gpin[i].gpio.gp_ops = &gpin_ops; g_gpin[i].gpio.gp_ops = &gpin_ops;
g_gpin[i].id = i; g_gpin[i].id = i;
gpio_pin_register(&g_gpin[i].gpio, pincount); gpio_pin_register(&g_gpin[i].gpio, i);
/* Configure the pins that will be used as INPUT */ /* Configure the pins that will be used as INPUT */
esp32_configgpio(g_gpioinputs[i], INPUT_FUNCTION_3); esp32_configgpio(g_gpioinputs[i], INPUT_FUNCTION_3);
pincount++;
} }
#endif #endif
pincount = 0;
#if BOARD_NGPIOINT > 0 #if BOARD_NGPIOINT > 0
for (i = 0; i < BOARD_NGPIOINT; i++) for (i = 0; i < BOARD_NGPIOINT; i++)
{ {
@@ -379,13 +371,11 @@ int esp32_gpio_init(void)
g_gpint[i].esp32gpio.gpio.gp_pintype = GPIO_INTERRUPT_PIN; g_gpint[i].esp32gpio.gpio.gp_pintype = GPIO_INTERRUPT_PIN;
g_gpint[i].esp32gpio.gpio.gp_ops = &gpint_ops; g_gpint[i].esp32gpio.gpio.gp_ops = &gpint_ops;
g_gpint[i].esp32gpio.id = i; g_gpint[i].esp32gpio.id = i;
gpio_pin_register(&g_gpint[i].esp32gpio.gpio, pincount); gpio_pin_register(&g_gpint[i].esp32gpio.gpio, i);
/* Configure the pins that will be used as interrupt input */ /* Configure the pins that will be used as interrupt input */
esp32_configgpio(g_gpiointinputs[i], INPUT_FUNCTION_3 | PULLDOWN); esp32_configgpio(g_gpiointinputs[i], INPUT_FUNCTION_3 | PULLDOWN);
pincount++;
} }
#endif #endif
boards/xtensa/esp32/esp32-wrover-kit/src/esp32_gpio.c
+5 -15
View File
@@ -327,7 +327,6 @@ static int gpint_enable(FAR struct gpio_dev_s *dev, bool enable)
int esp32_gpio_init(void) int esp32_gpio_init(void)
{ {
int i; int i;
int pincount = 0;
#if BOARD_NGPIOOUT > 0 #if BOARD_NGPIOOUT > 0
for (i = 0; i < BOARD_NGPIOOUT; i++) for (i = 0; i < BOARD_NGPIOOUT; i++)
@@ -337,20 +336,17 @@ int esp32_gpio_init(void)
g_gpout[i].gpio.gp_pintype = GPIO_OUTPUT_PIN; g_gpout[i].gpio.gp_pintype = GPIO_OUTPUT_PIN;
g_gpout[i].gpio.gp_ops = &gpout_ops; g_gpout[i].gpio.gp_ops = &gpout_ops;
g_gpout[i].id = i; g_gpout[i].id = i;
gpio_pin_register(&g_gpout[i].gpio, pincount); gpio_pin_register(&g_gpout[i].gpio, i);
/* Configure the pins that will be used as output */ /* Configure the pins that will be used as output */
esp32_gpio_matrix_out(g_gpiooutputs[i], SIG_GPIO_OUT_IDX, 0, 0); esp32_gpio_matrix_out(g_gpiooutputs[i], SIG_GPIO_OUT_IDX, 0, 0);
esp32_configgpio(g_gpiooutputs[i], OUTPUT_FUNCTION_3); esp32_configgpio(g_gpiooutputs[i], OUTPUT_FUNCTION_3 |
INPUT_FUNCTION_3);
esp32_gpiowrite(g_gpiooutputs[i], 0); esp32_gpiowrite(g_gpiooutputs[i], 0);
pincount++;
} }
#endif #endif
pincount = 0;
#if BOARD_NGPIOIN > 0 #if BOARD_NGPIOIN > 0
for (i = 0; i < BOARD_NGPIOIN; i++) for (i = 0; i < BOARD_NGPIOIN; i++)
{ {
@@ -359,18 +355,14 @@ int esp32_gpio_init(void)
g_gpin[i].gpio.gp_pintype = GPIO_INPUT_PIN; g_gpin[i].gpio.gp_pintype = GPIO_INPUT_PIN;
g_gpin[i].gpio.gp_ops = &gpin_ops; g_gpin[i].gpio.gp_ops = &gpin_ops;
g_gpin[i].id = i; g_gpin[i].id = i;
gpio_pin_register(&g_gpin[i].gpio, pincount); gpio_pin_register(&g_gpin[i].gpio, i);
/* Configure the pins that will be used as INPUT */ /* Configure the pins that will be used as INPUT */
esp32_configgpio(g_gpioinputs[i], INPUT_FUNCTION_3); esp32_configgpio(g_gpioinputs[i], INPUT_FUNCTION_3);
pincount++;
} }
#endif #endif
pincount = 0;
#if BOARD_NGPIOINT > 0 #if BOARD_NGPIOINT > 0
for (i = 0; i < BOARD_NGPIOINT; i++) for (i = 0; i < BOARD_NGPIOINT; i++)
{ {
@@ -379,13 +371,11 @@ int esp32_gpio_init(void)
g_gpint[i].esp32gpio.gpio.gp_pintype = GPIO_INTERRUPT_PIN; g_gpint[i].esp32gpio.gpio.gp_pintype = GPIO_INTERRUPT_PIN;
g_gpint[i].esp32gpio.gpio.gp_ops = &gpint_ops; g_gpint[i].esp32gpio.gpio.gp_ops = &gpint_ops;
g_gpint[i].esp32gpio.id = i; g_gpint[i].esp32gpio.id = i;
gpio_pin_register(&g_gpint[i].esp32gpio.gpio, pincount); gpio_pin_register(&g_gpint[i].esp32gpio.gpio, i);
/* Configure the pins that will be used as interrupt input */ /* Configure the pins that will be used as interrupt input */
esp32_configgpio(g_gpiointinputs[i], INPUT_FUNCTION_3 | PULLDOWN); esp32_configgpio(g_gpiointinputs[i], INPUT_FUNCTION_3 | PULLDOWN);
pincount++;
} }
#endif #endif