git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@199 35acf78f-673a-0410-8e92-d51de3d6d3f4

8 files changed, 218 insertions, 9 deletions

diff --git a/demos/ARM7-AT91SAM7X-GCC/Makefile b/demos/ARM7-AT91SAM7X-GCC/Makefile
index b5768f619..b419f525f 100644
--- a/demos/ARM7-AT91SAM7X-GCC/Makefile
+++ b/demos/ARM7-AT91SAM7X-GCC/Makefile
@@ -62,13 +62,14 @@ UDEFS =
 UADEFS =

 

 # List ARM-mode C source files here

-ASRC = ../../ports/ARM7-AT91SAM7X/GCC/chcore.c ../../ports\ARM7-AT91SAM7X\GCC\sam7x_serial.c \

+ASRC = ../../ports/ARM7-AT91SAM7X/GCC/chcore.c \

+       ../../ports/ARM7-AT91SAM7X/GCC/sam7x_serial.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 \

        ../../src/chserial.c \

        ../../src/lib/evtimer.c ../../test/test.c \

-       at91lib\aic.c \

+       at91lib/aic.c \

        board.c main.c

 

 # List THUMB-mode C sources here

diff --git a/demos/ARM7-AT91SAM7X-GCC/Makefile.thumb b/demos/ARM7-AT91SAM7X-GCC/Makefile.thumb
new file mode 100644
index 000000000..bb33297ca
--- /dev/null
+++ b/demos/ARM7-AT91SAM7X-GCC/Makefile.thumb
@@ -0,0 +1,199 @@
+#

+#       !!!! Do NOT edit this makefile with an editor which replace tabs by spaces !!!!

+#

+##############################################################################################

+#

+# On command line:

+#

+# make all = Create project

+#

+# make clean = Clean project files.

+#

+# To rebuild project do "make clean" and "make all".

+#

+

+##############################################################################################

+# Start of default section

+#

+

+TRGT = arm-elf-

+CC   = $(TRGT)gcc

+CP   = $(TRGT)objcopy

+AS   = $(TRGT)gcc -x assembler-with-cpp

+OD   = $(TRGT)objdump

+HEX  = $(CP) -O ihex

+BIN  = $(CP) -O binary

+

+MCU  = arm7tdmi

+

+# List all default C defines here, like -D_DEBUG=1

+DDEFS =

+

+# List all default ASM defines here, like -D_DEBUG=1

+DADEFS =

+

+# List all default directories to look for include files here

+DINCDIR =

+

+# List the default directory to look for the libraries here

+DLIBDIR =

+

+# List all default libraries here

+DLIBS =

+

+#

+# End of default section

+##############################################################################################

+

+##############################################################################################

+# Start of user section

+#

+

+# Define project name here

+PROJECT = ch

+

+# Define linker script file here

+LDSCRIPT= ch.ld

+

+# List all user C define here, like -D_DEBUG=1

+UDEFS =

+

+# Define ASM defines here

+UADEFS =

+

+# List ARM-mode C source files here

+ASRC =

+

+# List THUMB-mode C sources here

+# NOTE: If any module is compiled in thumb mode then -mthumb-interwork is

+#       enabled for all modules and that lowers performance.

+TSRC = ../../ports/ARM7-AT91SAM7X/GCC/chcore.c \

+       ../../ports/ARM7-AT91SAM7X/GCC/sam7x_serial.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 \

+       ../../src/chserial.c \

+       ../../src/lib/evtimer.c ../../test/test.c \

+       at91lib/aic.c \

+       board.c main.c

+

+# List ASM source files here

+ASMSRC = ../../ports/ARM7-AT91SAM7X/GCC/crt0.s

+

+# List all user directories here

+UINCDIR = ../../src/include ../../src/lib ../../ports/ARM7-AT91SAM7X/GCC

+

+# List the user directory to look for the libraries here

+ULIBDIR =

+

+# List all user libraries here

+ULIBS =

+

+# ARM-specific options here

+AOPT =

+

+# THUMB-specific options here

+TOPT = -mthumb -D THUMB

+

+# Common options here

+# NOTE: -ffixed-r7 is only needed if you enabled CH_CURRP_REGISTER_CACHE in

+#       chconf.h.

+# NOTE: -falign-functions=16 may improve the performance, not always, but

+#       increases the code size.

+OPT = -Os -ggdb -fomit-frame-pointer -fno-strict-aliasing

+#OPT += -ffixed-r7

+OPT += -falign-functions=16

+

+# Define warning options here

+WARN = -Wall -Wstrict-prototypes

+

+#

+# End of user defines

+##############################################################################################

+

+INCDIR  = $(patsubst %,-I%,$(DINCDIR) $(UINCDIR))

+LIBDIR  = $(patsubst %,-L%,$(DLIBDIR) $(ULIBDIR))

+DEFS    = $(DDEFS) $(UDEFS)

+ADEFS   = $(DADEFS) $(UADEFS)

+AOBJS   = $(ASRC:.c=.o)

+TOBJS   = $(TSRC:.c=.o)

+OBJS	= $(ASMOBJS) $(AOBJS) $(TOBJS)

+ASMOBJS = $(ASMSRC:.s=.o)

+LIBS    = $(DLIBS) $(ULIBS)

+MCFLAGS = -mcpu=$(MCU)

+

+ASFLAGS = $(MCFLAGS) -Wa,-amhls=$(<:.s=.lst) $(ADEFS)

+CPFLAGS = $(MCFLAGS) $(OPT) $(WARN) -Wa,-alms=$(<:.c=.lst) $(DEFS)

+LDFLAGS = $(MCFLAGS) -nostartfiles -T$(LDSCRIPT) -Wl,-Map=$(PROJECT).map,--cref,--no-warn-mismatch $(LIBDIR)

+ODFLAGS	= -x --syms

+

+# Thumb interwork enabled only if needed because it kills performance.

+ifneq ($(TSRC),)

+  CPFLAGS += -D THUMB_PRESENT

+  ifneq ($(ASRC),)

+    # Mixed ARM and THUMB case.

+    CPFLAGS += -mthumb-interwork

+    LDFLAGS += -mthumb-interwork

+  else

+    # Pure THUMB case, THUMB C code cannot be called by ARM asm code directly.

+    CPFLAGS += -D THUMB_NO_INTERWORKING

+    LDFLAGS += -mthumb

+    ASFLAGS += -D THUMB_NO_INTERWORKING

+  endif

+endif

+

+# Generate dependency information

+CPFLAGS += -MD -MP -MF .dep/$(@F).d

+

+#

+# Makefile rules

+#

+

+all: $(OBJS) $(PROJECT).elf $(PROJECT).hex $(PROJECT).bin $(PROJECT).dmp

+

+$(AOBJS) : %.o : %.c

+	@echo

+	$(CC) -c $(CPFLAGS) $(AOPT) -I . $(INCDIR) $< -o $@

+

+$(TOBJS) : %.o : %.c

+	@echo

+	$(CC) -c $(CPFLAGS) $(TOPT) -I . $(INCDIR) $< -o $@

+

+$(ASMOBJS) : %.o : %.s

+	@echo

+	$(AS) -c $(ASFLAGS) -I . $(INCDIR) $< -o $@

+

+%elf: $(OBJS)

+	@echo

+	$(CC) $(ASMOBJS) $(AOBJS) $(TOBJS) $(LDFLAGS) $(LIBS) -o $@

+

+%hex: %elf

+	$(HEX) $< $@

+

+%bin: %elf

+	$(BIN) $< $@

+

+%dmp: %elf

+	$(OD) $(ODFLAGS) $< > $@

+

+clean:

+	-rm -f $(OBJS)

+	-rm -f $(PROJECT).elf

+	-rm -f $(PROJECT).dmp

+	-rm -f $(PROJECT).map

+	-rm -f $(PROJECT).hex

+	-rm -f $(PROJECT).bin

+	-rm -f $(ASRC:.c=.c.bak)

+	-rm -f $(ASRC:.c=.lst)

+	-rm -f $(TSRC:.c=.c.bak)

+	-rm -f $(TSRC:.c=.lst)

+	-rm -f $(ASMSRC:.s=.s.bak)

+	-rm -f $(ASMSRC:.s=.lst)

+	-rm -fR .dep

+

+#

+# Include the dependency files, should be the last of the makefile

+#

+-include $(shell mkdir .dep 2>/dev/null) $(wildcard .dep/*)

+

+# *** EOF ***

diff --git a/demos/ARM7-AT91SAM7X-GCC/board.c b/demos/ARM7-AT91SAM7X-GCC/board.c
index 3a5539587..8d0851329 100644
--- a/demos/ARM7-AT91SAM7X-GCC/board.c
+++ b/demos/ARM7-AT91SAM7X-GCC/board.c
@@ -25,10 +25,14 @@
 

 extern void FiqHandler(void);

 

-__attribute__((interrupt("IRQ")))

+__attribute__((naked))

 static void SpuriousHandler(void) {

 

+  chSysIRQEnterI();

+

   AT91C_BASE_AIC->AIC_EOICR = (AT91_REG)AT91C_BASE_AIC;

+

+  chSysIRQExitI();

 }

 

 /*

diff --git a/docs/Doxyfile b/docs/Doxyfile
index 42b137d91..a451fbc01 100644
--- a/docs/Doxyfile
+++ b/docs/Doxyfile
@@ -4,7 +4,7 @@
 # Project related configuration options
 #---------------------------------------------------------------------------
 PROJECT_NAME           = ChibiOS/RT
-PROJECT_NUMBER         = "0.5.3 beta"
+PROJECT_NUMBER         = "0.5.4 beta"
 OUTPUT_DIRECTORY       = .
 CREATE_SUBDIRS         = NO
 OUTPUT_LANGUAGE        = English
diff --git a/docs/index.html b/docs/index.html
index 9bde1d9f8..f8978bd4b 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -13,7 +13,7 @@ Homepage</h2>
     </tr>

     <tr>

       <td style="text-align: center; vertical-align: top; width: 150px;">Current

-Version 0.5.3<br>

+Version 0.5.4<br>

 -<br>

       <a href="http://sourceforge.net/projects/chibios/" rel="me" target="_top">Project on SourceForge</a><br>

       <a href="html/index.html" target="_top" rel="me">Documentation</a><br>

@@ -57,8 +57,13 @@ ports</h3>
 Currently the ChibiOS/RT is ported to the following architectures:<br>

       <ul>

         <li>ARM7TDMI-LPC214x, the port to other LPC2000 chips

-should be trivial, port to other ARM families should be easy too. Both

-ARM and THUMB modes are supported.</li><li>Atmel AVR, the port is almost complete but untested because I broke my JTAG probe...</li><li>x86 as a Win32 process, this port allows to write

+should be trivial. Both ARM and THUMB modes are supported.</li>

+        <li>ARM7TDMI-AT91SAM7X256, this port also supports other Atmel

+chips: SAM7XC, SAM7S and the various sizes (128, 256, 512) with

+minimal changes.</li>

+        <li>Atmel AVR, the port is almost complete but untested because

+I broke my JTAG probe...</li>

+        <li>x86 as a Win32 process, this port allows to write

 your application on the PC without the need of a development

 board/simulator/emulator. Communication ports are simulated over

 sockets, you can telnet on the simulator ports for the debug. I am

diff --git a/ports/ARM7-AT91SAM7X/GCC/chcore.h b/ports/ARM7-AT91SAM7X/GCC/chcore.h
index 75392b6b9..8f3e7f4be 100644
--- a/ports/ARM7-AT91SAM7X/GCC/chcore.h
+++ b/ports/ARM7-AT91SAM7X/GCC/chcore.h
@@ -103,7 +103,6 @@ extern void chSysUnlock(void);
 }

 

 #define chSysIRQExitI() {                                               \

-  VICVectAddr = 0;                                                      \

   asm("ldr      r0, =IrqCommon                  \n\t"                   \

       "bx       r0                              \n\t");                 \

 }

diff --git a/ports/ARM7-LPC214x/GCC/chcore.h b/ports/ARM7-LPC214x/GCC/chcore.h
index 75392b6b9..8f3e7f4be 100644
--- a/ports/ARM7-LPC214x/GCC/chcore.h
+++ b/ports/ARM7-LPC214x/GCC/chcore.h
@@ -103,7 +103,6 @@ extern void chSysUnlock(void);
 }

 

 #define chSysIRQExitI() {                                               \

-  VICVectAddr = 0;                                                      \

   asm("ldr      r0, =IrqCommon                  \n\t"                   \

       "bx       r0                              \n\t");                 \

 }

diff --git a/readme.txt b/readme.txt
index e5e123b77..2d9d35d45 100644
--- a/readme.txt
+++ b/readme.txt
@@ -49,6 +49,8 @@ AVR-AT90CANx-GCC       - Port on AVR AT90CAN128, not complete yet.
   ChibiOS/RT releases, see the demo readme.txt file.

   The kernel is *unchanged* compared to version 0.5.3, just the new port and

   the new demo were added.

+- Small fix to the thumb mode IRQ code on the LPC214x port, removed some extra

+  code.

 

 *** 0.5.3 ***

 - Removed the chMsgSendTimeout() API, it was conceptually flawed because,