Source-Changes-HG archive

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

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



details:   https://anonhg.NetBSD.org/src/rev/972718e407fd
branches:  trunk
changeset: 761577:972718e407fd
user:      chuck <chuck%NetBSD.org@localhost>
date:      Tue Feb 01 19:50:03 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/dev/ic/midway.c     |  13 +++----------
 sys/dev/ic/midwayvar.h  |  11 ++---------
 sys/dev/pci/if_en_pci.c |  13 +++----------
 sys/dev/sbus/if_en.c    |  11 ++---------
 4 files changed, 10 insertions(+), 38 deletions(-)

diffs (154 lines):

diff -r 6377770da8fe -r 972718e407fd sys/dev/ic/midway.c
--- a/sys/dev/ic/midway.c       Tue Feb 01 19:40:24 2011 +0000
+++ b/sys/dev/ic/midway.c       Tue Feb 01 19:50:03 2011 +0000
@@ -1,8 +1,7 @@
-/*     $NetBSD: midway.c,v 1.91 2010/04/05 07:19:35 joerg Exp $        */
+/*     $NetBSD: midway.c,v 1.92 2011/02/01 19:50:03 chuck Exp $        */
 /*     (sync'd to midway.c 1.68)       */
 
 /*
- *
  * Copyright (c) 1996 Charles D. Cranor and Washington University.
  * All rights reserved.
  *
@@ -14,12 +13,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 and
- *     Washington University.
- * 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 +30,7 @@
  *
  * m i d w a y . c   e n i 1 5 5   d r i v e r
  *
- * author: Chuck Cranor <chuck%ccrc.wustl.edu@localhost>
+ * author: Chuck Cranor <chuck@netbsd>
  * started: spring, 1996 (written from scratch).
  *
  * notes from the author:
@@ -68,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: midway.c,v 1.91 2010/04/05 07:19:35 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: midway.c,v 1.92 2011/02/01 19:50:03 chuck Exp $");
 
 #include "opt_natm.h"
 
diff -r 6377770da8fe -r 972718e407fd sys/dev/ic/midwayvar.h
--- a/sys/dev/ic/midwayvar.h    Tue Feb 01 19:40:24 2011 +0000
+++ b/sys/dev/ic/midwayvar.h    Tue Feb 01 19:50:03 2011 +0000
@@ -1,7 +1,6 @@
-/*     $NetBSD: midwayvar.h,v 1.16 2005/12/11 12:21:27 christos Exp $  */
+/*     $NetBSD: midwayvar.h,v 1.17 2011/02/01 19:50:03 chuck Exp $     */
 
 /*
- *
  * Copyright (c) 1996 Charles D. Cranor and Washington University.
  * All rights reserved.
  *
@@ -13,12 +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 and
- *     Washington University.
- * 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
@@ -39,7 +32,7 @@
  * it as the first item in their softc.   note that BSD-required
  * "struct device" is in the mid_softc!
  *
- * author: Chuck Cranor <chuck%ccrc.wustl.edu@localhost>
+ * author: Chuck Cranor <chuck@netbsd>
  */
 
 /*
diff -r 6377770da8fe -r 972718e407fd sys/dev/pci/if_en_pci.c
--- a/sys/dev/pci/if_en_pci.c   Tue Feb 01 19:40:24 2011 +0000
+++ b/sys/dev/pci/if_en_pci.c   Tue Feb 01 19:50:03 2011 +0000
@@ -1,7 +1,6 @@
-/*     $NetBSD: if_en_pci.c,v 1.33 2009/11/26 15:17:09 njoly Exp $     */
+/*     $NetBSD: if_en_pci.c,v 1.34 2011/02/01 19:50:03 chuck Exp $     */
 
 /*
- *
  * Copyright (c) 1996 Charles D. Cranor and Washington University.
  * All rights reserved.
  *
@@ -13,12 +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 and
- *     Washington University.
- * 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
@@ -36,14 +29,14 @@
  *
  * i f _ e n _ p c i . c
  *
- * author: Chuck Cranor <chuck%ccrc.wustl.edu@localhost>
+ * author: Chuck Cranor <chuck@netbsd>
  * started: spring, 1996.
  *
  * PCI glue for the eni155p card.
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_en_pci.c,v 1.33 2009/11/26 15:17:09 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_en_pci.c,v 1.34 2011/02/01 19:50:03 chuck Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff -r 6377770da8fe -r 972718e407fd sys/dev/sbus/if_en.c
--- a/sys/dev/sbus/if_en.c      Tue Feb 01 19:40:24 2011 +0000
+++ b/sys/dev/sbus/if_en.c      Tue Feb 01 19:50:03 2011 +0000
@@ -1,7 +1,6 @@
-/*     $NetBSD: if_en.c,v 1.27 2009/09/18 12:23:16 tsutsui Exp $       */
+/*     $NetBSD: if_en.c,v 1.28 2011/02/01 19:50:04 chuck Exp $ */
 
 /*
- *
  * Copyright (c) 1996 Charles D. Cranor and Washington University.
  * All rights reserved.
  *
@@ -13,12 +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 and
- *     Washington University.
- * 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
@@ -43,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_en.c,v 1.27 2009/09/18 12:23:16 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_en.c,v 1.28 2011/02/01 19:50:04 chuck Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>



Home | Main Index | Thread Index | Old Index