diff options
| author | px4dev <px4@purgatory.org> | 2013-01-25 19:29:29 -0800 |
|---|---|---|
| committer | px4dev <px4@purgatory.org> | 2013-01-25 19:29:29 -0800 |
| commit | 24f6c6b121ea87b26a2c5cac933089be496a28b6 (patch) | |
| tree | c3b8fdab88b12c72197348873caa03d22eb46b60 /nuttx/arch/arm/src/armv7-m/up_initialstate.c | |
| parent | 0bc836ae1d90b1805940ec8ae271639f0074a792 (diff) | |
| parent | beb45222985f1eb9fbe21b22b95c30ab8ca5bbac (diff) | |
| download | px4-firmware-24f6c6b121ea87b26a2c5cac933089be496a28b6.tar.gz px4-firmware-24f6c6b121ea87b26a2c5cac933089be496a28b6.tar.bz2 px4-firmware-24f6c6b121ea87b26a2c5cac933089be496a28b6.zip | |
Merge branch 'master' into px4io-i2c
Diffstat (limited to 'nuttx/arch/arm/src/armv7-m/up_initialstate.c')
| -rw-r--r-- | nuttx/arch/arm/src/armv7-m/up_initialstate.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/nuttx/arch/arm/src/armv7-m/up_initialstate.c b/nuttx/arch/arm/src/armv7-m/up_initialstate.c index 52a2682a0..4af553f25 100644 --- a/nuttx/arch/arm/src/armv7-m/up_initialstate.c +++ b/nuttx/arch/arm/src/armv7-m/up_initialstate.c @@ -1,7 +1,7 @@ /**************************************************************************** * arch/arm/src/armv7-m/up_initialstate.c * - * Copyright (C) 2009, 2011-2 Gregory Nutt. All rights reserved. + * Copyright (C) 2009, 2011-2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> * * Redistribution and use in source and binary forms, with or without @@ -156,7 +156,7 @@ void up_initial_state(_TCB *tcb) xcp->regs[REG_FPSCR] = 0; // XXX initial FPSCR should be configurable xcp->regs[REG_FPReserved] = 0; -#endif +#endif /* CONFIG_ARCH_FPU */ #ifdef CONFIG_NUTTX_KERNEL if ((tcb->flags & TCB_FLAG_TTYPE_MASK) != TCB_FLAG_TTYPE_KERNEL) @@ -165,7 +165,7 @@ void up_initial_state(_TCB *tcb) xcp->regs[REG_EXC_RETURN] = EXC_RETURN_PROCESS_STACK; } -#endif +#endif /* CONFIG_NUTTX_KERNEL */ #else /* CONFIG_ARMV7M_CMNVECTOR */ @@ -189,12 +189,16 @@ void up_initial_state(_TCB *tcb) xcp->regs[REG_EXC_RETURN] = EXC_RETURN_UNPRIVTHR; } -#endif +#endif /* CONFIG_NUTTX_KERNEL */ #endif /* CONFIG_ARMV7M_CMNVECTOR */ /* Enable or disable interrupts, based on user configuration */ #ifdef CONFIG_SUPPRESS_INTERRUPTS +#ifdef CONFIG_ARMV7M_USEBASEPRI + xcp->regs[REG_BASEPRI] = NVIC_SYSH_DISABLE_PRIORITY; +#else xcp->regs[REG_PRIMASK] = 1; #endif +#endif /* CONFIG_SUPPRESS_INTERRUPTS */ } |