mirror of
https://github.com/apache/nuttx.git
synced 2026-06-04 23:03:27 +08:00
Misc PIC32 fixes
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4082 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
@@ -95,7 +95,7 @@ static inline uint32_t cp0_getintctl(void)
|
|||||||
: "memory"
|
: "memory"
|
||||||
);
|
);
|
||||||
|
|
||||||
return cause;
|
return intctl;
|
||||||
}
|
}
|
||||||
|
|
||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
@@ -155,7 +155,7 @@ static inline uint32_t cp0_getebase(void)
|
|||||||
: "memory"
|
: "memory"
|
||||||
);
|
);
|
||||||
|
|
||||||
return cause;
|
return ebase;
|
||||||
}
|
}
|
||||||
|
|
||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
|
|||||||
@@ -39,6 +39,8 @@
|
|||||||
|
|
||||||
#include <nuttx/config.h>
|
#include <nuttx/config.h>
|
||||||
|
|
||||||
|
#include <debug.h>
|
||||||
|
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
|
||||||
@@ -83,14 +85,6 @@
|
|||||||
|
|
||||||
uint32_t *pic32mx_decodeirq(uint32_t *regs)
|
uint32_t *pic32mx_decodeirq(uint32_t *regs)
|
||||||
{
|
{
|
||||||
#ifdef CONFIG_SUPPRESS_INTERRUPTS
|
|
||||||
|
|
||||||
up_ledon(LED_INIRQ);
|
|
||||||
PANIC(OSERR_ERREXCEPTION);
|
|
||||||
up_ledoff(LED_INIRQ); /* Won't get here */
|
|
||||||
return regs;
|
|
||||||
|
|
||||||
#else
|
|
||||||
uint32_t *savestate;
|
uint32_t *savestate;
|
||||||
uint32_t regval;
|
uint32_t regval;
|
||||||
int irq;
|
int irq;
|
||||||
@@ -170,5 +164,4 @@ uint32_t *pic32mx_decodeirq(uint32_t *regs)
|
|||||||
}
|
}
|
||||||
|
|
||||||
return regs;
|
return regs;
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user