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

Fix naming issues and includes in uip-ds6-nbr.h

Browse source
This commit is contained in:
Simon Duquennoy 2013-07-29 18:49:21 +02:00
parent 5dc05e7913
commit 248301a041
48 changed files with 151 additions and 148 deletions
Download patch file Download diff file Expand all files Collapse all files

2
platform/avr-atmega128rfa1/apps/raven-webserver/httpd-cgi.c
View file

@ -335,7 +335,7 @@ uint16_t numprinted;
numprinted += httpd_snprintf((char *)uip_appdata+numprinted, uip_mss()-numprinted, httpd_cgi_addrb);
}
//if (j==0) numprinted += httpd_snprintf((char *)uip_appdata+numprinted, uip_mss()-numprinted, httpd_cgi_addrn);
numprinted += httpd_snprintf((char *)uip_appdata+numprinted, uip_mss()-numprinted, httpd_cgi_addrf,NEIGHBOR_TABLE_MAX_NEIGHBORS-j);
numprinted += httpd_snprintf((char *)uip_appdata+numprinted, uip_mss()-numprinted, httpd_cgi_addrf,NBR_TABLE_MAX_NEIGHBORS-j);
return numprinted;
}
/*---------------------------------------------------------------------------*/

6
platform/avr-atmega128rfa1/contiki-conf.h
View file

@ -221,7 +221,7 @@ typedef unsigned short uip_stats_t;
/* 25 bytes per UDP connection */
#define UIP_CONF_UDP_CONNS 10
/* See uip-ds6.h */
#define NEIGHBOR_CONF_MAX_NEIGHBORS 20
#define NBR_TABLE_CONF_MAX_NEIGHBORS 20
#define UIP_CONF_DS6_DEFRT_NBU 2
#define UIP_CONF_DS6_PREFIX_NBU 3
#define UIP_CONF_MAX_ROUTES 20
@ -266,7 +266,7 @@ typedef unsigned short uip_stats_t;
#define UIP_CONF_MAX_CONNECTIONS 2
#define UIP_CONF_MAX_LISTENPORTS 4
#define UIP_CONF_UDP_CONNS 5
#define NEIGHBOR_CONF_MAX_NEIGHBORS 20
#define NBR_TABLE_CONF_MAX_NEIGHBORS 20
#define UIP_CONF_DS6_DEFRT_NBU 2
#define UIP_CONF_DS6_PREFIX_NBU 3
#define UIP_CONF_MAX_ROUTES 4
@ -302,7 +302,7 @@ typedef unsigned short uip_stats_t;
#define UIP_CONF_MAX_CONNECTIONS 2
#define UIP_CONF_MAX_LISTENPORTS 4
#define UIP_CONF_UDP_CONNS 5
#define NEIGHBOR_CONF_MAX_NEIGHBORS 4
#define NBR_TABLE_CONF_MAX_NEIGHBORS 4
#define UIP_CONF_DS6_DEFRT_NBU 2
#define UIP_CONF_DS6_PREFIX_NBU 3
#define UIP_CONF_MAX_ROUTES 4

2
platform/avr-atmega128rfa1/contiki-main.c
View file

@ -527,7 +527,7 @@ extern uip_ds6_netif_t uip_ds6_if;
PRINTF("\n");
}
}
PRINTF("\nNeighbors [%u max]\n",NEIGHBOR_TABLE_MAX_NEIGHBORS);
PRINTF("\nNeighbors [%u max]\n",NBR_TABLE_MAX_NEIGHBORS);
for(nbr = nbr_table_head(ds6_neighbors);
nbr != NULL;