From bc8016543ab2f7628f2692402658529b1ccbc611 Mon Sep 17 00:00:00 2001 From: adamdunkels Date: Tue, 10 Oct 2006 15:58:31 +0000 Subject: [PATCH] Make netsim more like the esb target --- platform/netsim/Makefile.netsim | 2 +- platform/netsim/contiki-esb.h | 4 ++- platform/netsim/dev/pir-sensor.h | 2 ++ platform/netsim/dev/rs232.c | 10 ++++-- platform/netsim/dev/tr1001-drv.c | 56 ++++++++++++++--------------- platform/netsim/dev/tr1001.c | 13 ++++++- platform/netsim/dev/vib-sensor.h | 8 +++-- platform/netsim/net/ethernode-drv.c | 9 +---- 8 files changed, 59 insertions(+), 45 deletions(-) diff --git a/platform/netsim/Makefile.netsim b/platform/netsim/Makefile.netsim index b69f3e686..8ed352f4c 100644 --- a/platform/netsim/Makefile.netsim +++ b/platform/netsim/Makefile.netsim @@ -12,7 +12,7 @@ SENSORS = sensors.c beep.c button-sensor.c pir-sensor.c vib-sensor.c \ NETSIM = ether.c ethernode.c ethernode-drv.c lpm.c \ tapdev-drv.c tapdev-service.c tapdev.c rs232.c flash.c \ node.c nodes.c sensor.c display.c random.c radio.c \ - dlloader.c main.c init.c contiki-main.c symtab.c symbols.c #tr1001.c tr1001-drv.c + dlloader.c main.c init.c contiki-main.c symtab.c symbols.c tr1001.c tr1001-drv.c CONTIKI_TARGET_SOURCEFILES = $(NETSIM) $(SENSORS) diff --git a/platform/netsim/contiki-esb.h b/platform/netsim/contiki-esb.h index 49d74ec57..48dd8447a 100644 --- a/platform/netsim/contiki-esb.h +++ b/platform/netsim/contiki-esb.h @@ -28,7 +28,7 @@ * * This file is part of the Contiki operating system. * - * $Id: contiki-esb.h,v 1.1 2006/06/17 22:41:33 adamdunkels Exp $ + * $Id: contiki-esb.h,v 1.2 2006/10/10 15:58:31 adamdunkels Exp $ */ /** @@ -60,4 +60,6 @@ #include "dev/beep.h" +#include "node-id.h" + #endif /* __CONTIKI_ESB_H__ */ diff --git a/platform/netsim/dev/pir-sensor.h b/platform/netsim/dev/pir-sensor.h index 84659c760..bb60a442c 100644 --- a/platform/netsim/dev/pir-sensor.h +++ b/platform/netsim/dev/pir-sensor.h @@ -9,4 +9,6 @@ extern const struct sensors_sensor pir_sensor; void pir_sensor_changed(int strength); +#define PIR_ENABLE_EVENT 1 + #endif /* __PIR_SENSOR_H__ */ diff --git a/platform/netsim/dev/rs232.c b/platform/netsim/dev/rs232.c index 01126ff50..24aa79d8d 100644 --- a/platform/netsim/dev/rs232.c +++ b/platform/netsim/dev/rs232.c @@ -28,7 +28,7 @@ * * This file is part of the Contiki operating system. * - * $Id: rs232.c,v 1.1 2006/06/17 22:41:36 adamdunkels Exp $ + * $Id: rs232.c,v 1.2 2006/10/10 15:58:31 adamdunkels Exp $ */ /** @@ -44,6 +44,12 @@ void rs232_set_input(int (* f)(unsigned char)) { - printf("rs232_set_input(%p)\n", f); + /* printf("rs232_set_input(%p)\n", f);*/ +} +/*---------------------------------------------------------------------------*/ +void +slip_arch_writeb(unsigned char c) +{ + printf("%c", c); } /*---------------------------------------------------------------------------*/ diff --git a/platform/netsim/dev/tr1001-drv.c b/platform/netsim/dev/tr1001-drv.c index 90f1810e0..3e08ac1e8 100644 --- a/platform/netsim/dev/tr1001-drv.c +++ b/platform/netsim/dev/tr1001-drv.c @@ -1,34 +1,34 @@ /* * Copyright (c) 2005, Swedish Institute of Computer Science - * All rights reserved. + * All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the Institute nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the Institute nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. + * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. * * This file is part of the Contiki operating system. * - * @(#)$Id: tr1001-drv.c,v 1.1 2006/06/17 22:41:36 adamdunkels Exp $ + * @(#)$Id: tr1001-drv.c,v 1.2 2006/10/10 15:58:31 adamdunkels Exp $ */ #include "contiki-esb.h" @@ -55,7 +55,7 @@ PROCESS_THREAD(tr1001_drv_process, ev, data) uip_len = tr1001_poll(); if(uip_len > 0) { - uip_len = hc_inflate(); + uip_len = hc_inflate(&uip_buf[UIP_LLH_LEN], uip_len); tcpip_input(); } } @@ -72,10 +72,8 @@ tr1001_drv_request_poll(void) u8_t tr1001_drv_send(void) { - int len; - - len = hc_compress(); - return tr1001_send(&uip_buf[UIP_LLH_LEN], len); + uip_len = hc_compress(&uip_buf[UIP_LLH_LEN], uip_len); + return tr1001_send(&uip_buf[UIP_LLH_LEN], uip_len); } /*---------------------------------------------------------------------------*/ void diff --git a/platform/netsim/dev/tr1001.c b/platform/netsim/dev/tr1001.c index e52a1f64d..97b4c173c 100644 --- a/platform/netsim/dev/tr1001.c +++ b/platform/netsim/dev/tr1001.c @@ -28,7 +28,7 @@ * * This file is part of the Contiki operating system. * - * $Id: tr1001.c,v 1.1 2006/06/17 22:41:36 adamdunkels Exp $ + * $Id: tr1001.c,v 1.2 2006/10/10 15:58:31 adamdunkels Exp $ */ /** @@ -92,6 +92,17 @@ tr1001_clear_packets(void) packets_ok = packets_err = 0; } /*---------------------------------------------------------------------------*/ +void +tr1001_clear_active(void) +{ +} +/*---------------------------------------------------------------------------*/ +int +tr1001_active(void) +{ + return 0; +} +/*---------------------------------------------------------------------------*/ unsigned short tr1001_sstrength_value(unsigned int type) { diff --git a/platform/netsim/dev/vib-sensor.h b/platform/netsim/dev/vib-sensor.h index 0e54ff747..8272ad19c 100644 --- a/platform/netsim/dev/vib-sensor.h +++ b/platform/netsim/dev/vib-sensor.h @@ -29,14 +29,14 @@ * This file is part of the Configurable Sensor Network Application * Architecture for sensor nodes running the Contiki operating system. * - * $Id: vib-sensor.h,v 1.1 2006/06/17 22:41:36 adamdunkels Exp $ + * $Id: vib-sensor.h,v 1.2 2006/10/10 15:58:31 adamdunkels Exp $ * * ----------------------------------------------------------------- * * Author : Adam Dunkels, Joakim Eriksson, Niclas Finne * Created : 2005-11-01 - * Updated : $Date: 2006/06/17 22:41:36 $ - * $Revision: 1.1 $ + * Updated : $Date: 2006/10/10 15:58:31 $ + * $Revision: 1.2 $ */ #ifndef __VIB_SENSOR_H__ @@ -50,4 +50,6 @@ extern const struct sensors_sensor vib_sensor; void vib_sensor_changed(void); +#define VIB_ENABLE_EVENT 1 + #endif /* __VIB_SENSOR_H__ */ diff --git a/platform/netsim/net/ethernode-drv.c b/platform/netsim/net/ethernode-drv.c index 99a4c9e37..a9eb70384 100644 --- a/platform/netsim/net/ethernode-drv.c +++ b/platform/netsim/net/ethernode-drv.c @@ -30,7 +30,7 @@ * * Author: Adam Dunkels * - * $Id: ethernode-drv.c,v 1.3 2006/10/09 11:56:49 adamdunkels Exp $ + * $Id: ethernode-drv.c,v 1.4 2006/10/10 15:58:31 adamdunkels Exp $ */ #include "contiki.h" @@ -76,13 +76,6 @@ PROCESS_THREAD(ethernode_drv_process, ev, data) uip_len = hc_inflate(&uip_buf[UIP_LLH_LEN], uip_len); - { - char buf[40]; - tcpdump_format(&uip_buf[UIP_LLH_LEN], uip_len, buf, sizeof(buf)); - printf("radio_sniffer: packet length %d, %s\n", uip_len, buf); - - } - tapdev_send_raw(); /* if(uip_fw_forward() == UIP_FW_LOCAL)*/ { /* A frame was avaliable (and is now read into the uip_buf), so