RPL BR: more rafactoring: move project-conf and sky module to project top-level

examples/rpl-border-router/Makefile

@@ -4,15 +4,10 @@ CONTIKI = ../..
 
 include $(CONTIKI)/Makefile.identify-target
 
-ifeq ($(TARGET),native)
+ifneq ($(TARGET),native)
-  MODULES_REL += native
-	CFLAGS += -DPROJECT_CONF_PATH=\"native/project-conf.h\"
-else
 	MODULES_REL += embedded
-	# For embedded platforms, include platform-specific directory
-	MODULES_REL += embedded/$(TARGET)
-	CFLAGS += -DPROJECT_CONF_PATH=\"embedded/project-conf.h\"
 endif
+MODULES_REL += $(TARGET)
 MODULES_REL += common
 
 include $(CONTIKI)/Makefile.include

examples/rpl-border-router/embedded/project-conf.h

@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2010, 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.
- *
- */
-
-#ifndef PROJECT_ROUTER_CONF_H_
-#define PROJECT_ROUTER_CONF_H_
-/*---------------------------------------------------------------------------*/
-/* Include target-specific header */
-#ifdef TARGET_CONF_PATH
-#include TARGET_CONF_PATH
-#endif /* TARGET_CONF_PATH */
-/*---------------------------------------------------------------------------*/
-#ifndef UIP_FALLBACK_INTERFACE
-#define UIP_FALLBACK_INTERFACE rpl_interface
-#endif
-
-#ifndef WEBSERVER_CONF_CFS_CONNS
-#define WEBSERVER_CONF_CFS_CONNS 2
-#endif
-
-#ifndef BORDER_ROUTER_CONF_WEBSERVER
-#define BORDER_ROUTER_CONF_WEBSERVER 1
-#endif
-
-#if BORDER_ROUTER_CONF_WEBSERVER
-#define UIP_CONF_TCP 1
-#endif
-
-#endif /* PROJECT_ROUTER_CONF_H_ */

examples/rpl-border-router/embedded/sky/Makefile.sky

@@ -1 +0,0 @@
-CFLAGS += -DTARGET_CONF_PATH=\"target-conf.h\"

examples/rpl-border-router/native/Makefile.native

@@ -1,3 +1,4 @@
+CFLAGS += -DTARGET_CONF_PATH=\"native/module-conf.h\"
 MODULES += os/services/slip-cmd
 
 MAKE_MAC = MAKE_MAC_OTHER

examples/rpl-border-router/native/module-conf.h

@@ -27,13 +27,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef PROJECT_ROUTER_CONF_H_
-#define PROJECT_ROUTER_CONF_H_
-
-#define BORDER_ROUTER_CONF_WEBSERVER 1
-
-#define UIP_FALLBACK_INTERFACE rpl_interface
-
 /* use a non-default network driver */
 #define NETSTACK_CONF_NETWORK sicslowpan_driver
 
@@ -42,14 +35,9 @@
 
 #define SLIP_DEV_CONF_SEND_DELAY (CLOCK_SECOND / 32)
 
-#define WEBSERVER_CONF_CFS_CONNS 2
-
 #define SERIALIZE_ATTRIBUTES 1
-#define UIP_CONF_TCP 1
 
 #define CMD_CONF_OUTPUT border_router_cmd_output
 
 /* used by wpcap (see /cpu/native/net/wpcap-drv.c) */
 #define SELECT_CALLBACK 1
-
-#endif /* PROJECT_ROUTER_CONF_H_ */

examples/rpl-border-router/sky/Makefile.sky

@@ -0,0 +1 @@
+CFLAGS += -DTARGET_CONF_PATH=\"sky/module-conf.h\"

examples/rpl-border-router/sky/module-conf.h

@@ -29,13 +29,8 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /*---------------------------------------------------------------------------*/
-#ifndef TARGET_CONF_H_
-#define TARGET_CONF_H_
-/*---------------------------------------------------------------------------*/
 /* Save some RAM and ROM */
 #define QUEUEBUF_CONF_NUM              4
 #define UIP_CONF_BUFFER_SIZE         140
 #define BORDER_ROUTER_CONF_WEBSERVER   0
 /*---------------------------------------------------------------------------*/
-#endif /* TARGET_CONF_H_ */
-/*---------------------------------------------------------------------------*/