Module Name: src Committed By: cliff Date: Tue Jul 19 20:52:10 UTC 2011
Modified Files: src/sys/arch/powerpc/booke/dev: pq3cfi.c src/sys/dev/nor: cfi.c cfi_0002.c cfi_0002.h Log Message: add TNF copyright To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/powerpc/booke/dev/pq3cfi.c cvs rdiff -u -r1.2 -r1.3 src/sys/dev/nor/cfi.c src/sys/dev/nor/cfi_0002.c cvs rdiff -u -r1.1 -r1.2 src/sys/dev/nor/cfi_0002.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/powerpc/booke/dev/pq3cfi.c diff -u src/sys/arch/powerpc/booke/dev/pq3cfi.c:1.2 src/sys/arch/powerpc/booke/dev/pq3cfi.c:1.3 --- src/sys/arch/powerpc/booke/dev/pq3cfi.c:1.2 Sun Jul 17 23:08:56 2011 +++ src/sys/arch/powerpc/booke/dev/pq3cfi.c Tue Jul 19 20:52:10 2011 @@ -1,4 +1,32 @@ -/* $NetBSD: pq3cfi.c,v 1.2 2011/07/17 23:08:56 dyoung Exp $ */ +/* $NetBSD: pq3cfi.c,v 1.3 2011/07/19 20:52:10 cliff Exp $ */ +/*- + * Copyright (c) 2011 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Cliff Neighbors. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 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. + * + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ /* * NOR CFI driver support for booke @@ -8,7 +36,7 @@ #include "locators.h" #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pq3cfi.c,v 1.2 2011/07/17 23:08:56 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pq3cfi.c,v 1.3 2011/07/19 20:52:10 cliff Exp $"); #include <sys/param.h> #include <sys/systm.h> Index: src/sys/dev/nor/cfi.c diff -u src/sys/dev/nor/cfi.c:1.2 src/sys/dev/nor/cfi.c:1.3 --- src/sys/dev/nor/cfi.c:1.2 Sun Jul 17 00:52:42 2011 +++ src/sys/dev/nor/cfi.c Tue Jul 19 20:52:10 2011 @@ -1,10 +1,38 @@ -/* $NetBSD: cfi.c,v 1.2 2011/07/17 00:52:42 dyoung Exp $ */ +/* $NetBSD: cfi.c,v 1.3 2011/07/19 20:52:10 cliff Exp $ */ +/*- + * Copyright (c) 2011 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Cliff Neighbors. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 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. + * + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ #include "opt_nor.h" #include "opt_flash.h" #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cfi.c,v 1.2 2011/07/17 00:52:42 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cfi.c,v 1.3 2011/07/19 20:52:10 cliff Exp $"); #include <sys/param.h> #include <sys/systm.h> Index: src/sys/dev/nor/cfi_0002.c diff -u src/sys/dev/nor/cfi_0002.c:1.2 src/sys/dev/nor/cfi_0002.c:1.3 --- src/sys/dev/nor/cfi_0002.c:1.2 Sun Jul 17 00:52:42 2011 +++ src/sys/dev/nor/cfi_0002.c Tue Jul 19 20:52:10 2011 @@ -1,9 +1,37 @@ -/* $NetBSD: cfi_0002.c,v 1.2 2011/07/17 00:52:42 dyoung Exp $ */ +/* $NetBSD: cfi_0002.c,v 1.3 2011/07/19 20:52:10 cliff Exp $ */ +/*- + * Copyright (c) 2011 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Cliff Neighbors. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 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. + * + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ #include "opt_flash.h" #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cfi_0002.c,v 1.2 2011/07/17 00:52:42 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cfi_0002.c,v 1.3 2011/07/19 20:52:10 cliff Exp $"); #include <sys/param.h> #include <sys/systm.h> Index: src/sys/dev/nor/cfi_0002.h diff -u src/sys/dev/nor/cfi_0002.h:1.1 src/sys/dev/nor/cfi_0002.h:1.2 --- src/sys/dev/nor/cfi_0002.h:1.1 Fri Jul 15 19:19:57 2011 +++ src/sys/dev/nor/cfi_0002.h Tue Jul 19 20:52:10 2011 @@ -1,4 +1,32 @@ -/* $NetBSD: cfi_0002.h,v 1.1 2011/07/15 19:19:57 cliff Exp $ */ +/* $NetBSD: cfi_0002.h,v 1.2 2011/07/19 20:52:10 cliff Exp $ */ +/*- + * Copyright (c) 2011 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Cliff Neighbors. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 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. + * + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ #ifndef _DEV_NOR_CFI_0002_H_ #define _DEV_NOR_CFI_0002_H_