Module Name: src
Committed By: chuck
Date: Tue Feb 1 19:50:04 UTC 2011
Modified Files:
src/sys/dev/ic: midway.c midwayvar.h
src/sys/dev/pci: if_en_pci.c
src/sys/dev/sbus: if_en.c
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.91 -r1.92 src/sys/dev/ic/midway.c
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/ic/midwayvar.h
cvs rdiff -u -r1.33 -r1.34 src/sys/dev/pci/if_en_pci.c
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/sbus/if_en.c
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/ic/midway.c
diff -u src/sys/dev/ic/midway.c:1.91 src/sys/dev/ic/midway.c:1.92
--- src/sys/dev/ic/midway.c:1.91 Mon Apr 5 07:19:35 2010
+++ src/sys/dev/ic/midway.c Tue Feb 1 19:50:03 2011
@@ -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 <[email protected]>
+ * 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"
Index: src/sys/dev/ic/midwayvar.h
diff -u src/sys/dev/ic/midwayvar.h:1.16 src/sys/dev/ic/midwayvar.h:1.17
--- src/sys/dev/ic/midwayvar.h:1.16 Sun Dec 11 12:21:27 2005
+++ src/sys/dev/ic/midwayvar.h Tue Feb 1 19:50:03 2011
@@ -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 <[email protected]>
+ * author: Chuck Cranor <chuck@netbsd>
*/
/*
Index: src/sys/dev/pci/if_en_pci.c
diff -u src/sys/dev/pci/if_en_pci.c:1.33 src/sys/dev/pci/if_en_pci.c:1.34
--- src/sys/dev/pci/if_en_pci.c:1.33 Thu Nov 26 15:17:09 2009
+++ src/sys/dev/pci/if_en_pci.c Tue Feb 1 19:50:03 2011
@@ -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 <[email protected]>
+ * 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>
Index: src/sys/dev/sbus/if_en.c
diff -u src/sys/dev/sbus/if_en.c:1.27 src/sys/dev/sbus/if_en.c:1.28
--- src/sys/dev/sbus/if_en.c:1.27 Fri Sep 18 12:23:16 2009
+++ src/sys/dev/sbus/if_en.c Tue Feb 1 19:50:04 2011
@@ -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>
