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

4 files changed, 14 insertions, 12 deletions

diff --git a/demos/ARM7-LPC214x-GCC/Makefile b/demos/ARM7-LPC214x-GCC/Makefile
index 8400d8f82..b69ae8780 100644
--- a/demos/ARM7-LPC214x-GCC/Makefile
+++ b/demos/ARM7-LPC214x-GCC/Makefile
@@ -62,7 +62,7 @@ UDEFS =
 UADEFS =

 

 # List ARM-mode C source files here

-ASRC = chcore.c main.c buzzer.c \

+ASRC = chcore.c main.c buzzer.c ../../src/lib/evtimer.c \

        ../../test/test.c ../../ports/ARM7-LPC214x/GCC/lpc214x_serial.c  \

        ../../src/chinit.c ../../src/chlists.c ../../src/chdelta.c ../../src/chschd.c \

        ../../src/chthreads.c ../../src/chsem.c ../../src/chevents.c ../../src/chmsg.c \

@@ -92,8 +92,6 @@ AOPT =
 TOPT = -mthumb -D THUMB

 

 # Common options here

-# NOTE: -mthumb-interwork increases the code size, remove it if you dont have

-#       Thumb code anywhere in the project.

 # NOTE: -ffixed-f7 is only needed if you enabled CH_CURRP_REGISTER_CACHE in chconf.h.

 OPT = -O2 -ggdb -fomit-frame-pointer -fno-strict-aliasing

 #OPT += -ffixed-f7

@@ -117,7 +115,7 @@ LIBS    = $(DLIBS) $(ULIBS)
 MCFLAGS = -mcpu=$(MCU)

 

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

-CPFLAGS = $(MCFLAGS) $(OPT) $(WARN) -fverbose-asm -Wa,-ahlms=$(<:.c=.lst) $(DEFS)

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

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

 ODFLAGS	= -x --syms

 

@@ -137,15 +135,19 @@ CPFLAGS += -MD -MP -MF .dep/$(@F).d
 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) $< -o $@

 

 %elf: $(OBJS)

+	@echo

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

 

 %hex: %elf

diff --git a/demos/ARM7-LPC214x-GCC/chcore.h b/demos/ARM7-LPC214x-GCC/chcore.h
index b2091b686..9c583c2ac 100644
--- a/demos/ARM7-LPC214x-GCC/chcore.h
+++ b/demos/ARM7-LPC214x-GCC/chcore.h
@@ -98,7 +98,7 @@ extern void chSysUnlock(void);
                           sizeof(struct stackregs) + (n) + (INT_REQUIRED_STACK))

 

 void chSysHalt(void) __attribute__((noreturn));

-void chSysPause(void);

+void chSysPause(void)  __attribute__((noreturn));

 void chSysSwitchI(Context *oldp, Context *newp);

 void threadstart(void);

 void DefFiqHandler(void);

diff --git a/demos/ARM7-LPC214x-GCC/main.c b/demos/ARM7-LPC214x-GCC/main.c
index 0183b276b..5db6815fb 100644
--- a/demos/ARM7-LPC214x-GCC/main.c
+++ b/demos/ARM7-LPC214x-GCC/main.c
@@ -57,18 +57,18 @@ static BYTE8 waThread3[UserStackSize(64)];
 

 static t_msg Thread3(void *arg) {

   t_msg TestThread(void *p);

-  

+

   while (TRUE) {

-  	if (!(IO0PIN & 0x00018000)) {

+    if (!(IO0PIN & 0x00018000)) {

       TestThread(&COM1);

       PlaySound(500, 100);

-  	}

-  	else {

+    }

+    else {

       if (!(IO0PIN & 0x00008000)) // Button 1

         PlaySound(1000, 100);

       if (!(IO0PIN & 0x00010000)) // Button 2

         chFDDWrite(&COM1, (BYTE8 *)"Hello World!\r\n", 14);

-  	}

+    }

     chThdSleep(500);

   }

   return 0;

diff --git a/demos/AVR-AT90CANx-GCC/chcore.h b/demos/AVR-AT90CANx-GCC/chcore.h
index d263202d8..799742f47 100644
--- a/demos/AVR-AT90CANx-GCC/chcore.h
+++ b/demos/AVR-AT90CANx-GCC/chcore.h
@@ -97,8 +97,8 @@ typedef struct {
 #define chSysLock() asm("cli")

 #define chSysUnlock() asm("sei")

 

-void chSysHalt(void);

-void chSysPause(void);

+void chSysHalt(void) __attribute__((noreturn)) ;

+void chSysPause(void) __attribute__((noreturn)) ;

 void chSysSwitchI(Context *oldp, Context *newp);

 

 #endif /* _CHCORE_H_ */