deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

- Fixed a compilation problem caused by 2.3 root Makefile-include changes with regard to sdcc.

Browse source 
- Fixed a small typo in cc2430_rf.c
- examples/sensinode now compiles
This commit is contained in:
zdshelby 2009-09-09 07:32:02 +00:00
parent c9954072c9
commit 4a14db6d3a
2 changed files with 65 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
cpu/cc2430/Makefile.cc2430
View file

@ -1,7 +1,3 @@
CONTIKI_CPU_DIRS = . net
CONTIKI_SOURCEFILES += #mtarch.c rtimer-arch.c elfloader-stub.c watchdog.c
### Compiler definitions ### Compiler definitions
CC = sdcc CC = sdcc
LD = sdcc LD = sdcc
@ -36,9 +32,15 @@ CONTIKI_PLATFORM_DIRS = $(PLATFORM_APPDIRS) \
### Compilation rules ### Compilation rules
#CUSTOM_RULE_C_TO_OBJECTDIR_O=1 CUSTOM_RULE_C_TO_OBJECTDIR_O=1
CUSTOM_RULE_ALLOBJS_TO_TARGETLIB=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 ifdef CUSTOM_RULE_CS_TO_OBJECTDIR_O
$(OBJECTDIR)/%.o: %.cS $(OBJECTDIR)/%.o: %.cS
cp $< $(OBJECTDIR)/$*.c cp $< $(OBJECTDIR)/$*.c

2
cpu/cc2430/dev/cc2430_rf.c
View file

@ -266,7 +266,7 @@ cc2430_rf_read(void *buf, unsigned short bufsize)
/* Check the type */ /* Check the type */
type = RFD; type = RFD;
type &= 0x07; type &= 0x07;
if(typ e== 0x02) { if(type == 0x02) {
printf("cc2430_rf: ack\n"); printf("cc2430_rf: ack\n");
} else { } else {
/* Read the buffer */ /* Read the buffer */