diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2013-03-07 01:52:30 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2013-03-07 01:52:30 +0000 |
| commit | ce376ed9e145fe7b9c0215e93bfebf0893ecf7b3 (patch) | |
| tree | 425cec7640f89663994f2a3646ca35e54db91df6 /nuttx/arch/arm/src/armv7-m | |
| parent | 5332fb0e659549272ed5527c26964b22d31da3bc (diff) | |
| download | px4-nuttx-ce376ed9e145fe7b9c0215e93bfebf0893ecf7b3.tar.gz px4-nuttx-ce376ed9e145fe7b9c0215e93bfebf0893ecf7b3.tar.bz2 px4-nuttx-ce376ed9e145fe7b9c0215e93bfebf0893ecf7b3.zip | |
More LPC1788 changes from Rommel Marcelo + a few kernel build fixes
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5715 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/arm/src/armv7-m')
| -rw-r--r-- | nuttx/arch/arm/src/armv7-m/up_svcall.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/nuttx/arch/arm/src/armv7-m/up_svcall.c b/nuttx/arch/arm/src/armv7-m/up_svcall.c index 078f85606..4da466934 100644 --- a/nuttx/arch/arm/src/armv7-m/up_svcall.c +++ b/nuttx/arch/arm/src/armv7-m/up_svcall.c @@ -118,7 +118,6 @@ static void dispatch_syscall(void) " mov r2, r0\n" /* R2=Saved return value in R0 */ " mov r0, #3\n" /* R0=SYS_syscall_return */ " svc 0" /* Return from the syscall */ - ::: ); } #endif @@ -260,7 +259,7 @@ int up_svcall(int irq, FAR void *context) current_regs[REG_PC] = rtcb->xcp.sysreturn; current_regs[REG_EXC_RETURN] = EXC_RETURN_UNPRIVTHR; - rtcb->sysreturn = NULL; + rtcb->xcp.sysreturn = NULL; /* The return value must be in R0-R1. dispatch_syscall() temporarily * moved the value to R2. @@ -294,7 +293,7 @@ int up_svcall(int irq, FAR void *context) /* Setup to return to dispatch_syscall in privileged mode. */ - rtcb->sysreturn = regs[REG_PC] + rtcb->xcp.sysreturn = regs[REG_PC]; regs[REG_PC] = (uint32_t)dispatch_syscall; current_regs[REG_EXC_RETURN] = EXC_RETURN_PRIVTHR; |