From 892bfb567883f805eff579e4bf3ba7c8b962e2bf Mon Sep 17 00:00:00 2001 From: fros4943 Date: Wed, 1 Apr 2009 13:45:41 +0000 Subject: [PATCH] moved radio-uip link functionality directly to comm stack sources --- platform/cooja/net/radio-uip.c | 65 ---------------------------------- platform/cooja/net/radio-uip.h | 45 ----------------------- 2 files changed, 110 deletions(-) delete mode 100644 platform/cooja/net/radio-uip.c delete mode 100644 platform/cooja/net/radio-uip.h diff --git a/platform/cooja/net/radio-uip.c b/platform/cooja/net/radio-uip.c deleted file mode 100644 index 269cca93a..000000000 --- a/platform/cooja/net/radio-uip.c +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright (c) 2007, 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: radio-uip.c,v 1.1 2007/05/18 13:49:49 fros4943 Exp $ - */ - -#include "radio-uip.h" -#include "net/hc.h" - -static const struct radio_driver *radio; - -/*---------------------------------------------------------------------------*/ -static void -receiver(const struct radio_driver *d) -{ - uip_len = d->read(&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(); - } -} -/*---------------------------------------------------------------------------*/ -u8_t -radio_uip_send(void) -{ - uip_len = hc_compress(&uip_buf[UIP_LLH_LEN], uip_len); - return radio->send(&uip_buf[UIP_LLH_LEN], uip_len); -} -/*---------------------------------------------------------------------------*/ -void -radio_uip_init(const struct radio_driver *d) -{ - radio = d; - radio->set_receive_function(receiver); - radio->on(); -} -/*---------------------------------------------------------------------------*/ diff --git a/platform/cooja/net/radio-uip.h b/platform/cooja/net/radio-uip.h deleted file mode 100644 index e9fede153..000000000 --- a/platform/cooja/net/radio-uip.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (c) 2007, 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: radio-uip.h,v 1.1 2007/05/18 13:49:49 fros4943 Exp $ - */ -#ifndef __RADIO_UIP_H__ -#define __RADIO_UIP_H__ - -#include "contiki.h" -#include "dev/radio.h" - -void -radio_uip_init(const struct radio_driver *d); - -u8_t -radio_uip_send(void); - -#endif /* __RADIO_UIP_H__ */