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 2020/10/02 14:46:39 UTC
[incubator-nuttx] 02/02: arch/xtensa/src/esp32/esp32_gpio.c:
ESP32_NIRQ_GPIO was used instead of ESP32_NGPIOS
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
commit 62732dd6b8309d356f34643a02beb9b7dd93161b
Author: Abdelatif Guettouche <ab...@espressif.com>
AuthorDate: Fri Oct 2 13:02:11 2020 +0100
arch/xtensa/src/esp32/esp32_gpio.c: ESP32_NIRQ_GPIO was used instead of
ESP32_NGPIOS
Signed-off-by: Abdelatif Guettouche <ab...@espressif.com>
---
arch/xtensa/include/esp32/chip.h | 2 ++
arch/xtensa/src/esp32/esp32_gpio.c | 6 +++---
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/arch/xtensa/include/esp32/chip.h b/arch/xtensa/include/esp32/chip.h
index e3cbc19..08cd344 100644
--- a/arch/xtensa/include/esp32/chip.h
+++ b/arch/xtensa/include/esp32/chip.h
@@ -51,6 +51,8 @@
#define ESP32_NSPI 4 /* SPI0-3 */
#define ESP32_NUARTS 3 /* UART0-2 */
+#define ESP32_NGPIOS 40 /* GPIO0-39 */
+
/****************************************************************************
* Public Types
****************************************************************************/
diff --git a/arch/xtensa/src/esp32/esp32_gpio.c b/arch/xtensa/src/esp32/esp32_gpio.c
index 25bf4fa..cbb90f5 100644
--- a/arch/xtensa/src/esp32/esp32_gpio.c
+++ b/arch/xtensa/src/esp32/esp32_gpio.c
@@ -163,7 +163,7 @@ int esp32_configgpio(int pin, gpio_pinattr_t attr)
uint32_t cntrl;
unsigned int pinmode;
- DEBUGASSERT(pin >= 0 && pin <= ESP32_NIRQ_GPIO);
+ DEBUGASSERT(pin >= 0 && pin <= ESP32_NGPIOS);
/* Handle input pins */
@@ -250,7 +250,7 @@ int esp32_configgpio(int pin, gpio_pinattr_t attr)
void esp32_gpiowrite(int pin, bool value)
{
- DEBUGASSERT(pin >= 0 && pin <= ESP32_NIRQ_GPIO);
+ DEBUGASSERT(pin >= 0 && pin <= ESP32_NGPIOS);
if (value)
{
@@ -288,7 +288,7 @@ bool esp32_gpioread(int pin)
{
uint32_t regval;
- DEBUGASSERT(pin >= 0 && pin <= ESP32_NIRQ_GPIO);
+ DEBUGASSERT(pin >= 0 && pin <= ESP32_NGPIOS);
if (pin < 32)
{