From 78a06fe9b5c5c1483ec5aaf44f8e2cfa97e800aa Mon Sep 17 00:00:00 2001 From: fros4943 Date: Fri, 8 Jun 2007 12:25:54 +0000 Subject: [PATCH] using nullmac for cooja rime radio --- platform/cooja/init-net-rime.c | 10 +-- platform/cooja/net/radio-rime.c | 69 ------------------- platform/cooja/net/radio-rime.h | 42 ----------- .../cooja/contikimote/ContikiMoteType.java | 4 +- 4 files changed, 7 insertions(+), 118 deletions(-) delete mode 100644 platform/cooja/net/radio-rime.c delete mode 100644 platform/cooja/net/radio-rime.h diff --git a/platform/cooja/init-net-rime.c b/platform/cooja/init-net-rime.c index c52bd93a6..351893586 100644 --- a/platform/cooja/init-net-rime.c +++ b/platform/cooja/init-net-rime.c @@ -28,20 +28,20 @@ * * This file is part of the Contiki operating system. * - * @(#)$Id: init-net-rime.c,v 1.1 2007/05/18 13:49:15 fros4943 Exp $ + * @(#)$Id: init-net-rime.c,v 1.2 2007/06/08 12:26:25 fros4943 Exp $ */ #include "contiki.h" #include "net/rime.h" -#include "net/radio-rime.h" -#include "dev/cooja-radio.h" #include "dev/radio.h" +#include "dev/cooja-radio.h" +#include "net/mac/nullmac.h" void init_net(void) { - rime_init(); - radio_rime_init(&cooja_driver); + nullmac_init(&cooja_driver); + rime_init(&nullmac_driver); /* TODO Rime node ID */ } diff --git a/platform/cooja/net/radio-rime.c b/platform/cooja/net/radio-rime.c deleted file mode 100644 index 6c5e46e71..000000000 --- a/platform/cooja/net/radio-rime.c +++ /dev/null @@ -1,69 +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-rime.c,v 1.1 2007/05/18 13:49:49 fros4943 Exp $ - */ - -#include "contiki.h" -#include "net/rime.h" -#include "dev/radio.h" -#include "dev/cooja-radio.h" - -#include -#include - -static const struct radio_driver *radio; - -/*---------------------------------------------------------------------------*/ -static void -receiver(const struct radio_driver *d) -{ - int len; - rimebuf_clear(); - len = d->read(rimebuf_dataptr(), RIMEBUF_SIZE); - rimebuf_set_datalen(len); - rime_input(); -} -/*---------------------------------------------------------------------------*/ -static void -send(void) -{ - radio->send(rimebuf_hdrptr(), rimebuf_totlen()); -} -/*---------------------------------------------------------------------------*/ -void -radio_rime_init(const struct radio_driver *d) -{ - rime_set_output(send); - radio = d; - radio->set_receive_function(receiver); - radio->on(); -} -/*---------------------------------------------------------------------------*/ diff --git a/platform/cooja/net/radio-rime.h b/platform/cooja/net/radio-rime.h deleted file mode 100644 index f3cd7a1d7..000000000 --- a/platform/cooja/net/radio-rime.h +++ /dev/null @@ -1,42 +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-rime.h,v 1.1 2007/05/18 13:49:49 fros4943 Exp $ - */ -#ifndef __RADIO_RIME_H__ -#define __RADIO_RIME_H__ - -#include "contiki.h" -#include "dev/radio.h" - -void -radio_rime_init(const struct radio_driver *d); - -#endif /* __RADIO_RIME_H__ */ diff --git a/tools/cooja/java/se/sics/cooja/contikimote/ContikiMoteType.java b/tools/cooja/java/se/sics/cooja/contikimote/ContikiMoteType.java index 444435875..b124cb8be 100644 --- a/tools/cooja/java/se/sics/cooja/contikimote/ContikiMoteType.java +++ b/tools/cooja/java/se/sics/cooja/contikimote/ContikiMoteType.java @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ContikiMoteType.java,v 1.15 2007/05/19 14:27:08 fros4943 Exp $ + * $Id: ContikiMoteType.java,v 1.16 2007/06/08 12:25:54 fros4943 Exp $ */ package se.sics.cooja.contikimote; @@ -112,7 +112,7 @@ public class ContikiMoteType implements MoteType { if (this == UIP_UAODV) return " cooja-radio.c radio-uip-uaodv.c init-net-uip-uaodv.c"; if (this == RIME) - return " cooja-radio.c radio-rime.c init-net-rime.c"; + return " cooja-radio.c init-net-rime.c"; return " "; }