You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by ac...@apache.org on 2021/07/16 22:53:57 UTC
[incubator-nuttx] branch master updated: xtensa/esp32: Make output
readable and rmv unnecessary var.
This is an automated email from the ASF dual-hosted git repository.
acassis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new c47faa7 xtensa/esp32: Make output readable and rmv unnecessary var.
c47faa7 is described below
commit c47faa7120047a0ac3b2d969be309458947fa35c
Author: Sara Souza <sa...@espressif.com>
AuthorDate: Thu Jul 15 18:01:19 2021 -0300
xtensa/esp32: Make output readable and rmv unnecessary var.
---
boards/xtensa/esp32/esp32-devkitc/src/esp32_gpio.c | 20 +++++---------------
.../xtensa/esp32/esp32-wrover-kit/src/esp32_gpio.c | 20 +++++---------------
2 files changed, 10 insertions(+), 30 deletions(-)
diff --git a/boards/xtensa/esp32/esp32-devkitc/src/esp32_gpio.c b/boards/xtensa/esp32/esp32-devkitc/src/esp32_gpio.c
index 8b2cd41..e5c8d9b 100644
--- a/boards/xtensa/esp32/esp32-devkitc/src/esp32_gpio.c
+++ b/boards/xtensa/esp32/esp32-devkitc/src/esp32_gpio.c
@@ -327,7 +327,6 @@ static int gpint_enable(FAR struct gpio_dev_s *dev, bool enable)
int esp32_gpio_init(void)
{
int i;
- int pincount = 0;
#if BOARD_NGPIOOUT > 0
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_ops = &gpout_ops;
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 */
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);
-
- pincount++;
}
#endif
- pincount = 0;
-
#if BOARD_NGPIOIN > 0
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_ops = &gpin_ops;
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 */
esp32_configgpio(g_gpioinputs[i], INPUT_FUNCTION_3);
-
- pincount++;
}
#endif
- pincount = 0;
-
#if BOARD_NGPIOINT > 0
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_ops = &gpint_ops;
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 */
esp32_configgpio(g_gpiointinputs[i], INPUT_FUNCTION_3 | PULLDOWN);
-
- pincount++;
}
#endif
diff --git a/boards/xtensa/esp32/esp32-wrover-kit/src/esp32_gpio.c b/boards/xtensa/esp32/esp32-wrover-kit/src/esp32_gpio.c
index 785ad3b..cb50010 100644
--- a/boards/xtensa/esp32/esp32-wrover-kit/src/esp32_gpio.c
+++ b/boards/xtensa/esp32/esp32-wrover-kit/src/esp32_gpio.c
@@ -327,7 +327,6 @@ static int gpint_enable(FAR struct gpio_dev_s *dev, bool enable)
int esp32_gpio_init(void)
{
int i;
- int pincount = 0;
#if BOARD_NGPIOOUT > 0
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_ops = &gpout_ops;
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 */
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);
-
- pincount++;
}
#endif
- pincount = 0;
-
#if BOARD_NGPIOIN > 0
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_ops = &gpin_ops;
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 */
esp32_configgpio(g_gpioinputs[i], INPUT_FUNCTION_3);
-
- pincount++;
}
#endif
- pincount = 0;
-
#if BOARD_NGPIOINT > 0
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_ops = &gpint_ops;
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 */
esp32_configgpio(g_gpiointinputs[i], INPUT_FUNCTION_3 | PULLDOWN);
-
- pincount++;
}
#endif