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

Don't create an object directory if target does not exist

Browse source
This commit is contained in:
dak664 2011-03-10 14:59:21 -05:00
parent 2295238ee1
commit bb574fd1e2
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Makefile.include
View file

@ -36,9 +36,6 @@ savedefines:
@echo >Makefile.$(TARGET).defines "DEFINES = $(DEFINES)" @echo >Makefile.$(TARGET).defines "DEFINES = $(DEFINES)"
OBJECTDIR = obj_$(TARGET) OBJECTDIR = obj_$(TARGET)
ifeq (${wildcard $(OBJECTDIR)},)
DUMMY := ${shell mkdir $(OBJECTDIR)}
endif
LOWERCASE = -abcdefghijklmnopqrstuvwxyz LOWERCASE = -abcdefghijklmnopqrstuvwxyz
UPPERCASE = _ABCDEFGHIJKLMNOPQRSTUVWXYZ UPPERCASE = _ABCDEFGHIJKLMNOPQRSTUVWXYZ
@ -109,10 +106,13 @@ endif
target_makefile := $(wildcard $(CONTIKI)/platform/$(TARGET)/Makefile.$(TARGET)) target_makefile := $(wildcard $(CONTIKI)/platform/$(TARGET)/Makefile.$(TARGET))
# Check if the target makefile exists # Check if the target makefile exists, and create the object directory if necessary.
ifeq ($(strip $(target_makefile)),) ifeq ($(strip $(target_makefile)),)
${error The target platform "$(TARGET)" does not exist (maybe it was misspelled?)} ${error The target platform "$(TARGET)" does not exist (maybe it was misspelled?)}
else else
ifeq (${wildcard $(OBJECTDIR)},)
DUMMY := ${shell mkdir $(OBJECTDIR)}
endif
include $(CONTIKI)/platform/$(TARGET)/Makefile.$(TARGET) include $(CONTIKI)/platform/$(TARGET)/Makefile.$(TARGET)
endif endif

2
cpu/mc1322x/lib/maca.c
View file

@ -368,9 +368,7 @@ void post_receive(void) {
( 4 << PRECOUNT) | ( 4 << PRECOUNT) |
( fcs_mode << NOFC ) | ( fcs_mode << NOFC ) |
( prm_mode << PRM) | ( prm_mode << PRM) |
#if 0 //dak says removing ctrl auto fixes the autoack checksum error --- doesn't cause a performance issue either
(1 << maca_ctrl_auto) | (1 << maca_ctrl_auto) |
#endif
(maca_ctrl_seq_rx)); (maca_ctrl_seq_rx));
/* status bit 10 is set immediately */ /* status bit 10 is set immediately */
/* then 11, 10, and 9 get set */ /* then 11, 10, and 9 get set */