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

Merge pull request #520 from oliverschmidt/master

Browse source 
Fixed some of the targets broken by changing the UIP_CONF_LLH_LEN default.
This commit is contained in:
Oliver Schmidt 2014-01-17 14:11:49 -08:00
parent 03e0c02fab fb20cf5ee6
commit 9c8302b56c
3 changed files with 19 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
cpu/6502/6502def.h
View file

@ -69,6 +69,7 @@ typedef unsigned short uip_stats_t;
#define UIP_ARCH_ADD32 1 #define UIP_ARCH_ADD32 1
#define UIP_ARCH_CHKSUM 1 #define UIP_ARCH_CHKSUM 1
#define UIP_CONF_LLH_LEN 14
#define RESOLV_CONF_SUPPORTS_MDNS 0 #define RESOLV_CONF_SUPPORTS_MDNS 0
#define RESOLV_CONF_SUPPORTS_RECORD_EXPIRATION 0 #define RESOLV_CONF_SUPPORTS_RECORD_EXPIRATION 0
#define NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE 1 #define NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE 1

1
platform/minimal-net/contiki-conf.h
View file

@ -140,6 +140,7 @@ typedef unsigned short uip_stats_t;
#endif #endif
#define UIP_CONF_LLH_LEN 14
#define UIP_CONF_MAX_LISTENPORTS 40 #define UIP_CONF_MAX_LISTENPORTS 40
#define UIP_CONF_MAX_CONNECTIONS 40 #define UIP_CONF_MAX_CONNECTIONS 40
#define UIP_CONF_BYTE_ORDER UIP_LITTLE_ENDIAN #define UIP_CONF_BYTE_ORDER UIP_LITTLE_ENDIAN

33
platform/win32/contiki-conf.h
View file

@ -56,25 +56,26 @@ typedef long s32_t;
typedef unsigned short uip_stats_t; typedef unsigned short uip_stats_t;
#define UIP_CONF_MAX_CONNECTIONS 40 #define UIP_CONF_MAX_CONNECTIONS 40
#define UIP_CONF_MAX_LISTENPORTS 40 #define UIP_CONF_MAX_LISTENPORTS 40
#define UIP_CONF_BUFFER_SIZE 1514 #define UIP_CONF_LLH_LEN 14
#define UIP_CONF_BYTE_ORDER UIP_LITTLE_ENDIAN #define UIP_CONF_BUFFER_SIZE 1514
#define UIP_CONF_TCP_SPLIT 1 #define UIP_CONF_BYTE_ORDER UIP_LITTLE_ENDIAN
#define UIP_CONF_TCP_SPLIT 1
#define UIP_CONF_LOGGING 1
#define UIP_CONF_UDP_CHECKSUMS 1
#if UIP_CONF_IPV6 #if UIP_CONF_IPV6
#define UIP_CONF_IP_FORWARD 0 #define UIP_CONF_IP_FORWARD 0
#define NBR_TABLE_CONF_MAX_NEIGHBORS 100 #define NBR_TABLE_CONF_MAX_NEIGHBORS 100
#define UIP_CONF_DS6_DEFRT_NBU 2 #define UIP_CONF_DS6_DEFRT_NBU 2
#define UIP_CONF_DS6_PREFIX_NBU 5 #define UIP_CONF_DS6_PREFIX_NBU 5
#define UIP_CONF_MAX_ROUTES 100 #define UIP_CONF_MAX_ROUTES 100
#define UIP_CONF_DS6_ADDR_NBU 10 #define UIP_CONF_DS6_ADDR_NBU 10
#define UIP_CONF_DS6_MADDR_NBU 0 //VC++ does not allow zero length arrays #define UIP_CONF_DS6_MADDR_NBU 0 //VC++ does not allow zero length arrays
#define UIP_CONF_DS6_AADDR_NBU 0 //inside a struct #define UIP_CONF_DS6_AADDR_NBU 0 //inside a struct
#else #else
#define UIP_CONF_IP_FORWARD 1 #define UIP_CONF_IP_FORWARD 1
#endif #endif
#define UIP_CONF_LOGGING 1
#define UIP_CONF_UDP_CHECKSUMS 1
#include <ctype.h> #include <ctype.h>