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.

9 files changed, 49 insertions, 39 deletions

diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index 0f4ba19858..36617a42c7 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,5 +1,14 @@
 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.
+
+2009-12-17	Joel Sherrill <joel.sherrill@oarcorp.com>
+
 	* telnetd/telnetd.c: Honor configuration setting for telnet daemon
 	stack size.
 
diff --git a/cpukit/libcsupport/src/termios.c b/cpukit/libcsupport/src/termios.c
index 51f3ac8cce..22811b64e8 100644
--- a/cpukit/libcsupport/src/termios.c
+++ b/cpukit/libcsupport/src/termios.c
@@ -553,9 +553,8 @@ rtems_termios_ioctl (void *arg)
 			tty->rawInBufSemaphoreFirstTimeout = RTEMS_NO_TIMEOUT;
 		}
 		else {
-			rtems_interval ticksPerSecond;
-			rtems_clock_get (RTEMS_CLOCK_GET_TICKS_PER_SECOND, &ticksPerSecond);
-			tty->vtimeTicks = tty->termios.c_cc[VTIME] * ticksPerSecond / 10;
+			tty->vtimeTicks = tty->termios.c_cc[VTIME] * 
+			              rtems_clock_get_ticks_per_second() / 10;
 			if (tty->termios.c_cc[VTIME]) {
 				tty->rawInBufSemaphoreOptions = RTEMS_WAIT;
 				tty->rawInBufSemaphoreTimeout = tty->vtimeTicks;
@@ -977,13 +976,13 @@ fillBufferPoll (struct rtems_termios_tty *tty)
 	else {
 		rtems_interval then, now;
 		if (!tty->termios.c_cc[VMIN] && tty->termios.c_cc[VTIME])
-			rtems_clock_get (RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &then);
+			then = rtems_clock_get_ticks_since_boot();
 		for (;;) {
 			n = (*tty->device.pollRead)(tty->minor);
 			if (n < 0) {
 				if (tty->termios.c_cc[VMIN]) {
 					if (tty->termios.c_cc[VTIME] && tty->ccount) {
-						rtems_clock_get (RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &now);
+						now = rtems_clock_get_ticks_since_boot();
 						if ((now - then) > tty->vtimeTicks) {
 							break;
 						}
@@ -992,7 +991,7 @@ fillBufferPoll (struct rtems_termios_tty *tty)
 				else {
 					if (!tty->termios.c_cc[VTIME])
 						break;
-					rtems_clock_get (RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &now);
+					now = rtems_clock_get_ticks_since_boot();
 					if ((now - then) > tty->vtimeTicks) {
 						break;
 					}
@@ -1004,7 +1003,7 @@ fillBufferPoll (struct rtems_termios_tty *tty)
 				if (tty->ccount >= tty->termios.c_cc[VMIN])
 					break;
 				if (tty->termios.c_cc[VMIN] && tty->termios.c_cc[VTIME])
-					rtems_clock_get (RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &then);
+					then = rtems_clock_get_ticks_since_boot();
 			}
 		}
 	}
diff --git a/cpukit/libfs/src/dosfs/msdos_format.c b/cpukit/libfs/src/dosfs/msdos_format.c
index 98cb334787..e9d7cc2e5c 100644
--- a/cpukit/libfs/src/dosfs/msdos_format.c
+++ b/cpukit/libfs/src/dosfs/msdos_format.c
@@ -250,11 +250,11 @@ static int msdos_format_gen_volid
 {
   int ret_val = 0;
   int rc;
-  rtems_clock_time_value time_value;
+  struct timeval time_value;
 
-  rc = rtems_clock_get(RTEMS_CLOCK_GET_TIME_VALUE,&time_value);
+  rc = rtems_clock_get_tod_timeval(&time_value);
   if (rc == RTEMS_SUCCESSFUL) {
-    *volid_ptr = time_value.seconds + time_value.microseconds;
+    *volid_ptr = time_value.tv_sec + time_value.tv_sec;
   }
   else {
     *volid_ptr = rand();
diff --git a/cpukit/libfs/src/nfsclient/src/nfs.c b/cpukit/libfs/src/nfsclient/src/nfs.c
index 61e4373ee1..7014055448 100644
--- a/cpukit/libfs/src/nfsclient/src/nfs.c
+++ b/cpukit/libfs/src/nfsclient/src/nfs.c
@@ -2128,7 +2128,8 @@ static int nfs_mknod(
 	rtems_filesystem_location_info_t  *pathloc     /* IN/OUT */
 )
 {
-rtems_clock_time_value	now;
+
+struct timeval				now;
 diropres				res;
 NfsNode					node = pathloc->node_access;
 mode_t					type = S_IFMT & mode;
@@ -2140,7 +2141,7 @@ mode_t					type = S_IFMT & mode;
 	fprintf(stderr,"nfs_mknod: creating %s\n", path);
 #endif
 
-	rtems_clock_get(RTEMS_CLOCK_GET_TIME_VALUE, &now);
+        rtems_clock_get_tod_timeval(&now);
 
 	SERP_ARGS(node).createarg.name       		= (filename)path;
 	SERP_ARGS(node).createarg.attributes.mode	= mode;
@@ -2148,10 +2149,10 @@ mode_t					type = S_IFMT & mode;
 	SERP_ARGS(node).createarg.attributes.uid	= 0;
 	SERP_ARGS(node).createarg.attributes.gid	= 0;
 	SERP_ARGS(node).createarg.attributes.size	= 0;
-	SERP_ARGS(node).createarg.attributes.atime.seconds	= now.seconds;
-	SERP_ARGS(node).createarg.attributes.atime.useconds	= now.microseconds;
-	SERP_ARGS(node).createarg.attributes.mtime.seconds	= now.seconds;
-	SERP_ARGS(node).createarg.attributes.mtime.useconds	= now.microseconds;
+	SERP_ARGS(node).createarg.attributes.atime.seconds	= now.tv_sec;
+	SERP_ARGS(node).createarg.attributes.atime.useconds	= now.tv_usec;
+	SERP_ARGS(node).createarg.attributes.mtime.seconds	= now.tv_sec;
+	SERP_ARGS(node).createarg.attributes.mtime.useconds	= now.tv_usec;
 
 	if ( nfscall( node->nfs->server,
 						NFSPROC_CREATE,
@@ -2190,7 +2191,7 @@ static int nfs_symlink(
 	const char                        *node_name
 )
 {
-rtems_clock_time_value	now;
+struct timeval				now;
 nfsstat					status;
 NfsNode					node = loc->node_access;
 
@@ -2199,7 +2200,7 @@ NfsNode					node = loc->node_access;
 	fprintf(stderr,"nfs_symlink: creating %s -> %s\n", link_name, node_name);
 #endif
 
-	rtems_clock_get(RTEMS_CLOCK_GET_TIME_VALUE, &now);
+	rtems_clock_get_tod_timeval(&now);
 
 	SERP_ARGS(node).symlinkarg.name       		= (filename)link_name;
 	SERP_ARGS(node).symlinkarg.to				= (nfspath) node_name;
@@ -2209,10 +2210,10 @@ NfsNode					node = loc->node_access;
 	SERP_ARGS(node).symlinkarg.attributes.uid	= 0;
 	SERP_ARGS(node).symlinkarg.attributes.gid	= 0;
 	SERP_ARGS(node).symlinkarg.attributes.size	= 0;
-	SERP_ARGS(node).symlinkarg.attributes.atime.seconds	 = now.seconds;
-	SERP_ARGS(node).symlinkarg.attributes.atime.useconds = now.microseconds;
-	SERP_ARGS(node).symlinkarg.attributes.mtime.seconds	 = now.seconds;
-	SERP_ARGS(node).symlinkarg.attributes.mtime.useconds = now.microseconds;
+	SERP_ARGS(node).symlinkarg.attributes.atime.seconds  = now.tv_sec;
+	SERP_ARGS(node).symlinkarg.attributes.atime.useconds = now.tv_usec;
+	SERP_ARGS(node).symlinkarg.attributes.mtime.seconds  = now.tv_sec;
+	SERP_ARGS(node).symlinkarg.attributes.mtime.useconds = now.tv_usec;
 
 	if ( nfscall( node->nfs->server,
 						NFSPROC_SYMLINK,
@@ -2918,7 +2919,7 @@ static int
 nfs_sattr(NfsNode node, sattr *arg, u_long mask)
 {
 
-rtems_clock_time_value	now;
+struct timeval				now;
 nfstime					nfsnow, t;
 int						e;
 u_int					mode;
@@ -2926,11 +2927,11 @@ u_int					mode;
 	if (updateAttr(node, 0 /* only if old */))
 		return -1;
 
-	rtems_clock_get(RTEMS_CLOCK_GET_TIME_VALUE, &now);
+        rtems_clock_get_tod_timeval(&now);
 
 	/* TODO: add rtems EPOCH - UNIX EPOCH seconds */
-	nfsnow.seconds  = now.seconds;
-	nfsnow.useconds = now.microseconds;
+	nfsnow.seconds  = now.tv_sec;
+	nfsnow.useconds = now.tv_usec;
 
 	/* merge permission bits into existing type bits */
 	mode = SERP_ATTR(node).mode;
diff --git a/cpukit/libfs/src/pipe/fifo.c b/cpukit/libfs/src/pipe/fifo.c
index 846874b080..8f3fe82ddc 100644
--- a/cpukit/libfs/src/pipe/fifo.c
+++ b/cpukit/libfs/src/pipe/fifo.c
@@ -560,6 +560,6 @@ void rtems_pipe_initialize (void)
     rtems_fatal_error_occurred (sc);
 
   rtems_interval now;
-  rtems_clock_get(RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &now);
+  now = rtems_clock_get_ticks_since_boot();
   rtems_pipe_no = now;
 }
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;