OrgApache/incubator-nuttx
OrgApache
/
incubator-nuttx
mirror of https://github.com/apache/incubator-nuttx.git
1
0
Fork 0
Code Issues Releases Wiki Activity

xtensa/esp32(s2)_user.c: For EXCCAUSE values, use macros defined in xtensa_corebits.h 

instead of those defined in core.h as they are deprecated.

Signed-off-by: Abdelatif Guettouche <abdelatif.guettouche@espressif.com>
This commit is contained in:
Abdelatif Guettouche 2022-03-21 12:20:40 +01:00 committed by Xiang Xiao
parent b7c4746b0a
commit 10f8f6c9e3
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/xtensa/src/esp32/esp32_user.c
View File

@ -26,7 +26,7 @@
#include <nuttx/arch.h>
#include <arch/loadstore.h>
#include <arch/xtensa/core.h>
#include <arch/xtensa/xtensa_corebits.h>
#include <sys/types.h>
#include <assert.h>
@ -337,7 +337,7 @@ uint32_t *xtensa_user(int exccause, uint32_t *regs)
* (thus binfo() is used below)
*/
if (exccause == XCHAL_EXCCAUSE_LOAD_STORE_ERROR &&
if (exccause == EXCCAUSE_LOAD_STORE_ERROR &&
(uintptr_t)&_siramheap <= regs[REG_EXCVADDR] &&
(uintptr_t)&_eiramheap > regs[REG_EXCVADDR])
{
@ -346,7 +346,7 @@ uint32_t *xtensa_user(int exccause, uint32_t *regs)
uint8_t s;
uint8_t t;
binfo("XCHAL_EXCCAUSE_LOAD_STORE_ERROR at %p, pc=%p\n",
binfo("EXCCAUSE_LOAD_STORE_ERROR at %p, pc=%p\n",
(void *)regs[REG_EXCVADDR],
pc);

6
arch/xtensa/src/esp32s2/esp32s2_user.c
View File

@ -26,7 +26,7 @@
#include <nuttx/arch.h>
#include <arch/loadstore.h>
#include <arch/xtensa/core.h>
#include <arch/xtensa/xtensa_corebits.h>
#include <sys/types.h>
#include <assert.h>
@ -307,7 +307,7 @@ uint32_t *xtensa_user(int exccause, uint32_t *regs)
* (thus binfo() is used below)
*/
if (exccause == XCHAL_EXCCAUSE_LOAD_STORE_ERROR &&
if (exccause == EXCCAUSE_LOAD_STORE_ERROR &&
(uintptr_t)&_stextheap <= regs[REG_EXCVADDR] &&
(uintptr_t)&_etextheap > regs[REG_EXCVADDR])
{
@ -316,7 +316,7 @@ uint32_t *xtensa_user(int exccause, uint32_t *regs)
uint8_t s;
uint8_t t;
binfo("XCHAL_EXCCAUSE_LOAD_STORE_ERROR at %p, pc=%p\n",
binfo("EXCCAUSE_LOAD_STORE_ERROR at %p, pc=%p\n",
(void *)regs[REG_EXCVADDR],
pc);