Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch udpate license clauses on my code to match the new-...



details:   https://anonhg.NetBSD.org/src/rev/1013823b260f
branches:  trunk
changeset: 761580:1013823b260f
user:      chuck <chuck%NetBSD.org@localhost>
date:      Tue Feb 01 20:19:31 2011 +0000

description:
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.

diffstat:

 sys/arch/mvme68k/dev/pcc.c           |  11 +++--------
 sys/arch/mvme68k/dev/pccreg.h        |   8 +-------
 sys/arch/mvme68k/include/autoconf.h  |   8 +-------
 sys/arch/mvme68k/stand/sboot/start.s |   7 +------
 sys/arch/sparc/dev/if_ie_obio.c      |  11 +++--------
 sys/arch/sun2/dev/if_ie_mbmem.c      |  11 +++--------
 sys/arch/sun2/dev/if_ie_obio.c       |   9 ++-------
 sys/arch/sun3/dev/xd.c               |  12 +++---------
 sys/arch/sun3/dev/xdreg.h            |  10 ++--------
 sys/arch/sun3/dev/xdvar.h            |  10 ++--------
 sys/arch/sun3/dev/xio.h              |  10 ++--------
 sys/arch/sun3/dev/xy.c               |  12 +++---------
 sys/arch/sun3/dev/xyreg.h            |  10 ++--------
 sys/arch/sun3/dev/xyvar.h            |  10 ++--------
 sys/arch/x86/include/pmap.h          |   9 +--------
 sys/arch/x86/x86/pmap.c              |  11 ++---------
 16 files changed, 33 insertions(+), 126 deletions(-)

diffs (truncated from 518 to 300 lines):

diff -r c8bc761d9d26 -r 1013823b260f sys/arch/mvme68k/dev/pcc.c
--- a/sys/arch/mvme68k/dev/pcc.c        Tue Feb 01 20:09:08 2011 +0000
+++ b/sys/arch/mvme68k/dev/pcc.c        Tue Feb 01 20:19:31 2011 +0000
@@ -1,6 +1,6 @@
-/*     $NetBSD: pcc.c,v 1.30 2008/04/28 20:23:29 martin Exp $  */
+/*     $NetBSD: pcc.c,v 1.31 2011/02/01 20:19:31 chuck Exp $   */
 
-/*-
+/*
  * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
  * All rights reserved.
  *
@@ -41,11 +41,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
@@ -64,7 +59,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcc.c,v 1.30 2008/04/28 20:23:29 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcc.c,v 1.31 2011/02/01 20:19:31 chuck Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff -r c8bc761d9d26 -r 1013823b260f sys/arch/mvme68k/dev/pccreg.h
--- a/sys/arch/mvme68k/dev/pccreg.h     Tue Feb 01 20:09:08 2011 +0000
+++ b/sys/arch/mvme68k/dev/pccreg.h     Tue Feb 01 20:19:31 2011 +0000
@@ -1,7 +1,6 @@
-/*     $NetBSD: pccreg.h,v 1.10 2008/01/07 14:39:28 tsutsui Exp $      */
+/*     $NetBSD: pccreg.h,v 1.11 2011/02/01 20:19:31 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
diff -r c8bc761d9d26 -r 1013823b260f sys/arch/mvme68k/include/autoconf.h
--- a/sys/arch/mvme68k/include/autoconf.h       Tue Feb 01 20:09:08 2011 +0000
+++ b/sys/arch/mvme68k/include/autoconf.h       Tue Feb 01 20:19:31 2011 +0000
@@ -1,7 +1,6 @@
-/*     $NetBSD: autoconf.h,v 1.7 2005/12/11 12:18:17 christos Exp $    */
+/*     $NetBSD: autoconf.h,v 1.8 2011/02/01 20:19:31 chuck Exp $       */
 
 /*
- *
  * Copyright (c) 1996 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
diff -r c8bc761d9d26 -r 1013823b260f sys/arch/mvme68k/stand/sboot/start.s
--- a/sys/arch/mvme68k/stand/sboot/start.s      Tue Feb 01 20:09:08 2011 +0000
+++ b/sys/arch/mvme68k/stand/sboot/start.s      Tue Feb 01 20:19:31 2011 +0000
@@ -1,5 +1,5 @@
 /*
- * $NetBSD: start.s,v 1.7 2000/12/04 20:31:16 scw Exp $
+ * $NetBSD: start.s,v 1.8 2011/02/01 20:19:31 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
diff -r c8bc761d9d26 -r 1013823b260f sys/arch/sparc/dev/if_ie_obio.c
--- a/sys/arch/sparc/dev/if_ie_obio.c   Tue Feb 01 20:09:08 2011 +0000
+++ b/sys/arch/sparc/dev/if_ie_obio.c   Tue Feb 01 20:19:31 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_ie_obio.c,v 1.37 2009/09/20 16:18:21 tsutsui Exp $  */
+/*     $NetBSD: if_ie_obio.c,v 1.38 2011/02/01 20:19:31 chuck Exp $    */
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-/*-
+/*
  * Copyright (c) 1995 Charles D. Cranor
  * All rights reserved.
  *
@@ -41,11 +41,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
@@ -78,7 +73,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ie_obio.c,v 1.37 2009/09/20 16:18:21 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ie_obio.c,v 1.38 2011/02/01 20:19:31 chuck Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff -r c8bc761d9d26 -r 1013823b260f sys/arch/sun2/dev/if_ie_mbmem.c
--- a/sys/arch/sun2/dev/if_ie_mbmem.c   Tue Feb 01 20:09:08 2011 +0000
+++ b/sys/arch/sun2/dev/if_ie_mbmem.c   Tue Feb 01 20:19:31 2011 +0000
@@ -1,6 +1,6 @@
-/*     $NetBSD: if_ie_mbmem.c,v 1.9 2005/12/11 12:19:16 christos Exp $ */
+/*     $NetBSD: if_ie_mbmem.c,v 1.10 2011/02/01 20:19:31 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_mbmem.c,v 1.9 2005/12/11 12:19:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ie_mbmem.c,v 1.10 2011/02/01 20:19:31 chuck Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff -r c8bc761d9d26 -r 1013823b260f sys/arch/sun2/dev/if_ie_obio.c
--- a/sys/arch/sun2/dev/if_ie_obio.c    Tue Feb 01 20:09:08 2011 +0000
+++ b/sys/arch/sun2/dev/if_ie_obio.c    Tue Feb 01 20:19:31 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_ie_obio.c,v 1.13 2008/04/28 20:23:37 martin Exp $   */
+/*     $NetBSD: if_ie_obio.c,v 1.14 2011/02/01 20:19:31 chuck Exp $    */
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -41,11 +41,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
@@ -78,7 +73,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ie_obio.c,v 1.13 2008/04/28 20:23:37 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ie_obio.c,v 1.14 2011/02/01 20:19:31 chuck Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff -r c8bc761d9d26 -r 1013823b260f sys/arch/sun3/dev/xd.c
--- a/sys/arch/sun3/dev/xd.c    Tue Feb 01 20:09:08 2011 +0000
+++ b/sys/arch/sun3/dev/xd.c    Tue Feb 01 20:19:31 2011 +0000
@@ -1,7 +1,6 @@
-/*     $NetBSD: xd.c,v 1.67 2009/01/13 13:35:52 yamt Exp $     */
+/*     $NetBSD: xd.c,v 1.68 2011/02/01 20:19:32 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 <chuck%ccrc.wustl.edu@localhost>
+ * author: Chuck Cranor <chuck@netbsd>
  * id: &Id: xd.c,v 1.9 1995/09/25 20:12:44 chuck Exp &
  * started: 27-Feb-95
  * references: [1] Xylogics Model 753 User's Manual
@@ -52,7 +46,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xd.c,v 1.67 2009/01/13 13:35:52 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xd.c,v 1.68 2011/02/01 20:19:32 chuck Exp $");
 
 #undef XDC_DEBUG               /* full debug */
 #define XDC_DIAG               /* extra sanity checks */
diff -r c8bc761d9d26 -r 1013823b260f sys/arch/sun3/dev/xdreg.h
--- a/sys/arch/sun3/dev/xdreg.h Tue Feb 01 20:09:08 2011 +0000
+++ b/sys/arch/sun3/dev/xdreg.h Tue Feb 01 20:19:31 2011 +0000
@@ -1,7 +1,6 @@
-/*     $NetBSD: xdreg.h,v 1.6 2005/12/11 12:19:20 christos Exp $       */
+/*     $NetBSD: xdreg.h,v 1.7 2011/02/01 20:19:32 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 <chuck%ccrc.wustl.edu@localhost>
+ * author: Chuck Cranor <chuck@netbsd>
  */
 
 #define XDC_MAXDEV    4       /* max devices per controller */
diff -r c8bc761d9d26 -r 1013823b260f sys/arch/sun3/dev/xdvar.h
--- a/sys/arch/sun3/dev/xdvar.h Tue Feb 01 20:09:08 2011 +0000
+++ b/sys/arch/sun3/dev/xdvar.h Tue Feb 01 20:19:31 2011 +0000
@@ -1,7 +1,6 @@
-/*     $NetBSD: xdvar.h,v 1.11 2008/06/28 12:13:38 tsutsui Exp $       */
+/*     $NetBSD: xdvar.h,v 1.12 2011/02/01 20:19:32 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



Home | Main Index | Thread Index | Old Index