Module Name: src
Committed By: snj
Date: Sun Nov 1 01:51:35 UTC 2009
Modified Files:
src/sys/arch/mac68k/dev: adb.c adbsys.c adbsysasm.s adbvar.h aed.c
aedvar.h
src/sys/arch/mac68k/mac68k: macrom.c macrom.h macromasm.s
src/sys/arch/macppc/dev: adb.c adbvar.h aed.c aedvar.h
Log Message:
Drop 3rd and 4th clauses. Approved by Brad Grantham (copyright holder).
To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/mac68k/dev/adb.c
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/mac68k/dev/adbsys.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/mac68k/dev/adbsysasm.s
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/mac68k/dev/adbvar.h
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/mac68k/dev/aed.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/mac68k/dev/aedvar.h
cvs rdiff -u -r1.70 -r1.71 src/sys/arch/mac68k/mac68k/macrom.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/mac68k/mac68k/macrom.h
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/mac68k/mac68k/macromasm.s
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/macppc/dev/adb.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/macppc/dev/adbvar.h
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/macppc/dev/aed.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/macppc/dev/aedvar.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/arch/mac68k/dev/adb.c
diff -u src/sys/arch/mac68k/dev/adb.c:1.52 src/sys/arch/mac68k/dev/adb.c:1.53
--- src/sys/arch/mac68k/dev/adb.c:1.52 Thu Apr 3 05:03:23 2008
+++ src/sys/arch/mac68k/dev/adb.c Sun Nov 1 01:51:35 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: adb.c,v 1.52 2008/04/03 05:03:23 scottr Exp $ */
+/* $NetBSD: adb.c,v 1.53 2009/11/01 01:51:35 snj Exp $ */
/*
* Copyright (C) 1994 Bradley A. Grantham
@@ -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 Bradley A. Grantham.
- * 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
@@ -31,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adb.c,v 1.52 2008/04/03 05:03:23 scottr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adb.c,v 1.53 2009/11/01 01:51:35 snj Exp $");
#include "opt_adb.h"
Index: src/sys/arch/mac68k/dev/adbsys.c
diff -u src/sys/arch/mac68k/dev/adbsys.c:1.47 src/sys/arch/mac68k/dev/adbsys.c:1.48
--- src/sys/arch/mac68k/dev/adbsys.c:1.47 Sun Mar 4 06:00:06 2007
+++ src/sys/arch/mac68k/dev/adbsys.c Sun Nov 1 01:51:35 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: adbsys.c,v 1.47 2007/03/04 06:00:06 christos Exp $ */
+/* $NetBSD: adbsys.c,v 1.48 2009/11/01 01:51:35 snj Exp $ */
/*-
* Copyright (C) 1994 Bradley A. Grantham
@@ -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 Bradley A. Grantham.
- * 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
@@ -31,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adbsys.c,v 1.47 2007/03/04 06:00:06 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adbsys.c,v 1.48 2009/11/01 01:51:35 snj Exp $");
#include "opt_adb.h"
Index: src/sys/arch/mac68k/dev/adbsysasm.s
diff -u src/sys/arch/mac68k/dev/adbsysasm.s:1.11 src/sys/arch/mac68k/dev/adbsysasm.s:1.12
--- src/sys/arch/mac68k/dev/adbsysasm.s:1.11 Tue Nov 20 03:19:42 2001
+++ src/sys/arch/mac68k/dev/adbsysasm.s Sun Nov 1 01:51:35 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: adbsysasm.s,v 1.11 2001/11/20 03:19:42 chs Exp $ */
+/* $NetBSD: adbsysasm.s,v 1.12 2009/11/01 01:51:35 snj Exp $ */
/*-
* Copyright (C) 1994 Bradley A. Grantham
@@ -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 Bradley A. Grantham.
- * 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
Index: src/sys/arch/mac68k/dev/adbvar.h
diff -u src/sys/arch/mac68k/dev/adbvar.h:1.25 src/sys/arch/mac68k/dev/adbvar.h:1.26
--- src/sys/arch/mac68k/dev/adbvar.h:1.25 Thu Apr 3 05:03:23 2008
+++ src/sys/arch/mac68k/dev/adbvar.h Sun Nov 1 01:51:35 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: adbvar.h,v 1.25 2008/04/03 05:03:23 scottr Exp $ */
+/* $NetBSD: adbvar.h,v 1.26 2009/11/01 01:51:35 snj Exp $ */
/*
* Copyright (C) 1994 Bradley A. Grantham
@@ -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 Bradley A. Grantham.
- * 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
Index: src/sys/arch/mac68k/dev/aed.c
diff -u src/sys/arch/mac68k/dev/aed.c:1.28 src/sys/arch/mac68k/dev/aed.c:1.29
--- src/sys/arch/mac68k/dev/aed.c:1.28 Wed Jun 11 23:54:45 2008
+++ src/sys/arch/mac68k/dev/aed.c Sun Nov 1 01:51:35 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: aed.c,v 1.28 2008/06/11 23:54:45 cegger Exp $ */
+/* $NetBSD: aed.c,v 1.29 2009/11/01 01:51:35 snj Exp $ */
/*
* Copyright (C) 1994 Bradley A. Grantham
@@ -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 Bradley A. Grantham.
- * 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
@@ -31,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aed.c,v 1.28 2008/06/11 23:54:45 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aed.c,v 1.29 2009/11/01 01:51:35 snj Exp $");
#include "opt_adb.h"
Index: src/sys/arch/mac68k/dev/aedvar.h
diff -u src/sys/arch/mac68k/dev/aedvar.h:1.7 src/sys/arch/mac68k/dev/aedvar.h:1.8
--- src/sys/arch/mac68k/dev/aedvar.h:1.7 Sun Dec 11 12:18:02 2005
+++ src/sys/arch/mac68k/dev/aedvar.h Sun Nov 1 01:51:35 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: aedvar.h,v 1.7 2005/12/11 12:18:02 christos Exp $ */
+/* $NetBSD: aedvar.h,v 1.8 2009/11/01 01:51:35 snj Exp $ */
/*
* Copyright (C) 1994 Bradley A. Grantham
@@ -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 Bradley A. Grantham.
- * 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
Index: src/sys/arch/mac68k/mac68k/macrom.c
diff -u src/sys/arch/mac68k/mac68k/macrom.c:1.70 src/sys/arch/mac68k/mac68k/macrom.c:1.71
--- src/sys/arch/mac68k/mac68k/macrom.c:1.70 Wed Mar 18 22:13:05 2009
+++ src/sys/arch/mac68k/mac68k/macrom.c Sun Nov 1 01:51:35 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: macrom.c,v 1.70 2009/03/18 22:13:05 he Exp $ */
+/* $NetBSD: macrom.c,v 1.71 2009/11/01 01:51:35 snj Exp $ */
/*-
* Copyright (C) 1994 Bradley A. Grantham
@@ -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 Bradley A. Grantham.
- * 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
@@ -46,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: macrom.c,v 1.70 2009/03/18 22:13:05 he Exp $");
+__KERNEL_RCSID(0, "$NetBSD: macrom.c,v 1.71 2009/11/01 01:51:35 snj Exp $");
#include "opt_adb.h"
#include "opt_ddb.h"
Index: src/sys/arch/mac68k/mac68k/macrom.h
diff -u src/sys/arch/mac68k/mac68k/macrom.h:1.18 src/sys/arch/mac68k/mac68k/macrom.h:1.19
--- src/sys/arch/mac68k/mac68k/macrom.h:1.18 Sun Mar 4 06:00:08 2007
+++ src/sys/arch/mac68k/mac68k/macrom.h Sun Nov 1 01:51:35 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: macrom.h,v 1.18 2007/03/04 06:00:08 christos Exp $ */
+/* $NetBSD: macrom.h,v 1.19 2009/11/01 01:51:35 snj Exp $ */
/*-
* Copyright (C) 1994 Bradley A. Grantham
@@ -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 Bradley A. Grantham.
- * 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
Index: src/sys/arch/mac68k/mac68k/macromasm.s
diff -u src/sys/arch/mac68k/mac68k/macromasm.s:1.21 src/sys/arch/mac68k/mac68k/macromasm.s:1.22
--- src/sys/arch/mac68k/mac68k/macromasm.s:1.21 Sun Mar 4 06:00:08 2007
+++ src/sys/arch/mac68k/mac68k/macromasm.s Sun Nov 1 01:51:35 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: macromasm.s,v 1.21 2007/03/04 06:00:08 christos Exp $ */
+/* $NetBSD: macromasm.s,v 1.22 2009/11/01 01:51:35 snj Exp $ */
/*-
* Copyright (C) 1994 Bradley A. Grantham
@@ -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 Bradley A. Grantham.
- * 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
Index: src/sys/arch/macppc/dev/adb.c
diff -u src/sys/arch/macppc/dev/adb.c:1.27 src/sys/arch/macppc/dev/adb.c:1.28
--- src/sys/arch/macppc/dev/adb.c:1.27 Sat Mar 14 21:04:11 2009
+++ src/sys/arch/macppc/dev/adb.c Sun Nov 1 01:51:35 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: adb.c,v 1.27 2009/03/14 21:04:11 dsl Exp $ */
+/* $NetBSD: adb.c,v 1.28 2009/11/01 01:51:35 snj Exp $ */
/*-
* Copyright (C) 1994 Bradley A. Grantham
@@ -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 Bradley A. Grantham.
- * 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
@@ -31,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adb.c,v 1.27 2009/03/14 21:04:11 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adb.c,v 1.28 2009/11/01 01:51:35 snj Exp $");
#include <sys/param.h>
#include <sys/device.h>
Index: src/sys/arch/macppc/dev/adbvar.h
diff -u src/sys/arch/macppc/dev/adbvar.h:1.13 src/sys/arch/macppc/dev/adbvar.h:1.14
--- src/sys/arch/macppc/dev/adbvar.h:1.13 Sat Mar 14 14:46:01 2009
+++ src/sys/arch/macppc/dev/adbvar.h Sun Nov 1 01:51:35 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: adbvar.h,v 1.13 2009/03/14 14:46:01 dsl Exp $ */
+/* $NetBSD: adbvar.h,v 1.14 2009/11/01 01:51:35 snj Exp $ */
/*-
* Copyright (C) 1994 Bradley A. Grantham
@@ -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 Bradley A. Grantham.
- * 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
Index: src/sys/arch/macppc/dev/aed.c
diff -u src/sys/arch/macppc/dev/aed.c:1.24 src/sys/arch/macppc/dev/aed.c:1.25
--- src/sys/arch/macppc/dev/aed.c:1.24 Sat Mar 14 21:04:11 2009
+++ src/sys/arch/macppc/dev/aed.c Sun Nov 1 01:51:35 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: aed.c,v 1.24 2009/03/14 21:04:11 dsl Exp $ */
+/* $NetBSD: aed.c,v 1.25 2009/11/01 01:51:35 snj Exp $ */
/*
* Copyright (C) 1994 Bradley A. Grantham
@@ -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 Bradley A. Grantham.
- * 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
@@ -31,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aed.c,v 1.24 2009/03/14 21:04:11 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aed.c,v 1.25 2009/11/01 01:51:35 snj Exp $");
#include <sys/param.h>
#include <sys/device.h>
Index: src/sys/arch/macppc/dev/aedvar.h
diff -u src/sys/arch/macppc/dev/aedvar.h:1.4 src/sys/arch/macppc/dev/aedvar.h:1.5
--- src/sys/arch/macppc/dev/aedvar.h:1.4 Sat Mar 14 14:46:01 2009
+++ src/sys/arch/macppc/dev/aedvar.h Sun Nov 1 01:51:35 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: aedvar.h,v 1.4 2009/03/14 14:46:01 dsl Exp $ */
+/* $NetBSD: aedvar.h,v 1.5 2009/11/01 01:51:35 snj Exp $ */
/*
* Copyright (C) 1994 Bradley A. Grantham
@@ -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 Bradley A. Grantham.
- * 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
