diff options
author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2008-05-16 09:17:25 +0000 |
---|---|---|
committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2008-05-16 09:17:25 +0000 |
commit | 1e99857780de7d93c5e6c246202584c1fe270696 (patch) | |
tree | d8c7ccadedb6bd169419ff2f8b7f65be2d728f2f /demos/ARM7-AT91SAM7X-GCC | |
parent | 1dce6b0fb931d38b30f53e99d7b60374e46f7d03 (diff) | |
download | ChibiOS-1e99857780de7d93c5e6c246202584c1fe270696.tar.gz ChibiOS-1e99857780de7d93c5e6c246202584c1fe270696.tar.bz2 ChibiOS-1e99857780de7d93c5e6c246202584c1fe270696.zip |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@291 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'demos/ARM7-AT91SAM7X-GCC')
-rw-r--r-- | demos/ARM7-AT91SAM7X-GCC/Makefile | 3 | ||||
-rw-r--r-- | demos/ARM7-AT91SAM7X-GCC/Makefile.thumb | 3 | ||||
-rw-r--r-- | demos/ARM7-AT91SAM7X-GCC/ch.ld | 2 | ||||
-rw-r--r-- | demos/ARM7-AT91SAM7X-GCC/main.c | 6 |
4 files changed, 8 insertions, 6 deletions
diff --git a/demos/ARM7-AT91SAM7X-GCC/Makefile b/demos/ARM7-AT91SAM7X-GCC/Makefile index 6c6d8f783..8ac2a69af 100644 --- a/demos/ARM7-AT91SAM7X-GCC/Makefile +++ b/demos/ARM7-AT91SAM7X-GCC/Makefile @@ -64,6 +64,7 @@ UADEFS = # List ARM-mode C source files here
ASRC = ../../ports/ARM7-AT91SAM7X/chcore.c \
../../ports/ARM7-AT91SAM7X/sam7x_serial.c \
+ ../../ports/ARM7-AT91SAM7X/sam7x_emac.c \
../../src/chinit.c ../../src/chdebug.c ../../src/chlists.c ../../src/chdelta.c \
../../src/chschd.c ../../src/chthreads.c ../../src/chsem.c ../../src/chmtx.c \
../../src/chevents.c ../../src/chmsg.c ../../src/chsleep.c ../../src/chqueues.c \
@@ -81,7 +82,7 @@ TSRC = ASMSRC = ../../ports/ARM7-AT91SAM7X/crt0.s ../../ports/ARM7/chsys.s
# List all user directories here
-UINCDIR = ../../src/include ../../src/lib \
+UINCDIR = ../../src/include ../../src/lib ../../test \
../../ports/ARM7 ../../ports/ARM7-AT91SAM7X
# List the user directory to look for the libraries here
diff --git a/demos/ARM7-AT91SAM7X-GCC/Makefile.thumb b/demos/ARM7-AT91SAM7X-GCC/Makefile.thumb index 212886957..e3fb4a6ce 100644 --- a/demos/ARM7-AT91SAM7X-GCC/Makefile.thumb +++ b/demos/ARM7-AT91SAM7X-GCC/Makefile.thumb @@ -69,6 +69,7 @@ ASRC = # enabled for all modules and that lowers performance.
TSRC = ../../ports/ARM7-AT91SAM7X/chcore.c \
../../ports/ARM7-AT91SAM7X/sam7x_serial.c \
+ ../../ports/ARM7-AT91SAM7X/sam7x_emac.c \
../../src/chinit.c ../../src/chdebug.c ../../src/chlists.c ../../src/chdelta.c \
../../src/chschd.c ../../src/chthreads.c ../../src/chsem.c ../../src/chmtx.c \
../../src/chevents.c ../../src/chmsg.c ../../src/chsleep.c ../../src/chqueues.c \
@@ -81,7 +82,7 @@ TSRC = ../../ports/ARM7-AT91SAM7X/chcore.c \ ASMSRC = ../../ports/ARM7-AT91SAM7X/crt0.s ../../ports/ARM7/chsys.s
# List all user directories here
-UINCDIR = ../../src/include ../../src/lib \
+UINCDIR = ../../src/include ../../src/lib ../../test \
../../ports/ARM7 ../../ports/ARM7-AT91SAM7X
# List the user directory to look for the libraries here
diff --git a/demos/ARM7-AT91SAM7X-GCC/ch.ld b/demos/ARM7-AT91SAM7X-GCC/ch.ld index 541c73b5b..847340cb4 100644 --- a/demos/ARM7-AT91SAM7X-GCC/ch.ld +++ b/demos/ARM7-AT91SAM7X-GCC/ch.ld @@ -30,7 +30,7 @@ __stacks_total_size__ = __und_stack_size__ + __abt_stack_size__ + __fiq_stack_si MEMORY
{
- flash : org = 0x100000, len = 256k
+ flash : org = 0x000000, len = 256k
ram : org = 0x200020, len = 64k - 0x20
}
diff --git a/demos/ARM7-AT91SAM7X-GCC/main.c b/demos/ARM7-AT91SAM7X-GCC/main.c index a255c9939..27fc20a3d 100644 --- a/demos/ARM7-AT91SAM7X-GCC/main.c +++ b/demos/ARM7-AT91SAM7X-GCC/main.c @@ -18,6 +18,7 @@ */
#include <ch.h>
+#include <test.h>
#include "board.h"
#include "sam7x_serial.h"
@@ -27,9 +28,9 @@ static msg_t Thread1(void *arg) { while (TRUE) {
AT91C_BASE_PIOB->PIO_SODR = PIOB_LCD_BL; // LCD on.
- chThdSleep(500);
+ chThdSleep(100);
AT91C_BASE_PIOB->PIO_CODR = PIOB_LCD_BL; // LCD off.
- chThdSleep(500);
+ chThdSleep(900);
}
return 0;
}
@@ -38,7 +39,6 @@ static msg_t Thread1(void *arg) { * Entry point, the interrupts are disabled on entry.
*/
int main(int argc, char **argv) {
- msg_t TestThread(void *p);
/*
* The main() function becomes a thread here then the interrupts are
|