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

cc2538dk: Make it possible to override SLIP_ARCH_CONF_ENABLED

Browse source 
As the comment in contiki-conf.h says, the automatic definition of
SLIP_ARCH_CONF_ENABLED works only if UIP_FALLBACK_INTERFACE is tied to SLIP. If
UIP_FALLBACK_INTERFACE is set to another interface, SLIP_ARCH_CONF_ENABLED is
still automatically set to 1, leading to unwanted SLIP_END characters from
dbg.c:putchar() being printed on the UART.

This change makes it possible to force the definition of SLIP_ARCH_CONF_ENABLED
(e.g. from project-conf.h), so that it can be disabled if UIP_FALLBACK_INTERFACE
is used with something else than SLIP.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
This commit is contained in:
Benoît Thébaudeau 2013-11-25 20:48:52 +01:00
parent b133e387bd
commit 436b585d7e
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
platform/cc2538dk/contiki-conf.h
View file

@ -112,6 +112,7 @@ typedef uint32_t rtimer_clock_t;
#define SLIP_BRIDGE_CONF_NO_PUTCHAR 1 #define SLIP_BRIDGE_CONF_NO_PUTCHAR 1
#define SLIP_RADIO_CONF_NO_PUTCHAR 1 #define SLIP_RADIO_CONF_NO_PUTCHAR 1
#ifndef SLIP_ARCH_CONF_ENABLED
/* /*
* Determine whether we need SLIP * Determine whether we need SLIP
* This will keep working while UIP_FALLBACK_INTERFACE and CMD_CONF_OUTPUT * This will keep working while UIP_FALLBACK_INTERFACE and CMD_CONF_OUTPUT
@ -120,6 +121,7 @@ typedef uint32_t rtimer_clock_t;
#if defined (UIP_FALLBACK_INTERFACE) || defined (CMD_CONF_OUTPUT) #if defined (UIP_FALLBACK_INTERFACE) || defined (CMD_CONF_OUTPUT)
#define SLIP_ARCH_CONF_ENABLED 1 #define SLIP_ARCH_CONF_ENABLED 1
#endif #endif
#endif
/* /*
* When set, the radio turns off address filtering and sends all captured * When set, the radio turns off address filtering and sends all captured