diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2010-05-27 04:14:17 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2010-05-27 04:14:17 +0000 |
| commit | 0bf68a543be989da9005e57e43cc83681b1f33b9 (patch) | |
| tree | b28e142ef940d6643f28d105d825d7d1e851e0c9 /cpukit | |
| parent | 2010-05-27 Ralf Corsépius <ralf.corsepius@rtems.org> (diff) | |
| download | rtems-0bf68a543be989da9005e57e43cc83681b1f33b9.tar.bz2 | |
2010-05-27 Ralf Corsépius <ralf.corsepius@rtems.org>
* libfs/src/nfsclient/src/rpcio.c:
Use address to rpciod in calls to rxWakeupCB.
Diffstat (limited to 'cpukit')
| -rw-r--r-- | cpukit/ChangeLog | 2 | ||||
| -rw-r--r-- | cpukit/libfs/src/nfsclient/src/rpcio.c | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index a08a87f8d9..9b99461dec 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,5 +1,7 @@ 2010-05-27 Ralf Corsépius <ralf.corsepius@rtems.org> + * libfs/src/nfsclient/src/rpcio.c: + Use address to rpciod in calls to rxWakeupCB. * libnetworking/sys/socket.h (struct sockwakeup): Use void* instead of caddr_t. * librpc/include/rpc/xdr.h: Cosmetics from freebsd. diff --git a/cpukit/libfs/src/nfsclient/src/rpcio.c b/cpukit/libfs/src/nfsclient/src/rpcio.c index e814b33a61..80802cb87e 100644 --- a/cpukit/libfs/src/nfsclient/src/rpcio.c +++ b/cpukit/libfs/src/nfsclient/src/rpcio.c @@ -921,9 +921,10 @@ rtems_event_set gotEvents; * be more efficient */ static void -rxWakeupCB(struct socket *sock, caddr_t arg) +rxWakeupCB(struct socket *sock, void *arg) { -rtems_event_send((rtems_id)arg, RPCIOD_RX_EVENT); + rtems_id *rpciod = (rtems_id*) arg; + rtems_event_send(*rpciod, RPCIOD_RX_EVENT); } int @@ -966,7 +967,7 @@ struct sockwakeup wkup; assert( status == RTEMS_SUCCESSFUL ); wkup.sw_pfn = rxWakeupCB; - wkup.sw_arg = (caddr_t)rpciod; + wkup.sw_arg = &rpciod; assert( 0==setsockopt(ourSock, SOL_SOCKET, SO_RCVWAKEUP, &wkup, sizeof(wkup)) ); status = rtems_message_queue_create( rtems_build_name('R','P','C','q'), |