summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authoragc <agc@NetBSD.org>2003-08-07 16:26:28 +0000
committeragc <agc@NetBSD.org>2003-08-07 16:26:28 +0000
commitaad01611e7d49352752bfcd4a3f76ed8d8b2123e (patch)
tree809b4b9fa82fe4345cd0a3e4eb748c0f86478195 /sys/dev
parent208a93d254dd5434264363dbee9ad4b99ca25424 (diff)
Move UCB-licensed code from 4-clause to 3-clause licence.
Patches provided by Joel Baker in PR 22364, verified by myself.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/bi/bireg.h8
-rw-r--r--sys/dev/bi/if_nireg.h8
-rw-r--r--sys/dev/bi/kdbreg.h8
-rw-r--r--sys/dev/ccd.c41
-rw-r--r--sys/dev/ccdvar.h39
-rw-r--r--sys/dev/clock_subr.c41
-rw-r--r--sys/dev/cninit.c41
-rw-r--r--sys/dev/cons.c41
-rw-r--r--sys/dev/cons.h39
-rw-r--r--sys/dev/dec/dec_boot.h8
-rw-r--r--sys/dev/dec/dz.c36
-rw-r--r--sys/dev/dec/dzkbd.c10
-rw-r--r--sys/dev/dec/dzms.c10
-rw-r--r--sys/dev/dec/dzvar.h34
-rw-r--r--sys/dev/dec/if_le_dec.c40
-rw-r--r--sys/dev/gpib/ct.c41
-rw-r--r--sys/dev/gpib/ctreg.h8
-rw-r--r--sys/dev/gpib/mt.c41
-rw-r--r--sys/dev/gpib/ppi.c10
-rw-r--r--sys/dev/gpib/ppiio.h8
-rw-r--r--sys/dev/gpib/rd.c41
-rw-r--r--sys/dev/gpib/rdreg.h39
-rw-r--r--sys/dev/hpc/biconsdev.c10
-rw-r--r--sys/dev/ic/am7990.c10
-rw-r--r--sys/dev/ic/am79900.c40
-rw-r--r--sys/dev/ic/am79900reg.h8
-rw-r--r--sys/dev/ic/am7990reg.h8
-rw-r--r--sys/dev/ic/cd18xx.c10
-rw-r--r--sys/dev/ic/com.c10
-rw-r--r--sys/dev/ic/comreg.h8
-rw-r--r--sys/dev/ic/depca.c10
-rw-r--r--sys/dev/ic/depcareg.h8
-rw-r--r--sys/dev/ic/depcavar.h8
-rw-r--r--sys/dev/ic/i8253reg.h8
-rw-r--r--sys/dev/ic/lance.c10
-rw-r--r--sys/dev/ic/lancereg.h8
-rw-r--r--sys/dev/ic/lptreg.h8
-rw-r--r--sys/dev/ic/mb89352reg.h42
-rw-r--r--sys/dev/ic/nec765reg.h8
-rw-r--r--sys/dev/ic/ns16450reg.h8
-rw-r--r--sys/dev/ic/ns16550reg.h8
-rw-r--r--sys/dev/ic/oosiopreg.h8
-rw-r--r--sys/dev/ic/osiop.c38
-rw-r--r--sys/dev/ic/osiopreg.h8
-rw-r--r--sys/dev/ic/osiopvar.h8
-rw-r--r--sys/dev/ic/sgecreg.h8
-rw-r--r--sys/dev/ic/st16650reg.h8
-rw-r--r--sys/dev/ic/wdcreg.h8
-rw-r--r--sys/dev/ic/z8530reg.h8
-rw-r--r--sys/dev/ic/z8530sc.c44
-rw-r--r--sys/dev/ic/z8530sc.h42
-rw-r--r--sys/dev/ic/z8530tty.c44
-rw-r--r--sys/dev/isa/com_isa.c10
-rw-r--r--sys/dev/isa/com_multi.c10
-rw-r--r--sys/dev/isa/depca_isa.c10
-rw-r--r--sys/dev/isa/fd.c10
-rw-r--r--sys/dev/isa/fdc_isa.c10
-rw-r--r--sys/dev/isa/fdcvar.h8
-rw-r--r--sys/dev/isa/fdreg.h8
-rw-r--r--sys/dev/isa/if_hp.c33
-rw-r--r--sys/dev/isa/if_le_isa.c10
-rw-r--r--sys/dev/isa/isareg.h8
-rw-r--r--sys/dev/mca/com_mca.c10
-rw-r--r--sys/dev/mscp/mscp.c38
-rw-r--r--sys/dev/mscp/mscp.h8
-rw-r--r--sys/dev/mscp/mscp_disk.c38
-rw-r--r--sys/dev/mscp/mscp_subr.c38
-rw-r--r--sys/dev/mscp/mscpreg.h36
-rw-r--r--sys/dev/mscp/mscpvar.h36
-rw-r--r--sys/dev/ofw/openfirmio.c10
-rw-r--r--sys/dev/ofw/openfirmio.h8
-rw-r--r--sys/dev/pci/if_le_pci.c10
-rw-r--r--sys/dev/pckbc/pckbd.c10
-rw-r--r--sys/dev/pcmcia/com_pcmcia.c10
-rw-r--r--sys/dev/qbus/dhu.c38
-rw-r--r--sys/dev/qbus/dl.c38
-rw-r--r--sys/dev/qbus/if_de.c35
-rw-r--r--sys/dev/qbus/if_dereg.h8
-rw-r--r--sys/dev/qbus/if_dmc.c10
-rw-r--r--sys/dev/qbus/if_dmcreg.h8
-rw-r--r--sys/dev/qbus/if_il.c10
-rw-r--r--sys/dev/qbus/if_il.h8
-rw-r--r--sys/dev/qbus/if_ilreg.h8
-rw-r--r--sys/dev/qbus/if_qereg.h8
-rw-r--r--sys/dev/qbus/if_uba.c10
-rw-r--r--sys/dev/qbus/if_uba.h8
-rw-r--r--sys/dev/qbus/qd.c10
-rw-r--r--sys/dev/qbus/qdioctl.h8
-rw-r--r--sys/dev/qbus/qdreg.h8
-rw-r--r--sys/dev/qbus/qduser.h8
-rw-r--r--sys/dev/qbus/qevent.h8
-rw-r--r--sys/dev/qbus/qfont.c10
-rw-r--r--sys/dev/qbus/ts.c10
-rw-r--r--sys/dev/qbus/uba.c37
-rw-r--r--sys/dev/qbus/ubavar.h8
-rw-r--r--sys/dev/qbus/uda.c39
-rw-r--r--sys/dev/raidframe/rf_netbsdkintf.c41
-rw-r--r--sys/dev/rcons/raster.h8
-rw-r--r--sys/dev/rcons/raster_op.c10
-rw-r--r--sys/dev/rcons/raster_text.c10
-rw-r--r--sys/dev/rcons/rcons.h8
-rw-r--r--sys/dev/rcons/rcons_kern.c10
-rw-r--r--sys/dev/rcons/rcons_subr.c10
-rw-r--r--sys/dev/sbus/bwtwo_sbus.c10
-rw-r--r--sys/dev/sbus/cgthree_sbus.c10
-rw-r--r--sys/dev/sun/bt_subr.c10
-rw-r--r--sys/dev/sun/btreg.h8
-rw-r--r--sys/dev/sun/btvar.h8
-rw-r--r--sys/dev/sun/bwtwo.c10
-rw-r--r--sys/dev/sun/bwtworeg.h8
-rw-r--r--sys/dev/sun/bwtwovar.h8
-rw-r--r--sys/dev/sun/cgsix.c10
-rw-r--r--sys/dev/sun/cgsixreg.h8
-rw-r--r--sys/dev/sun/cgthreereg.h8
-rw-r--r--sys/dev/sun/disklabel.h8
-rw-r--r--sys/dev/sun/event.c10
-rw-r--r--sys/dev/sun/event_var.h8
-rw-r--r--sys/dev/sun/fb.c10
-rw-r--r--sys/dev/sun/fbio.h8
-rw-r--r--sys/dev/sun/fbvar.h8
-rw-r--r--sys/dev/sun/kbd.c10
-rw-r--r--sys/dev/sun/kbd_ms_ttyvar.h8
-rw-r--r--sys/dev/sun/kbd_reg.h8
-rw-r--r--sys/dev/sun/kbd_xlate.h8
-rw-r--r--sys/dev/sun/kbd_zs.c10
-rw-r--r--sys/dev/sun/kbdsun.c10
-rw-r--r--sys/dev/sun/kbdsunvar.h8
-rw-r--r--sys/dev/sun/kbdvar.h8
-rw-r--r--sys/dev/sun/kbio.h8
-rw-r--r--sys/dev/sun/ms.c10
-rw-r--r--sys/dev/sun/ms_zs.c10
-rw-r--r--sys/dev/sun/msvar.h8
-rw-r--r--sys/dev/sun/sunkbd.c10
-rw-r--r--sys/dev/sun/sunms.c10
-rw-r--r--sys/dev/sun/vuid_event.h8
-rw-r--r--sys/dev/tc/if_levar.h8
-rw-r--r--sys/dev/tc/ioasicreg.h8
-rw-r--r--sys/dev/tc/zskbd.c10
-rw-r--r--sys/dev/tc/zsms.c10
-rw-r--r--sys/dev/vnd.c41
-rw-r--r--sys/dev/vndvar.h39
-rw-r--r--sys/dev/wscons/wscons_raster.h8
-rw-r--r--sys/dev/wscons/wscons_rfont.h8
-rw-r--r--sys/dev/wscons/wscons_rinit.c10
-rw-r--r--sys/dev/wscons/wscons_rops.c10
-rw-r--r--sys/dev/wscons/wsevent.c10
-rw-r--r--sys/dev/wscons/wseventvar.h8
-rw-r--r--sys/dev/wscons/wskbd.c10
-rw-r--r--sys/dev/wscons/wsmouse.c10
-rw-r--r--sys/dev/wsfont/gallant12x22.h8
-rw-r--r--sys/dev/wsfont/omron12x20.h36
-rw-r--r--sys/dev/wsfont/qvss8x15.h8
-rw-r--r--sys/dev/wsfont/sony12x24.h8
-rw-r--r--sys/dev/wsfont/sony8x16.h8
154 files changed, 1521 insertions, 868 deletions
diff --git a/sys/dev/bi/bireg.h b/sys/dev/bi/bireg.h
index ae771ff5c99..a56726e561e 100644
--- a/sys/dev/bi/bireg.h
+++ b/sys/dev/bi/bireg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: bireg.h,v 1.7 2000/07/06 17:47:02 ragge Exp $ */
+/* $NetBSD: bireg.h,v 1.8 2003/08/07 16:30:53 agc Exp $ */
/*
* Copyright (c) 1988 Regents of the University of California.
* All rights reserved.
@@ -14,11 +14,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/dev/bi/if_nireg.h b/sys/dev/bi/if_nireg.h
index cfb287e2196..dfe9f09dff2 100644
--- a/sys/dev/bi/if_nireg.h
+++ b/sys/dev/bi/if_nireg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: if_nireg.h,v 1.3 2001/08/20 12:20:07 wiz Exp $ */
+/* $NetBSD: if_nireg.h,v 1.4 2003/08/07 16:30:53 agc Exp $ */
/*
* Copyright (c) 1988 Regents of the University of California.
* All rights reserved.
@@ -14,11 +14,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/dev/bi/kdbreg.h b/sys/dev/bi/kdbreg.h
index 349a0d83684..4427e9e05f9 100644
--- a/sys/dev/bi/kdbreg.h
+++ b/sys/dev/bi/kdbreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: kdbreg.h,v 1.3 1999/11/03 21:57:40 ragge Exp $ */
+/* $NetBSD: kdbreg.h,v 1.4 2003/08/07 16:30:53 agc Exp $ */
/*
* Copyright (c) 1988 Regents of the University of California.
* All rights reserved.
@@ -14,11 +14,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/dev/ccd.c b/sys/dev/ccd.c
index a25692cfd9b..c241d5e03ef 100644
--- a/sys/dev/ccd.c
+++ b/sys/dev/ccd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ccd.c,v 1.90 2003/06/29 22:29:57 fvdl Exp $ */
+/* $NetBSD: ccd.c,v 1.91 2003/08/07 16:30:50 agc Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 1999 The NetBSD Foundation, Inc.
@@ -37,7 +37,6 @@
*/
/*
- * Copyright (c) 1988 University of Utah.
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
@@ -53,6 +52,42 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * from: Utah $Hdr: cd.c 1.6 90/11/28$
+ *
+ * @(#)cd.c 8.2 (Berkeley) 11/16/93
+ */
+
+/*
+ * Copyright (c) 1988 University of Utah.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * the Systems Programming Group of the University of Utah Computer
+ * Science Department.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the University of
@@ -90,7 +125,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ccd.c,v 1.90 2003/06/29 22:29:57 fvdl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ccd.c,v 1.91 2003/08/07 16:30:50 agc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/ccdvar.h b/sys/dev/ccdvar.h
index 4170971f7dd..5444e2196a6 100644
--- a/sys/dev/ccdvar.h
+++ b/sys/dev/ccdvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ccdvar.h,v 1.22 2003/05/17 21:42:08 thorpej Exp $ */
+/* $NetBSD: ccdvar.h,v 1.23 2003/08/07 16:30:50 agc Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 1999 The NetBSD Foundation, Inc.
@@ -37,7 +37,6 @@
*/
/*
- * Copyright (c) 1988 University of Utah.
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
@@ -53,6 +52,42 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * from: Utah $Hdr: cdvar.h 1.1 90/07/09$
+ *
+ * @(#)cdvar.h 8.1 (Berkeley) 6/10/93
+ */
+
+/*
+ * Copyright (c) 1988 University of Utah.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * the Systems Programming Group of the University of Utah Computer
+ * Science Department.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the University of
diff --git a/sys/dev/clock_subr.c b/sys/dev/clock_subr.c
index e5297d29454..0e76ad46efe 100644
--- a/sys/dev/clock_subr.c
+++ b/sys/dev/clock_subr.c
@@ -1,7 +1,6 @@
-/* $NetBSD: clock_subr.c,v 1.7 2001/11/13 05:32:49 lukem Exp $ */
+/* $NetBSD: clock_subr.c,v 1.8 2003/08/07 16:30:51 agc Exp $ */
/*
- * Copyright (c) 1988 University of Utah.
* Copyright (c) 1982, 1990, 1993
* The Regents of the University of California. All rights reserved.
*
@@ -17,6 +16,42 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * from: Utah $Hdr: clock.c 1.18 91/01/21$
+ *
+ * @(#)clock.c 8.2 (Berkeley) 1/12/94
+ */
+
+/*
+ * Copyright (c) 1988 University of Utah.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * the Systems Programming Group of the University of Utah Computer
+ * Science Department.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the University of
@@ -49,7 +84,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clock_subr.c,v 1.7 2001/11/13 05:32:49 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock_subr.c,v 1.8 2003/08/07 16:30:51 agc Exp $");
#include <sys/types.h>
#include <sys/systm.h>
diff --git a/sys/dev/cninit.c b/sys/dev/cninit.c
index c5d6961586d..8af43a69f41 100644
--- a/sys/dev/cninit.c
+++ b/sys/dev/cninit.c
@@ -1,7 +1,6 @@
-/* $NetBSD: cninit.c,v 1.4 2001/11/13 05:32:50 lukem Exp $ */
+/* $NetBSD: cninit.c,v 1.5 2003/08/07 16:30:51 agc Exp $ */
/*
- * Copyright (c) 1988 University of Utah.
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
@@ -17,6 +16,42 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * from: Utah $Hdr: cons.c 1.7 92/01/21$
+ *
+ * @(#)cons.c 8.2 (Berkeley) 1/12/94
+ */
+
+/*
+ * Copyright (c) 1988 University of Utah.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * the Systems Programming Group of the University of Utah Computer
+ * Science Department.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the University of
@@ -43,7 +78,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cninit.c,v 1.4 2001/11/13 05:32:50 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cninit.c,v 1.5 2003/08/07 16:30:51 agc Exp $");
#include <sys/param.h>
#include <sys/proc.h>
diff --git a/sys/dev/cons.c b/sys/dev/cons.c
index ec3a127eefb..93ee43f2dea 100644
--- a/sys/dev/cons.c
+++ b/sys/dev/cons.c
@@ -1,7 +1,6 @@
-/* $NetBSD: cons.c,v 1.48 2003/06/29 22:29:58 fvdl Exp $ */
+/* $NetBSD: cons.c,v 1.49 2003/08/07 16:30:51 agc Exp $ */
/*
- * Copyright (c) 1988 University of Utah.
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
@@ -17,6 +16,42 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * from: Utah $Hdr: cons.c 1.7 92/01/21$
+ *
+ * @(#)cons.c 8.2 (Berkeley) 1/12/94
+ */
+
+/*
+ * Copyright (c) 1988 University of Utah.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * the Systems Programming Group of the University of Utah Computer
+ * Science Department.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the University of
@@ -43,7 +78,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cons.c,v 1.48 2003/06/29 22:29:58 fvdl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cons.c,v 1.49 2003/08/07 16:30:51 agc Exp $");
#include <sys/param.h>
#include <sys/proc.h>
diff --git a/sys/dev/cons.h b/sys/dev/cons.h
index ce4f877067a..66a94effe75 100644
--- a/sys/dev/cons.h
+++ b/sys/dev/cons.h
@@ -1,7 +1,6 @@
-/* $NetBSD: cons.h,v 1.20 2003/03/06 00:38:26 matt Exp $ */
+/* $NetBSD: cons.h,v 1.21 2003/08/07 16:30:51 agc Exp $ */
/*
- * Copyright (c) 1988 University of Utah.
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
@@ -17,6 +16,42 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * from: Utah $Hdr: cons.h 1.6 92/01/21$
+ *
+ * @(#)cons.h 8.1 (Berkeley) 6/10/93
+ */
+
+/*
+ * Copyright (c) 1988 University of Utah.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * the Systems Programming Group of the University of Utah Computer
+ * Science Department.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the University of
diff --git a/sys/dev/dec/dec_boot.h b/sys/dev/dec/dec_boot.h
index 4bac7edd9e9..d8e86a4d483 100644
--- a/sys/dev/dec/dec_boot.h
+++ b/sys/dev/dec/dec_boot.h
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_boot.h,v 1.5 2002/05/14 06:34:21 lukem Exp $ */
+/* $NetBSD: dec_boot.h,v 1.6 2003/08/07 16:30:54 agc Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/dev/dec/dz.c b/sys/dev/dec/dz.c
index 68084501dbe..7a640afdfdf 100644
--- a/sys/dev/dec/dz.c
+++ b/sys/dev/dec/dz.c
@@ -1,6 +1,5 @@
-/* $NetBSD: dz.c,v 1.9 2002/10/23 09:13:09 jdolecek Exp $ */
+/* $NetBSD: dz.c,v 1.10 2003/08/07 16:30:54 agc Exp $ */
/*
- * Copyright (c) 1996 Ken C. Wellsch. All rights reserved.
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
@@ -15,6 +14,37 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/*
+ * Copyright (c) 1996 Ken C. Wellsch. All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Ralph Campbell and Rick Macklem.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the University of
@@ -37,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dz.c,v 1.9 2002/10/23 09:13:09 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dz.c,v 1.10 2003/08/07 16:30:54 agc Exp $");
#include "opt_ddb.h"
diff --git a/sys/dev/dec/dzkbd.c b/sys/dev/dec/dzkbd.c
index 2bc2a6b26b7..652226db907 100644
--- a/sys/dev/dec/dzkbd.c
+++ b/sys/dev/dec/dzkbd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dzkbd.c,v 1.11 2002/12/29 19:30:57 ad Exp $ */
+/* $NetBSD: dzkbd.c,v 1.12 2003/08/07 16:30:54 agc Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -21,11 +21,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -49,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dzkbd.c,v 1.11 2002/12/29 19:30:57 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dzkbd.c,v 1.12 2003/08/07 16:30:54 agc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/dec/dzms.c b/sys/dev/dec/dzms.c
index d4aa94d49bd..900701cb41c 100644
--- a/sys/dev/dec/dzms.c
+++ b/sys/dev/dec/dzms.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dzms.c,v 1.9 2002/10/02 16:33:44 thorpej Exp $ */
+/* $NetBSD: dzms.c,v 1.10 2003/08/07 16:30:54 agc Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -21,11 +21,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -49,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dzms.c,v 1.9 2002/10/02 16:33:44 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dzms.c,v 1.10 2003/08/07 16:30:54 agc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/dec/dzvar.h b/sys/dev/dec/dzvar.h
index c909cf6f9e8..4f07358ce8e 100644
--- a/sys/dev/dec/dzvar.h
+++ b/sys/dev/dec/dzvar.h
@@ -1,6 +1,5 @@
-/* $NetBSD: dzvar.h,v 1.5 2003/01/06 21:05:38 matt Exp $ */
+/* $NetBSD: dzvar.h,v 1.6 2003/08/07 16:30:55 agc Exp $ */
/*
- * Copyright (c) 1996 Ken C. Wellsch. All rights reserved.
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
@@ -15,6 +14,37 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/*
+ * Copyright (c) 1996 Ken C. Wellsch. All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Ralph Campbell and Rick Macklem.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the University of
diff --git a/sys/dev/dec/if_le_dec.c b/sys/dev/dec/if_le_dec.c
index a42b90dd919..e63050c4a23 100644
--- a/sys/dev/dec/if_le_dec.c
+++ b/sys/dev/dec/if_le_dec.c
@@ -1,8 +1,6 @@
-/* $NetBSD: if_le_dec.c,v 1.12 2001/11/13 12:49:45 lukem Exp $ */
+/* $NetBSD: if_le_dec.c,v 1.13 2003/08/07 16:30:55 agc Exp $ */
/*-
- * Copyright (c) 1997 Jonathan Stone. All rights reserved.
- * Copyright (c) 1995 Charles M. Hannum. All rights reserved.
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
@@ -17,6 +15,40 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * @(#)if_le.c 8.2 (Berkeley) 11/16/93
+ */
+
+/*-
+ * Copyright (c) 1997 Jonathan Stone. All rights reserved.
+ * Copyright (c) 1995 Charles M. Hannum. All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Ralph Campbell and Rick Macklem.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the University of
@@ -41,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_le_dec.c,v 1.12 2001/11/13 12:49:45 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_le_dec.c,v 1.13 2003/08/07 16:30:55 agc Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
diff --git a/sys/dev/gpib/ct.c b/sys/dev/gpib/ct.c
index fd9c7324afa..c682593db7d 100644
--- a/sys/dev/gpib/ct.c
+++ b/sys/dev/gpib/ct.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ct.c,v 1.1 2003/06/02 03:51:52 gmcgarry Exp $ */
+/* $NetBSD: ct.c,v 1.2 2003/08/07 16:30:55 agc Exp $ */
/*-
* Copyright (c) 1996-2003 The NetBSD Foundation, Inc.
@@ -37,7 +37,6 @@
*/
/*
- * Copyright (c) 1988 University of Utah.
* Copyright (c) 1982, 1990, 1993
* The Regents of the University of California. All rights reserved.
*
@@ -53,6 +52,42 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * from: Utah $Hdr: rd.c 1.44 92/12/26$
+ *
+ * @(#)rd.c 8.2 (Berkeley) 5/19/94
+ */
+
+/*
+ * Copyright (c) 1988 University of Utah.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * the Systems Programming Group of the University of Utah Computer
+ * Science Department.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the University of
@@ -93,7 +128,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ct.c,v 1.1 2003/06/02 03:51:52 gmcgarry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ct.c,v 1.2 2003/08/07 16:30:55 agc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/gpib/ctreg.h b/sys/dev/gpib/ctreg.h
index b095110eda5..88389ac6d90 100644
--- a/sys/dev/gpib/ctreg.h
+++ b/sys/dev/gpib/ctreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ctreg.h,v 1.1 2003/06/02 03:51:52 gmcgarry Exp $ */
+/* $NetBSD: ctreg.h,v 1.2 2003/08/07 16:30:56 agc Exp $ */
/*
* Copyright (c) 1982, 1990, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/dev/gpib/mt.c b/sys/dev/gpib/mt.c
index a327dd9fa8f..a7e95bfceb0 100644
--- a/sys/dev/gpib/mt.c
+++ b/sys/dev/gpib/mt.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mt.c,v 1.1 2003/06/02 03:52:24 gmcgarry Exp $ */
+/* $NetBSD: mt.c,v 1.2 2003/08/07 16:30:56 agc Exp $ */
/*-
* Copyright (c) 1996-2003 The NetBSD Foundation, Inc.
@@ -37,7 +37,6 @@
*/
/*
- * Copyright (c) 1988 University of Utah.
* Copyright (c) 1982, 1990, 1993
* The Regents of the University of California. All rights reserved.
*
@@ -53,6 +52,42 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * from: Utah $Hdr: rd.c 1.44 92/12/26$
+ *
+ * @(#)rd.c 8.2 (Berkeley) 5/19/94
+ */
+
+/*
+ * Copyright (c) 1988 University of Utah.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * the Systems Programming Group of the University of Utah Computer
+ * Science Department.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the University of
@@ -86,7 +121,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mt.c,v 1.1 2003/06/02 03:52:24 gmcgarry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mt.c,v 1.2 2003/08/07 16:30:56 agc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/gpib/ppi.c b/sys/dev/gpib/ppi.c
index 847c026610f..c6ccd63dcc9 100644
--- a/sys/dev/gpib/ppi.c
+++ b/sys/dev/gpib/ppi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ppi.c,v 1.1 2003/06/02 03:47:09 gmcgarry Exp $ */
+/* $NetBSD: ppi.c,v 1.2 2003/08/07 16:30:56 agc Exp $ */
/*-
* Copyright (c) 1996-2003 The NetBSD Foundation, Inc.
@@ -48,11 +48,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -76,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ppi.c,v 1.1 2003/06/02 03:47:09 gmcgarry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ppi.c,v 1.2 2003/08/07 16:30:56 agc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/gpib/ppiio.h b/sys/dev/gpib/ppiio.h
index 2fef3264620..8c5f6d8aad6 100644
--- a/sys/dev/gpib/ppiio.h
+++ b/sys/dev/gpib/ppiio.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ppiio.h,v 1.1 2003/06/02 03:47:10 gmcgarry Exp $ */
+/* $NetBSD: ppiio.h,v 1.2 2003/08/07 16:30:56 agc Exp $ */
/*
* Copyright (c) 1990, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/dev/gpib/rd.c b/sys/dev/gpib/rd.c
index 92b9894277f..d21f306b289 100644
--- a/sys/dev/gpib/rd.c
+++ b/sys/dev/gpib/rd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rd.c,v 1.1 2003/06/02 03:53:02 gmcgarry Exp $ */
+/* $NetBSD: rd.c,v 1.2 2003/08/07 16:30:56 agc Exp $ */
/*-
* Copyright (c) 1996-2003 The NetBSD Foundation, Inc.
@@ -37,7 +37,6 @@
*/
/*
- * Copyright (c) 1988 University of Utah.
* Copyright (c) 1982, 1990, 1993
* The Regents of the University of California. All rights reserved.
*
@@ -53,6 +52,42 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * from: Utah $Hdr: rd.c 1.44 92/12/26$
+ *
+ * @(#)rd.c 8.2 (Berkeley) 5/19/94
+ */
+
+/*
+ * Copyright (c) 1988 University of Utah.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * the Systems Programming Group of the University of Utah Computer
+ * Science Department.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the University of
@@ -83,7 +118,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rd.c,v 1.1 2003/06/02 03:53:02 gmcgarry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rd.c,v 1.2 2003/08/07 16:30:56 agc Exp $");
#include "rnd.h"
diff --git a/sys/dev/gpib/rdreg.h b/sys/dev/gpib/rdreg.h
index 8360cce1e2c..b3f303255a4 100644
--- a/sys/dev/gpib/rdreg.h
+++ b/sys/dev/gpib/rdreg.h
@@ -1,7 +1,6 @@
-/* $NetBSD: rdreg.h,v 1.1 2003/06/02 03:53:02 gmcgarry Exp $ */
+/* $NetBSD: rdreg.h,v 1.2 2003/08/07 16:30:56 agc Exp $ */
/*
- * Copyright (c) 1988 University of Utah.
* Copyright (c) 1982, 1990, 1993
* The Regents of the University of California. All rights reserved.
*
@@ -17,6 +16,42 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * from: Utah $Hdr: rdreg.h 1.2 90/10/12$
+ *
+ * @(#)rdreg.h 8.1 (Berkeley) 6/10/93
+ */
+
+/*
+ * Copyright (c) 1988 University of Utah.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * the Systems Programming Group of the University of Utah Computer
+ * Science Department.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the University of
diff --git a/sys/dev/hpc/biconsdev.c b/sys/dev/hpc/biconsdev.c
index 6b32ae4a9f3..e70662da1af 100644
--- a/sys/dev/hpc/biconsdev.c
+++ b/sys/dev/hpc/biconsdev.c
@@ -1,4 +1,4 @@
-/* $NetBSD: biconsdev.c,v 1.9 2003/06/29 22:30:07 fvdl Exp $ */
+/* $NetBSD: biconsdev.c,v 1.10 2003/08/07 16:30:57 agc Exp $ */
/*-
* Copyright (c) 1999-2001
@@ -48,11 +48,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -71,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: biconsdev.c,v 1.9 2003/06/29 22:30:07 fvdl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: biconsdev.c,v 1.10 2003/08/07 16:30:57 agc Exp $");
#include "biconsdev.h"
#include <sys/param.h>
diff --git a/sys/dev/ic/am7990.c b/sys/dev/ic/am7990.c
index 777fabd008d..f3a3cec4bd7 100644
--- a/sys/dev/ic/am7990.c
+++ b/sys/dev/ic/am7990.c
@@ -1,4 +1,4 @@
-/* $NetBSD: am7990.c,v 1.64 2001/11/13 13:14:34 lukem Exp $ */
+/* $NetBSD: am7990.c,v 1.65 2003/08/07 16:30:58 agc Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -52,11 +52,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -76,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: am7990.c,v 1.64 2001/11/13 13:14:34 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: am7990.c,v 1.65 2003/08/07 16:30:58 agc Exp $");
#include "bpfilter.h"
#include "rnd.h"
diff --git a/sys/dev/ic/am79900.c b/sys/dev/ic/am79900.c
index 6e19f460a3d..c857e7e8d90 100644
--- a/sys/dev/ic/am79900.c
+++ b/sys/dev/ic/am79900.c
@@ -1,12 +1,44 @@
-/* $NetBSD: am79900.c,v 1.11 2001/11/13 13:14:34 lukem Exp $ */
+/* $NetBSD: am79900.c,v 1.12 2003/08/07 16:30:58 agc Exp $ */
+
+/*-
+ * Copyright (c) 1992, 1993
+ * The Regents of the University of California. All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Ralph Campbell and Rick Macklem.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * @(#)if_le.c 8.2 (Berkeley) 11/16/93
+ */
/*-
* Copyright (c) 1998
* Matthias Drochner. All rights reserved.
* Copyright (c) 1997 Jason R. Thorpe. All rights reserved.
* Copyright (c) 1995 Charles M. Hannum. All rights reserved.
- * Copyright (c) 1992, 1993
- * The Regents of the University of California. All rights reserved.
*
* This code is derived from software contributed to Berkeley by
* Ralph Campbell and Rick Macklem.
@@ -43,7 +75,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: am79900.c,v 1.11 2001/11/13 13:14:34 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: am79900.c,v 1.12 2003/08/07 16:30:58 agc Exp $");
#include "bpfilter.h"
#include "rnd.h"
diff --git a/sys/dev/ic/am79900reg.h b/sys/dev/ic/am79900reg.h
index cea436d0f4f..1b561edb0fd 100644
--- a/sys/dev/ic/am79900reg.h
+++ b/sys/dev/ic/am79900reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: am79900reg.h,v 1.4 2001/08/24 00:16:25 thorpej Exp $ */
+/* $NetBSD: am79900reg.h,v 1.5 2003/08/07 16:30:58 agc Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -51,11 +51,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/dev/ic/am7990reg.h b/sys/dev/ic/am7990reg.h
index bf9809786e1..783cc217238 100644
--- a/sys/dev/ic/am7990reg.h
+++ b/sys/dev/ic/am7990reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: am7990reg.h,v 1.6 1998/08/15 10:18:14 mycroft Exp $ */
+/* $NetBSD: am7990reg.h,v 1.7 2003/08/07 16:30:58 agc Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -51,11 +51,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/dev/ic/cd18xx.c b/sys/dev/ic/cd18xx.c
index 90ffca68321..c1b690d9cb4 100644
--- a/sys/dev/ic/cd18xx.c
+++ b/sys/dev/ic/cd18xx.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cd18xx.c,v 1.8 2003/01/06 13:05:09 wiz Exp $ */
+/* $NetBSD: cd18xx.c,v 1.9 2003/08/07 16:30:59 agc Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -76,11 +76,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -105,7 +101,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cd18xx.c,v 1.8 2003/01/06 13:05:09 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cd18xx.c,v 1.9 2003/08/07 16:30:59 agc Exp $");
#include <sys/param.h>
#include <sys/conf.h>
diff --git a/sys/dev/ic/com.c b/sys/dev/ic/com.c
index 2e7486b587e..906a155df1a 100644
--- a/sys/dev/ic/com.c
+++ b/sys/dev/ic/com.c
@@ -1,4 +1,4 @@
-/* $NetBSD: com.c,v 1.216 2003/06/29 22:30:10 fvdl Exp $ */
+/* $NetBSD: com.c,v 1.217 2003/08/07 16:31:00 agc Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -48,11 +48,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -77,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com.c,v 1.216 2003/06/29 22:30:10 fvdl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com.c,v 1.217 2003/08/07 16:31:00 agc Exp $");
#include "opt_com.h"
#include "opt_ddb.h"
diff --git a/sys/dev/ic/comreg.h b/sys/dev/ic/comreg.h
index 28eeb5e1be9..9a94c908a11 100644
--- a/sys/dev/ic/comreg.h
+++ b/sys/dev/ic/comreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: comreg.h,v 1.12 2003/06/05 13:40:38 scw Exp $ */
+/* $NetBSD: comreg.h,v 1.13 2003/08/07 16:31:01 agc Exp $ */
/*-
* Copyright (c) 1991 The Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/dev/ic/depca.c b/sys/dev/ic/depca.c
index bc541038724..2dbdc5082d2 100644
--- a/sys/dev/ic/depca.c
+++ b/sys/dev/ic/depca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: depca.c,v 1.9 2003/01/01 00:10:18 thorpej Exp $ */
+/* $NetBSD: depca.c,v 1.10 2003/08/07 16:31:01 agc Exp $ */
/*-
* Copyright (c) 1997, 1998, 2000 The NetBSD Foundation, Inc.
@@ -52,11 +52,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -76,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: depca.c,v 1.9 2003/01/01 00:10:18 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: depca.c,v 1.10 2003/08/07 16:31:01 agc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/ic/depcareg.h b/sys/dev/ic/depcareg.h
index 350b4b2516a..d0df5d0f5e0 100644
--- a/sys/dev/ic/depcareg.h
+++ b/sys/dev/ic/depcareg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: depcareg.h,v 1.1 2000/08/11 02:27:09 thorpej Exp $ */
+/* $NetBSD: depcareg.h,v 1.2 2003/08/07 16:31:01 agc Exp $ */
/*-
* Copyright (c) 1997, 1998, 2000 The NetBSD Foundation, Inc.
@@ -52,11 +52,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/dev/ic/depcavar.h b/sys/dev/ic/depcavar.h
index 133a364cfff..ca02027e728 100644
--- a/sys/dev/ic/depcavar.h
+++ b/sys/dev/ic/depcavar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: depcavar.h,v 1.1 2000/08/11 02:27:10 thorpej Exp $ */
+/* $NetBSD: depcavar.h,v 1.2 2003/08/07 16:31:01 agc Exp $ */
/*-
* Copyright (c) 1997, 1998, 2000 The NetBSD Foundation, Inc.
@@ -52,11 +52,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/dev/ic/i8253reg.h b/sys/dev/ic/i8253reg.h
index 2730aa49431..da303b316d1 100644
--- a/sys/dev/ic/i8253reg.h
+++ b/sys/dev/ic/i8253reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: i8253reg.h,v 1.7 2003/05/03 18:11:18 wiz Exp $ */
+/* $NetBSD: i8253reg.h,v 1.8 2003/08/07 16:31:01 agc Exp $ */
/*-
* Copyright (c) 1993 The Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/dev/ic/lance.c b/sys/dev/ic/lance.c
index 0c828197271..a7595593cec 100644
--- a/sys/dev/ic/lance.c
+++ b/sys/dev/ic/lance.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lance.c,v 1.28 2003/01/31 17:40:05 pk Exp $ */
+/* $NetBSD: lance.c,v 1.29 2003/08/07 16:31:01 agc Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -52,11 +52,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -76,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lance.c,v 1.28 2003/01/31 17:40:05 pk Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lance.c,v 1.29 2003/08/07 16:31:01 agc Exp $");
#include "opt_ccitt.h"
#include "opt_llc.h"
diff --git a/sys/dev/ic/lancereg.h b/sys/dev/ic/lancereg.h
index da4e9f22206..f49af4749d6 100644
--- a/sys/dev/ic/lancereg.h
+++ b/sys/dev/ic/lancereg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: lancereg.h,v 1.9 2002/09/03 17:57:49 thorpej Exp $ */
+/* $NetBSD: lancereg.h,v 1.10 2003/08/07 16:31:01 agc Exp $ */
/*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -51,11 +51,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/dev/ic/lptreg.h b/sys/dev/ic/lptreg.h
index d49ad756dfe..686aa6b0d25 100644
--- a/sys/dev/ic/lptreg.h
+++ b/sys/dev/ic/lptreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: lptreg.h,v 1.6 2001/01/06 17:16:19 nathanw Exp $ */
+/* $NetBSD: lptreg.h,v 1.7 2003/08/07 16:31:02 agc Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/dev/ic/mb89352reg.h b/sys/dev/ic/mb89352reg.h
index e2289e46cc8..4d1e19b6357 100644
--- a/sys/dev/ic/mb89352reg.h
+++ b/sys/dev/ic/mb89352reg.h
@@ -1,10 +1,7 @@
-/* $NetBSD: mb89352reg.h,v 1.2 2003/08/02 12:48:09 tsutsui Exp $ */
+/* $NetBSD: mb89352reg.h,v 1.3 2003/08/07 16:31:02 agc Exp $ */
/* NecBSD: mb89352reg.h,v 1.3 1998/03/14 07:04:34 kmatsuda Exp */
/*-
- * Copyright (c) 1996,97,98,99 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
@@ -22,6 +19,43 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * @(#)scsireg.h 8.1 (Berkeley) 6/10/93
+ */
+
+/*-
+ * Copyright (c) 1996,97,98,99 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Charles M. Hannum, Masaru Oki and Kouichi Matsuda.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Van Jacobson of Lawrence Berkeley Laboratory.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the University of
diff --git a/sys/dev/ic/nec765reg.h b/sys/dev/ic/nec765reg.h
index e53df8916fb..adb2d5bd082 100644
--- a/sys/dev/ic/nec765reg.h
+++ b/sys/dev/ic/nec765reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: nec765reg.h,v 1.5 2003/05/03 18:11:23 wiz Exp $ */
+/* $NetBSD: nec765reg.h,v 1.6 2003/08/07 16:31:02 agc Exp $ */
/*-
* Copyright (c) 1991 The Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/dev/ic/ns16450reg.h b/sys/dev/ic/ns16450reg.h
index eb79ecdfc75..0b23414b326 100644
--- a/sys/dev/ic/ns16450reg.h
+++ b/sys/dev/ic/ns16450reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ns16450reg.h,v 1.4 1997/10/03 16:40:35 enami Exp $ */
+/* $NetBSD: ns16450reg.h,v 1.5 2003/08/07 16:31:02 agc Exp $ */
/*-
* Copyright (c) 1991 The Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/dev/ic/ns16550reg.h b/sys/dev/ic/ns16550reg.h
index 19e05e4a0f7..e7e9b670c87 100644
--- a/sys/dev/ic/ns16550reg.h
+++ b/sys/dev/ic/ns16550reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ns16550reg.h,v 1.5 2000/05/16 00:18:44 thorpej Exp $ */
+/* $NetBSD: ns16550reg.h,v 1.6 2003/08/07 16:31:02 agc Exp $ */
/*-
* Copyright (c) 1991 The Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/dev/ic/oosiopreg.h b/sys/dev/ic/oosiopreg.h
index 6f6499c9fb4..91ea0cc851f 100644
--- a/sys/dev/ic/oosiopreg.h
+++ b/sys/dev/ic/oosiopreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: oosiopreg.h,v 1.1 2003/04/06 09:48:43 tsutsui Exp $ */
+/* $NetBSD: oosiopreg.h,v 1.2 2003/08/07 16:31:02 agc Exp $ */
/*
* Copyright (c) 1990 The Regents of the University of California.
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/dev/ic/osiop.c b/sys/dev/ic/osiop.c
index d00099e75fa..4f9403dfbab 100644
--- a/sys/dev/ic/osiop.c
+++ b/sys/dev/ic/osiop.c
@@ -1,4 +1,4 @@
-/* $NetBSD: osiop.c,v 1.13 2003/04/12 06:42:38 tsutsui Exp $ */
+/* $NetBSD: osiop.c,v 1.14 2003/08/07 16:31:02 agc Exp $ */
/*
* Copyright (c) 2001 Izumi Tsutsui. All rights reserved.
@@ -27,7 +27,6 @@
*/
/*
- * Copyright (c) 1994 Michael L. Hitch
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
*
@@ -42,6 +41,39 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * @(#)siop.c 7.5 (Berkeley) 5/4/91
+ */
+
+/*
+ * Copyright (c) 1994 Michael L. Hitch
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Van Jacobson of Lawrence Berkeley Laboratory.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the University of
@@ -76,7 +108,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: osiop.c,v 1.13 2003/04/12 06:42:38 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: osiop.c,v 1.14 2003/08/07 16:31:02 agc Exp $");
/* #define OSIOP_DEBUG */
diff --git a/sys/dev/ic/osiopreg.h b/sys/dev/ic/osiopreg.h
index b0d461780e2..65719cf922a 100644
--- a/sys/dev/ic/osiopreg.h
+++ b/sys/dev/ic/osiopreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: osiopreg.h,v 1.2 2003/02/18 16:37:48 tsutsui Exp $ */
+/* $NetBSD: osiopreg.h,v 1.3 2003/08/07 16:31:02 agc Exp $ */
/*
* Copyright (c) 1990 The Regents of the University of California.
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/dev/ic/osiopvar.h b/sys/dev/ic/osiopvar.h
index a6ccd9a79ed..28970086318 100644
--- a/sys/dev/ic/osiopvar.h
+++ b/sys/dev/ic/osiopvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: osiopvar.h,v 1.3 2002/05/14 02:58:35 matt Exp $ */
+/* $NetBSD: osiopvar.h,v 1.4 2003/08/07 16:31:03 agc Exp $ */
/*
* Copyright (c) 2001 Izumi Tsutsui. All rights reserved.
@@ -41,11 +41,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/dev/ic/sgecreg.h b/sys/dev/ic/sgecreg.h
index f4fd0f16155..712d4d79775 100644
--- a/sys/dev/ic/sgecreg.h
+++ b/sys/dev/ic/sgecreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: sgecreg.h,v 1.2 2003/01/06 21:05:38 matt Exp $ */
+/* $NetBSD: sgecreg.h,v 1.3 2003/08/07 16:31:03 agc Exp $ */
/*
* Copyright (c) 1988 Regents of the University of California.
* All rights reserved.
@@ -14,11 +14,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/dev/ic/st16650reg.h b/sys/dev/ic/st16650reg.h
index f61790bc448..4e47f45467c 100644
--- a/sys/dev/ic/st16650reg.h
+++ b/sys/dev/ic/st16650reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: st16650reg.h,v 1.1 1997/10/19 14:26:26 fvdl Exp $ */
+/* $NetBSD: st16650reg.h,v 1.2 2003/08/07 16:31:03 agc Exp $ */
/*
* Copyright (c) 1991 The Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/dev/ic/wdcreg.h b/sys/dev/ic/wdcreg.h
index f6f92380a10..aae9a020c55 100644
--- a/sys/dev/ic/wdcreg.h
+++ b/sys/dev/ic/wdcreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: wdcreg.h,v 1.27 2003/04/26 09:29:41 bouyer Exp $ */
+/* $NetBSD: wdcreg.h,v 1.28 2003/08/07 16:31:03 agc Exp $ */
/*-
* Copyright (c) 1991 The Regents of the University of California.
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/dev/ic/z8530reg.h b/sys/dev/ic/z8530reg.h
index 4680457e8db..0c850108406 100644
--- a/sys/dev/ic/z8530reg.h
+++ b/sys/dev/ic/z8530reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: z8530reg.h,v 1.9 1998/07/31 05:08:38 wrstuden Exp $ */
+/* $NetBSD: z8530reg.h,v 1.10 2003/08/07 16:31:03 agc Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -21,11 +21,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/dev/ic/z8530sc.c b/sys/dev/ic/z8530sc.c
index f4874c8d7df..0f0f8b9583a 100644
--- a/sys/dev/ic/z8530sc.c
+++ b/sys/dev/ic/z8530sc.c
@@ -1,7 +1,6 @@
-/* $NetBSD: z8530sc.c,v 1.18 2003/01/28 12:35:39 pk Exp $ */
+/* $NetBSD: z8530sc.c,v 1.19 2003/08/07 16:31:03 agc Exp $ */
/*
- * Copyright (c) 1994 Gordon W. Ross
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
@@ -22,6 +21,45 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * @(#)zs.c 8.1 (Berkeley) 7/19/93
+ */
+
+/*
+ * Copyright (c) 1994 Gordon W. Ross
+ *
+ * This software was developed by the Computer Systems Engineering group
+ * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
+ * contributed to Berkeley.
+ *
+ * All advertising materials mentioning features or use of this software
+ * must display the following acknowledgement:
+ * This product includes software developed by the University of
+ * California, Lawrence Berkeley Laboratory.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the University of
@@ -53,7 +91,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: z8530sc.c,v 1.18 2003/01/28 12:35:39 pk Exp $");
+__KERNEL_RCSID(0, "$NetBSD: z8530sc.c,v 1.19 2003/08/07 16:31:03 agc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/ic/z8530sc.h b/sys/dev/ic/z8530sc.h
index df27a919471..9625123ae37 100644
--- a/sys/dev/ic/z8530sc.h
+++ b/sys/dev/ic/z8530sc.h
@@ -1,7 +1,6 @@
-/* $NetBSD: z8530sc.h,v 1.18 2003/01/28 12:35:39 pk Exp $ */
+/* $NetBSD: z8530sc.h,v 1.19 2003/08/07 16:31:04 agc Exp $ */
/*
- * Copyright (c) 1994 Gordon W. Ross
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
@@ -22,6 +21,45 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * @(#)zsvar.h 8.1 (Berkeley) 6/11/93
+ */
+
+/*
+ * Copyright (c) 1994 Gordon W. Ross
+ *
+ * This software was developed by the Computer Systems Engineering group
+ * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
+ * contributed to Berkeley.
+ *
+ * All advertising materials mentioning features or use of this software
+ * must display the following acknowledgement:
+ * This product includes software developed by the University of
+ * California, Lawrence Berkeley Laboratory.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the University of
diff --git a/sys/dev/ic/z8530tty.c b/sys/dev/ic/z8530tty.c
index 1e681485aa9..4234001a47d 100644
--- a/sys/dev/ic/z8530tty.c
+++ b/sys/dev/ic/z8530tty.c
@@ -1,4 +1,4 @@
-/* $NetBSD: z8530tty.c,v 1.91 2003/06/29 22:30:15 fvdl Exp $ */
+/* $NetBSD: z8530tty.c,v 1.92 2003/08/07 16:31:04 agc Exp $ */
/*-
* Copyright (c) 1993, 1994, 1995, 1996, 1997, 1998, 1999
@@ -31,7 +31,6 @@
*/
/*
- * Copyright (c) 1994 Gordon W. Ross
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
@@ -52,6 +51,45 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * @(#)zs.c 8.1 (Berkeley) 7/19/93
+ */
+
+/*
+ * Copyright (c) 1994 Gordon W. Ross
+ *
+ * This software was developed by the Computer Systems Engineering group
+ * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
+ * contributed to Berkeley.
+ *
+ * All advertising materials mentioning features or use of this software
+ * must display the following acknowledgement:
+ * This product includes software developed by the University of
+ * California, Lawrence Berkeley Laboratory.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the University of
@@ -99,7 +137,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: z8530tty.c,v 1.91 2003/06/29 22:30:15 fvdl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: z8530tty.c,v 1.92 2003/08/07 16:31:04 agc Exp $");
#include "opt_kgdb.h"
diff --git a/sys/dev/isa/com_isa.c b/sys/dev/isa/com_isa.c
index 4463d5faaa2..a3483bcf7a6 100644
--- a/sys/dev/isa/com_isa.c
+++ b/sys/dev/isa/com_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: com_isa.c,v 1.20 2002/10/02 03:10:46 thorpej Exp $ */
+/* $NetBSD: com_isa.c,v 1.21 2003/08/07 16:31:05 agc Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -48,11 +48,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -72,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_isa.c,v 1.20 2002/10/02 03:10:46 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_isa.c,v 1.21 2003/08/07 16:31:05 agc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isa/com_multi.c b/sys/dev/isa/com_multi.c
index 340472ba7e8..e14745eb728 100644
--- a/sys/dev/isa/com_multi.c
+++ b/sys/dev/isa/com_multi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: com_multi.c,v 1.16 2002/10/02 03:10:46 thorpej Exp $ */
+/* $NetBSD: com_multi.c,v 1.17 2003/08/07 16:31:05 agc Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -48,11 +48,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -76,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_multi.c,v 1.16 2002/10/02 03:10:46 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_multi.c,v 1.17 2003/08/07 16:31:05 agc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isa/depca_isa.c b/sys/dev/isa/depca_isa.c
index 4d5d7688063..ed8899334a6 100644
--- a/sys/dev/isa/depca_isa.c
+++ b/sys/dev/isa/depca_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: depca_isa.c,v 1.6 2002/10/02 03:10:46 thorpej Exp $ */
+/* $NetBSD: depca_isa.c,v 1.7 2003/08/07 16:31:05 agc Exp $ */
/*-
* Copyright (c) 1997, 1998, 2000 The NetBSD Foundation, Inc.
@@ -52,11 +52,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -76,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: depca_isa.c,v 1.6 2002/10/02 03:10:46 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: depca_isa.c,v 1.7 2003/08/07 16:31:05 agc Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
diff --git a/sys/dev/isa/fd.c b/sys/dev/isa/fd.c
index 953c1f6cfef..3a9b6f3cb0d 100644
--- a/sys/dev/isa/fd.c
+++ b/sys/dev/isa/fd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fd.c,v 1.45 2003/06/29 22:30:20 fvdl Exp $ */
+/* $NetBSD: fd.c,v 1.46 2003/08/07 16:31:06 agc Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -51,11 +51,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -92,7 +88,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.45 2003/06/29 22:30:20 fvdl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.46 2003/08/07 16:31:06 agc Exp $");
#include "rnd.h"
#include "opt_ddb.h"
diff --git a/sys/dev/isa/fdc_isa.c b/sys/dev/isa/fdc_isa.c
index c859f71e2d7..64dfc774ffd 100644
--- a/sys/dev/isa/fdc_isa.c
+++ b/sys/dev/isa/fdc_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fdc_isa.c,v 1.7 2002/10/02 03:10:46 thorpej Exp $ */
+/* $NetBSD: fdc_isa.c,v 1.8 2003/08/07 16:31:06 agc Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -51,11 +51,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -75,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdc_isa.c,v 1.7 2002/10/02 03:10:46 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdc_isa.c,v 1.8 2003/08/07 16:31:06 agc Exp $");
#include "rnd.h"
diff --git a/sys/dev/isa/fdcvar.h b/sys/dev/isa/fdcvar.h
index 67aa300d1d9..fad51f34af6 100644
--- a/sys/dev/isa/fdcvar.h
+++ b/sys/dev/isa/fdcvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: fdcvar.h,v 1.2 2003/01/08 23:51:11 jmcneill Exp $ */
+/* $NetBSD: fdcvar.h,v 1.3 2003/08/07 16:31:06 agc Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -51,11 +51,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/dev/isa/fdreg.h b/sys/dev/isa/fdreg.h
index 79dbb3be30a..dba20c0a8e0 100644
--- a/sys/dev/isa/fdreg.h
+++ b/sys/dev/isa/fdreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: fdreg.h,v 1.2 2000/05/02 03:33:45 thorpej Exp $ */
+/* $NetBSD: fdreg.h,v 1.3 2003/08/07 16:31:07 agc Exp $ */
/*-
* Copyright (c) 1991 The Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/dev/isa/if_hp.c b/sys/dev/isa/if_hp.c
index 335ff509e1c..efb5e049dd7 100644
--- a/sys/dev/isa/if_hp.c
+++ b/sys/dev/isa/if_hp.c
@@ -1,9 +1,8 @@
-/* $NetBSD: if_hp.c,v 1.36 2003/05/03 18:11:27 wiz Exp $ */
+/* $NetBSD: if_hp.c,v 1.37 2003/08/07 16:31:07 agc Exp $ */
/* XXX THIS DRIVER IS BROKEN. IT WILL NOT EVEN COMPILE. */
/*-
- * Copyright (c) 1990, 1991 William F. Jolitz.
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
*
@@ -15,6 +14,34 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/*-
+ * Copyright (c) 1990, 1991 William F. Jolitz.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the University of
@@ -53,7 +80,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_hp.c,v 1.36 2003/05/03 18:11:27 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_hp.c,v 1.37 2003/08/07 16:31:07 agc Exp $");
#include "hp.h"
#if NHP > 0
diff --git a/sys/dev/isa/if_le_isa.c b/sys/dev/isa/if_le_isa.c
index 70350ce1f19..c2cfcdb9a1f 100644
--- a/sys/dev/isa/if_le_isa.c
+++ b/sys/dev/isa/if_le_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_le_isa.c,v 1.34 2002/10/02 03:10:48 thorpej Exp $ */
+/* $NetBSD: if_le_isa.c,v 1.35 2003/08/07 16:31:07 agc Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -52,11 +52,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -76,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_le_isa.c,v 1.34 2002/10/02 03:10:48 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_le_isa.c,v 1.35 2003/08/07 16:31:07 agc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isa/isareg.h b/sys/dev/isa/isareg.h
index f211f9fd567..9ba78af07fe 100644
--- a/sys/dev/isa/isareg.h
+++ b/sys/dev/isa/isareg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: isareg.h,v 1.7 2003/05/05 12:55:41 fvdl Exp $ */
+/* $NetBSD: isareg.h,v 1.8 2003/08/07 16:31:07 agc Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/dev/mca/com_mca.c b/sys/dev/mca/com_mca.c
index 3de3725a7c0..4a917ab8586 100644
--- a/sys/dev/mca/com_mca.c
+++ b/sys/dev/mca/com_mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: com_mca.c,v 1.9 2002/10/02 16:34:06 thorpej Exp $ */
+/* $NetBSD: com_mca.c,v 1.10 2003/08/07 16:31:08 agc Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -48,11 +48,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -76,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_mca.c,v 1.9 2002/10/02 16:34:06 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_mca.c,v 1.10 2003/08/07 16:31:08 agc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/mscp/mscp.c b/sys/dev/mscp/mscp.c
index 43dd65e3f94..358f651bdec 100644
--- a/sys/dev/mscp/mscp.c
+++ b/sys/dev/mscp/mscp.c
@@ -1,7 +1,6 @@
-/* $NetBSD: mscp.c,v 1.19 2003/02/04 13:20:45 matt Exp $ */
+/* $NetBSD: mscp.c,v 1.20 2003/08/07 16:31:08 agc Exp $ */
/*
- * Copyright (c) 1996 Ludd, University of Lule}, Sweden.
* Copyright (c) 1988 Regents of the University of California.
* All rights reserved.
*
@@ -16,6 +15,39 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * @(#)mscp.c 7.5 (Berkeley) 12/16/90
+ */
+
+/*
+ * Copyright (c) 1996 Ludd, University of Lule}, Sweden.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Chris Torek.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the University of
@@ -44,7 +76,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mscp.c,v 1.19 2003/02/04 13:20:45 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mscp.c,v 1.20 2003/08/07 16:31:08 agc Exp $");
#include <sys/param.h>
#include <sys/buf.h>
diff --git a/sys/dev/mscp/mscp.h b/sys/dev/mscp/mscp.h
index b0ebf466c90..fd3980af2cb 100644
--- a/sys/dev/mscp/mscp.h
+++ b/sys/dev/mscp/mscp.h
@@ -1,4 +1,4 @@
-/* $NetBSD: mscp.h,v 1.6 1999/05/29 19:11:16 ragge Exp $ */
+/* $NetBSD: mscp.h,v 1.7 2003/08/07 16:31:09 agc Exp $ */
/*
* Copyright (c) 1988 Regents of the University of California.
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/dev/mscp/mscp_disk.c b/sys/dev/mscp/mscp_disk.c
index 7914803af4b..32fe7e1728e 100644
--- a/sys/dev/mscp/mscp_disk.c
+++ b/sys/dev/mscp/mscp_disk.c
@@ -1,6 +1,5 @@
-/* $NetBSD: mscp_disk.c,v 1.41 2003/05/10 23:12:45 thorpej Exp $ */
+/* $NetBSD: mscp_disk.c,v 1.42 2003/08/07 16:31:09 agc Exp $ */
/*
- * Copyright (c) 1996 Ludd, University of Lule}, Sweden.
* Copyright (c) 1988 Regents of the University of California.
* All rights reserved.
*
@@ -15,6 +14,39 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * @(#)uda.c 7.32 (Berkeley) 2/13/91
+ */
+
+/*
+ * Copyright (c) 1996 Ludd, University of Lule}, Sweden.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Chris Torek.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the University of
@@ -49,7 +81,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mscp_disk.c,v 1.41 2003/05/10 23:12:45 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mscp_disk.c,v 1.42 2003/08/07 16:31:09 agc Exp $");
#include <sys/param.h>
#include <sys/buf.h>
diff --git a/sys/dev/mscp/mscp_subr.c b/sys/dev/mscp/mscp_subr.c
index 90e552f5030..3e0d7575574 100644
--- a/sys/dev/mscp/mscp_subr.c
+++ b/sys/dev/mscp/mscp_subr.c
@@ -1,6 +1,5 @@
-/* $NetBSD: mscp_subr.c,v 1.23 2003/01/01 00:10:22 thorpej Exp $ */
+/* $NetBSD: mscp_subr.c,v 1.24 2003/08/07 16:31:09 agc Exp $ */
/*
- * Copyright (c) 1996 Ludd, University of Lule}, Sweden.
* Copyright (c) 1988 Regents of the University of California.
* All rights reserved.
*
@@ -15,6 +14,39 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * @(#)mscp.c 7.5 (Berkeley) 12/16/90
+ */
+
+/*
+ * Copyright (c) 1996 Ludd, University of Lule}, Sweden.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Chris Torek.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the University of
@@ -43,7 +75,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mscp_subr.c,v 1.23 2003/01/01 00:10:22 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mscp_subr.c,v 1.24 2003/08/07 16:31:09 agc Exp $");
#include <sys/param.h>
#include <sys/device.h>
diff --git a/sys/dev/mscp/mscpreg.h b/sys/dev/mscp/mscpreg.h
index 431498a0285..b6c43938734 100644
--- a/sys/dev/mscp/mscpreg.h
+++ b/sys/dev/mscp/mscpreg.h
@@ -1,6 +1,5 @@
-/* $NetBSD: mscpreg.h,v 1.4 1999/05/29 19:12:53 ragge Exp $ */
+/* $NetBSD: mscpreg.h,v 1.5 2003/08/07 16:31:09 agc Exp $ */
/*
- * Copyright (c) 1996 Ludd, University of Lule}, Sweden.
* Copyright (c) 1988 Regents of the University of California.
* All rights reserved.
*
@@ -15,6 +14,39 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * @(#)udareg.h 7.3 (Berkeley) 5/8/91
+ */
+
+/*
+ * Copyright (c) 1996 Ludd, University of Lule}, Sweden.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Chris Torek.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the University of
diff --git a/sys/dev/mscp/mscpvar.h b/sys/dev/mscp/mscpvar.h
index 0a61077da9e..024ce50bb23 100644
--- a/sys/dev/mscp/mscpvar.h
+++ b/sys/dev/mscp/mscpvar.h
@@ -1,6 +1,5 @@
-/* $NetBSD: mscpvar.h,v 1.9 2002/07/22 21:48:40 hannken Exp $ */
+/* $NetBSD: mscpvar.h,v 1.10 2003/08/07 16:31:10 agc Exp $ */
/*
- * Copyright (c) 1996 Ludd, University of Lule}, Sweden.
* Copyright (c) 1988 Regents of the University of California.
* All rights reserved.
*
@@ -15,6 +14,39 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * @(#)mscpvar.h 7.3 (Berkeley) 6/28/90
+ */
+
+/*
+ * Copyright (c) 1996 Ludd, University of Lule}, Sweden.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Chris Torek.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the University of
diff --git a/sys/dev/ofw/openfirmio.c b/sys/dev/ofw/openfirmio.c
index b775b9ed0d3..6150cdc55b1 100644
--- a/sys/dev/ofw/openfirmio.c
+++ b/sys/dev/ofw/openfirmio.c
@@ -1,4 +1,4 @@
-/* $NetBSD: openfirmio.c,v 1.7 2003/06/29 22:30:23 fvdl Exp $ */
+/* $NetBSD: openfirmio.c,v 1.8 2003/08/07 16:31:10 agc Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -21,11 +21,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -45,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: openfirmio.c,v 1.7 2003/06/29 22:30:23 fvdl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: openfirmio.c,v 1.8 2003/08/07 16:31:10 agc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/ofw/openfirmio.h b/sys/dev/ofw/openfirmio.h
index c38a49754e4..12784bbfd4e 100644
--- a/sys/dev/ofw/openfirmio.h
+++ b/sys/dev/ofw/openfirmio.h
@@ -1,4 +1,4 @@
-/* $NetBSD: openfirmio.h,v 1.4 2002/09/06 13:18:43 gehenna Exp $ */
+/* $NetBSD: openfirmio.h,v 1.5 2003/08/07 16:31:10 agc Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -21,11 +21,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/dev/pci/if_le_pci.c b/sys/dev/pci/if_le_pci.c
index 6c44e77def1..c2351eb042c 100644
--- a/sys/dev/pci/if_le_pci.c
+++ b/sys/dev/pci/if_le_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_le_pci.c,v 1.39 2002/10/02 16:51:26 thorpej Exp $ */
+/* $NetBSD: if_le_pci.c,v 1.40 2003/08/07 16:31:11 agc Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -52,11 +52,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -76,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_le_pci.c,v 1.39 2002/10/02 16:51:26 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_le_pci.c,v 1.40 2003/08/07 16:31:11 agc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pckbc/pckbd.c b/sys/dev/pckbc/pckbd.c
index f119d0c4c17..33ebb8d15ba 100644
--- a/sys/dev/pckbc/pckbd.c
+++ b/sys/dev/pckbc/pckbd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pckbd.c,v 1.34 2003/02/05 17:36:16 perry Exp $ */
+/* $NetBSD: pckbd.c,v 1.35 2003/08/07 16:31:11 agc Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -51,11 +51,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -79,7 +75,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pckbd.c,v 1.34 2003/02/05 17:36:16 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pckbd.c,v 1.35 2003/08/07 16:31:11 agc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pcmcia/com_pcmcia.c b/sys/dev/pcmcia/com_pcmcia.c
index 6d83d904b35..af4d8e401d0 100644
--- a/sys/dev/pcmcia/com_pcmcia.c
+++ b/sys/dev/pcmcia/com_pcmcia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: com_pcmcia.c,v 1.32 2002/10/02 16:52:05 thorpej Exp $ */
+/* $NetBSD: com_pcmcia.c,v 1.33 2003/08/07 16:31:12 agc Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -48,11 +48,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -72,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_pcmcia.c,v 1.32 2002/10/02 16:52:05 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_pcmcia.c,v 1.33 2003/08/07 16:31:12 agc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/qbus/dhu.c b/sys/dev/qbus/dhu.c
index 36a0e65e466..e5c5df34c9b 100644
--- a/sys/dev/qbus/dhu.c
+++ b/sys/dev/qbus/dhu.c
@@ -1,7 +1,5 @@
-/* $NetBSD: dhu.c,v 1.33 2003/04/06 15:45:11 ragge Exp $ */
+/* $NetBSD: dhu.c,v 1.34 2003/08/07 16:31:13 agc Exp $ */
/*
- * Copyright (c) 2003, Hugh Graham.
- * Copyright (c) 1996 Ken C. Wellsch. All rights reserved.
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
@@ -16,6 +14,38 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/*
+ * Copyright (c) 2003, Hugh Graham.
+ * Copyright (c) 1996 Ken C. Wellsch. All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Ralph Campbell and Rick Macklem.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the University of
@@ -38,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dhu.c,v 1.33 2003/04/06 15:45:11 ragge Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dhu.c,v 1.34 2003/08/07 16:31:13 agc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/qbus/dl.c b/sys/dev/qbus/dl.c
index 3bd81afc754..6c1adf5f0bd 100644
--- a/sys/dev/qbus/dl.c
+++ b/sys/dev/qbus/dl.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dl.c,v 1.26 2002/10/23 09:13:36 jdolecek Exp $ */
+/* $NetBSD: dl.c,v 1.27 2003/08/07 16:31:13 agc Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -37,8 +37,6 @@
*/
/*
- * Copyright (c) 1997 Ben Harris. All rights reserved.
- * Copyright (c) 1996 Ken C. Wellsch. All rights reserved.
* Copyright (c) 1982, 1986, 1990, 1992, 1993
* The Regents of the University of California. All rights reserved.
*
@@ -53,6 +51,38 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/*
+ * Copyright (c) 1997 Ben Harris. All rights reserved.
+ * Copyright (c) 1996 Ken C. Wellsch. All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Ralph Campbell and Rick Macklem.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the University of
@@ -81,7 +111,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dl.c,v 1.26 2002/10/23 09:13:36 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dl.c,v 1.27 2003/08/07 16:31:13 agc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/qbus/if_de.c b/sys/dev/qbus/if_de.c
index eafdab000cc..69c7bba4810 100644
--- a/sys/dev/qbus/if_de.c
+++ b/sys/dev/qbus/if_de.c
@@ -1,7 +1,38 @@
-/* $NetBSD: if_de.c,v 1.14 2002/10/02 16:52:26 thorpej Exp $ */
+/* $NetBSD: if_de.c,v 1.15 2003/08/07 16:31:14 agc Exp $ */
/*
* Copyright (c) 1982, 1986, 1989 Regents of the University of California.
+ * All rights reserved.
+ *
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * @(#)if_de.c 7.12 (Berkeley) 12/16/90
+ */
+
+/*
* Copyright (c) 2000 Ludd, University of Lule}, Sweden.
* All rights reserved.
*
@@ -50,7 +81,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_de.c,v 1.14 2002/10/02 16:52:26 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_de.c,v 1.15 2003/08/07 16:31:14 agc Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
diff --git a/sys/dev/qbus/if_dereg.h b/sys/dev/qbus/if_dereg.h
index 40fc0ef9726..d9f390b0e5b 100644
--- a/sys/dev/qbus/if_dereg.h
+++ b/sys/dev/qbus/if_dereg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: if_dereg.h,v 1.2 2000/05/28 17:23:44 ragge Exp $ */
+/* $NetBSD: if_dereg.h,v 1.3 2003/08/07 16:31:14 agc Exp $ */
/*
* Copyright (c) 1982, 1986 Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/dev/qbus/if_dmc.c b/sys/dev/qbus/if_dmc.c
index cd0f05b9485..3fd06e24db4 100644
--- a/sys/dev/qbus/if_dmc.c
+++ b/sys/dev/qbus/if_dmc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_dmc.c,v 1.6 2002/10/02 16:52:27 thorpej Exp $ */
+/* $NetBSD: if_dmc.c,v 1.7 2003/08/07 16:31:14 agc Exp $ */
/*
* Copyright (c) 1982, 1986 Regents of the University of California.
* All rights reserved.
@@ -11,11 +11,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -45,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_dmc.c,v 1.6 2002/10/02 16:52:27 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_dmc.c,v 1.7 2003/08/07 16:31:14 agc Exp $");
#undef DMCDEBUG /* for base table dump on fatal error */
diff --git a/sys/dev/qbus/if_dmcreg.h b/sys/dev/qbus/if_dmcreg.h
index d96085740e2..99ea6f89b25 100644
--- a/sys/dev/qbus/if_dmcreg.h
+++ b/sys/dev/qbus/if_dmcreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: if_dmcreg.h,v 1.1 2001/05/06 17:36:04 ragge Exp $ */
+/* $NetBSD: if_dmcreg.h,v 1.2 2003/08/07 16:31:14 agc Exp $ */
/*
* Copyright (c) 1982, 1986 Regents of the University of California.
* All rights reserved.
@@ -11,11 +11,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/dev/qbus/if_il.c b/sys/dev/qbus/if_il.c
index 439c3914261..97056663ec8 100644
--- a/sys/dev/qbus/if_il.c
+++ b/sys/dev/qbus/if_il.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_il.c,v 1.9 2003/01/15 22:12:31 bouyer Exp $ */
+/* $NetBSD: if_il.c,v 1.10 2003/08/07 16:31:14 agc Exp $ */
/*
* Copyright (c) 1982, 1986 Regents of the University of California.
* All rights reserved.
@@ -11,11 +11,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -39,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_il.c,v 1.9 2003/01/15 22:12:31 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_il.c,v 1.10 2003/08/07 16:31:14 agc Exp $");
#include "opt_inet.h"
#include "opt_ns.h"
diff --git a/sys/dev/qbus/if_il.h b/sys/dev/qbus/if_il.h
index 31d0cbfe966..78b403beed0 100644
--- a/sys/dev/qbus/if_il.h
+++ b/sys/dev/qbus/if_il.h
@@ -1,4 +1,4 @@
-/* $NetBSD: if_il.h,v 1.1 2001/05/06 15:30:47 ragge Exp $ */
+/* $NetBSD: if_il.h,v 1.2 2003/08/07 16:31:15 agc Exp $ */
/*
* Copyright (c) 1982, 1986 Regents of the University of California.
* All rights reserved.
@@ -11,11 +11,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/dev/qbus/if_ilreg.h b/sys/dev/qbus/if_ilreg.h
index 0a4f6d70422..9a04801c071 100644
--- a/sys/dev/qbus/if_ilreg.h
+++ b/sys/dev/qbus/if_ilreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ilreg.h,v 1.2 2003/05/03 18:11:38 wiz Exp $ */
+/* $NetBSD: if_ilreg.h,v 1.3 2003/08/07 16:31:15 agc Exp $ */
/*
* Copyright (c) 1982, 1986 Regents of the University of California.
* All rights reserved.
@@ -11,11 +11,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/dev/qbus/if_qereg.h b/sys/dev/qbus/if_qereg.h
index e86c11b3ff5..2ea30924362 100644
--- a/sys/dev/qbus/if_qereg.h
+++ b/sys/dev/qbus/if_qereg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: if_qereg.h,v 1.6 2001/06/19 13:42:18 wiz Exp $ */
+/* $NetBSD: if_qereg.h,v 1.7 2003/08/07 16:31:15 agc Exp $ */
/*
* Copyright (c) 1988 Regents of the University of California.
* All rights reserved.
@@ -14,11 +14,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/dev/qbus/if_uba.c b/sys/dev/qbus/if_uba.c
index c5a21e6960c..668361e6635 100644
--- a/sys/dev/qbus/if_uba.c
+++ b/sys/dev/qbus/if_uba.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_uba.c,v 1.23 2003/04/01 02:06:06 thorpej Exp $ */
+/* $NetBSD: if_uba.c,v 1.24 2003/08/07 16:31:15 agc Exp $ */
/*
* Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -36,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_uba.c,v 1.23 2003/04/01 02:06:06 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_uba.c,v 1.24 2003/08/07 16:31:15 agc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/qbus/if_uba.h b/sys/dev/qbus/if_uba.h
index 6e1bad5597a..f4f3536e0b0 100644
--- a/sys/dev/qbus/if_uba.h
+++ b/sys/dev/qbus/if_uba.h
@@ -1,4 +1,4 @@
-/* $NetBSD: if_uba.h,v 1.11 2001/08/16 14:56:30 ragge Exp $ */
+/* $NetBSD: if_uba.h,v 1.12 2003/08/07 16:31:15 agc Exp $ */
/*
* Copyright (c) 1982, 1986 Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/dev/qbus/qd.c b/sys/dev/qbus/qd.c
index fe40b37f254..7d423686c27 100644
--- a/sys/dev/qbus/qd.c
+++ b/sys/dev/qbus/qd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: qd.c,v 1.30 2002/11/26 18:49:45 christos Exp $ */
+/* $NetBSD: qd.c,v 1.31 2003/08/07 16:31:16 agc Exp $ */
/*-
* Copyright (c) 1988 Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -62,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: qd.c,v 1.30 2002/11/26 18:49:45 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: qd.c,v 1.31 2003/08/07 16:31:16 agc Exp $");
#include "opt_ddb.h"
diff --git a/sys/dev/qbus/qdioctl.h b/sys/dev/qbus/qdioctl.h
index 169053110a3..f26a83c5d88 100644
--- a/sys/dev/qbus/qdioctl.h
+++ b/sys/dev/qbus/qdioctl.h
@@ -1,4 +1,4 @@
-/* $NetBSD: qdioctl.h,v 1.3 1999/06/20 17:58:56 ragge Exp $ */
+/* $NetBSD: qdioctl.h,v 1.4 2003/08/07 16:31:16 agc Exp $ */
/*-
* Copyright (c) 1982, 1986
* The Regents of the University of California. All rights reserved.
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/dev/qbus/qdreg.h b/sys/dev/qbus/qdreg.h
index 112997d58b9..2b05007b0cd 100644
--- a/sys/dev/qbus/qdreg.h
+++ b/sys/dev/qbus/qdreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: qdreg.h,v 1.5 2003/01/06 13:05:15 wiz Exp $ */
+/* $NetBSD: qdreg.h,v 1.6 2003/08/07 16:31:16 agc Exp $ */
/*-
* Copyright (c) 1982, 1986 The Regents of the University of California.
* All rights reserved.
@@ -11,11 +11,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/dev/qbus/qduser.h b/sys/dev/qbus/qduser.h
index 2496538b45c..67e3618d1f0 100644
--- a/sys/dev/qbus/qduser.h
+++ b/sys/dev/qbus/qduser.h
@@ -1,4 +1,4 @@
-/* $NetBSD: qduser.h,v 1.4 2001/06/11 01:50:56 wiz Exp $ */
+/* $NetBSD: qduser.h,v 1.5 2003/08/07 16:31:16 agc Exp $ */
/*-
* Copyright (c) 1982, 1986 The Regents of the University of California.
* All rights reserved.
@@ -11,11 +11,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/dev/qbus/qevent.h b/sys/dev/qbus/qevent.h
index b4dd1b0ffa1..d6a2f41f5f3 100644
--- a/sys/dev/qbus/qevent.h
+++ b/sys/dev/qbus/qevent.h
@@ -1,4 +1,4 @@
-/* $NetBSD: qevent.h,v 1.3 1999/06/20 17:58:56 ragge Exp $ */
+/* $NetBSD: qevent.h,v 1.4 2003/08/07 16:31:17 agc Exp $ */
/*-
* Copyright (c) 1982, 1986 The Regents of the University of California.
* All rights reserved.
@@ -11,11 +11,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/dev/qbus/qfont.c b/sys/dev/qbus/qfont.c
index 0c739315d8b..f8c1cc574b1 100644
--- a/sys/dev/qbus/qfont.c
+++ b/sys/dev/qbus/qfont.c
@@ -1,4 +1,4 @@
-/* $NetBSD: qfont.c,v 1.5 2001/11/13 07:11:25 lukem Exp $ */
+/* $NetBSD: qfont.c,v 1.6 2003/08/07 16:31:17 agc Exp $ */
/*-
* Copyright (c) 1982, 1986
* The Regents of the University of California. All rights reserved.
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -78,7 +74,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: qfont.c,v 1.5 2001/11/13 07:11:25 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: qfont.c,v 1.6 2003/08/07 16:31:17 agc Exp $");
unsigned short q_key[]={
0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 /* 0 */
diff --git a/sys/dev/qbus/ts.c b/sys/dev/qbus/ts.c
index 0fa22270626..bbc6c37463c 100644
--- a/sys/dev/qbus/ts.c
+++ b/sys/dev/qbus/ts.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ts.c,v 1.10 2002/10/23 09:13:38 jdolecek Exp $ */
+/* $NetBSD: ts.c,v 1.11 2003/08/07 16:31:17 agc Exp $ */
/*-
* Copyright (c) 1991 The Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -70,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ts.c,v 1.10 2002/10/23 09:13:38 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ts.c,v 1.11 2003/08/07 16:31:17 agc Exp $");
#undef TSDEBUG
diff --git a/sys/dev/qbus/uba.c b/sys/dev/qbus/uba.c
index ea782c8f378..a208ca45f3d 100644
--- a/sys/dev/qbus/uba.c
+++ b/sys/dev/qbus/uba.c
@@ -1,8 +1,39 @@
-/* $NetBSD: uba.c,v 1.66 2003/06/18 08:58:34 drochner Exp $ */
+/* $NetBSD: uba.c,v 1.67 2003/08/07 16:31:17 agc Exp $ */
+/*
+ * Copyright (c) 1982, 1986 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * @(#)uba.c 7.10 (Berkeley) 12/16/90
+ * @(#)autoconf.c 7.20 (Berkeley) 5/9/91
+ */
+
/*
* Copyright (c) 1996 Jonathan Stone.
* Copyright (c) 1994, 1996 Ludd, University of Lule}, Sweden.
- * Copyright (c) 1982, 1986 The Regents of the University of California.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -38,7 +69,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uba.c,v 1.66 2003/06/18 08:58:34 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uba.c,v 1.67 2003/08/07 16:31:17 agc Exp $");
#include <sys/param.h>
#include <sys/time.h>
diff --git a/sys/dev/qbus/ubavar.h b/sys/dev/qbus/ubavar.h
index 2f2b16cc99c..be26446c269 100644
--- a/sys/dev/qbus/ubavar.h
+++ b/sys/dev/qbus/ubavar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ubavar.h,v 1.32 2001/05/13 15:23:37 ragge Exp $ */
+/* $NetBSD: ubavar.h,v 1.33 2003/08/07 16:31:18 agc Exp $ */
/*
* Copyright (c) 1982, 1986 Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/dev/qbus/uda.c b/sys/dev/qbus/uda.c
index dd1f7bc5f97..82787a5e331 100644
--- a/sys/dev/qbus/uda.c
+++ b/sys/dev/qbus/uda.c
@@ -1,6 +1,5 @@
-/* $NetBSD: uda.c,v 1.48 2003/01/01 00:10:24 thorpej Exp $ */
+/* $NetBSD: uda.c,v 1.49 2003/08/07 16:31:18 agc Exp $ */
/*
- * Copyright (c) 1996 Ludd, University of Lule}, Sweden.
* Copyright (c) 1988 Regents of the University of California.
* All rights reserved.
*
@@ -15,6 +14,40 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * @(#)uda.c 7.32 (Berkeley) 2/13/91
+ */
+
+/*
+ * Copyright (c) 1996 Ludd, University of Lule}, Sweden.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Chris Torek.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the University of
@@ -43,7 +76,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uda.c,v 1.48 2003/01/01 00:10:24 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uda.c,v 1.49 2003/08/07 16:31:18 agc Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
diff --git a/sys/dev/raidframe/rf_netbsdkintf.c b/sys/dev/raidframe/rf_netbsdkintf.c
index 600e2035632..e200798c5ac 100644
--- a/sys/dev/raidframe/rf_netbsdkintf.c
+++ b/sys/dev/raidframe/rf_netbsdkintf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_netbsdkintf.c,v 1.161 2003/06/29 22:30:33 fvdl Exp $ */
+/* $NetBSD: rf_netbsdkintf.c,v 1.162 2003/08/07 16:31:19 agc Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -36,7 +36,6 @@
*/
/*
- * Copyright (c) 1988 University of Utah.
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
@@ -52,6 +51,42 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * from: Utah $Hdr: cd.c 1.6 90/11/28$
+ *
+ * @(#)cd.c 8.2 (Berkeley) 11/16/93
+ */
+
+/*
+ * Copyright (c) 1988 University of Utah.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * the Systems Programming Group of the University of Utah Computer
+ * Science Department.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the University of
@@ -111,7 +146,7 @@
***********************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.161 2003/06/29 22:30:33 fvdl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.162 2003/08/07 16:31:19 agc Exp $");
#include <sys/param.h>
#include <sys/errno.h>
diff --git a/sys/dev/rcons/raster.h b/sys/dev/rcons/raster.h
index 6ead6481a2a..5ec7692f37a 100644
--- a/sys/dev/rcons/raster.h
+++ b/sys/dev/rcons/raster.h
@@ -1,4 +1,4 @@
-/* $NetBSD: raster.h,v 1.5 2000/09/29 06:29:47 deberg Exp $ */
+/* $NetBSD: raster.h,v 1.6 2003/08/07 16:31:20 agc Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/dev/rcons/raster_op.c b/sys/dev/rcons/raster_op.c
index c30ae086d2c..7caedcf49e3 100644
--- a/sys/dev/rcons/raster_op.c
+++ b/sys/dev/rcons/raster_op.c
@@ -1,4 +1,4 @@
-/* $NetBSD: raster_op.c,v 1.11 2001/11/13 06:58:44 lukem Exp $ */
+/* $NetBSD: raster_op.c,v 1.12 2003/08/07 16:31:20 agc Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -71,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: raster_op.c,v 1.11 2001/11/13 06:58:44 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: raster_op.c,v 1.12 2003/08/07 16:31:20 agc Exp $");
#include <sys/types.h>
#ifdef _KERNEL
diff --git a/sys/dev/rcons/raster_text.c b/sys/dev/rcons/raster_text.c
index 6a2b90ea221..1cdf78d1297 100644
--- a/sys/dev/rcons/raster_text.c
+++ b/sys/dev/rcons/raster_text.c
@@ -1,4 +1,4 @@
-/* $NetBSD: raster_text.c,v 1.6 2001/11/15 09:48:15 lukem Exp $ */
+/* $NetBSD: raster_text.c,v 1.7 2003/08/07 16:31:20 agc Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -44,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: raster_text.c,v 1.6 2001/11/15 09:48:15 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: raster_text.c,v 1.7 2003/08/07 16:31:20 agc Exp $");
#include <sys/param.h>
#ifdef _KERNEL
diff --git a/sys/dev/rcons/rcons.h b/sys/dev/rcons/rcons.h
index 4bc975dfdc4..731a66cbb19 100644
--- a/sys/dev/rcons/rcons.h
+++ b/sys/dev/rcons/rcons.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rcons.h,v 1.12 2000/04/16 21:49:49 pk Exp $ */
+/* $NetBSD: rcons.h,v 1.13 2003/08/07 16:31:20 agc Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -21,11 +21,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/dev/rcons/rcons_kern.c b/sys/dev/rcons/rcons_kern.c
index ceef263d0a1..fec99746f77 100644
--- a/sys/dev/rcons/rcons_kern.c
+++ b/sys/dev/rcons/rcons_kern.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rcons_kern.c,v 1.13 2001/11/13 06:58:44 lukem Exp $ */
+/* $NetBSD: rcons_kern.c,v 1.14 2003/08/07 16:31:21 agc Exp $ */
/*
* Copyright (c) 1991, 1993
@@ -21,11 +21,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -45,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rcons_kern.c,v 1.13 2001/11/13 06:58:44 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rcons_kern.c,v 1.14 2003/08/07 16:31:21 agc Exp $");
#include <sys/param.h>
#include <sys/device.h>
diff --git a/sys/dev/rcons/rcons_subr.c b/sys/dev/rcons/rcons_subr.c
index 97a1111a99d..844737ff907 100644
--- a/sys/dev/rcons/rcons_subr.c
+++ b/sys/dev/rcons/rcons_subr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rcons_subr.c,v 1.11 2002/07/04 14:37:12 junyoung Exp $ */
+/* $NetBSD: rcons_subr.c,v 1.12 2003/08/07 16:31:21 agc Exp $ */
/*
* Copyright (c) 1991, 1993
@@ -21,11 +21,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -45,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rcons_subr.c,v 1.11 2002/07/04 14:37:12 junyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rcons_subr.c,v 1.12 2003/08/07 16:31:21 agc Exp $");
#include <sys/param.h>
#ifdef _KERNEL
diff --git a/sys/dev/sbus/bwtwo_sbus.c b/sys/dev/sbus/bwtwo_sbus.c
index e2920a00aa3..f110514f1ea 100644
--- a/sys/dev/sbus/bwtwo_sbus.c
+++ b/sys/dev/sbus/bwtwo_sbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bwtwo_sbus.c,v 1.12 2003/04/24 05:06:32 martin Exp $ */
+/* $NetBSD: bwtwo_sbus.c,v 1.13 2003/08/07 16:31:21 agc Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -57,11 +57,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -90,7 +86,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bwtwo_sbus.c,v 1.12 2003/04/24 05:06:32 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bwtwo_sbus.c,v 1.13 2003/08/07 16:31:21 agc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/sbus/cgthree_sbus.c b/sys/dev/sbus/cgthree_sbus.c
index 4628e51a537..a3259ad7b65 100644
--- a/sys/dev/sbus/cgthree_sbus.c
+++ b/sys/dev/sbus/cgthree_sbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cgthree_sbus.c,v 1.12 2003/04/24 05:06:33 martin Exp $ */
+/* $NetBSD: cgthree_sbus.c,v 1.13 2003/08/07 16:31:22 agc Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -57,11 +57,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -89,7 +85,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cgthree_sbus.c,v 1.12 2003/04/24 05:06:33 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgthree_sbus.c,v 1.13 2003/08/07 16:31:22 agc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/sun/bt_subr.c b/sys/dev/sun/bt_subr.c
index 888e38f537c..de1c64aba4a 100644
--- a/sys/dev/sun/bt_subr.c
+++ b/sys/dev/sun/bt_subr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bt_subr.c,v 1.4 2002/09/04 03:58:37 itojun Exp $ */
+/* $NetBSD: bt_subr.c,v 1.5 2003/08/07 16:31:22 agc Exp $ */
/*
* Copyright (c) 1993
@@ -21,11 +21,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -45,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bt_subr.c,v 1.4 2002/09/04 03:58:37 itojun Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bt_subr.c,v 1.5 2003/08/07 16:31:22 agc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/sun/btreg.h b/sys/dev/sun/btreg.h
index f0e9dceee1f..bae1be90523 100644
--- a/sys/dev/sun/btreg.h
+++ b/sys/dev/sun/btreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: btreg.h,v 1.1 2000/08/20 14:28:51 pk Exp $ */
+/* $NetBSD: btreg.h,v 1.2 2003/08/07 16:31:22 agc Exp $ */
/*
* Copyright (c) 1993
@@ -21,11 +21,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/dev/sun/btvar.h b/sys/dev/sun/btvar.h
index b604490fea0..c9a32b7290a 100644
--- a/sys/dev/sun/btvar.h
+++ b/sys/dev/sun/btvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: btvar.h,v 1.1 2000/08/20 14:28:51 pk Exp $ */
+/* $NetBSD: btvar.h,v 1.2 2003/08/07 16:31:22 agc Exp $ */
/*
* Copyright (c) 1993
@@ -21,11 +21,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/dev/sun/bwtwo.c b/sys/dev/sun/bwtwo.c
index 45f6db70292..80927cc2c55 100644
--- a/sys/dev/sun/bwtwo.c
+++ b/sys/dev/sun/bwtwo.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bwtwo.c,v 1.8 2003/06/29 22:30:46 fvdl Exp $ */
+/* $NetBSD: bwtwo.c,v 1.9 2003/08/07 16:31:22 agc Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -57,11 +57,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -90,7 +86,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bwtwo.c,v 1.8 2003/06/29 22:30:46 fvdl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bwtwo.c,v 1.9 2003/08/07 16:31:22 agc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/sun/bwtworeg.h b/sys/dev/sun/bwtworeg.h
index b718c49a392..f0749189eb9 100644
--- a/sys/dev/sun/bwtworeg.h
+++ b/sys/dev/sun/bwtworeg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: bwtworeg.h,v 1.1 2000/08/20 14:28:50 pk Exp $ */
+/* $NetBSD: bwtworeg.h,v 1.2 2003/08/07 16:31:23 agc Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -21,11 +21,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/dev/sun/bwtwovar.h b/sys/dev/sun/bwtwovar.h
index 5257a086dca..1702395a9d0 100644
--- a/sys/dev/sun/bwtwovar.h
+++ b/sys/dev/sun/bwtwovar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: bwtwovar.h,v 1.2 2002/03/11 16:01:57 pk Exp $ */
+/* $NetBSD: bwtwovar.h,v 1.3 2003/08/07 16:31:23 agc Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -57,11 +57,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/dev/sun/cgsix.c b/sys/dev/sun/cgsix.c
index a5145d06106..90457c55f90 100644
--- a/sys/dev/sun/cgsix.c
+++ b/sys/dev/sun/cgsix.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cgsix.c,v 1.12 2003/06/29 22:30:47 fvdl Exp $ */
+/* $NetBSD: cgsix.c,v 1.13 2003/08/07 16:31:23 agc Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -57,11 +57,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -89,7 +85,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cgsix.c,v 1.12 2003/06/29 22:30:47 fvdl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgsix.c,v 1.13 2003/08/07 16:31:23 agc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/sun/cgsixreg.h b/sys/dev/sun/cgsixreg.h
index 79c3f4561ff..eac05c696ae 100644
--- a/sys/dev/sun/cgsixreg.h
+++ b/sys/dev/sun/cgsixreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: cgsixreg.h,v 1.4 2001/01/10 14:58:08 tsutsui Exp $ */
+/* $NetBSD: cgsixreg.h,v 1.5 2003/08/07 16:31:23 agc Exp $ */
/*
* Copyright (c) 1993
@@ -21,11 +21,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/dev/sun/cgthreereg.h b/sys/dev/sun/cgthreereg.h
index c990446670f..a6e9af0ef52 100644
--- a/sys/dev/sun/cgthreereg.h
+++ b/sys/dev/sun/cgthreereg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: cgthreereg.h,v 1.1 2000/08/20 19:58:19 pk Exp $ */
+/* $NetBSD: cgthreereg.h,v 1.2 2003/08/07 16:31:23 agc Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -21,11 +21,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/dev/sun/disklabel.h b/sys/dev/sun/disklabel.h
index 23188f2d463..c58fa375fea 100644
--- a/sys/dev/sun/disklabel.h
+++ b/sys/dev/sun/disklabel.h
@@ -1,4 +1,4 @@
-/* $NetBSD: disklabel.h,v 1.2 1998/08/22 14:55:28 mrg Exp $ */
+/* $NetBSD: disklabel.h,v 1.3 2003/08/07 16:31:23 agc Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -21,11 +21,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/dev/sun/event.c b/sys/dev/sun/event.c
index 5be4ed1d02f..dd5c4cbad4a 100644
--- a/sys/dev/sun/event.c
+++ b/sys/dev/sun/event.c
@@ -1,4 +1,4 @@
-/* $NetBSD: event.c,v 1.14 2003/06/29 22:30:47 fvdl Exp $ */
+/* $NetBSD: event.c,v 1.15 2003/08/07 16:31:23 agc Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -21,11 +21,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -49,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: event.c,v 1.14 2003/06/29 22:30:47 fvdl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: event.c,v 1.15 2003/08/07 16:31:23 agc Exp $");
#include <sys/param.h>
#include <sys/fcntl.h>
diff --git a/sys/dev/sun/event_var.h b/sys/dev/sun/event_var.h
index b42482f17f7..fef1d8cde0a 100644
--- a/sys/dev/sun/event_var.h
+++ b/sys/dev/sun/event_var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: event_var.h,v 1.6 2003/06/29 22:30:48 fvdl Exp $ */
+/* $NetBSD: event_var.h,v 1.7 2003/08/07 16:31:24 agc Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -21,11 +21,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/dev/sun/fb.c b/sys/dev/sun/fb.c
index 02fad571774..50b0d72a906 100644
--- a/sys/dev/sun/fb.c
+++ b/sys/dev/sun/fb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fb.c,v 1.12 2003/06/29 22:30:48 fvdl Exp $ */
+/* $NetBSD: fb.c,v 1.13 2003/08/07 16:31:24 agc Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -21,11 +21,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -50,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fb.c,v 1.12 2003/06/29 22:30:48 fvdl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fb.c,v 1.13 2003/08/07 16:31:24 agc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/sun/fbio.h b/sys/dev/sun/fbio.h
index 0f6f10adb0f..2e0d9ce7c62 100644
--- a/sys/dev/sun/fbio.h
+++ b/sys/dev/sun/fbio.h
@@ -1,4 +1,4 @@
-/* $NetBSD: fbio.h,v 1.3 2001/09/19 18:29:03 thorpej Exp $ */
+/* $NetBSD: fbio.h,v 1.4 2003/08/07 16:31:24 agc Exp $ */
/*
* Copyright (c) 1992 Regents of the University of California.
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/dev/sun/fbvar.h b/sys/dev/sun/fbvar.h
index 243ebf9c716..73401fa10b9 100644
--- a/sys/dev/sun/fbvar.h
+++ b/sys/dev/sun/fbvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: fbvar.h,v 1.6 2003/06/29 22:30:48 fvdl Exp $ */
+/* $NetBSD: fbvar.h,v 1.7 2003/08/07 16:31:24 agc Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -21,11 +21,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/dev/sun/kbd.c b/sys/dev/sun/kbd.c
index c35bcf2e193..984bad300a5 100644
--- a/sys/dev/sun/kbd.c
+++ b/sys/dev/sun/kbd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: kbd.c,v 1.37 2003/06/29 22:30:48 fvdl Exp $ */
+/* $NetBSD: kbd.c,v 1.38 2003/08/07 16:31:24 agc Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -21,11 +21,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -51,7 +47,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kbd.c,v 1.37 2003/06/29 22:30:48 fvdl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kbd.c,v 1.38 2003/08/07 16:31:24 agc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/sun/kbd_ms_ttyvar.h b/sys/dev/sun/kbd_ms_ttyvar.h
index f2b4ff5da5d..2ebe2c90d9e 100644
--- a/sys/dev/sun/kbd_ms_ttyvar.h
+++ b/sys/dev/sun/kbd_ms_ttyvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: kbd_ms_ttyvar.h,v 1.1 2000/09/21 22:25:08 eeh Exp $ */
+/* $NetBSD: kbd_ms_ttyvar.h,v 1.2 2003/08/07 16:31:25 agc Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -21,11 +21,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/dev/sun/kbd_reg.h b/sys/dev/sun/kbd_reg.h
index 9a8a08c2d0f..a03696de171 100644
--- a/sys/dev/sun/kbd_reg.h
+++ b/sys/dev/sun/kbd_reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: kbd_reg.h,v 1.2 2002/10/03 16:13:25 uwe Exp $ */
+/* $NetBSD: kbd_reg.h,v 1.3 2003/08/07 16:31:25 agc Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -21,11 +21,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/dev/sun/kbd_xlate.h b/sys/dev/sun/kbd_xlate.h
index e9480637b15..2f89b9fab29 100644
--- a/sys/dev/sun/kbd_xlate.h
+++ b/sys/dev/sun/kbd_xlate.h
@@ -1,4 +1,4 @@
-/* $NetBSD: kbd_xlate.h,v 1.4 2002/10/03 16:13:26 uwe Exp $ */
+/* $NetBSD: kbd_xlate.h,v 1.5 2003/08/07 16:31:25 agc Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -21,11 +21,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/dev/sun/kbd_zs.c b/sys/dev/sun/kbd_zs.c
index 069d3add334..8a4830aabcd 100644
--- a/sys/dev/sun/kbd_zs.c
+++ b/sys/dev/sun/kbd_zs.c
@@ -1,4 +1,4 @@
-/* $NetBSD: kbd_zs.c,v 1.15 2002/10/21 15:36:35 uwe Exp $ */
+/* $NetBSD: kbd_zs.c,v 1.16 2003/08/07 16:31:25 agc Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -21,11 +21,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -57,7 +53,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kbd_zs.c,v 1.15 2002/10/21 15:36:35 uwe Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kbd_zs.c,v 1.16 2003/08/07 16:31:25 agc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/sun/kbdsun.c b/sys/dev/sun/kbdsun.c
index 2e8189e554b..ffd6a5b9f32 100644
--- a/sys/dev/sun/kbdsun.c
+++ b/sys/dev/sun/kbdsun.c
@@ -1,4 +1,4 @@
-/* $NetBSD: kbdsun.c,v 1.2 2002/10/21 15:36:35 uwe Exp $ */
+/* $NetBSD: kbdsun.c,v 1.3 2003/08/07 16:31:25 agc Exp $ */
/* NetBSD: kbd.c,v 1.29 2001/11/13 06:54:32 lukem Exp */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -51,7 +47,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kbdsun.c,v 1.2 2002/10/21 15:36:35 uwe Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kbdsun.c,v 1.3 2003/08/07 16:31:25 agc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/sun/kbdsunvar.h b/sys/dev/sun/kbdsunvar.h
index 0ebfee67abf..fc094553ca7 100644
--- a/sys/dev/sun/kbdsunvar.h
+++ b/sys/dev/sun/kbdsunvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: kbdsunvar.h,v 1.2 2002/10/21 15:36:35 uwe Exp $ */
+/* $NetBSD: kbdsunvar.h,v 1.3 2003/08/07 16:31:26 agc Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -21,11 +21,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/dev/sun/kbdvar.h b/sys/dev/sun/kbdvar.h
index e252c4ba379..f83722c48de 100644
--- a/sys/dev/sun/kbdvar.h
+++ b/sys/dev/sun/kbdvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: kbdvar.h,v 1.11 2002/10/26 19:11:13 martin Exp $ */
+/* $NetBSD: kbdvar.h,v 1.12 2003/08/07 16:31:26 agc Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -21,11 +21,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/dev/sun/kbio.h b/sys/dev/sun/kbio.h
index 154ef28bf97..18dc17900c3 100644
--- a/sys/dev/sun/kbio.h
+++ b/sys/dev/sun/kbio.h
@@ -1,4 +1,4 @@
-/* $NetBSD: kbio.h,v 1.1 2002/03/22 00:11:56 fredette Exp $ */
+/* $NetBSD: kbio.h,v 1.2 2003/08/07 16:31:26 agc Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -21,11 +21,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/dev/sun/ms.c b/sys/dev/sun/ms.c
index 4afe4f59f1b..26a45fae179 100644
--- a/sys/dev/sun/ms.c
+++ b/sys/dev/sun/ms.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ms.c,v 1.26 2003/06/29 22:30:49 fvdl Exp $ */
+/* $NetBSD: ms.c,v 1.27 2003/08/07 16:31:26 agc Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -21,11 +21,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -56,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ms.c,v 1.26 2003/06/29 22:30:49 fvdl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ms.c,v 1.27 2003/08/07 16:31:26 agc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/sun/ms_zs.c b/sys/dev/sun/ms_zs.c
index a22833083c1..355bd50cffe 100644
--- a/sys/dev/sun/ms_zs.c
+++ b/sys/dev/sun/ms_zs.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ms_zs.c,v 1.9 2002/10/02 16:52:59 thorpej Exp $ */
+/* $NetBSD: ms_zs.c,v 1.10 2003/08/07 16:31:26 agc Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -21,11 +21,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -56,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ms_zs.c,v 1.9 2002/10/02 16:52:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ms_zs.c,v 1.10 2003/08/07 16:31:26 agc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/sun/msvar.h b/sys/dev/sun/msvar.h
index 5554b65c559..f0ad9f0c6f7 100644
--- a/sys/dev/sun/msvar.h
+++ b/sys/dev/sun/msvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: msvar.h,v 1.4 2003/05/30 23:34:06 petrov Exp $ */
+/* $NetBSD: msvar.h,v 1.5 2003/08/07 16:31:26 agc Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -21,11 +21,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/dev/sun/sunkbd.c b/sys/dev/sun/sunkbd.c
index 2efcb425930..60e602e8d1f 100644
--- a/sys/dev/sun/sunkbd.c
+++ b/sys/dev/sun/sunkbd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sunkbd.c,v 1.18 2003/06/29 22:30:49 fvdl Exp $ */
+/* $NetBSD: sunkbd.c,v 1.19 2003/08/07 16:31:27 agc Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -21,11 +21,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -55,7 +51,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunkbd.c,v 1.18 2003/06/29 22:30:49 fvdl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunkbd.c,v 1.19 2003/08/07 16:31:27 agc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/sun/sunms.c b/sys/dev/sun/sunms.c
index 427c465e5fe..cf7405be171 100644
--- a/sys/dev/sun/sunms.c
+++ b/sys/dev/sun/sunms.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sunms.c,v 1.16 2003/06/29 22:30:49 fvdl Exp $ */
+/* $NetBSD: sunms.c,v 1.17 2003/08/07 16:31:27 agc Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -21,11 +21,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -56,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunms.c,v 1.16 2003/06/29 22:30:49 fvdl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunms.c,v 1.17 2003/08/07 16:31:27 agc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/sun/vuid_event.h b/sys/dev/sun/vuid_event.h
index 2d5d88242b7..792a7ca498d 100644
--- a/sys/dev/sun/vuid_event.h
+++ b/sys/dev/sun/vuid_event.h
@@ -1,4 +1,4 @@
-/* $NetBSD: vuid_event.h,v 1.1 2002/03/22 00:11:56 fredette Exp $ */
+/* $NetBSD: vuid_event.h,v 1.2 2003/08/07 16:31:27 agc Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -21,11 +21,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/dev/tc/if_levar.h b/sys/dev/tc/if_levar.h
index 6f08a8d2bf2..1dc0593e30f 100644
--- a/sys/dev/tc/if_levar.h
+++ b/sys/dev/tc/if_levar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: if_levar.h,v 1.4 1997/03/15 18:12:07 is Exp $ */
+/* $NetBSD: if_levar.h,v 1.5 2003/08/07 16:31:27 agc Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/dev/tc/ioasicreg.h b/sys/dev/tc/ioasicreg.h
index d4e91c0aaa2..680d90c025e 100644
--- a/sys/dev/tc/ioasicreg.h
+++ b/sys/dev/tc/ioasicreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ioasicreg.h,v 1.6 2000/07/17 02:18:17 thorpej Exp $ */
+/* $NetBSD: ioasicreg.h,v 1.7 2003/08/07 16:31:27 agc Exp $ */
/*
* Copyright (c) 1991,1990,1989,1994,1995 Carnegie Mellon University
@@ -41,11 +41,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/dev/tc/zskbd.c b/sys/dev/tc/zskbd.c
index 18683701ed1..714e9584db3 100644
--- a/sys/dev/tc/zskbd.c
+++ b/sys/dev/tc/zskbd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: zskbd.c,v 1.8 2002/10/02 16:53:11 thorpej Exp $ */
+/* $NetBSD: zskbd.c,v 1.9 2003/08/07 16:31:28 agc Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -21,11 +21,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -49,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zskbd.c,v 1.8 2002/10/02 16:53:11 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zskbd.c,v 1.9 2003/08/07 16:31:28 agc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/tc/zsms.c b/sys/dev/tc/zsms.c
index 10665eda149..a666a617246 100644
--- a/sys/dev/tc/zsms.c
+++ b/sys/dev/tc/zsms.c
@@ -1,4 +1,4 @@
-/* $NetBSD: zsms.c,v 1.9 2002/10/02 16:53:11 thorpej Exp $ */
+/* $NetBSD: zsms.c,v 1.10 2003/08/07 16:31:28 agc Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -21,11 +21,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -49,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zsms.c,v 1.9 2002/10/02 16:53:11 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zsms.c,v 1.10 2003/08/07 16:31:28 agc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/vnd.c b/sys/dev/vnd.c
index aee816891ed..161a5d763fc 100644
--- a/sys/dev/vnd.c
+++ b/sys/dev/vnd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vnd.c,v 1.101 2003/06/29 22:30:03 fvdl Exp $ */
+/* $NetBSD: vnd.c,v 1.102 2003/08/07 16:30:52 agc Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,6 @@
*/
/*
- * Copyright (c) 1988 University of Utah.
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
@@ -53,6 +52,42 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * from: Utah $Hdr: vn.c 1.13 94/04/02$
+ *
+ * @(#)vn.c 8.9 (Berkeley) 5/14/95
+ */
+
+/*
+ * Copyright (c) 1988 University of Utah.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * the Systems Programming Group of the University of Utah Computer
+ * Science Department.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the University of
@@ -98,7 +133,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.101 2003/06/29 22:30:03 fvdl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.102 2003/08/07 16:30:52 agc Exp $");
#if defined(_KERNEL_OPT)
#include "fs_nfs.h"
diff --git a/sys/dev/vndvar.h b/sys/dev/vndvar.h
index f068840f3a8..3ddcebbf36d 100644
--- a/sys/dev/vndvar.h
+++ b/sys/dev/vndvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: vndvar.h,v 1.11 2003/05/17 16:11:52 thorpej Exp $ */
+/* $NetBSD: vndvar.h,v 1.12 2003/08/07 16:30:52 agc Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,6 @@
*/
/*
- * Copyright (c) 1988 University of Utah.
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
@@ -53,6 +52,42 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * from: Utah $Hdr: fdioctl.h 1.1 90/07/09$
+ *
+ * @(#)vnioctl.h 8.1 (Berkeley) 6/10/93
+ */
+
+/*
+ * Copyright (c) 1988 University of Utah.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * the Systems Programming Group of the University of Utah Computer
+ * Science Department.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the University of
diff --git a/sys/dev/wscons/wscons_raster.h b/sys/dev/wscons/wscons_raster.h
index 10f9ebccdf5..5951f861824 100644
--- a/sys/dev/wscons/wscons_raster.h
+++ b/sys/dev/wscons/wscons_raster.h
@@ -1,4 +1,4 @@
-/* $NetBSD: wscons_raster.h,v 1.7 2002/07/04 14:37:14 junyoung Exp $ */
+/* $NetBSD: wscons_raster.h,v 1.8 2003/08/07 16:31:28 agc Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -21,11 +21,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/dev/wscons/wscons_rfont.h b/sys/dev/wscons/wscons_rfont.h
index 6a776522038..98dcfec34e4 100644
--- a/sys/dev/wscons/wscons_rfont.h
+++ b/sys/dev/wscons/wscons_rfont.h
@@ -1,4 +1,4 @@
-/* $NetBSD: wscons_rfont.h,v 1.1 1998/03/22 14:24:02 drochner Exp $ */
+/* $NetBSD: wscons_rfont.h,v 1.2 2003/08/07 16:31:28 agc Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/dev/wscons/wscons_rinit.c b/sys/dev/wscons/wscons_rinit.c
index 41db5659edc..ebd7ed0eea3 100644
--- a/sys/dev/wscons/wscons_rinit.c
+++ b/sys/dev/wscons/wscons_rinit.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wscons_rinit.c,v 1.4 2001/11/13 06:17:46 lukem Exp $ */
+/* $NetBSD: wscons_rinit.c,v 1.5 2003/08/07 16:31:29 agc Exp $ */
/*
* Copyright (c) 1991, 1993
@@ -21,11 +21,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -45,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wscons_rinit.c,v 1.4 2001/11/13 06:17:46 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wscons_rinit.c,v 1.5 2003/08/07 16:31:29 agc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/wscons/wscons_rops.c b/sys/dev/wscons/wscons_rops.c
index 7d416d8ee80..7a032d34fb6 100644
--- a/sys/dev/wscons/wscons_rops.c
+++ b/sys/dev/wscons/wscons_rops.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wscons_rops.c,v 1.9 2002/07/04 17:58:02 junyoung Exp $ */
+/* $NetBSD: wscons_rops.c,v 1.10 2003/08/07 16:31:29 agc Exp $ */
/*
* Copyright (c) 1991, 1993
@@ -21,11 +21,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -45,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wscons_rops.c,v 1.9 2002/07/04 17:58:02 junyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wscons_rops.c,v 1.10 2003/08/07 16:31:29 agc Exp $");
#include <sys/param.h>
#include <sys/device.h>
diff --git a/sys/dev/wscons/wsevent.c b/sys/dev/wscons/wsevent.c
index b1568302104..df30808deed 100644
--- a/sys/dev/wscons/wsevent.c
+++ b/sys/dev/wscons/wsevent.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wsevent.c,v 1.15 2003/06/29 22:31:03 fvdl Exp $ */
+/* $NetBSD: wsevent.c,v 1.16 2003/08/07 16:31:29 agc Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@@ -51,11 +51,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -79,7 +75,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsevent.c,v 1.15 2003/06/29 22:31:03 fvdl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsevent.c,v 1.16 2003/08/07 16:31:29 agc Exp $");
#include <sys/param.h>
#include <sys/fcntl.h>
diff --git a/sys/dev/wscons/wseventvar.h b/sys/dev/wscons/wseventvar.h
index ee34a7c79d3..55af835217c 100644
--- a/sys/dev/wscons/wseventvar.h
+++ b/sys/dev/wscons/wseventvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: wseventvar.h,v 1.7 2003/06/29 22:31:04 fvdl Exp $ */
+/* $NetBSD: wseventvar.h,v 1.8 2003/08/07 16:31:29 agc Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@@ -51,11 +51,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/dev/wscons/wskbd.c b/sys/dev/wscons/wskbd.c
index 07cccfd03da..8ad796da7fa 100644
--- a/sys/dev/wscons/wskbd.c
+++ b/sys/dev/wscons/wskbd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wskbd.c,v 1.69 2003/06/29 22:31:04 fvdl Exp $ */
+/* $NetBSD: wskbd.c,v 1.70 2003/08/07 16:31:29 agc Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@@ -54,11 +54,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -83,7 +79,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wskbd.c,v 1.69 2003/06/29 22:31:04 fvdl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wskbd.c,v 1.70 2003/08/07 16:31:29 agc Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
diff --git a/sys/dev/wscons/wsmouse.c b/sys/dev/wscons/wsmouse.c
index 8cc8661e708..341146b29c1 100644
--- a/sys/dev/wscons/wsmouse.c
+++ b/sys/dev/wscons/wsmouse.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wsmouse.c,v 1.31 2003/06/29 22:31:05 fvdl Exp $ */
+/* $NetBSD: wsmouse.c,v 1.32 2003/08/07 16:31:30 agc Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@@ -51,11 +51,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -79,7 +75,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsmouse.c,v 1.31 2003/06/29 22:31:05 fvdl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsmouse.c,v 1.32 2003/08/07 16:31:30 agc Exp $");
#include "wsmouse.h"
#include "wsdisplay.h"
diff --git a/sys/dev/wsfont/gallant12x22.h b/sys/dev/wsfont/gallant12x22.h
index ab21c1cd0ac..b06e995f3c5 100644
--- a/sys/dev/wsfont/gallant12x22.h
+++ b/sys/dev/wsfont/gallant12x22.h
@@ -1,4 +1,4 @@
-/* $NetBSD: gallant12x22.h,v 1.5 2003/02/10 14:28:19 jdolecek Exp $ */
+/* $NetBSD: gallant12x22.h,v 1.6 2003/08/07 16:31:31 agc Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/dev/wsfont/omron12x20.h b/sys/dev/wsfont/omron12x20.h
index 7b770f3d5b0..853f447588a 100644
--- a/sys/dev/wsfont/omron12x20.h
+++ b/sys/dev/wsfont/omron12x20.h
@@ -1,6 +1,5 @@
-/* $NetBSD: omron12x20.h,v 1.3 2003/02/10 14:28:20 jdolecek Exp $ */
+/* $NetBSD: omron12x20.h,v 1.4 2003/08/07 16:31:31 agc Exp $ */
/*
- * Copyright (c) 1992 OMRON Corporation.
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
@@ -15,6 +14,39 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * @(#)font.c 8.1 (Berkeley) 6/10/93
+ */
+
+/*
+ * Copyright (c) 1992 OMRON Corporation.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * OMRON Corporation.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the University of
diff --git a/sys/dev/wsfont/qvss8x15.h b/sys/dev/wsfont/qvss8x15.h
index 254618ad74d..319441407f2 100644
--- a/sys/dev/wsfont/qvss8x15.h
+++ b/sys/dev/wsfont/qvss8x15.h
@@ -1,4 +1,4 @@
-/* $NetBSD: qvss8x15.h,v 1.6 2003/02/10 14:28:20 jdolecek Exp $ */
+/* $NetBSD: qvss8x15.h,v 1.7 2003/08/07 16:31:31 agc Exp $ */
/*-
* Copyright (c) 1982, 1986
@@ -17,11 +17,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/dev/wsfont/sony12x24.h b/sys/dev/wsfont/sony12x24.h
index b30af20a012..4a7539f04c9 100644
--- a/sys/dev/wsfont/sony12x24.h
+++ b/sys/dev/wsfont/sony12x24.h
@@ -1,4 +1,4 @@
-/* $NetBSD: sony12x24.h,v 1.5 2003/02/10 14:28:20 jdolecek Exp $ */
+/* $NetBSD: sony12x24.h,v 1.6 2003/08/07 16:31:32 agc Exp $ */
/*
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -14,11 +14,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/dev/wsfont/sony8x16.h b/sys/dev/wsfont/sony8x16.h
index bcd27ae2034..7c4b743ae2f 100644
--- a/sys/dev/wsfont/sony8x16.h
+++ b/sys/dev/wsfont/sony8x16.h
@@ -1,4 +1,4 @@
-/* $NetBSD: sony8x16.h,v 1.5 2003/02/10 14:28:20 jdolecek Exp $ */
+/* $NetBSD: sony8x16.h,v 1.6 2003/08/07 16:31:33 agc Exp $ */
/*
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -14,11 +14,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*