diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-04-08 03:54:17 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-04-08 03:54:17 +0000 |
| commit | fde641dedf8a3922658e92a19ca8eb7698db3ac0 (patch) | |
| tree | ac51801a1589a0bee815abcee5c66f34c53a590e /nuttx | |
| parent | 45474d6e667a62ce96979008613e3b2fd5c713e0 (diff) | |
| download | px4-nuttx-fde641dedf8a3922658e92a19ca8eb7698db3ac0.tar.gz px4-nuttx-fde641dedf8a3922658e92a19ca8eb7698db3ac0.tar.bz2 px4-nuttx-fde641dedf8a3922658e92a19ca8eb7698db3ac0.zip | |
Fix error introduced in last commit
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3481 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx')
| -rw-r--r-- | nuttx/arch/arm/src/lm3s/lm3s_vectors.S | 4 | ||||
| -rwxr-xr-x | nuttx/arch/arm/src/lpc17xx/lpc17_vectors.S | 4 | ||||
| -rwxr-xr-x | nuttx/arch/arm/src/sam3u/sam3u_vectors.S | 4 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/stm32/stm32_vectors.S | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/nuttx/arch/arm/src/lm3s/lm3s_vectors.S b/nuttx/arch/arm/src/lm3s/lm3s_vectors.S index 90f2850af..87d995b29 100644 --- a/nuttx/arch/arm/src/lm3s/lm3s_vectors.S +++ b/nuttx/arch/arm/src/lm3s/lm3s_vectors.S @@ -643,9 +643,9 @@ lm3s_irqcommon: */ 1: #ifdef CONFIG_NUTTX_KERNEL - ldmia r0, {r2-r11,r14} /* Recover R4-R11, r14 + 2 temp values */ + ldmia r1!, {r2-r11,r14} /* Recover R4-R11, r14 + 2 temp values */ #else - ldmia r0, {r2-r11} /* Recover R4-R11 + 2 temp values */ + ldmia r1!, {r2-r11} /* Recover R4-R11 + 2 temp values */ #endif 2: #ifdef CONFIG_NUTTX_KERNEL diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_vectors.S b/nuttx/arch/arm/src/lpc17xx/lpc17_vectors.S index 4cfa9a3ce..75eb71f17 100755 --- a/nuttx/arch/arm/src/lpc17xx/lpc17_vectors.S +++ b/nuttx/arch/arm/src/lpc17xx/lpc17_vectors.S @@ -317,9 +317,9 @@ lpc17_common: */ 1: #ifdef CONFIG_NUTTX_KERNEL - ldmia r0, {r2-r11,r14} /* Recover R4-R11, r14 + 2 temp values */ + ldmia r1!, {r2-r11,r14} /* Recover R4-R11, r14 + 2 temp values */ #else - ldmia r0, {r2-r11} /* Recover R4-R11 + 2 temp values */ + ldmia r1!, {r2-r11} /* Recover R4-R11 + 2 temp values */ #endif 2: #ifdef CONFIG_NUTTX_KERNEL diff --git a/nuttx/arch/arm/src/sam3u/sam3u_vectors.S b/nuttx/arch/arm/src/sam3u/sam3u_vectors.S index c4ab12ba0..7e7ad188e 100755 --- a/nuttx/arch/arm/src/sam3u/sam3u_vectors.S +++ b/nuttx/arch/arm/src/sam3u/sam3u_vectors.S @@ -308,9 +308,9 @@ sam3u_common: */ 1: #ifdef CONFIG_NUTTX_KERNEL - ldmia r0, {r2-r11,r14} /* Recover R4-R11, r14 + 2 temp values */ + ldmia r1!, {r2-r11,r14} /* Recover R4-R11, r14 + 2 temp values */ #else - ldmia r0, {r2-r11} /* Recover R4-R11 + 2 temp values */ + ldmia r1!, {r2-r11} /* Recover R4-R11 + 2 temp values */ #endif 2: #ifdef CONFIG_NUTTX_KERNEL diff --git a/nuttx/arch/arm/src/stm32/stm32_vectors.S b/nuttx/arch/arm/src/stm32/stm32_vectors.S index 908dc5b44..60f08b375 100644 --- a/nuttx/arch/arm/src/stm32/stm32_vectors.S +++ b/nuttx/arch/arm/src/stm32/stm32_vectors.S @@ -500,9 +500,9 @@ stm32_common: */ 1: #ifdef CONFIG_NUTTX_KERNEL - ldmia r0, {r2-r11,r14} /* Recover R4-R11, r14 + 2 temp values */ + ldmia r1!, {r2-r11,r14} /* Recover R4-R11, r14 + 2 temp values */ #else - ldmia r0, {r2-r11} /* Recover R4-R11 + 2 temp values */ + ldmia r1!, {r2-r11} /* Recover R4-R11 + 2 temp values */ #endif 2: #ifdef CONFIG_NUTTX_KERNEL |