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

Rename PROJECT_CONF_H to PROJECT_CONF_PATH for clarity and so as to avoid possible conflicts with guards in project-conf.h files

This commit is contained in:
Simon Duquennoy 2017-10-07 08:57:32 +02:00
parent 20559fd308
commit a92319bbca
11 changed files with 30 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.include
View File

@ -76,7 +76,7 @@ MODULES += os os/sys os/dev os/lib os/services
# Automatically include project-conf.h if found
ifneq ("$(wildcard project-conf.h)","")
CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
CFLAGS += -DPROJECT_CONF_PATH=\"project-conf.h\"
endif
# Configure MAC layer

6
arch/platform/cc2538dk/contiki-conf.h
View File

@ -12,9 +12,9 @@
#include <string.h>
/*---------------------------------------------------------------------------*/
/* Include Project Specific conf */
#ifdef PROJECT_CONF_H
#include PROJECT_CONF_H
#endif /* PROJECT_CONF_H */
#ifdef PROJECT_CONF_PATH
#include PROJECT_CONF_PATH
#endif /* PROJECT_CONF_PATH */
/*---------------------------------------------------------------------------*/
/**
* \name Compiler configuration and platform-specific type definitions

7
arch/platform/cooja/contiki-conf.h
View File

@ -138,10 +138,9 @@ typedef uint64_t rtimer_clock_t;
#define NETSTACK_RADIO_MAX_PAYLOAD_LEN 125
/* include the project config */
/* PROJECT_CONF_H might be defined in the project Makefile */
#ifdef PROJECT_CONF_H
#include PROJECT_CONF_H
#endif /* PROJECT_CONF_H */
#ifdef PROJECT_CONF_PATH
#include PROJECT_CONF_PATH
#endif /* PROJECT_CONF_PATH */
#endif /* CONTIKI_CONF_H_ */

7
arch/platform/jn516x/contiki-conf.h
View File

@ -50,9 +50,8 @@
#endif /* CCM_STAR_CONF */
/* include the project config */
/* PROJECT_CONF_H might be defined in the project Makefile */
#ifdef PROJECT_CONF_H
#include PROJECT_CONF_H
#endif /* PROJECT_CONF_H */
#ifdef PROJECT_CONF_PATH
#include PROJECT_CONF_PATH
#endif /* PROJECT_CONF_PATH */
#endif /* CONTIKI_CONF_H_ */

7
arch/platform/native/contiki-conf.h
View File

@ -91,9 +91,8 @@ typedef unsigned long clock_time_t;
int strcasecmp(const char*, const char*);
/* include the project config */
/* PROJECT_CONF_H might be defined in the project Makefile */
#ifdef PROJECT_CONF_H
#include PROJECT_CONF_H
#endif /* PROJECT_CONF_H */
#ifdef PROJECT_CONF_PATH
#include PROJECT_CONF_PATH
#endif /* PROJECT_CONF_PATH */
#endif /* CONTIKI_CONF_H_ */

6
arch/platform/nrf52dk/contiki-conf.h
View File

@ -43,9 +43,9 @@
#include <stdint.h>
/*---------------------------------------------------------------------------*/
/* Include Project Specific conf */
#ifdef PROJECT_CONF_H
#include PROJECT_CONF_H
#endif /* PROJECT_CONF_H */
#ifdef PROJECT_CONF_PATH
#include PROJECT_CONF_PATH
#endif /* PROJECT_CONF_PATH */
/*---------------------------------------------------------------------------*/
/* Include platform peripherals configuration */
#include "platform-conf.h"

6
arch/platform/openmote-cc2538/contiki-conf.h
View File

@ -51,9 +51,9 @@
#include <string.h>
/*---------------------------------------------------------------------------*/
/* Include Project Specific conf */
#ifdef PROJECT_CONF_H
#include PROJECT_CONF_H
#endif /* PROJECT_CONF_H */
#ifdef PROJECT_CONF_PATH
#include PROJECT_CONF_PATH
#endif /* PROJECT_CONF_PATH */
/*---------------------------------------------------------------------------*/
/**
* \name Compiler configuration and platform-specific type definitions

7
arch/platform/sky/contiki-conf.h
View File

@ -34,9 +34,8 @@
#endif /* AES_128_CONF */
/* include the project config */
/* PROJECT_CONF_H might be defined in the project Makefile */
#ifdef PROJECT_CONF_H
#include PROJECT_CONF_H
#endif /* PROJECT_CONF_H */
#ifdef PROJECT_CONF_PATH
#include PROJECT_CONF_PATH
#endif /* PROJECT_CONF_PATH */
#endif /* CONTIKI_CONF_H */

6
arch/platform/srf06-cc26xx/contiki-conf.h
View File

@ -40,9 +40,9 @@
#include <stdint.h>
/*---------------------------------------------------------------------------*/
/* Include Project Specific conf */
#ifdef PROJECT_CONF_H
#include PROJECT_CONF_H
#endif /* PROJECT_CONF_H */
#ifdef PROJECT_CONF_PATH
#include PROJECT_CONF_PATH
#endif /* PROJECT_CONF_PATH */
/*---------------------------------------------------------------------------*/
/**
* \name Network Stack Configuration

6
arch/platform/zoul/contiki-conf.h
View File

@ -49,9 +49,9 @@
#include <string.h>
/*---------------------------------------------------------------------------*/
/* Include Project Specific conf */
#ifdef PROJECT_CONF_H
#include PROJECT_CONF_H
#endif /* PROJECT_CONF_H */
#ifdef PROJECT_CONF_PATH
#include PROJECT_CONF_PATH
#endif /* PROJECT_CONF_PATH */
/*---------------------------------------------------------------------------*/
/**
* \name Compiler configuration and platform-specific type definitions

4
os/lib/heapmem.c
View File

@ -48,9 +48,9 @@
#define PRINTF(...)
#endif
#ifdef PROJECT_CONF_H
#ifdef PROJECT_CONF_PATH
/* Load the heapmem configuration from a project configuration file. */
#include PROJECT_CONF_H
#include PROJECT_CONF_PATH
#endif
#include <stdint.h>