esp32: replace EPS32 typo with ESP32
This commit is contained in:
parent
07cde736bd
commit
0a0a034a3f
@ -417,7 +417,7 @@ I assume that:
|
|||||||
|
|
||||||
- You did not install OpenOCD; binaries are available at
|
- You did not install OpenOCD; binaries are available at
|
||||||
openocd-esp32/src and interface scripts are in
|
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
|
- I select the configuration for the Olimex ARM-USB-OCD
|
||||||
debugger.
|
debugger.
|
||||||
|
|
||||||
|
@ -355,7 +355,7 @@
|
|||||||
#define ESP32_CPUINT_LEVELPERIPH_20 31
|
#define ESP32_CPUINT_LEVELPERIPH_20 31
|
||||||
|
|
||||||
#define ESP32_CPUINT_NLEVELPERIPHS 21
|
#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_0 10
|
||||||
#define ESP32_CPUINT_EDGEPERIPH_1 22
|
#define ESP32_CPUINT_EDGEPERIPH_1 22
|
||||||
@ -363,10 +363,10 @@
|
|||||||
#define ESP32_CPUINT_EDGEPERIPH_3 30
|
#define ESP32_CPUINT_EDGEPERIPH_3 30
|
||||||
|
|
||||||
#define ESP32_CPUINT_NEDGEPERIPHS 4
|
#define ESP32_CPUINT_NEDGEPERIPHS 4
|
||||||
#define EPS32_CPUINT_EDGESET 0x50400400
|
#define ESP32_CPUINT_EDGESET 0x50400400
|
||||||
|
|
||||||
#define ESP32_CPUINT_NNMIPERIPHS 1
|
#define ESP32_CPUINT_NNMIPERIPHS 1
|
||||||
#define EPS32_CPUINT_NMISET 0x00004000
|
#define ESP32_CPUINT_NMISET 0x00004000
|
||||||
|
|
||||||
#define ESP32_CPUINT_MAC 0
|
#define ESP32_CPUINT_MAC 0
|
||||||
#define ESP32_CPUINT_TIMER0 6
|
#define ESP32_CPUINT_TIMER0 6
|
||||||
@ -380,8 +380,8 @@
|
|||||||
|
|
||||||
#define ESP32_NCPUINTS 32
|
#define ESP32_NCPUINTS 32
|
||||||
#define ESP32_CPUINT_MAX (ESP32_NCPUINTS - 1)
|
#define ESP32_CPUINT_MAX (ESP32_NCPUINTS - 1)
|
||||||
#define EPS32_CPUINT_PERIPHSET 0xdffe773f
|
#define ESP32_CPUINT_PERIPHSET 0xdffe773f
|
||||||
#define EPS32_CPUINT_INTERNALSET 0x200188c0
|
#define ESP32_CPUINT_INTERNALSET 0x200188c0
|
||||||
|
|
||||||
/* Priority 1: 0-10, 12-13, 17-18 (15)
|
/* Priority 1: 0-10, 12-13, 17-18 (15)
|
||||||
* Priority 2: 19-21 (3)
|
* Priority 2: 19-21 (3)
|
||||||
|
@ -170,10 +170,10 @@ static uint32_t g_intenable[1];
|
|||||||
* devices.
|
* devices.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
static uint32_t g_cpu0_freeints = EPS32_CPUINT_PERIPHSET &
|
static uint32_t g_cpu0_freeints = ESP32_CPUINT_PERIPHSET &
|
||||||
(~ESP32_WIRELESS_RESERVE_INT);
|
(~ESP32_WIRELESS_RESERVE_INT);
|
||||||
#ifdef CONFIG_SMP
|
#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);
|
(~ESP32_WIRELESS_RESERVE_INT);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -465,7 +465,7 @@ int esp32_alloc_levelint(int priority)
|
|||||||
* interrupt 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);
|
return esp32_alloc_cpuint(intmask);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -497,7 +497,7 @@ int esp32_alloc_edgeint(int priority)
|
|||||||
* interrupt 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);
|
return esp32_alloc_cpuint(intmask);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user