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

Added support for (simulated) serial data input. Data written to netsim's standard input are now sent as serial data to the main node.

Browse source
This commit is contained in:
adamdunkels 2008-01-14 09:38:16 +00:00
parent 7fcb1f3b2a
commit 7a356d0fb5
9 changed files with 120 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

36
platform/netsim/contiki-main.c
View file

@ -30,7 +30,7 @@
*
* Author: Adam Dunkels <adam@sics.se>
*
* $Id: contiki-main.c,v 1.25 2008/01/04 23:09:03 oliverschmidt Exp $
* $Id: contiki-main.c,v 1.26 2008/01/14 09:38:16 adamdunkels Exp $
*/
#include "contiki.h"
@ -64,6 +64,12 @@
#include "dev/radio-sensor.h"
#include "dev/leds.h"
#ifdef __CYGWIN__
__attribute__((dllimport)) extern int __argc;
__attribute__((dllimport)) extern char **__argv[];
#endif /* __CYGWIN__ */
#ifdef __CYGWIN__
static struct uip_fw_netif extif =
{UIP_FW_NETIF(0,0,0,0, 0,0,0,0, wpcap_output)};
@ -111,8 +117,10 @@ contiki_main(int flag)
procinit_init();
uip_init();
serial_init();
uip_init();
ctimer_init();
rime_init(nullmac_init(&ethernode_driver));
@ -120,17 +128,19 @@ contiki_main(int flag)
if(flag == 1) {
#ifdef __CYGWIN__
process_start(&wpcap_process, NULL);
{
char buf[1024];
snprintf(buf, sizeof(buf), "route add %d.%d.%d.%d mask %d.%d.%d.%d %d.%d.%d.%d",
uip_ipaddr_to_quad(&meshif.ipaddr),
uip_ipaddr_to_quad(&meshif.netmask),
uip_ipaddr_to_quad(&uip_hostaddr));
printf("%s\n", buf);
system(buf);
signal(SIGTERM, remove_route);
if(__argc > 2 && (*__argv)[1][0] != '-') {
process_start(&wpcap_process, NULL);
{
char buf[1024];
snprintf(buf, sizeof(buf), "route add %d.%d.%d.%d mask %d.%d.%d.%d %d.%d.%d.%d",
uip_ipaddr_to_quad(&meshif.ipaddr),
uip_ipaddr_to_quad(&meshif.netmask),
uip_ipaddr_to_quad(&uip_hostaddr));
printf("%s\n", buf);
system(buf);
signal(SIGTERM, remove_route);
}
}
#else /* __CYGWIN__ */
process_start(&tapdev_process, NULL);