added radio sensor for signal strength etc.

platform/cooja/Makefile.cooja

@@ -1,4 +1,4 @@
-# $Id: Makefile.cooja,v 1.5 2006/09/29 14:33:31 fros4943 Exp $
+# $Id: Makefile.cooja,v 1.6 2006/10/06 10:44:03 fros4943 Exp $
 
 ## The COOJA Simulator Contiki platform Makefile
 ##
@@ -31,7 +31,7 @@ COOJA_BASE	= simEnvChange.c irq.c cooja_mt.c cooja_mtarch.c
 
 COOJA_INTFS	= beep.c button-sensor.c ip.c leds-arch.c moteid.c \
 		    pir-sensor.c radio-arch.c rs232.c vib-sensor.c \
-		    clock.c log.c
+		    clock.c log.c radio-sensor.c
 
 CORE_FILES = random.c sensors.c leds.c serial.c
 

platform/cooja/dev/radio-sensor.c

@@ -0,0 +1,94 @@
+/*
+ * 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: radio-sensor.c,v 1.1 2006/10/06 10:44:37 fros4943 Exp $
+ */
+
+#include "lib/sensors.h"
+#include "dev/radio-sensor.h"
+#include "dev/radio-arch.h"
+#include "lib/simEnvChange.h"
+
+const struct sensors_sensor radio_sensor;
+
+extern int simSignalStrength;
+
+// COOJA variables (none - no corresponding part in Java)
+
+/*---------------------------------------------------------------------------*/
+static void
+init(void)
+{
+  simSignalStrength = 0;;
+}
+/*---------------------------------------------------------------------------*/
+static int
+irq(void)
+{
+  return 0;
+}
+/*---------------------------------------------------------------------------*/
+static void
+activate(void)
+{
+}
+/*---------------------------------------------------------------------------*/
+static void
+deactivate(void)
+{
+}
+/*---------------------------------------------------------------------------*/
+static int
+active(void)
+{
+  return 0;
+}
+/*---------------------------------------------------------------------------*/
+static unsigned int
+value(int type)
+{
+  return simSignalStrength;
+}
+/*---------------------------------------------------------------------------*/
+static int
+configure(int type, void *c)
+{
+  return 0;
+}
+/*---------------------------------------------------------------------------*/
+static void *
+status(int type)
+{
+  return NULL;
+}
+/*---------------------------------------------------------------------------*/
+SENSORS_SENSOR(radio_sensor, RADIO_SENSOR,
+	       init, irq, activate, deactivate, active,
+	       value, configure, status);

platform/cooja/dev/radio-sensor.h

@@ -0,0 +1,45 @@
+/*
+ * 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: radio-sensor.h,v 1.1 2006/10/06 10:44:37 fros4943 Exp $
+ */
+#ifndef __RADIO_SENSOR_H__
+#define __RADIO_SENSOR_H__
+
+#include "lib/sensors.h"
+extern const struct sensors_sensor radio_sensor;
+
+#define RADIO_SENSOR "Radio"
+
+#ifndef radio_sensor_signal
+#define radio_sensor_signal simSignalStrength
+#endif
+
+#endif /* __RADIO_SENSOR_H__ */