From ecf8ca55ef4b7a839cc9bf2c644f566833f440f0 Mon Sep 17 00:00:00 2001 From: George Oikonomou Date: Sat, 23 Mar 2013 15:00:05 +0000 Subject: [PATCH] Move SLIP interface define to project-conf --- examples/cc2530dk/border-router/project-conf.h | 2 ++ examples/sensinode/border-router/project-conf.h | 1 + platform/cc2530dk/contiki-conf.h | 1 - platform/sensinode/contiki-conf.h | 1 - 4 files changed, 3 insertions(+), 2 deletions(-) diff --git a/examples/cc2530dk/border-router/project-conf.h b/examples/cc2530dk/border-router/project-conf.h index 71d15ab63..1de93e878 100644 --- a/examples/cc2530dk/border-router/project-conf.h +++ b/examples/cc2530dk/border-router/project-conf.h @@ -51,4 +51,6 @@ * Has no effect when building for the SmartRF. */ #define USB_SERIAL_CONF_BUFFERED 1 +#define UIP_FALLBACK_INTERFACE slip_interface + #endif /* PROJECT_CONF_H_ */ diff --git a/examples/sensinode/border-router/project-conf.h b/examples/sensinode/border-router/project-conf.h index f0fdb71fd..17cbe3193 100644 --- a/examples/sensinode/border-router/project-conf.h +++ b/examples/sensinode/border-router/project-conf.h @@ -46,5 +46,6 @@ #define VIZTOOL_MAX_PAYLOAD_LEN 120 #define SLIP_ARCH_CONF_ENABLE 1 #define LPM_CONF_MODE 0 +#define UIP_FALLBACK_INTERFACE slip_interface #endif /* PROJECT_CONF_H_ */ diff --git a/platform/cc2530dk/contiki-conf.h b/platform/cc2530dk/contiki-conf.h index c673b0f43..1a3d16fb3 100644 --- a/platform/cc2530dk/contiki-conf.h +++ b/platform/cc2530dk/contiki-conf.h @@ -73,7 +73,6 @@ #undef UART0_CONF_WITH_INPUT #define UART0_CONF_ENABLE 1 #define UART0_CONF_WITH_INPUT 1 -#define UIP_FALLBACK_INTERFACE slip_interface #endif /* Output all captured frames over the UART in hexdump format */ diff --git a/platform/sensinode/contiki-conf.h b/platform/sensinode/contiki-conf.h index d7d9aa30c..56f6cb3ed 100644 --- a/platform/sensinode/contiki-conf.h +++ b/platform/sensinode/contiki-conf.h @@ -73,7 +73,6 @@ #undef UART_ONE_CONF_WITH_INPUT #define UART_ONE_CONF_ENABLE 1 #define UART_ONE_CONF_WITH_INPUT 1 -#define UIP_FALLBACK_INTERFACE slip_interface #endif /* Output all captured frames over the UART in hexdump format */