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

RPL BR and slip-radio: use c flag '-imacros' to include module-specific defines

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

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

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

0
examples/rpl-border-router/native/module-conf.h → examples/rpl-border-router/native/module-macros.h
View File

2
examples/rpl-border-router/sky/Makefile.sky
View File

@ -1 +1 @@
CFLAGS += -DTARGET_CONF_PATH=\"sky/module-conf.h\" CFLAGS += -imacros sky/module-macros.h

0
examples/rpl-border-router/sky/module-conf.h → examples/rpl-border-router/sky/module-macros.h
View File

6
examples/slip-radio/project-conf.h
View File

@ -29,11 +29,7 @@
#ifndef PROJECT_CONF_H_ #ifndef PROJECT_CONF_H_
#define PROJECT_CONF_H_ #define PROJECT_CONF_H_
/*---------------------------------------------------------------------------*/
/* Include target-specific header */
#ifdef TARGET_CONF_PATH
#include TARGET_CONF_PATH
#endif /* TARGET_CONF_PATH */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
#define UIP_CONF_ROUTER 0 #define UIP_CONF_ROUTER 0

2
examples/slip-radio/sky/Makefile.sky
View File

@ -1 +1 @@
CFLAGS += -DTARGET_CONF_PATH=\"target-conf.h\" CFLAGS += -imacros sky/module-macros.h

5
examples/slip-radio/sky/target-conf.h → examples/slip-radio/sky/module-macros.h
View File

@ -29,9 +29,6 @@
* OF THE POSSIBILITY OF SUCH DAMAGE. * OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
#ifndef TARGET_CONF_H_
#define TARGET_CONF_H_
/*---------------------------------------------------------------------------*/
#define QUEUEBUF_CONF_NUM 4 #define QUEUEBUF_CONF_NUM 4
#define UIP_CONF_BUFFER_SIZE 140 #define UIP_CONF_BUFFER_SIZE 140
@ -39,5 +36,3 @@
#define SLIP_RADIO_CONF_SENSORS slip_radio_sky_sensors #define SLIP_RADIO_CONF_SENSORS slip_radio_sky_sensors
#define UART1_CONF_RX_WITH_DMA 1 #define UART1_CONF_RX_WITH_DMA 1
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
#endif /* TARGET_CONF_H_ */
/*---------------------------------------------------------------------------*/