Module Name:    src
Committed By:   chuck
Date:           Tue Feb  1 19:36:24 UTC 2011

Modified Files:
        src/sys/dev/vme: if_ie_vme.c xd.c xdreg.h xdvar.h xio.h xy.c xyreg.h
            xyvar.h

Log Message:
udpate license clauses on my code to match the new-style BSD licenses.
remove no-longer-valid wustl email address for me.
based on diff that rmind@ sent me.

no functional change with this commit.


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/vme/if_ie_vme.c
cvs rdiff -u -r1.86 -r1.87 src/sys/dev/vme/xd.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/vme/xdreg.h src/sys/dev/vme/xyreg.h
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/vme/xdvar.h
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/vme/xio.h
cvs rdiff -u -r1.90 -r1.91 src/sys/dev/vme/xy.c
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/vme/xyvar.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/vme/if_ie_vme.c
diff -u src/sys/dev/vme/if_ie_vme.c:1.28 src/sys/dev/vme/if_ie_vme.c:1.29
--- src/sys/dev/vme/if_ie_vme.c:1.28	Fri Jan 22 16:12:41 2010
+++ src/sys/dev/vme/if_ie_vme.c	Tue Feb  1 19:36:24 2011
@@ -1,6 +1,6 @@
-/*	$NetBSD: if_ie_vme.c,v 1.28 2010/01/22 16:12:41 martin Exp $	*/
+/*	$NetBSD: if_ie_vme.c,v 1.29 2011/02/01 19:36:24 chuck Exp $	*/
 
-/*-
+/*
  * Copyright (c) 1995 Charles D. Cranor
  * All rights reserved.
  *
@@ -12,11 +12,6 @@
  * 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 Charles D. Cranor.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -145,7 +140,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ie_vme.c,v 1.28 2010/01/22 16:12:41 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ie_vme.c,v 1.29 2011/02/01 19:36:24 chuck Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>

Index: src/sys/dev/vme/xd.c
diff -u src/sys/dev/vme/xd.c:1.86 src/sys/dev/vme/xd.c:1.87
--- src/sys/dev/vme/xd.c:1.86	Tue May 12 14:47:27 2009
+++ src/sys/dev/vme/xd.c	Tue Feb  1 19:36:24 2011
@@ -1,7 +1,6 @@
-/*	$NetBSD: xd.c,v 1.86 2009/05/12 14:47:27 cegger Exp $	*/
+/*	$NetBSD: xd.c,v 1.87 2011/02/01 19:36:24 chuck Exp $	*/
 
 /*
- *
  * Copyright (c) 1995 Charles D. Cranor
  * All rights reserved.
  *
@@ -13,11 +12,6 @@
  * 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 Charles D. Cranor.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -35,7 +29,7 @@
  *
  * x d . c   x y l o g i c s   7 5 3 / 7 0 5 3   v m e / s m d   d r i v e r
  *
- * author: Chuck Cranor <[email protected]>
+ * author: Chuck Cranor <chuck@netbsd>
  * started: 27-Feb-95
  * references: [1] Xylogics Model 753 User's Manual
  *                 part number: 166-753-001, Revision B, May 21, 1988.
@@ -51,7 +45,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xd.c,v 1.86 2009/05/12 14:47:27 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xd.c,v 1.87 2011/02/01 19:36:24 chuck Exp $");
 
 #undef XDC_DEBUG		/* full debug */
 #define XDC_DIAG		/* extra sanity checks */

Index: src/sys/dev/vme/xdreg.h
diff -u src/sys/dev/vme/xdreg.h:1.6 src/sys/dev/vme/xdreg.h:1.7
--- src/sys/dev/vme/xdreg.h:1.6	Sun Aug 27 19:18:08 2006
+++ src/sys/dev/vme/xdreg.h	Tue Feb  1 19:36:24 2011
@@ -1,7 +1,6 @@
-/*	$NetBSD: xdreg.h,v 1.6 2006/08/27 19:18:08 christos Exp $	*/
+/*	$NetBSD: xdreg.h,v 1.7 2011/02/01 19:36:24 chuck Exp $	*/
 
 /*
- *
  * Copyright (c) 1995 Charles D. Cranor
  * All rights reserved.
  *
@@ -13,11 +12,6 @@
  * 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 Charles D. Cranor.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -37,7 +31,7 @@
  * this file contains the description of the Xylogics 753/7053's hardware
  * data structures.
  *
- * author: Chuck Cranor <[email protected]>
+ * author: Chuck Cranor <chuck@netbsd>
  */
 
 #define XDC_MAXDEV    4       /* max devices per controller */
Index: src/sys/dev/vme/xyreg.h
diff -u src/sys/dev/vme/xyreg.h:1.6 src/sys/dev/vme/xyreg.h:1.7
--- src/sys/dev/vme/xyreg.h:1.6	Sun Aug 27 19:18:08 2006
+++ src/sys/dev/vme/xyreg.h	Tue Feb  1 19:36:24 2011
@@ -1,7 +1,6 @@
-/*	$NetBSD: xyreg.h,v 1.6 2006/08/27 19:18:08 christos Exp $	*/
+/*	$NetBSD: xyreg.h,v 1.7 2011/02/01 19:36:24 chuck Exp $	*/
 
 /*
- *
  * Copyright (c) 1995 Charles D. Cranor
  * All rights reserved.
  *
@@ -13,11 +12,6 @@
  * 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 Charles D. Cranor.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -37,7 +31,7 @@
  * this file contains the description of the Xylogics 450/451's hardware
  * data structures.
  *
- * author: Chuck Cranor <[email protected]>
+ * author: Chuck Cranor <chuck@netbsd>
  */
 
 #define XYC_MAXDEV	2		/* max devices per controller */

Index: src/sys/dev/vme/xdvar.h
diff -u src/sys/dev/vme/xdvar.h:1.11 src/sys/dev/vme/xdvar.h:1.12
--- src/sys/dev/vme/xdvar.h:1.11	Sun Aug 27 19:18:08 2006
+++ src/sys/dev/vme/xdvar.h	Tue Feb  1 19:36:24 2011
@@ -1,7 +1,6 @@
-/*	$NetBSD: xdvar.h,v 1.11 2006/08/27 19:18:08 christos Exp $	*/
+/*	$NetBSD: xdvar.h,v 1.12 2011/02/01 19:36:24 chuck Exp $	*/
 
 /*
- *
  * Copyright (c) 1995 Charles D. Cranor
  * All rights reserved.
  *
@@ -13,11 +12,6 @@
  * 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 Charles D. Cranor.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -37,7 +31,7 @@
  * this file defines the software structure we use to control the
  * 753/7053.
  *
- * author: Chuck Cranor <[email protected]>
+ * author: Chuck Cranor <chuck@netbsd>
  */
 
 #include <sys/callout.h>

Index: src/sys/dev/vme/xio.h
diff -u src/sys/dev/vme/xio.h:1.4 src/sys/dev/vme/xio.h:1.5
--- src/sys/dev/vme/xio.h:1.4	Sun Mar  4 06:02:51 2007
+++ src/sys/dev/vme/xio.h	Tue Feb  1 19:36:24 2011
@@ -1,7 +1,6 @@
-/* $NetBSD: xio.h,v 1.4 2007/03/04 06:02:51 christos Exp $ */
+/* $NetBSD: xio.h,v 1.5 2011/02/01 19:36:24 chuck Exp $ */
 
 /*
- *
  * Copyright (c) 1995 Charles D. Cranor
  * All rights reserved.
  *
@@ -13,11 +12,6 @@
  * 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 Charles D. Cranor.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -38,7 +32,7 @@
  * 753/7053.   this interface isn't set in stone and may (or may not)
  * need adjustment.
  *
- * author: Chuck Cranor <[email protected]>
+ * author: Chuck Cranor <chuck@netbsd>
  */
 
 /*

Index: src/sys/dev/vme/xy.c
diff -u src/sys/dev/vme/xy.c:1.90 src/sys/dev/vme/xy.c:1.91
--- src/sys/dev/vme/xy.c:1.90	Tue May 12 14:47:27 2009
+++ src/sys/dev/vme/xy.c	Tue Feb  1 19:36:24 2011
@@ -1,7 +1,6 @@
-/*	$NetBSD: xy.c,v 1.90 2009/05/12 14:47:27 cegger Exp $	*/
+/*	$NetBSD: xy.c,v 1.91 2011/02/01 19:36:24 chuck Exp $	*/
 
 /*
- *
  * Copyright (c) 1995 Charles D. Cranor
  * All rights reserved.
  *
@@ -13,11 +12,6 @@
  * 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 Charles D. Cranor.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -35,7 +29,7 @@
  *
  * x y . c   x y l o g i c s   4 5 0 / 4 5 1   s m d   d r i v e r
  *
- * author: Chuck Cranor <[email protected]>
+ * author: Chuck Cranor <chuck@netbsd>
  * started: 14-Sep-95
  * references: [1] Xylogics Model 753 User's Manual
  *                 part number: 166-753-001, Revision B, May 21, 1988.
@@ -51,7 +45,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xy.c,v 1.90 2009/05/12 14:47:27 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xy.c,v 1.91 2011/02/01 19:36:24 chuck Exp $");
 
 #undef XYC_DEBUG		/* full debug */
 #undef XYC_DIAG			/* extra sanity checks */

Index: src/sys/dev/vme/xyvar.h
diff -u src/sys/dev/vme/xyvar.h:1.12 src/sys/dev/vme/xyvar.h:1.13
--- src/sys/dev/vme/xyvar.h:1.12	Sun Aug 27 19:18:08 2006
+++ src/sys/dev/vme/xyvar.h	Tue Feb  1 19:36:24 2011
@@ -1,7 +1,6 @@
-/*	$NetBSD: xyvar.h,v 1.12 2006/08/27 19:18:08 christos Exp $	*/
+/*	$NetBSD: xyvar.h,v 1.13 2011/02/01 19:36:24 chuck Exp $	*/
 
 /*
- *
  * Copyright (c) 1995 Charles D. Cranor
  * All rights reserved.
  *
@@ -13,11 +12,6 @@
  * 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 Charles D. Cranor.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -37,7 +31,7 @@
  * this file defines the software structure we use to control the
  * 450/451.
  *
- * author: Chuck Cranor <[email protected]>
+ * author: Chuck Cranor <chuck@netbsd>
  */
 
 #include <sys/callout.h>

Reply via email to