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:
parent
5de28bbfb5
commit
ceaff95d18
@ -95,7 +95,7 @@ static inline uint32_t cp0_getintctl(void)
|
||||
: "memory"
|
||||
);
|
||||
|
||||
return cause;
|
||||
return intctl;
|
||||
}
|
||||
|
||||
/****************************************************************************
|
||||
@ -155,7 +155,7 @@ static inline uint32_t cp0_getebase(void)
|
||||
: "memory"
|
||||
);
|
||||
|
||||
return cause;
|
||||
return ebase;
|
||||
}
|
||||
|
||||
/****************************************************************************
|
||||
|
@ -39,6 +39,8 @@
|
||||
|
||||
#include <nuttx/config.h>
|
||||
|
||||
#include <debug.h>
|
||||
|
||||
#include <stdint.h>
|
||||
#include <assert.h>
|
||||
|
||||
@ -83,14 +85,6 @@
|
||||
|
||||
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 regval;
|
||||
int irq;
|
||||
@ -170,5 +164,4 @@ uint32_t *pic32mx_decodeirq(uint32_t *regs)
|
||||
}
|
||||
|
||||
return regs;
|
||||
#endif
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user