OrgApache/incubator-nuttx
OrgApache
/
incubator-nuttx
mirror of https://github.com/apache/incubator-nuttx.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Patches for NSH disable background, and ARMv7M assembly from Freddie Chopin 

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5398 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2012-11-29 13:58:53 +00:00
parent 87f2b53ae8
commit 7017e67234
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/src/armv7-m/up_exception.S
View File

@ -134,9 +134,9 @@ exception_common:
#if CONFIG_ARCH_INTERRUPTSTACK > 3 #if CONFIG_ARCH_INTERRUPTSTACK > 3
ldr sp, =g_intstackbase ldr sp, =g_intstackbase
push r1 /* Save the MSP on the interrupt stack */ push {r1} /* Save the MSP on the interrupt stack */
bl up_doirq /* R0=IRQ, R1=register save area on stack */ bl up_doirq /* R0=IRQ, R1=register save area on stack */
pop r1 /* Recover R1=main stack pointer */ pop {r1} /* Recover R1=main stack pointer */
#else #else
msr msp, r1 /* We are using the main stack pointer */ msr msp, r1 /* We are using the main stack pointer */
bl up_doirq /* R0=IRQ, R1=register save area on stack */ bl up_doirq /* R0=IRQ, R1=register save area on stack */

2
configs/z8encore000zco/scripts/setenv.bat
View File

@ -41,7 +41,7 @@ set PATH=C:\MinGW\bin;%PATH%
rem This is the location where I installed the ZDS-II toolchain. rem This is the location where I installed the ZDS-II toolchain.
set PATH=C:\Program Files (x86)\ZiLOG\ZZDSII_Z8Encore!_5.0.0\bin;%PATH% set PATH=C:\Program Files (x86)\ZiLOG\ZDSII_Z8Encore!_5.0.0\bin;%PATH%
rem This is the location where I installed the GNUWin32 tools. See rem This is the location where I installed the GNUWin32 tools. See
rem http://gnuwin32.sourceforge.net/. rem http://gnuwin32.sourceforge.net/.

2
configs/z8f64200100kit/scripts/setenv.bat
View File

@ -41,7 +41,7 @@ set PATH=C:\MinGW\bin;%PATH%
rem This is the location where I installed the ZDS-II toolchain. rem This is the location where I installed the ZDS-II toolchain.
set PATH=C:\Program Files (x86)\ZiLOG\ZZDSII_Z8Encore!_5.0.0\bin;%PATH% set PATH=C:\Program Files (x86)\ZiLOG\ZDSII_Z8Encore!_5.0.0\bin;%PATH%
rem This is the location where I installed the GNUWin32 tools. See rem This is the location where I installed the GNUWin32 tools. See
rem http://gnuwin32.sourceforge.net/. rem http://gnuwin32.sourceforge.net/.