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

Merge pull request #42 from adamdunkels/fix-micaz-build 

Fix micaz build
This commit is contained in:
Nicolas Tsiftes 2012-11-22 01:21:00 -08:00
parent c7434df043 91206e2249
commit 0a8183d295
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/net/uip.h
View File

@ -1769,7 +1769,6 @@ typedef struct uip_ext_hdr_opt_padn {
uint8_t opt_len; uint8_t opt_len;
} uip_ext_hdr_opt_padn; } uip_ext_hdr_opt_padn;
#if UIP_CONF_IPV6_RPL
/* RPL option */ /* RPL option */
typedef struct uip_ext_hdr_opt_rpl { typedef struct uip_ext_hdr_opt_rpl {
uint8_t opt_type; uint8_t opt_type;
@ -1778,7 +1777,6 @@ typedef struct uip_ext_hdr_opt_rpl {
uint8_t instance; uint8_t instance;
uint16_t senderrank; uint16_t senderrank;
} uip_ext_hdr_opt_rpl; } uip_ext_hdr_opt_rpl;
#endif /* UIP_CONF_IPV6_RPL */
/* TCP header */ /* TCP header */
struct uip_tcp_hdr { struct uip_tcp_hdr {
@ -1850,9 +1848,7 @@ struct uip_udp_hdr {
/** \brief Destination and Hop By Hop extension headers option types */ /** \brief Destination and Hop By Hop extension headers option types */
#define UIP_EXT_HDR_OPT_PAD1 0 #define UIP_EXT_HDR_OPT_PAD1 0
#define UIP_EXT_HDR_OPT_PADN 1 #define UIP_EXT_HDR_OPT_PADN 1
#if UIP_CONF_IPV6_RPL
#define UIP_EXT_HDR_OPT_RPL 0x63 #define UIP_EXT_HDR_OPT_RPL 0x63
#endif /* UIP_CONF_IPV6_RPL */
/** @} */ /** @} */

3
platform/micaz/contiki-conf.h
View File

@ -71,7 +71,6 @@
#define NETSTACK_CONF_NETWORK rime_driver #define NETSTACK_CONF_NETWORK rime_driver
#define NETSTACK_CONF_MAC csma_driver #define NETSTACK_CONF_MAC csma_driver
#define NETSTACK_CONF_MAC nullmac_driver
#define NETSTACK_CONF_RDC cxmac_driver #define NETSTACK_CONF_RDC cxmac_driver
#define NETSTACK_CONF_FRAMER framer_802154 #define NETSTACK_CONF_FRAMER framer_802154
@ -116,7 +115,7 @@
#define UIP_CONF_LLH_LEN 0 #define UIP_CONF_LLH_LEN 0
#define UIP_CONF_ROUTER 0 #define UIP_CONF_ROUTER 0
#define UIP_CONF_IPV6_RPL 0 #define UIP_CONF_IPV6_RPL 1
/* configure number of neighbors and routes */ /* configure number of neighbors and routes */
#define UIP_CONF_DS6_NBR_NBU 5 #define UIP_CONF_DS6_NBR_NBU 5