This commit was manufactured by cvs2svn to create tag 'rtems-4-5-1-pre3'.4.5.1-pre3

Sprout from rtems-4-5-branch 2002-01-30 20:04:25 UTC cvs2git <rtems-devel@rtems.org> 'This commit was manufactured by cvs2svn to create branch 'rtems-4-5-branch'.'
Cherrypick from rtems-4-5-branch 2001-08-30 19:12:24 UTC Joel Sherrill <joel.sherrill@OARcorp.com> 'changed version to 4.5.1-pre1':
    VERSION
    c/src/lib/libc/termios.c
Cherrypick from master 1999-03-31 23:21:19 UTC Joel Sherrill <joel.sherrill@OARcorp.com> 'Fixed paths to include files so this will build.':
    c/src/lib/libcpu/mips/clock/clock.S
Cherrypick from master 2002-01-22 17:38:37 UTC Joel Sherrill <joel.sherrill@OARcorp.com> '2002-01-21	Ralf Corsepius <corsepiu@faw.uni-ulm.de>':
    doc/.cvsignore

4 files changed, 64 insertions, 16 deletions

diff --git a/VERSION b/VERSION
index ac5f065822..5ca35d2de0 100644
--- a/VERSION
+++ b/VERSION
@@ -4,4 +4,4 @@
 #  $Id$
 #
 
-RTEMS Version 4.5.1-pre3
+RTEMS Version 4.5.1-pre1
diff --git a/c/src/lib/libc/termios.c b/c/src/lib/libc/termios.c
index c23da7ab31..3dd122dca1 100644
--- a/c/src/lib/libc/termios.c
+++ b/c/src/lib/libc/termios.c
@@ -324,30 +324,19 @@ rtems_termios_close (void *arg)
 		drainOutput (tty);
 		if (tty->device.lastClose)
 			 (*tty->device.lastClose)(tty->major, tty->minor, arg);
-		if (tty->forw == NULL) {
+		if (tty->forw == NULL)
 			rtems_termios_ttyTail = tty->back;
-			if ( rtems_termios_ttyTail != NULL ) {
-				rtems_termios_ttyTail->forw = NULL;
-			}
-		}
-		else {
+		else
 			tty->forw->back = tty->back;
-		}
-		if (tty->back == NULL) {
+		if (tty->back == NULL)
 			rtems_termios_ttyHead = tty->forw;
-			if ( rtems_termios_ttyHead != NULL ) {
-				rtems_termios_ttyHead->back = NULL;
-			}
-		}
-		else {
+		else
 			tty->back->forw = tty->forw;
-		}
 		rtems_semaphore_delete (tty->isem);
 		rtems_semaphore_delete (tty->osem);
 		rtems_semaphore_delete (tty->rawOutBufSemaphore);
 		if (!tty->device.pollRead)
 			rtems_semaphore_delete (tty->rawInBufSemaphore);
-		free (tty->cbuf);
 		free (tty);
 	}
 	rtems_semaphore_release (rtems_termios_ttyMutex);
diff --git a/c/src/lib/libcpu/mips/clock/clock.S b/c/src/lib/libcpu/mips/clock/clock.S
new file mode 100644
index 0000000000..ab3533991a
--- /dev/null
+++ b/c/src/lib/libcpu/mips/clock/clock.S
@@ -0,0 +1,45 @@
+/*  clock.s 
+ *
+ *  This file contains the assembly code for the IDT 4650 clock driver.
+ *
+ *  Author:     Craig Lebakken <craigl@transition.com>
+ *
+ *  COPYRIGHT (c) 1996 by Transition Networks Inc.
+ *
+ *  To anyone who acknowledges that this file is provided "AS IS"
+ *  without any express or implied warranty:
+ *      permission to use, copy, modify, and distribute this file
+ *      for any purpose is hereby granted without fee, provided that
+ *      the above copyright notice and this notice appears in all
+ *      copies, and that the name of Transition Networks not be used in
+ *      advertising or publicity pertaining to distribution of the
+ *      software without specific, written prior permission.
+ *      Transition Networks makes no representations about the suitability
+ *      of this software for any purpose.
+ *
+ *  $Id$
+ */
+/* @(#)clock.S       08/20/96     1.2 */
+
+#include <iregdef.h>
+#include <idtcpu.h>
+#include <idtmon.h>
+
+FRAME(mips_set_timer,sp,0,ra)
+	.set noreorder
+        mfc0 t0,C0_COUNT
+        nop
+        addu t0,a0,t0
+        mtc0 t0,C0_COMPARE
+        nop
+        j ra
+	.set reorder
+ENDFRAME(mips_set_timer)
+
+FRAME(mips_get_timer,sp,0,ra)
+	.set noreorder
+        mfc0 v0,C0_COUNT
+        nop
+        j ra
+	.set reorder
+ENDFRAME(mips_get_timer)
diff --git a/doc/.cvsignore b/doc/.cvsignore
index 282522db03..4660ef6501 100644
--- a/doc/.cvsignore
+++ b/doc/.cvsignore
@@ -1,2 +1,16 @@
 Makefile
 Makefile.in
+aclocal.m4
+autom4te.cache
+config.*
+configure
+depcomp
+index.html
+install-sh
+mdate-sh
+missing
+mkinstalldirs
+rtems_footer.html
+rtems_header.html
+rtems_support.html
+texinfo.tex