Removed all patch kit headers, sccsid and rcsid strings, put $Id$ in, some

minor cleanup.  Added $Id$ to files that did not have any version info, etc

28 files changed, 81 insertions, 151 deletions

diff --git a/sys/i386/isa/clock.c b/sys/i386/isa/clock.c
index 0fb7701..53497c8 100644
--- a/sys/i386/isa/clock.c
+++ b/sys/i386/isa/clock.c
@@ -33,27 +33,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)clock.c	7.2 (Berkeley) 5/12/91
- *
- * PATCHES MAGIC                LEVEL   PATCH THAT GOT US HERE
- * --------------------         -----   ----------------------
- * CURRENT PATCH LEVEL:         5       00158
- * --------------------         -----   ----------------------
- *
- * 14 Aug 92	Arne Henrik Juul	Added code in the kernel to
- *					allow for DST in the BIOS.
- * 17 Jan 93	Bruce Evans		Fixed leap year and second
- *					calculations
- * 01 Feb 93	Julian Elischer		Added code to for the cpu
- *					speed independent spinwait()
- *					function, (used by scsi and others)
- * 25 Mar 93	Sean Eric Fagan		Add microtimer support using timer 1
- * 08 Apr 93	Poul-Henning Kamp/P-HK	Fixes, and support for dcfclock
- * 26 Apr 93	Bruce Evans		Eliminate findspeed, new spinwait
- * 26 Apr 93	Rodney W. Grimes	I merged in Bruce changes and hope I
- *					still kept the other fixes... Had to
- *					add back in findcpuspeed that Bruce
- *					had removed.
+ *	from: @(#)clock.c	7.2 (Berkeley) 5/12/91
+ *	$Id$
  */
 
 /*
diff --git a/sys/i386/isa/fdreg.h b/sys/i386/isa/fdreg.h
index 948f566..84dbf75 100644
--- a/sys/i386/isa/fdreg.h
+++ b/sys/i386/isa/fdreg.h
@@ -30,14 +30,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)fdreg.h	7.1 (Berkeley) 5/9/91
- *
- * PATCHES MAGIC                LEVEL   PATCH THAT GOT US HERE
- * --------------------         -----   ----------------------
- * CURRENT PATCH LEVEL:         1       00153
- * --------------------         -----   ----------------------
- *
- * 20 Apr 93	Julian Elischer		Heavily re worked, see notes below
+ *	from: @(#)fdreg.h	7.1 (Berkeley) 5/9/91
+ *	$Id$
  */
 
 /*
diff --git a/sys/i386/isa/ic/i8042.h b/sys/i386/isa/ic/i8042.h
index 4d04ce5..84ee90f 100644
--- a/sys/i386/isa/ic/i8042.h
+++ b/sys/i386/isa/ic/i8042.h
@@ -1,3 +1,7 @@
+/*
+ *	$Id$
+ */
+
 #define	KBSTATP		0x64	/* kbd controller status port (I) */
 #define	 KBS_DIB	0x01	/* kbd data in buffer */
 #define	 KBS_IBF	0x02	/* kbd input buffer low */
diff --git a/sys/i386/isa/ic/i8237.h b/sys/i386/isa/ic/i8237.h
index dc269f2..2199e73 100644
--- a/sys/i386/isa/ic/i8237.h
+++ b/sys/i386/isa/ic/i8237.h
@@ -1,5 +1,7 @@
 /*
  * Intel 8237 DMA Controller
+ *
+ *	$Id$
  */
 
 #define	DMA37MD_SINGLE	0x40	/* single pass mode */
diff --git a/sys/i386/isa/ic/nec765.h b/sys/i386/isa/ic/nec765.h
index b84b46e..1895db7 100644
--- a/sys/i386/isa/ic/nec765.h
+++ b/sys/i386/isa/ic/nec765.h
@@ -30,7 +30,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)nec765.h	7.1 (Berkeley) 5/9/91
+ *	from: @(#)nec765.h	7.1 (Berkeley) 5/9/91
+ *	$Id$
  */
 
 /*
diff --git a/sys/i386/isa/ic/ns16450.h b/sys/i386/isa/ic/ns16450.h
index f059035..aa6280d 100644
--- a/sys/i386/isa/ic/ns16450.h
+++ b/sys/i386/isa/ic/ns16450.h
@@ -30,7 +30,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)ns16450.h	7.1 (Berkeley) 5/9/91
+ *	from: @(#)ns16450.h	7.1 (Berkeley) 5/9/91
+ *	$Id$
  */
 
 /*
diff --git a/sys/i386/isa/ic/ns16550.h b/sys/i386/isa/ic/ns16550.h
index e20e9aa..ff59757 100644
--- a/sys/i386/isa/ic/ns16550.h
+++ b/sys/i386/isa/ic/ns16550.h
@@ -30,7 +30,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)ns16550.h	7.1 (Berkeley) 5/9/91
+ *	from: @(#)ns16550.h	7.1 (Berkeley) 5/9/91
+ *	$Id$
  */
 
 /*
diff --git a/sys/i386/isa/icu.h b/sys/i386/isa/icu.h
index 4866d8d..488ad3e 100644
--- a/sys/i386/isa/icu.h
+++ b/sys/i386/isa/icu.h
@@ -33,14 +33,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)icu.h	5.6 (Berkeley) 5/9/91
- *
- * PATCHES MAGIC                LEVEL   PATCH THAT GOT US HERE
- * --------------------         -----   ----------------------
- * CURRENT PATCH LEVEL:         1       00158
- * --------------------         -----   ----------------------
- *
- * 25 Apr 93	Bruce Evans		New fast interrupt code (intr-0.1)
+ *	from: @(#)icu.h	5.6 (Berkeley) 5/9/91
+ *	$Id$
  */
 
 /*
diff --git a/sys/i386/isa/if_is.c b/sys/i386/isa/if_is.c
index 1277b4d..d4de3e1 100644
--- a/sys/i386/isa/if_is.c
+++ b/sys/i386/isa/if_is.c
@@ -11,7 +11,8 @@
  *   of this software, nor does the author assume any responsibility
  *   for damages incurred with its use.
  *
-*/
+ *	$Id$
+ */
 
 /* TODO
 
diff --git a/sys/i386/isa/if_isreg.h b/sys/i386/isa/if_isreg.h
index 790313d..5e69064 100644
--- a/sys/i386/isa/if_isreg.h
+++ b/sys/i386/isa/if_isreg.h
@@ -1,3 +1,19 @@
+/*
+ * Isolan AT 4141-0 Ethernet driver header file
+ * Isolink 4110 
+ *
+ * By Paul Richards 
+ *
+ * Copyright (C) 1993, Paul Richards. This software may be used, modified,
+ *   copied, distributed, and sold, in both source and binary form provided
+ *   that the above copyright and these terms are retained. Under no
+ *   circumstances is the author responsible for the proper functioning
+ *   of this software, nor does the author assume any responsibility
+ *   for damages incurred with its use.
+ *
+ *	$Id$
+ */
+
 /* Declarations specific to this driver */
 #define NTBUF 2
 #define TLEN 1
diff --git a/sys/i386/isa/isa.h b/sys/i386/isa/isa.h
index a9c042d..24dc5cd 100644
--- a/sys/i386/isa/isa.h
+++ b/sys/i386/isa/isa.h
@@ -33,16 +33,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)isa.h	5.7 (Berkeley) 5/9/91
- * PATCHES MAGIC                LEVEL   PATCH THAT GOT US HERE
- * --------------------         -----   ----------------------
- * CURRENT PATCH LEVEL:         3       00158
- * --------------------         -----   ----------------------
- *
- * 15 Feb 93	Julian Elischer		Added entries for some scsi adapters
- * 06 Apr 93	Rodney W. Grimes	Added com3 and com4, added IO_ISASIZES
- *					section
- * 26 Apr 93	Bruce Evans		Support for intr-0.1
+ *	from: @(#)isa.h	5.7 (Berkeley) 5/9/91
+ *	$Id$
  */
 
 /*
diff --git a/sys/i386/isa/isa_device.h b/sys/i386/isa/isa_device.h
index eea71ec..4405c70 100644
--- a/sys/i386/isa/isa_device.h
+++ b/sys/i386/isa/isa_device.h
@@ -30,19 +30,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)isa_device.h	7.1 (Berkeley) 5/9/91
- *
- * PATCHES MAGIC                LEVEL   PATCH THAT GOT US HERE
- * --------------------         -----   ----------------------
- * CURRENT PATCH LEVEL:         2       00163
- * --------------------         -----   ----------------------
- *
- * 27 Feb 93    Chris Demetriou		Add proper flag handling.
- * 10 Mar 93	Rodney W. Grimes	Fixed isa_device->id_irq to be
- *					the u_short instead of short. This
- *					enables us to use irq15!
- * 27 May 93	Guido van Rooij		Add prototype find_isadev()
- *
+ *	from: @(#)isa_device.h	7.1 (Berkeley) 5/9/91
+ *	$Id$
  */
 
 /*
diff --git a/sys/i386/isa/iso8859.font b/sys/i386/isa/iso8859.font
index 869615e..4c5e972 100644
--- a/sys/i386/isa/iso8859.font
+++ b/sys/i386/isa/iso8859.font
@@ -1,4 +1,8 @@
-/* ISO 8859-1 font file */
+/*
+ * ISO 8859-1 font file
+ *
+ *	$Id$
+ */
 
 char font_8x8[256*8] = {
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
diff --git a/sys/i386/isa/kbd.h b/sys/i386/isa/kbd.h
index f60e8c2..66e5224 100644
--- a/sys/i386/isa/kbd.h
+++ b/sys/i386/isa/kbd.h
@@ -1,13 +1,7 @@
 /*
- *
- * PATCHES MAGIC                LEVEL   PATCH THAT GOT US HERE
- * --------------------         -----   ----------------------
- * CURRENT PATCH LEVEL:         1       00162
- * --------------------         -----   ----------------------
- *
- * 26 May 93	Holger Veit		added more 8042 defines
- *
  * Keyboard definitions
+ *	from: unknown origin, 386BSD 0.1
+ *	$Id$
  */
 
 /* Reference:	IBM AT Technical Reference Manual, 
diff --git a/sys/i386/isa/kbdtables.h b/sys/i386/isa/kbdtables.h
index dedfc67..5acb9af 100644
--- a/sys/i386/isa/kbdtables.h
+++ b/sys/i386/isa/kbdtables.h
@@ -12,6 +12,8 @@
  *	Søren Schmidt 		Email:	sos@kmd-ac.dk
  *	Tritonvej 36		UUCP:	...uunet!dkuug!kmd-ac!sos
  *	DK9210 Aalborg SO	Phone:  +45 9814 8076
+ *
+ *	$Id$
  */
 
 #define META 0x80       	/* eight bit for emacs META-key */
diff --git a/sys/i386/isa/lpt.c b/sys/i386/isa/lpt.c
index 17170402..6d65d8a 100644
--- a/sys/i386/isa/lpt.c
+++ b/sys/i386/isa/lpt.c
@@ -45,22 +45,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * PATCHES MAGIC                LEVEL   PATCH THAT GOT US HERE
- * --------------------         -----   ----------------------
- * CURRENT PATCH LEVEL:         2       00164
- * --------------------         -----   ----------------------
- *
- * 06 Apr 93	Eric Haug		Fixed comments and includes. [Ed: I did
- *					not include the unit-1 thing, that is a
- *					DOSism, fixed the config file instead]
- * 06 Apr 93	Rodney W. Grimes	A real probe routine, may even cause on
- *					interrupt if a printer is attached.
- *
- * 01 Jun 93	Rodney W. Grimes	Made lpflag uniq now is lptflag
- *					Added timeout loop to lpt_port_test.
- *					lpt_port_test should move to a common
- *					routine..
- *
+ *	from: unknown origin, 386BSD 0.1
+ *	$Id$
  */
 
 /*
diff --git a/sys/i386/isa/lptreg.h b/sys/i386/isa/lptreg.h
index 2605fa0..9e10ba9 100644
--- a/sys/i386/isa/lptreg.h
+++ b/sys/i386/isa/lptreg.h
@@ -5,9 +5,8 @@
  * This code is derived from software contributed to Berkeley by
  * William Jolitz.
  *
- * %sccs.include.noredist.c%
- *
- *      @(#)lptreg.h	1.1 (Berkeley) 12/19/90
+ *      form: @(#)lptreg.h	1.1 (Berkeley) 12/19/90
+ *	$Id$
  */
 
 /*
diff --git a/sys/i386/isa/mcd.c b/sys/i386/isa/mcd.c
index b301a48..3064d08 100644
--- a/sys/i386/isa/mcd.c
+++ b/sys/i386/isa/mcd.c
@@ -34,9 +34,8 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: mcd.c,v 1.1 1993/10/12 06:08:29 rgrimes Exp $
  */
-/*static char rcsid[] = "from: /sys/i386/isa/RCS/mcd.c,v 2.1 1993/09/24 21:23:13 root Exp root";*/
 static char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
 
 #include "mcd.h"
diff --git a/sys/i386/isa/rtc.h b/sys/i386/isa/rtc.h
index 2de060d..3f7b4c2 100644
--- a/sys/i386/isa/rtc.h
+++ b/sys/i386/isa/rtc.h
@@ -33,7 +33,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)rtc.h	7.1 (Berkeley) 5/12/91
+ *	from: @(#)rtc.h	7.1 (Berkeley) 5/12/91
+ *	$Id$
  */
 
 /*
diff --git a/sys/i386/isa/sio.c b/sys/i386/isa/sio.c
index 64ef339..055a5e8 100644
--- a/sys/i386/isa/sio.c
+++ b/sys/i386/isa/sio.c
@@ -30,18 +30,9 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	From:
- *	@(#)com.c	7.5 (Berkeley) 5/16/91
- *
- * 27 May 93	Bruce Evans		From com-0.2 package, fast interrupt
- *					com port driver.
- * 27 May 93	Guido van Rooij		Ported in Chris Demetriou's BIDIR
- *					code, add multiport support.
- * 27 May 93	Rodney W. Grimes	I then renamed it to sio.c for putting
- *					into the patch kit.  Added in sioselect
- *					from com.c.  Added port 4 support.
+ *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
+ *	$Id$
  */
-static char rcsid[] = "$Header: /a/cvs/386BSD/src/sys/i386/isa/sio.c,v 1.10 1993/10/12 06:32:28 davidg Exp $";
 
 #include "sio.h"
 #if NSIO > 0
diff --git a/sys/i386/isa/spkr.c b/sys/i386/isa/spkr.c
index 04feb2f..7b82f16 100644
--- a/sys/i386/isa/spkr.c
+++ b/sys/i386/isa/spkr.c
@@ -5,6 +5,8 @@
  *      modified for 386bsd by Andrew A. Chernov <ache@astral.msk.su>
  *      386bsd only clean version, all SYSV stuff removed
  *      use hz value from param.c
+ *
+ *	$Id$
  */
 
 #include "speaker.h"
diff --git a/sys/i386/isa/syscons.c b/sys/i386/isa/syscons.c
index 4c60968..237c32b 100644
--- a/sys/i386/isa/syscons.c
+++ b/sys/i386/isa/syscons.c
@@ -33,15 +33,13 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- */
-/*
+ *	from: @(#)pccons.c	5.11 (Berkeley) 5/21/91
+ *	from: @(#)syscons.c	1.0 930928
+ *	$Id$
+ *
  * Heavily modified by Søren Schmidt (sos@login.dkuug.dk) to provide:
  *
  * 	virtual consoles, SYSV ioctl's, ANSI emulation 
- *
- *	@(#)syscons.c	1.0 930928
- * Derived from:
- *	@(#)pccons.c	5.11 (Berkeley) 5/21/91
  */
 
 #define STAR_SAVER
diff --git a/sys/i386/isa/timerreg.h b/sys/i386/isa/timerreg.h
index 72c7022..5742f66 100644
--- a/sys/i386/isa/timerreg.h
+++ b/sys/i386/isa/timerreg.h
@@ -30,7 +30,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Header: timerreg.h,v 1.2 93/02/28 15:08:58 mccanne Exp $
+ *	from: Header: timerreg.h,v 1.2 93/02/28 15:08:58 mccanne Exp
+ *	$Id$
+ */
+
+/*
  *
  * Register definitions for the Intel 8253 Programmable Interval Timer.
  *
diff --git a/sys/i386/isa/vector.s b/sys/i386/isa/vector.s
index 0a1dec9..aa40fd5 100644
--- a/sys/i386/isa/vector.s
+++ b/sys/i386/isa/vector.s
@@ -1,14 +1,6 @@
-/* vector.s */
 /*
- * PATCHES MAGIC                LEVEL   PATCH THAT GOT US HERE
- * --------------------         -----   ----------------------
- * CURRENT PATCH LEVEL:         1       00167
- * --------------------         -----   ----------------------
- *
- * 04 Jun 93	Bruce Evans		Fixed irq_num vs id_num for multiple
- *					devices configed on the same irq with
- *					respect to ipending.  
- *
+ *	from: vector.s, 386BSD 0.1 unknown origin
+ *	$Id$
  */
 
 #include "i386/isa/icu.h"
diff --git a/sys/i386/isa/wd.c b/sys/i386/isa/wd.c
index a1041a0..02b53e4 100644
--- a/sys/i386/isa/wd.c
+++ b/sys/i386/isa/wd.c
@@ -33,29 +33,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from:@(#)wd.c	7.2 (Berkeley) 5/9/91
- *
- * PATCHES MAGIC                LEVEL   PATCH THAT GOT US HERE
- * --------------------         -----   ----------------------
- * CURRENT PATCH LEVEL:         6       00155
- * --------------------         -----   ----------------------
- *
- * 17 Sep 92	Frank Maclachlan	Fixed I/O error reporting on raw device
- * 31 Jul 92	Christoph Robitschko	Fixed second disk recognition,
- *					bzero of malloced memory for warm
- *					boot problem.
- * 19 Aug 92    Frank Maclachlan	Fixed bug when first sector of a
- *					multisector read is in bad144 table.
- * 17 Jan 93	B. Evans & A.Chernov	Fixed bugs from previous patches,
- *					driver initialization, and cylinder
- *					boundary conditions.
- * 28 Mar 93	Charles Hannum		Add missing splx calls.
- * 20 Apr 93	Terry Lee		Always report disk errors
- * 20 Apr 93	Brett Lymn		Change infinite while loops to
- *					timeouts
- * 17 May 93	Rodney W. Grimes	Fixed all 1000000 to use WDCTIMEOUT,
- *					and increased to 1000000*10 for new
- *					intr-0.1 code.
+ *	from: @(#)wd.c	7.2 (Berkeley) 5/9/91
+ *	$Id$
  */
 
 /* TODO:peel out buffer at low ipl, speed improvement */
diff --git a/sys/i386/isa/wdreg.h b/sys/i386/isa/wdreg.h
index d938915..5feabf5 100644
--- a/sys/i386/isa/wdreg.h
+++ b/sys/i386/isa/wdreg.h
@@ -33,7 +33,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)wdreg.h	7.1 (Berkeley) 5/9/91
+ *	from: @(#)wdreg.h	7.1 (Berkeley) 5/9/91
+ *	$Id$
  */
 
 /*
diff --git a/sys/i386/isa/wt.c b/sys/i386/isa/wt.c
index adf103b..7ae351f 100644
--- a/sys/i386/isa/wt.c
+++ b/sys/i386/isa/wt.c
@@ -6,8 +6,6 @@
  *      Sergey Ryzhkov       <sir@kiae.su>
  *      Serge Vakulenko      <vak@zebub.msk.su>
  *
- * Version 1.1, Fri Sep 24 02:14:31 MSD 1993
- *
  * Placed in the public domain with NO WARRANTIES, not even the implied
  * warranties for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
@@ -19,6 +17,9 @@
  * made by Robert Baron at CMU, based on Intel sources.
  * Authors thank Robert Baron, CMU and Intel and retain here
  * the original CMU copyright notice.
+ *
+ *	from: Version 1.1, Fri Sep 24 02:14:31 MSD 1993
+ *	$Id$
  */
 
 /*
diff --git a/sys/i386/isa/wtreg.h b/sys/i386/isa/wtreg.h
index 1f6c463..d7658f3 100644
--- a/sys/i386/isa/wtreg.h
+++ b/sys/i386/isa/wtreg.h
@@ -6,8 +6,6 @@
  *      Sergey Ryzhkov       <sir@kiae.su>
  *      Serge Vakulenko      <vak@zebub.msk.su>
  *
- * Version 1.1, Fri Sep 24 02:14:42 MSD 1993
- *
  * Placed in the public domain with NO WARRANTIES, not even the implied
  * warranties for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
@@ -19,6 +17,9 @@
  * made by Robert Baron at CMU, based on Intel sources.
  * Authors thank Robert Baron, CMU and Intel and retain here
  * the original CMU copyright notice.
+ *
+ *	from: Version 1.1, Fri Sep 24 02:14:42 MSD 1993
+ *	$Id$
  */
 
 /*