You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by gu...@apache.org on 2021/04/29 21:03:17 UTC
[incubator-nuttx] branch master updated: esp32: replace EPS32 typo
with ESP32
This is an automated email from the ASF dual-hosted git repository.
gustavonihei 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 0a0a034 esp32: replace EPS32 typo with ESP32
0a0a034 is described below
commit 0a0a034a3f3b2e88c2d536fb0d6cb0a3da0fd4af
Author: Alan C. Assis <ac...@gmail.com>
AuthorDate: Thu Apr 29 16:01:14 2021 -0300
esp32: replace EPS32 typo with ESP32
---
Documentation/platforms/xtensa/esp32/index.rst | 2 +-
arch/xtensa/include/esp32/irq.h | 10 +++++-----
arch/xtensa/src/esp32/esp32_cpuint.c | 8 ++++----
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/Documentation/platforms/xtensa/esp32/index.rst b/Documentation/platforms/xtensa/esp32/index.rst
index c47ab0c..9846524 100644
--- a/Documentation/platforms/xtensa/esp32/index.rst
+++ b/Documentation/platforms/xtensa/esp32/index.rst
@@ -417,7 +417,7 @@ I assume that:
- You did not install OpenOCD; binaries are available at
openocd-esp32/src and interface scripts are in
- openocd-eps32/tcl/interface
+ openocd-esp32/tcl/interface
- I select the configuration for the Olimex ARM-USB-OCD
debugger.
diff --git a/arch/xtensa/include/esp32/irq.h b/arch/xtensa/include/esp32/irq.h
index 7d7eee0..a610a63 100644
--- a/arch/xtensa/include/esp32/irq.h
+++ b/arch/xtensa/include/esp32/irq.h
@@ -355,7 +355,7 @@
#define ESP32_CPUINT_LEVELPERIPH_20 31
#define ESP32_CPUINT_NLEVELPERIPHS 21
-#define EPS32_CPUINT_LEVELSET 0x8fbe333f
+#define ESP32_CPUINT_LEVELSET 0x8fbe333f
#define ESP32_CPUINT_EDGEPERIPH_0 10
#define ESP32_CPUINT_EDGEPERIPH_1 22
@@ -363,10 +363,10 @@
#define ESP32_CPUINT_EDGEPERIPH_3 30
#define ESP32_CPUINT_NEDGEPERIPHS 4
-#define EPS32_CPUINT_EDGESET 0x50400400
+#define ESP32_CPUINT_EDGESET 0x50400400
#define ESP32_CPUINT_NNMIPERIPHS 1
-#define EPS32_CPUINT_NMISET 0x00004000
+#define ESP32_CPUINT_NMISET 0x00004000
#define ESP32_CPUINT_MAC 0
#define ESP32_CPUINT_TIMER0 6
@@ -380,8 +380,8 @@
#define ESP32_NCPUINTS 32
#define ESP32_CPUINT_MAX (ESP32_NCPUINTS - 1)
-#define EPS32_CPUINT_PERIPHSET 0xdffe773f
-#define EPS32_CPUINT_INTERNALSET 0x200188c0
+#define ESP32_CPUINT_PERIPHSET 0xdffe773f
+#define ESP32_CPUINT_INTERNALSET 0x200188c0
/* Priority 1: 0-10, 12-13, 17-18 (15)
* Priority 2: 19-21 (3)
diff --git a/arch/xtensa/src/esp32/esp32_cpuint.c b/arch/xtensa/src/esp32/esp32_cpuint.c
index fefa0a9..b7c941c 100644
--- a/arch/xtensa/src/esp32/esp32_cpuint.c
+++ b/arch/xtensa/src/esp32/esp32_cpuint.c
@@ -170,10 +170,10 @@ static uint32_t g_intenable[1];
* devices.
*/
-static uint32_t g_cpu0_freeints = EPS32_CPUINT_PERIPHSET &
+static uint32_t g_cpu0_freeints = ESP32_CPUINT_PERIPHSET &
(~ESP32_WIRELESS_RESERVE_INT);
#ifdef CONFIG_SMP
-static uint32_t g_cpu1_freeints = EPS32_CPUINT_PERIPHSET &
+static uint32_t g_cpu1_freeints = ESP32_CPUINT_PERIPHSET &
(~ESP32_WIRELESS_RESERVE_INT);
#endif
@@ -465,7 +465,7 @@ int esp32_alloc_levelint(int priority)
* interrupt priority.
*/
- intmask = g_priority[ESP32_PRIO_INDEX(priority)] & EPS32_CPUINT_LEVELSET;
+ intmask = g_priority[ESP32_PRIO_INDEX(priority)] & ESP32_CPUINT_LEVELSET;
return esp32_alloc_cpuint(intmask);
}
@@ -497,7 +497,7 @@ int esp32_alloc_edgeint(int priority)
* interrupt priority.
*/
- intmask = g_priority[ESP32_PRIO_INDEX(priority)] & EPS32_CPUINT_EDGESET;
+ intmask = g_priority[ESP32_PRIO_INDEX(priority)] & ESP32_CPUINT_EDGESET;
return esp32_alloc_cpuint(intmask);
}