From 924292823659b1e037188c608c795c80db42875e Mon Sep 17 00:00:00 2001 From: schodet Date: Tue, 20 Jul 2004 19:45:59 +0000 Subject: Nouveau system de makefile. Correction bug alacon dans poll. --- n/avr/rs232/Makefile | 1 + n/avr/rs232/Makefile.avr | 13 +++++-------- n/avr/rs232/rs232.c | 2 +- 3 files changed, 7 insertions(+), 9 deletions(-) (limited to 'n') diff --git a/n/avr/rs232/Makefile b/n/avr/rs232/Makefile index a44cfdf..a70b2e0 100644 --- a/n/avr/rs232/Makefile +++ b/n/avr/rs232/Makefile @@ -3,6 +3,7 @@ SOURCES = test_rs232.c rs232.c DOC = rs232.html EXTRACTDOC = rs232.c avrconfig.h MODULES = +CONFIGFILE = avrconfig.h # atmega8, atmega8535, atmega128... MCU_TARGET = atmega8 # -O2 : speed diff --git a/n/avr/rs232/Makefile.avr b/n/avr/rs232/Makefile.avr index d1411f4..01c9b7b 100644 --- a/n/avr/rs232/Makefile.avr +++ b/n/avr/rs232/Makefile.avr @@ -2,7 +2,8 @@ CC = avr-gcc -CFLAGS = -g -Wall $(OPTIMIZE) -mmcu=$(MCU_TARGET) +CFLAGS = -g -Wall $(OPTIMIZE) -mmcu=$(MCU_TARGET) \ + $(if $(CONFIGFILE), $(CONFIGFILE:%=-include %)) CPPFLAGS = $(DEFS) -Imodules LDFLAGS = @@ -22,19 +23,15 @@ all: elf lst hex # Rules for modules. {{{1 -MODULESFILES = $(MODULES:%=modules/%/Module) +MODULESFILES = $(MODULES:%=modules/%/Makefile.module) -Makefile: $(MODULESFILES) +include $(MODULESFILES) -MODULESOURCES = $(addprefix modules/$(module)/,\ - $(shell cat modules/$(module)/Module)) -MODULESSOURCES := $(if $(MODULES),\ - $(foreach module,$(MODULES),$(MODULESOURCES))) SOURCES += $(MODULESSOURCES) $(MODULESFILES): mkdir -p modules - cd modules && cvs co $(@:modules/%/Module=%) + cd modules && cvs co $(@:modules/%/Makefile.module=%) test -f $@ # General rules. {{{1 diff --git a/n/avr/rs232/rs232.c b/n/avr/rs232/rs232.c index 469ff17..bf1c83b 100644 --- a/n/avr/rs232/rs232.c +++ b/n/avr/rs232/rs232.c @@ -212,7 +212,7 @@ uint8_t rs232_poll (void) { #if RECV_MODE == POLLING - return UCSRA & RXC; + return UCSRA & _BV (RXC); #elif RECV_MODE == RING return (rs232_recv_head - rs232_recv_tail) & RECV_BUFFER_MASK; #endif -- cgit v1.2.3