diff --git a/platform/esb/Makefile.esb b/platform/esb/Makefile.esb index c7888aed9..d1a244cde 100644 --- a/platform/esb/Makefile.esb +++ b/platform/esb/Makefile.esb @@ -1,10 +1,10 @@ -# $Id: Makefile.esb,v 1.4 2006/12/19 09:19:14 adamdunkels Exp $ +# $Id: Makefile.esb,v 1.5 2007/03/16 11:34:05 adamdunkels Exp $ SENSORS = sensors.c irq.c button-sensor.c pir-sensor.c vib-sensor.c \ sound-sensor.c radio-sensor.c ctsrts-sensor.c battery-sensor.c \ temperature-sensor.c -ESB = ir.c beep.c ds1629.c tr1001-drv.c tr1001-gcr.c gcr.c \ - esb-sensors.c node-id.c eeprom.c cfs-eeprom.c +ESB = ir.c beep.c ds1629.c tr1001-uip.c tr1001-gcr.c gcr.c \ + esb-sensors.c node-id.c eeprom.c cfs-eeprom.c tr1001-rime.c CONTIKI_TARGET_DIRS = . dev apps net loader ifndef CONTIKI_TARGET_MAIN CONTIKI_TARGET_MAIN = contiki-esb-main.c diff --git a/platform/esb/contiki-esb.h b/platform/esb/contiki-esb.h index 0a922eb14..28ffc8d30 100644 --- a/platform/esb/contiki-esb.h +++ b/platform/esb/contiki-esb.h @@ -28,7 +28,7 @@ * * This file is part of the Contiki operating system. * - * @(#)$Id: contiki-esb.h,v 1.2 2006/10/09 11:55:16 adamdunkels Exp $ + * @(#)$Id: contiki-esb.h,v 1.3 2007/03/16 11:34:05 adamdunkels Exp $ */ #ifndef __CONTIKI_ESB_H__ #define __CONTIKI_ESB_H__ @@ -49,7 +49,7 @@ #include "dev/serial.h" #include "dev/slip.h" #include "dev/tr1001.h" -#include "net/tr1001-drv.h" +#include "net/tr1001-uip.h" #include "node-id.h" diff --git a/platform/esb/net/tr1001-drv.c b/platform/esb/net/tr1001-drv.c deleted file mode 100644 index 0f6bbe639..000000000 --- a/platform/esb/net/tr1001-drv.c +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Copyright (c) 2005, Swedish Institute of Computer Science - * 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. - * - * 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.2 2006/10/09 11:56:13 adamdunkels Exp $ - */ - -#include "contiki-esb.h" -#include "net/hc.h" - -#include -#include - -PROCESS(tr1001_drv_process, "TR1001 driver"); - -static unsigned char slip_dump; - -/*---------------------------------------------------------------------------*/ -PROCESS_THREAD(tr1001_drv_process, ev, data) -{ - PROCESS_BEGIN(); - - tr1001_init(); - - while(1) { - - PROCESS_WAIT_EVENT_UNTIL(ev == PROCESS_EVENT_POLL); - - uip_len = tr1001_poll(&uip_buf[UIP_LLH_LEN], UIP_BUFSIZE - UIP_LLH_LEN); - - if(uip_len > 0) { - uip_len = hc_inflate(&uip_buf[UIP_LLH_LEN], uip_len); - tcpip_input(); - } - } - - PROCESS_END(); -} -/*---------------------------------------------------------------------------*/ -void -tr1001_drv_request_poll(void) -{ - process_poll(&tr1001_drv_process); -} -/*---------------------------------------------------------------------------*/ -u8_t -tr1001_drv_send(void) -{ - uip_len = hc_compress(&uip_buf[UIP_LLH_LEN], uip_len); - return tr1001_send(&uip_buf[UIP_LLH_LEN], uip_len); -} -/*---------------------------------------------------------------------------*/ -void -tr1001_drv_set_slip_dump(int dump) -{ - slip_dump = dump; -} -/*---------------------------------------------------------------------------*/ diff --git a/platform/esb/net/tr1001-drv.h b/platform/esb/net/tr1001-drv.h deleted file mode 100644 index 5dbaee8bd..000000000 --- a/platform/esb/net/tr1001-drv.h +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (c) 2005, Swedish Institute of Computer Science - * 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. - * - * 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.h,v 1.1 2006/06/18 08:19:10 adamdunkels Exp $ - */ -#ifndef __TR1001_DRV_H__ -#define __TR1001_DRV_H__ - -PROCESS_NAME(tr1001_drv_process); - -void tr1001_drv_set_slip_dump(int dump); - -u8_t tr1001_drv_send(void); - -void tr1001_drv_request_poll(void); - -#endif /* __TR1001_DRV_H__ */