From 2bc1e08f19252a9c5d0435b25cd82e5a04155816 Mon Sep 17 00:00:00 2001 From: Enrico Joerns Date: Mon, 3 Nov 2014 22:48:13 +0100 Subject: [PATCH 1/4] [cooja-platform] Include eeprom.h to avoid implicit declaration warning --- platform/cooja/contiki-cooja-main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/platform/cooja/contiki-cooja-main.c b/platform/cooja/contiki-cooja-main.c index 3c8f98440..fdc7d0830 100644 --- a/platform/cooja/contiki-cooja-main.c +++ b/platform/cooja/contiki-cooja-main.c @@ -52,6 +52,7 @@ #include "net/rime/rime.h" #include "net/netstack.h" +#include "dev/eeprom.h" #include "dev/serial-line.h" #include "dev/cooja-radio.h" #include "dev/button-sensor.h" From f8445ba1bd42c2e4dd5379d4c2e1796118077d5c Mon Sep 17 00:00:00 2001 From: Enrico Joerns Date: Mon, 3 Nov 2014 22:51:43 +0100 Subject: [PATCH 2/4] [cooja-platform] Remove unused variable 'shortaddr' This variable was set but never used in the code --- platform/cooja/contiki-cooja-main.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/platform/cooja/contiki-cooja-main.c b/platform/cooja/contiki-cooja-main.c index fdc7d0830..31639124f 100644 --- a/platform/cooja/contiki-cooja-main.c +++ b/platform/cooja/contiki-cooja-main.c @@ -229,10 +229,7 @@ contiki_init() set_rime_addr(); { uint8_t longaddr[8]; - uint16_t shortaddr; - shortaddr = (linkaddr_node_addr.u8[0] << 8) + - linkaddr_node_addr.u8[1]; memset(longaddr, 0, sizeof(longaddr)); linkaddr_copy((linkaddr_t *)&longaddr, &linkaddr_node_addr); printf("MAC %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x ", From 5a4c2e0d1f76dc384dabe28e677701d66a9c1c38 Mon Sep 17 00:00:00 2001 From: Enrico Joerns Date: Mon, 3 Nov 2014 22:56:20 +0100 Subject: [PATCH 3/4] [cooja-platform] Add cast to linkaddr_t to avoid warning --- platform/cooja/contiki-cooja-main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/cooja/contiki-cooja-main.c b/platform/cooja/contiki-cooja-main.c index 31639124f..0f1e4eb3e 100644 --- a/platform/cooja/contiki-cooja-main.c +++ b/platform/cooja/contiki-cooja-main.c @@ -284,7 +284,7 @@ contiki_init() addr[i + 1] = node_id & 0xff; addr[i + 0] = node_id >> 8; } - linkaddr_copy(addr, &linkaddr_node_addr); + linkaddr_copy((linkaddr_t *)addr, &linkaddr_node_addr); memcpy(&uip_lladdr.addr, addr, sizeof(uip_lladdr.addr)); process_start(&tcpip_process, NULL); From 0d12bcffcb3ac766bea1bd37281b739588fa67b0 Mon Sep 17 00:00:00 2001 From: Enrico Joerns Date: Mon, 3 Nov 2014 23:58:00 +0100 Subject: [PATCH 4/4] [cooja-platform] Fixes for slip-bridge compatibility * Added dev/uart1.h header file to cooja platform * Added slip arch stub * Suppress examples putchar definition as cooja platform provides its own Note that the uart1.h file should only be an intermediate solution. A generic contiki-wide definition for uart handling is required as each platform defines its own varying set of uart functions. --- platform/cooja/Makefile.cooja | 2 +- platform/cooja/contiki-conf.h | 4 ++++ platform/cooja/dev/uart1.h | 31 ++++++++++++++++++++++++++++ platform/cooja/slip-arch.c | 39 +++++++++++++++++++++++++++++++++++ 4 files changed, 75 insertions(+), 1 deletion(-) create mode 100644 platform/cooja/dev/uart1.h create mode 100644 platform/cooja/slip-arch.c diff --git a/platform/cooja/Makefile.cooja b/platform/cooja/Makefile.cooja index 4492c2341..bfaa76044 100644 --- a/platform/cooja/Makefile.cooja +++ b/platform/cooja/Makefile.cooja @@ -52,7 +52,7 @@ COOJA_BASE = simEnvChange.c cooja_mt.c cooja_mtarch.c rtimer-arch.c slip.c watch COOJA_INTFS = beep.c button-sensor.c ip.c leds-arch.c moteid.c \ pir-sensor.c rs232.c vib-sensor.c \ clock.c log.c cfs-cooja.c cooja-radio.c \ - eeprom.c + eeprom.c slip-arch.c COOJA_CORE = random.c sensors.c leds.c symbols.c diff --git a/platform/cooja/contiki-conf.h b/platform/cooja/contiki-conf.h index 98d61151c..1dde2917a 100644 --- a/platform/cooja/contiki-conf.h +++ b/platform/cooja/contiki-conf.h @@ -235,6 +235,10 @@ typedef unsigned long rtimer_clock_t; #if UIP_CONF_IPV6 #endif /* UIP_CONF_IPV6 */ +/* Turn off example-provided putchars */ +#define SLIP_BRIDGE_CONF_NO_PUTCHAR 1 + + #define CFS_CONF_OFFSET_TYPE long /* include the project config */ diff --git a/platform/cooja/dev/uart1.h b/platform/cooja/dev/uart1.h new file mode 100644 index 000000000..69b96e574 --- /dev/null +++ b/platform/cooja/dev/uart1.h @@ -0,0 +1,31 @@ +/* + Copied from mc1322x/dev/cpu. + + This file exists as a work-around for the hardware dependant calls + to slip_arch_init. + + Current the prototype for slip_arch_init is slip_arch_init(urb) + + and a typical call is something like + slip_arch_init(BAUD2URB(115200)) + + BAUD2UBR is hardware specific, however. Furthermore, for the sky + platform it's typically defined with #include "dev/uart1.h" (see + rpl-boarder-router/slip-bridge.c), a sky specific file. dev/uart1.h + includes msp430.h which includes the sky contiki-conf.h which + defines BAUD2UBR. + + To me, the correct think to pass is simply the baudrate and have the + hardware specific conversion happen inside slip_arch_init. + + Notably, most implementations just ignore the passed parameter + anyway. (except AVR) + + */ + +#ifndef DEV_UART1_H +#define DEV_UART1_H + +#define BAUD2UBR(x) x + +#endif diff --git a/platform/cooja/slip-arch.c b/platform/cooja/slip-arch.c new file mode 100644 index 000000000..959eeda47 --- /dev/null +++ b/platform/cooja/slip-arch.c @@ -0,0 +1,39 @@ +/* + * Copyright (c) 2014, TU Braunschweig + * 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. + * + */ + +#include "dev/slip.h" +#include "dev/rs232.h" + +void +slip_arch_init(unsigned long ubr) +{ + rs232_set_input(slip_input_byte); +} +