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

using nullmac for cooja rime radio

Browse source
This commit is contained in:
fros4943 2007-06-08 12:25:54 +00:00
parent 8b8f23962e
commit 78a06fe9b5
4 changed files with 7 additions and 118 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
platform/cooja/init-net-rime.c
View file

@ -28,20 +28,20 @@
* *
* This file is part of the Contiki operating system. * 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 "contiki.h"
#include "net/rime.h" #include "net/rime.h"
#include "net/radio-rime.h"
#include "dev/cooja-radio.h"
#include "dev/radio.h" #include "dev/radio.h"
#include "dev/cooja-radio.h"
#include "net/mac/nullmac.h"
void void
init_net(void) init_net(void)
{ {
rime_init(); nullmac_init(&cooja_driver);
radio_rime_init(&cooja_driver); rime_init(&nullmac_driver);
/* TODO Rime node ID */ /* TODO Rime node ID */
} }

69
platform/cooja/net/radio-rime.c
View file

@ -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 <string.h>
#include <stdio.h>
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();
}
/*---------------------------------------------------------------------------*/

42
platform/cooja/net/radio-rime.h
View file

@ -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__ */

4
tools/cooja/java/se/sics/cooja/contikimote/ContikiMoteType.java
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: 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; package se.sics.cooja.contikimote;
@ -112,7 +112,7 @@ public class ContikiMoteType implements MoteType {
if (this == UIP_UAODV) if (this == UIP_UAODV)
return " cooja-radio.c radio-uip-uaodv.c init-net-uip-uaodv.c"; return " cooja-radio.c radio-uip-uaodv.c init-net-uip-uaodv.c";
if (this == RIME) if (this == RIME)
return " cooja-radio.c radio-rime.c init-net-rime.c"; return " cooja-radio.c init-net-rime.c";
return " "; return " ";
} }