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

* s/uip-fw-service/uip-fw-drv/

Browse source
This commit is contained in:
bg- 2007-05-21 14:22:05 +00:00
parent a3f5123c44
commit 95d95a63ac
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
platform/cc2420dbk/Makefile
View file

@ -1,4 +1,4 @@
# $Id: Makefile,v 1.5 2007/04/26 13:40:26 bg- Exp $ # $Id: Makefile,v 1.6 2007/05/21 14:26:56 bg- Exp $
# #
# This makefile requires GNU make! # This makefile requires GNU make!
@ -27,7 +27,7 @@ MCU=atmega128
ARCH=avr.o spi.o qleds.o rom.o xmem.o cle_avr.o ARCH=avr.o spi.o qleds.o rom.o xmem.o cle_avr.o
SYSTEM=process.o procinit.o service.o clock.o etimer.o timer.o \ SYSTEM=process.o procinit.o service.o clock.o etimer.o timer.o \
sym.o cle.o elfloader_compat.o sym.o cle.o elfloader_compat.o
UIP=uip.o uiplib.o tcpip.o uip-fw.o uip-fw-service.o uipbuf.o \ UIP=uip.o uiplib.o tcpip.o uip-fw.o uip-fw-drv.o uipbuf.o \
tcpdump.o psock.o dhcpc.o uaodv.o uaodv-rt.o uip-udp-packet.o tcpdump.o psock.o dhcpc.o uaodv.o uaodv-rt.o uip-udp-packet.o
UIPDRIVERS=slip.o slip_uart1.o \ UIPDRIVERS=slip.o slip_uart1.o \
cc2420.o cc2420_spi.o cc2420_send_ip.o cc2420_send_uaodv.o cc2420.o cc2420_spi.o cc2420_send_ip.o cc2420_send_uaodv.o
@ -38,7 +38,7 @@ LIBFILES=$(SYSTEM) $(ARCH) $(UIP) $(UIPDRIVERS) $(LIBS) $(SYSAPPS)
MKNMLIST=awk -f $(TOP)/tools/mknmlist-ansi MKNMLIST=awk -f $(TOP)/tools/mknmlist-ansi
CP=cp CP=cp
LIBC=-lgcc -lc -lgcc LIBC=-lgcc -lc -lgcc
CC=avr-gcc CC=avr-gcc -mno-tablejump
LD=avr-ld LD=avr-ld
AS=avr-as AS=avr-as
NM=avr-nm NM=avr-nm
@ -86,7 +86,7 @@ endif
$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $^ $(LIBC) $@_nm.c $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $^ $(LIBC) $@_nm.c
%.u: %.ihex %.u: %.ihex
$(BSL) -p $(MCU) -P $(COMPORT) -c stk200 -U flash:w:$< $(BSL) -p $(MCU) -P $(COMPORT) -c stk500 -U flash:w:$<
$(LIB): $(LIBFILES) $(LIB): $(LIBFILES)
$(AR) rcf $@ $^ $(AR) rcf $@ $^

6
platform/sky/gateway.c
View file

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* @(#)$Id: gateway.c,v 1.8 2007/04/11 10:13:59 bg- Exp $ * @(#)$Id: gateway.c,v 1.9 2007/05/21 14:22:05 bg- Exp $
*/ */
/* /*
@ -61,7 +61,7 @@
#include "contiki.h" #include "contiki.h"
/* Also IP output. */ /* Also IP output. */
#include "net/uip-fw-service.h" #include "net/uip-fw-drv.h"
#include "net/uaodv.h" #include "net/uaodv.h"
#include "dev/slip.h" #include "dev/slip.h"
#include "dev/cc2420.h" #include "dev/cc2420.h"
@ -128,7 +128,7 @@ main(int argc, char **argv)
leds_toggle(LEDS_ALL); leds_toggle(LEDS_ALL);
slip_arch_init(BAUD2UBR(115200)); /* Must come before first printf */ slip_arch_init(BAUD2UBR(115200)); /* Must come before first printf */
printf("Starting %s " printf("Starting %s "
"($Id: gateway.c,v 1.8 2007/04/11 10:13:59 bg- Exp $)\n", __FILE__); "($Id: gateway.c,v 1.9 2007/05/21 14:22:05 bg- Exp $)\n", __FILE__);
ds2411_init(); ds2411_init();
sensors_light_init(); sensors_light_init();
cc2420_init(); cc2420_init();