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

Merge pull request #656 from atiselsts/native_platform_patches

Browse source 
Minor improvements for the native platform
This commit is contained in:
Nicolas Tsiftes 2014-06-07 23:06:36 +02:00
parent e6128a1123 9cbfede2b6
commit 350c83c947
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
platform/native/contiki-main.c
View file

@ -35,6 +35,7 @@
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include <sys/select.h> #include <sys/select.h>
#include <errno.h>
#ifdef __CYGWIN__ #ifdef __CYGWIN__
#include "net/wpcap-drv.h" #include "net/wpcap-drv.h"
@ -190,6 +191,7 @@ main(int argc, char **argv)
process_init(); process_init();
process_start(&etimer_process, NULL); process_start(&etimer_process, NULL);
ctimer_init(); ctimer_init();
rtimer_init();
#if WITH_GUI #if WITH_GUI
process_start(&ctk_process, NULL); process_start(&ctk_process, NULL);
@ -197,12 +199,12 @@ main(int argc, char **argv)
set_rime_addr(); set_rime_addr();
queuebuf_init();
netstack_init(); netstack_init();
printf("MAC %s RDC %s NETWORK %s\n", NETSTACK_MAC.name, NETSTACK_RDC.name, NETSTACK_NETWORK.name); printf("MAC %s RDC %s NETWORK %s\n", NETSTACK_MAC.name, NETSTACK_RDC.name, NETSTACK_NETWORK.name);
#if WITH_UIP6 #if WITH_UIP6
queuebuf_init();
memcpy(&uip_lladdr.addr, serial_id, sizeof(uip_lladdr.addr)); memcpy(&uip_lladdr.addr, serial_id, sizeof(uip_lladdr.addr));
process_start(&tcpip_process, NULL); process_start(&tcpip_process, NULL);
@ -259,7 +261,9 @@ main(int argc, char **argv)
retval = select(maxfd + 1, &fdr, &fdw, NULL, &tv); retval = select(maxfd + 1, &fdr, &fdw, NULL, &tv);
if(retval < 0) { if(retval < 0) {
perror("select"); if(errno != EINTR) {
perror("select");
}
} else if(retval > 0) { } else if(retval > 0) {
/* timeout => retval == 0 */ /* timeout => retval == 0 */
for(i = 0; i <= maxfd; i++) { for(i = 0; i <= maxfd; i++) {