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

Merge pull request #180 from mmuman/cleanup-and-fixes 

Cleanup and fixes
This commit is contained in:
Oliver Schmidt 2013-03-20 02:37:24 -07:00
parent 8c25ed20d9 3d33248eff
commit 6ba28bf74f
6 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/shell/gui-shell.c
View File

@ -102,7 +102,7 @@ shell_prompt(char *str)
}
/*-----------------------------------------------------------------------------------*/
void
shell_exit(char *str)
shell_exit(void)
{
ctk_window_close(&window);
}

17
cpu/native/net/tapdev.c
View File

@ -69,6 +69,13 @@ static unsigned long lasttime;
#define BUF ((struct uip_eth_hdr *)&uip_buf[0])
#define DEBUG 0
#if DEBUG
#define PRINTF(...) fprintf(stderr, __VA_ARGS__)
#else
#define PRINTF(...)
#endif
/*---------------------------------------------------------------------------*/
int
tapdev_fd(void)
@ -83,7 +90,7 @@ remove_route(void)
char buf[1024];
snprintf(buf, sizeof(buf), "route delete -net 172.18.0.0");
system(buf);
printf("%s\n", buf);
fprintf(stderr, "%s\n", buf);
}
/*---------------------------------------------------------------------------*/
@ -112,7 +119,7 @@ tapdev_init(void)
snprintf(buf, sizeof(buf), "ifconfig tap0 inet 172.18.0.1/16");
system(buf);
printf("%s\n", buf);
fprintf(stderr, "%s\n", buf);
#ifdef linux
/* route add for linux */
snprintf(buf, sizeof(buf), "route add -net 172.18.0.0/16 dev tap0");
@ -122,7 +129,7 @@ tapdev_init(void)
#endif /* linux */
system(buf);
printf("%s\n", buf);
fprintf(stderr, "%s\n", buf);
atexit(remove_route);
lasttime = 0;
@ -149,6 +156,7 @@ tapdev_poll(void)
return 0;
}
ret = read(fd, uip_buf, UIP_BUFSIZE);
PRINTF("tapdev_poll: read %d bytes\n", ret);
if(ret == -1) {
perror("tapdev_poll: read");
@ -171,11 +179,12 @@ tapdev_send(void)
#if DROP
drop++;
if(drop % 8 == 7) {
printf("Dropped an output packet!\n");
fprintf(stderr, "Dropped an output packet!\n");
return;
}
#endif /* DROP */
PRINTF("tapdev_send: sending %d bytes\n", uip_len);
ret = write(fd, uip_buf, uip_len);
if(ret == -1) {

4
platform/native/contiki-main.c
View File

@ -271,12 +271,12 @@ main(int argc, char **argv)
void
log_message(char *m1, char *m2)
{
printf("%s%s\n", m1, m2);
fprintf(stderr, "%s%s\n", m1, m2);
}
/*---------------------------------------------------------------------------*/
void
uip_log(char *m)
{
printf("%s\n", m);
fprintf(stderr, "%s\n", m);
}
/*---------------------------------------------------------------------------*/