diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2009-08-10 16:10:37 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2009-08-10 16:10:37 +0000 |
| commit | f0266e169325eab8e2f7204e77937ae8ab98d47c (patch) | |
| tree | 6019af358475fbf86f6e8a5beb477ba1f8bc7ea8 /cpukit | |
| parent | 2009-08-10 Joel Sherrill <joel.sherrill@oarcorp.com> (diff) | |
| download | rtems-f0266e169325eab8e2f7204e77937ae8ab98d47c.tar.bz2 | |
2009-08-10 Joel Sherrill <joel.sherrill@oarcorp.com>
* libcsupport/src/__times.c, libfs/src/nfsclient/src/nfsTest.c,
libfs/src/nfsclient/src/rpcio.c: Convert calls to legacy routine
rtems_clock_get( RTEMS_CLOCK_GET_xxx, ..) to rtems_clock_get_xxx().
Diffstat (limited to 'cpukit')
| -rw-r--r-- | cpukit/ChangeLog | 6 | ||||
| -rw-r--r-- | cpukit/libcsupport/src/__times.c | 2 | ||||
| -rw-r--r-- | cpukit/libfs/src/nfsclient/src/nfsTest.c | 6 | ||||
| -rw-r--r-- | cpukit/libfs/src/nfsclient/src/rpcio.c | 9 |
4 files changed, 13 insertions, 10 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 12ebfc3a24..4479924199 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,9 @@ +2009-08-10 Joel Sherrill <joel.sherrill@oarcorp.com> + + * libcsupport/src/__times.c, libfs/src/nfsclient/src/nfsTest.c, + libfs/src/nfsclient/src/rpcio.c: Convert calls to legacy routine + rtems_clock_get( RTEMS_CLOCK_GET_xxx, ..) to rtems_clock_get_xxx(). + 2009-08-09 Joel Sherrill <joel.sherrill@oarcorp.com> * score/src/heapresizeblock.c: Remove printk's that were accidentally diff --git a/cpukit/libcsupport/src/__times.c b/cpukit/libcsupport/src/__times.c index 255057cc6e..a9690f9541 100644 --- a/cpukit/libcsupport/src/__times.c +++ b/cpukit/libcsupport/src/__times.c @@ -41,7 +41,7 @@ clock_t _times( * This call does not depend on TOD being initialized and can't fail. */ - (void) rtems_clock_get( RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &ticks ); + ticks = rtems_clock_get_ticks_since_boot(); /* * RTEMS technically has no notion of system versus user time diff --git a/cpukit/libfs/src/nfsclient/src/nfsTest.c b/cpukit/libfs/src/nfsclient/src/nfsTest.c index 9de6e2b43d..01ef860744 100644 --- a/cpukit/libfs/src/nfsclient/src/nfsTest.c +++ b/cpukit/libfs/src/nfsclient/src/nfsTest.c @@ -329,7 +329,7 @@ char *buf=0; } /* Timed main loop */ - rtems_clock_get( RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &then); + then = rtems_clock_get_ticks_since_boot(); if ( nrd ) { off = 0; @@ -348,9 +348,9 @@ char *buf=0; } } - rtems_clock_get( RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &now); + now = rtems_clock_get_ticks_since_boot(); now = (now-then)*1000; - rtems_clock_get( RTEMS_CLOCK_GET_TICKS_PER_SECOND, &tickspsec); + ticksspec = rtems_clock_get_ticks_per_second(); now /= tickspsec; /* time in ms */ cleanup: diff --git a/cpukit/libfs/src/nfsclient/src/rpcio.c b/cpukit/libfs/src/nfsclient/src/rpcio.c index 5e3abe416a..71a4161b58 100644 --- a/cpukit/libfs/src/nfsclient/src/rpcio.c +++ b/cpukit/libfs/src/nfsclient/src/rpcio.c @@ -941,8 +941,7 @@ struct sockwakeup wkup; s = ioctl(ourSock, FIONBIO, (char*)&noblock); assert( s == 0 ); /* assume nobody tampers with the clock !! */ - status = rtems_clock_get(RTEMS_CLOCK_GET_TICKS_PER_SECOND, &ticksPerSec); - assert( status == RTEMS_SUCCESSFUL ); + ticksPerSec = rtems_clock_get_ticks_per_second(); MU_CREAT( &hlock ); MU_CREAT( &llock ); @@ -1155,8 +1154,7 @@ unsigned long max_period = RPCIOD_RETX_CAP_S * ticksPerSec; rtems_status_code status; - status = rtems_clock_get( RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &then ); - assert( status == RTEMS_SUCCESSFUL ); + then = rtems_clock_get_ticks_since_boot(); for (next_retrans = epoch;;) { @@ -1199,8 +1197,7 @@ rtems_status_code status; } } - status = rtems_clock_get( RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &unow ); - assert( status == RTEMS_SUCCESSFUL ); + unow = rtems_clock_get_ticks_since_boot(); /* measure everything relative to then to protect against * rollover |