diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2008-02-22 10:53:47 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2008-02-22 10:53:47 +0000 |
| commit | 58ab6d53dd54635ef8d53166234c192312bb6854 (patch) | |
| tree | 3d247a3dfbf08d4dd5b2f144791f80fc154fb95b /demos/ARM7-AT91SAM7X-GCC | |
| parent | 9d95345fd750466563a0fd95a35ab20e425018b9 (diff) | |
| download | ChibiOS-58ab6d53dd54635ef8d53166234c192312bb6854.tar.gz ChibiOS-58ab6d53dd54635ef8d53166234c192312bb6854.tar.bz2 ChibiOS-58ab6d53dd54635ef8d53166234c192312bb6854.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@201 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'demos/ARM7-AT91SAM7X-GCC')
| -rw-r--r-- | demos/ARM7-AT91SAM7X-GCC/Makefile | 6 | ||||
| -rw-r--r-- | demos/ARM7-AT91SAM7X-GCC/Makefile.thumb | 6 | ||||
| -rw-r--r-- | demos/ARM7-AT91SAM7X-GCC/board.c | 3 |
3 files changed, 10 insertions, 5 deletions
diff --git a/demos/ARM7-AT91SAM7X-GCC/Makefile b/demos/ARM7-AT91SAM7X-GCC/Makefile index b419f525f..9c2006fe2 100644 --- a/demos/ARM7-AT91SAM7X-GCC/Makefile +++ b/demos/ARM7-AT91SAM7X-GCC/Makefile @@ -78,10 +78,11 @@ ASRC = ../../ports/ARM7-AT91SAM7X/GCC/chcore.c \ TSRC =
# List ASM source files here
-ASMSRC = ../../ports/ARM7-AT91SAM7X/GCC/crt0.s
+ASMSRC = ../../ports/ARM7-AT91SAM7X/GCC/crt0.s ../../ports/ARM7/chsys.s
# List all user directories here
-UINCDIR = ../../src/include ../../src/lib ../../ports/ARM7-AT91SAM7X/GCC
+UINCDIR = ../../src/include ../../src/lib \
+ ../../ports/ARM7 ../../ports/ARM7-AT91SAM7X/GCC
# List the user directory to look for the libraries here
ULIBDIR =
@@ -130,6 +131,7 @@ ODFLAGS = -x --syms # Thumb interwork enabled only if needed because it kills performance.
ifneq ($(TSRC),)
CPFLAGS += -D THUMB_PRESENT
+ ASFLAGS += -D THUMB_PRESENT
ifneq ($(ASRC),)
# Mixed ARM and THUMB case.
CPFLAGS += -mthumb-interwork
diff --git a/demos/ARM7-AT91SAM7X-GCC/Makefile.thumb b/demos/ARM7-AT91SAM7X-GCC/Makefile.thumb index bb33297ca..5dd2f33c6 100644 --- a/demos/ARM7-AT91SAM7X-GCC/Makefile.thumb +++ b/demos/ARM7-AT91SAM7X-GCC/Makefile.thumb @@ -78,10 +78,11 @@ TSRC = ../../ports/ARM7-AT91SAM7X/GCC/chcore.c \ board.c main.c
# List ASM source files here
-ASMSRC = ../../ports/ARM7-AT91SAM7X/GCC/crt0.s
+ASMSRC = ../../ports/ARM7-AT91SAM7X/GCC/crt0.s ../../ports/ARM7/chsys.s
# List all user directories here
-UINCDIR = ../../src/include ../../src/lib ../../ports/ARM7-AT91SAM7X/GCC
+UINCDIR = ../../src/include ../../src/lib \
+ ../../ports/ARM7 ../../ports/ARM7-AT91SAM7X/GCC
# List the user directory to look for the libraries here
ULIBDIR =
@@ -130,6 +131,7 @@ ODFLAGS = -x --syms # Thumb interwork enabled only if needed because it kills performance.
ifneq ($(TSRC),)
CPFLAGS += -D THUMB_PRESENT
+ ASFLAGS += -D THUMB_PRESENT
ifneq ($(ASRC),)
# Mixed ARM and THUMB case.
CPFLAGS += -mthumb-interwork
diff --git a/demos/ARM7-AT91SAM7X-GCC/board.c b/demos/ARM7-AT91SAM7X-GCC/board.c index 8d0851329..236e1100e 100644 --- a/demos/ARM7-AT91SAM7X-GCC/board.c +++ b/demos/ARM7-AT91SAM7X-GCC/board.c @@ -30,7 +30,7 @@ static void SpuriousHandler(void) { chSysIRQEnterI();
- AT91C_BASE_AIC->AIC_EOICR = (AT91_REG)AT91C_BASE_AIC;
+ AT91C_BASE_AIC->AIC_EOICR = 0;
chSysIRQExitI();
}
@@ -47,6 +47,7 @@ static void SYSIrqHandler(void) { (void) AT91C_BASE_PITC->PITC_PIVR;
chSysTimerHandlerI();
}
+ AT91C_BASE_AIC->AIC_EOICR = 0; \
chSysIRQExitI();
}
|