2009-12-17 Joel Sherrill <joel.sherrill@oarcorp.com>

	* libcsupport/src/termios.c, libfs/src/dosfs/msdos_format.c,
	libfs/src/nfsclient/src/nfs.c, libfs/src/pipe/fifo.c,
	libnetworking/lib/rtems_bsdnet_ntp.c, libnetworking/lib/tftpDriver.c,
	libnetworking/rtems/rtems_glue.c, libnetworking/rtems/rtems_select.c:
	Eliminate uses of deprecated rtems_clock_get() and replace with
	properly typed routine.

4 files changed, 13 insertions, 12 deletions

diff --git a/cpukit/libnetworking/lib/rtems_bsdnet_ntp.c b/cpukit/libnetworking/lib/rtems_bsdnet_ntp.c
index 8e19259bfc..c5ab53d762 100644
--- a/cpukit/libnetworking/lib/rtems_bsdnet_ntp.c
+++ b/cpukit/libnetworking/lib/rtems_bsdnet_ntp.c
@@ -52,7 +52,7 @@ processPacket (struct ntpPacketSmall *p, int state, void *unused)
 	if ( state )
 		return 0;
 
-	rtems_clock_get (RTEMS_CLOCK_GET_TICKS_PER_SECOND, &ticks_per_second);
+	ticks_per_second = rtems_clock_get_ticks_per_second();
 	tbuf = ntohl (p->transmit_timestamp.integer) - UNIX_BASE_TO_NTP_BASE - rtems_bsdnet_timeoffset;
 	lt = gmtime (&tbuf);
 	rt.year = lt->tm_year + 1900;
diff --git a/cpukit/libnetworking/lib/tftpDriver.c b/cpukit/libnetworking/lib/tftpDriver.c
index b84da7925d..0b21792abf 100644
--- a/cpukit/libnetworking/lib/tftpDriver.c
+++ b/cpukit/libnetworking/lib/tftpDriver.c
@@ -637,7 +637,7 @@ static int rtems_tftp_open_worker(
      * Bind the socket to a local address
      */
     retryCount = 0;
-    rtems_clock_get (RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &now);
+    now = rtems_clock_get_ticks_since_boot();
     for (;;) {
         int try = (now + retryCount) % 10;
 
@@ -923,7 +923,7 @@ static int rtems_tftp_close(
          */
         rtems_interval ticksPerSecond;
         sendStifle (tp, &tp->farAddress);
-        rtems_clock_get (RTEMS_CLOCK_GET_TICKS_PER_SECOND, &ticksPerSecond);
+        ticksPerSecond = rtems_clock_get_ticks_per_second();
         rtems_task_wake_after (1 + ticksPerSecond / 10);
     }
     close (tp->socket);
diff --git a/cpukit/libnetworking/rtems/rtems_glue.c b/cpukit/libnetworking/rtems/rtems_glue.c
index d3d589c166..f86e6e3a6e 100644
--- a/cpukit/libnetworking/rtems/rtems_glue.c
+++ b/cpukit/libnetworking/rtems/rtems_glue.c
@@ -288,10 +288,11 @@ rtems_bsdnet_initialize (void)
 	/*
 	 * Compute clock tick conversion factors
 	 */
-	rtems_clock_get (RTEMS_CLOCK_GET_TICKS_PER_SECOND, &rtems_bsdnet_ticks_per_second);
+	rtems_bsdnet_ticks_per_second = rtems_clock_get_ticks_per_second();
 	if (rtems_bsdnet_ticks_per_second <= 0)
 		rtems_bsdnet_ticks_per_second = 1;
-	rtems_bsdnet_microseconds_per_tick = 1000000 / rtems_bsdnet_ticks_per_second;
+	rtems_bsdnet_microseconds_per_tick =
+		1000000 / rtems_bsdnet_ticks_per_second;
 
 	/*
 	 * Ensure that `seconds' is greater than 0
@@ -554,7 +555,7 @@ networkDaemon (void *task_argument)
 				arpintr ();
 		}
 
-		rtems_clock_get (RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &now);
+  		now = rtems_clock_get_ticks_since_boot();
 		ticksPassed = now - ticksWhenCalloutsLastChecked;
 		if (ticksPassed != 0) {
 			ticksWhenCalloutsLastChecked = now;
@@ -677,7 +678,7 @@ microtime (struct timeval *t)
 {
 	rtems_interval now;
 
-	rtems_clock_get (RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &now);
+	now = rtems_clock_get_ticks_since_boot();
 	t->tv_sec = now / rtems_bsdnet_ticks_per_second;
 	t->tv_usec = (now % rtems_bsdnet_ticks_per_second) * rtems_bsdnet_microseconds_per_tick;
 }
@@ -687,7 +688,7 @@ rtems_bsdnet_seconds_since_boot (void)
 {
 	rtems_interval now;
 
-	rtems_clock_get (RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &now);
+	now = rtems_clock_get_ticks_since_boot();
 	return now / rtems_bsdnet_ticks_per_second;
 }
 
@@ -699,7 +700,7 @@ rtems_bsdnet_random (void)
 {
 	rtems_interval now;
 
-	rtems_clock_get (RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &now);
+	now = rtems_clock_get_ticks_since_boot();
 	return (now * 99991);
 }
 
diff --git a/cpukit/libnetworking/rtems/rtems_select.c b/cpukit/libnetworking/rtems/rtems_select.c
index 7a006095ea..927c07daa6 100644
--- a/cpukit/libnetworking/rtems/rtems_select.c
+++ b/cpukit/libnetworking/rtems/rtems_select.c
@@ -121,7 +121,7 @@ select (int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, struct t
 	int error, timo;
 	int retval = 0;
 	rtems_id tid;
-	rtems_interval then, now;
+	rtems_interval then = 0, now;
 	rtems_event_set events;
 
 	if (nfds < 0)
@@ -130,7 +130,7 @@ select (int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, struct t
 		timo = tv->tv_sec * hz + tv->tv_usec / tick;
 		if (timo == 0)
 			timo = 1;
-		rtems_clock_get (RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &then);
+		then = rtems_clock_get_ticks_since_boot();
 	}
 	else {
 		timo = 0;
@@ -156,7 +156,7 @@ select (int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, struct t
 		if (error || retval)
 			break;
 		if (timo) {
-			rtems_clock_get (RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &now);
+			now = rtems_clock_get_ticks_since_boot();
 			timo -= now - then;
 			if (timo <= 0)
 				break;