[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.
This commit is contained in:
parent
5a4c2e0d1f
commit
0d12bcffcb
4 changed files with 75 additions and 1 deletions
|
@ -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
|
||||
|
||||
|
|
|
@ -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 */
|
||||
|
|
31
platform/cooja/dev/uart1.h
Normal file
31
platform/cooja/dev/uart1.h
Normal file
|
@ -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
|
39
platform/cooja/slip-arch.c
Normal file
39
platform/cooja/slip-arch.c
Normal file
|
@ -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);
|
||||
}
|
||||
|
Loading…
Reference in a new issue