deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Add the NEIGHBOR_ATTR prefix to a macro name

Browse source
This commit is contained in:
nvt 2011-02-13 21:34:59 +01:00
parent 4125c38808
commit 0df450f0dc
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/net/neighbor-attr.c
View file

@ -50,7 +50,7 @@
static uint16_t timeout = 0; static uint16_t timeout = 0;
MEMB(neighbor_addr_mem, struct neighbor_addr, MAX_NEIGHBORS); MEMB(neighbor_addr_mem, struct neighbor_addr, NEIGHBOR_ATTR_MAX_NEIGHBORS);
LIST(neighbor_addrs); LIST(neighbor_addrs);
LIST(neighbor_attrs); LIST(neighbor_attrs);

6
core/net/neighbor-attr.h
View file

@ -39,9 +39,9 @@
* define how many neighbors you can store * define how many neighbors you can store
*/ */
#ifdef NEIGHBOR_CONF_MAX_NEIGHBORS #ifdef NEIGHBOR_CONF_MAX_NEIGHBORS
#define MAX_NEIGHBORS NEIGHBOR_CONF_MAX_NEIGHBORS #define NEIGHBOR_ATTR_MAX_NEIGHBORS NEIGHBOR_CONF_MAX_NEIGHBORS
#else /* NEIGHBOR_CONF_MAX_NEIGHBORS */ #else /* NEIGHBOR_CONF_MAX_NEIGHBORS */
#define MAX_NEIGHBORS 12 #define NEIGHBOR_ATTR_MAX_NEIGHBORS 12
#endif /* NEIGHBOR_CONF_MAX_NEIGHBORS */ #endif /* NEIGHBOR_CONF_MAX_NEIGHBORS */
/** /**
@ -75,7 +75,7 @@ struct neighbor_attr {
* during initialization. * during initialization.
*/ */
#define NEIGHBOR_ATTRIBUTE(type, name, default_value_ptr) \ #define NEIGHBOR_ATTRIBUTE(type, name, default_value_ptr) \
static type _##name##_mem[MAX_NEIGHBORS]; \ static type _##name##_mem[NEIGHBOR_ATTR_MAX_NEIGHBORS]; \
static struct neighbor_attr name = \ static struct neighbor_attr name = \
{NULL, sizeof(type), default_value_ptr, (void*)_##name##_mem} ; \ {NULL, sizeof(type), default_value_ptr, (void*)_##name##_mem} ; \