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

Replaced SELECT_CALLBACK with an API that supports multiple select callbacks

Browse source
This commit is contained in:
Niclas Finne 2012-01-18 17:44:31 +01:00
parent c67954c773
commit aceb36c66b
5 changed files with 138 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

52
examples/ipv6/native-border-router/slip-dev.c
View file

@ -368,6 +368,31 @@ stty_telos(int fd)
if(tcflush(fd, TCIOFLUSH) == -1) err(1, "tcflush");
}
/*---------------------------------------------------------------------------*/
static int
set_fd(fd_set *rset, fd_set *wset)
{
if(!slip_empty()) { /* Anything to flush? */
FD_SET(slipfd, wset);
}
FD_SET(slipfd, rset); /* Read from slip ASAP! */
return 1;
}
/*---------------------------------------------------------------------------*/
static void
handle_fd(fd_set *rset, fd_set *wset)
{
if(FD_ISSET(slipfd, rset)) {
serial_input(inslip);
}
if(FD_ISSET(slipfd, wset)) {
slip_flushbuf(slipfd);
}
}
/*---------------------------------------------------------------------------*/
static const struct select_callback slip_callback = { set_fd, handle_fd };
/*---------------------------------------------------------------------------*/
void
slip_init(void)
{
@ -395,6 +420,8 @@ slip_init(void)
}
}
select_set_callback(slipfd, &slip_callback);
fprintf(stderr, "********SLIP started on ``/dev/%s''\n", slip_config_siodev);
stty_telos(slipfd);
@ -402,28 +429,3 @@ slip_init(void)
inslip = fdopen(slipfd, "r");
if(inslip == NULL) err(1, "main: fdopen");
}
/*---------------------------------------------------------------------------*/
int
slip_set_fd(int maxfd, fd_set *rset, fd_set *wset)
{
if(!slip_empty()) { /* Anything to flush? */
FD_SET(slipfd, wset);
}
FD_SET(slipfd, rset); /* Read from slip ASAP! */
if(slipfd > maxfd) maxfd = slipfd;
return maxfd;
}
/*---------------------------------------------------------------------------*/
void
slip_handle_fd(fd_set *rset, fd_set *wset)
{
if(FD_ISSET(slipfd, rset)) {
serial_input(inslip);
}
if(FD_ISSET(slipfd, wset)) {
slip_flushbuf(slipfd);
}
}