giomba/nes-proj
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Simon Duquennoy 2017-12-19 07:10:23 -08:00
parent 81d1b1bd80
commit e63d428a91
8 changed files with 4 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
examples/rpl-border-router/Makefile
View File

@ -4,15 +4,10 @@ CONTIKI = ../..
include $(CONTIKI)/Makefile.identify-target
ifeq ($(TARGET),native)
MODULES_REL += native
CFLAGS += -DPROJECT_CONF_PATH=\"native/project-conf.h\"
else
ifneq ($(TARGET),native)
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

55
examples/rpl-border-router/embedded/project-conf.h
View File

@ -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_ */

1
examples/rpl-border-router/embedded/sky/Makefile.sky
View File

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

1
examples/rpl-border-router/native/Makefile.native
View File

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

12
examples/rpl-border-router/native/project-conf.h → examples/rpl-border-router/native/module-conf.h
View File

@ -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_ */

1
examples/rpl-border-router/sky/Makefile.sky Normal file
View File

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

5
examples/rpl-border-router/embedded/sky/target-conf.h → examples/rpl-border-router/sky/module-conf.h
View File

@ -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_ */
/*---------------------------------------------------------------------------*/

0
examples/rpl-border-router/embedded/sky/slip-bridge-putchar.c → examples/rpl-border-router/sky/slip-bridge-putchar.c
View File