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

Fixed linuxradio compilation issues with native and minimal-net

Browse source
This commit is contained in:
Vladimir Pouzanov 2014-03-01 10:37:10 +00:00 committed by Vladimir Pouzanov
parent 4c8618e6ba
commit bd1b7d9814
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cpu/native/net/linuxradio-drv.c
View file

@ -34,8 +34,9 @@
*/ */
#include "contiki.h" #include "contiki.h"
#include "contiki-conf.h"
#ifdef linux #if defined(linux) && UIP_CONF_IPV6
#include "linuxradio-drv.h" #include "linuxradio-drv.h"

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

@ -35,6 +35,9 @@
#include <inttypes.h> #include <inttypes.h>
#include <limits.h> #include <limits.h>
#ifndef WIN32_LEAN_AND_MEAN
#include <sys/select.h>
#endif
struct select_callback { struct select_callback {
int (* set_fd)(fd_set *fdr, fd_set *fdw); int (* set_fd)(fd_set *fdr, fd_set *fdw);
@ -157,6 +160,8 @@ typedef unsigned short uip_stats_t;
/* Not used but avoids compile errors while sicslowpan.c is being developed */ /* Not used but avoids compile errors while sicslowpan.c is being developed */
#define SICSLOWPAN_CONF_COMPRESSION SICSLOWPAN_COMPRESSION_HC06 #define SICSLOWPAN_CONF_COMPRESSION SICSLOWPAN_COMPRESSION_HC06
#define NETSTACK_CONF_LINUXRADIO_DEV "wpan0"
#define UIP_CONF_UDP 1 #define UIP_CONF_UDP 1
#define UIP_CONF_TCP 1 #define UIP_CONF_TCP 1
@ -174,8 +179,6 @@ typedef unsigned short uip_stats_t;
#define UIP_CONF_DS6_AADDR_NBU 0 #define UIP_CONF_DS6_AADDR_NBU 0
#endif /* NETSTACK_CONF_WITH_IPV6 */ #endif /* NETSTACK_CONF_WITH_IPV6 */
#define NETSTACK_CONF_LINUXRADIO_DEV "wpan0"
typedef unsigned long clock_time_t; typedef unsigned long clock_time_t;
#define CLOCK_CONF_SECOND 1000 #define CLOCK_CONF_SECOND 1000
#define INFINITE_TIME ULONG_MAX #define INFINITE_TIME ULONG_MAX