- Fixed a compilation problem caused by 2.3 root Makefile-include changes with regard to sdcc.
- Fixed a small typo in cc2430_rf.c - examples/sensinode now compiles
This commit is contained in:
parent
c9954072c9
commit
4a14db6d3a
@ -1,7 +1,3 @@
|
||||
CONTIKI_CPU_DIRS = . net
|
||||
|
||||
CONTIKI_SOURCEFILES += #mtarch.c rtimer-arch.c elfloader-stub.c watchdog.c
|
||||
|
||||
### Compiler definitions
|
||||
CC = sdcc
|
||||
LD = sdcc
|
||||
@ -36,9 +32,15 @@ CONTIKI_PLATFORM_DIRS = $(PLATFORM_APPDIRS) \
|
||||
|
||||
### Compilation rules
|
||||
|
||||
#CUSTOM_RULE_C_TO_OBJECTDIR_O=1
|
||||
CUSTOM_RULE_C_TO_OBJECTDIR_O=1
|
||||
CUSTOM_RULE_ALLOBJS_TO_TARGETLIB=1
|
||||
|
||||
ifdef CUSTOM_RULE_C_TO_OBJECTDIR_O
|
||||
$(OBJECTDIR)/%.o: %.c
|
||||
$(CC) $(CFLAGS) -c $< -o $@
|
||||
@$(FINALIZE_DEPENDENCY)
|
||||
endif
|
||||
|
||||
ifdef CUSTOM_RULE_CS_TO_OBJECTDIR_O
|
||||
$(OBJECTDIR)/%.o: %.cS
|
||||
cp $< $(OBJECTDIR)/$*.c
|
||||
|
@ -266,7 +266,7 @@ cc2430_rf_read(void *buf, unsigned short bufsize)
|
||||
/* Check the type */
|
||||
type = RFD;
|
||||
type &= 0x07;
|
||||
if(typ e== 0x02) {
|
||||
if(type == 0x02) {
|
||||
printf("cc2430_rf: ack\n");
|
||||
} else {
|
||||
/* Read the buffer */
|
||||
|
Loading…
Reference in New Issue
Block a user