diff --git a/sys/arch/atari/dev/grf.c b/sys/arch/atari/dev/grf.c index da7277fed84f..53eb1ceaeb81 100644 --- a/sys/arch/atari/dev/grf.c +++ b/sys/arch/atari/dev/grf.c @@ -1,6 +1,7 @@ -/* $NetBSD: grf.c,v 1.33 2003/08/07 16:26:58 agc Exp $ */ +/* $NetBSD: grf.c,v 1.34 2004/03/25 10:17:19 leo Exp $ */ /* + * Copyright (c) 1995 Leo Weppelman * Copyright (c) 1990 The Regents of the University of California. * All rights reserved. * @@ -38,7 +39,6 @@ */ /* - * Copyright (c) 1995 Leo Weppelman * Copyright (c) 1988 University of Utah. * * This code is derived from software contributed to Berkeley by @@ -85,7 +85,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: grf.c,v 1.33 2003/08/07 16:26:58 agc Exp $"); +__KERNEL_RCSID(0, "$NetBSD: grf.c,v 1.34 2004/03/25 10:17:19 leo Exp $"); #include #include diff --git a/sys/arch/atari/dev/hdfd.c b/sys/arch/atari/dev/hdfd.c index 1b3b3491b3c9..d9159af9ee55 100644 --- a/sys/arch/atari/dev/hdfd.c +++ b/sys/arch/atari/dev/hdfd.c @@ -1,6 +1,7 @@ -/* $NetBSD: hdfd.c,v 1.42 2003/09/29 01:20:41 cl Exp $ */ +/* $NetBSD: hdfd.c,v 1.43 2004/03/25 10:17:19 leo Exp $ */ /*- + * Copyright (c) 1996 Leo Weppelman * Copyright (c) 1990 The Regents of the University of California. * All rights reserved. * @@ -35,7 +36,6 @@ */ /*- - * Copyright (c) 1996 Leo Weppelman * Copyright (c) 1993, 1994, 1995, 1996 * Charles M. Hannum. All rights reserved. * @@ -91,7 +91,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: hdfd.c,v 1.42 2003/09/29 01:20:41 cl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hdfd.c,v 1.43 2004/03/25 10:17:19 leo Exp $"); #include "opt_ddb.h" diff --git a/sys/arch/atari/dev/kbd.c b/sys/arch/atari/dev/kbd.c index 44430dcd4357..b37172289d4b 100644 --- a/sys/arch/atari/dev/kbd.c +++ b/sys/arch/atari/dev/kbd.c @@ -1,6 +1,7 @@ -/* $NetBSD: kbd.c,v 1.27 2003/09/21 19:16:52 jdolecek Exp $ */ +/* $NetBSD: kbd.c,v 1.28 2004/03/25 10:17:19 leo Exp $ */ /* + * Copyright (c) 1995 Leo Weppelman * Copyright (c) 1982, 1986, 1990 The Regents of the University of California. * All rights reserved. * @@ -29,40 +30,8 @@ * SUCH DAMAGE. */ -/* - * Copyright (c) 1995 Leo Weppelman - * - * 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. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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 -__KERNEL_RCSID(0, "$NetBSD: kbd.c,v 1.27 2003/09/21 19:16:52 jdolecek Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kbd.c,v 1.28 2004/03/25 10:17:19 leo Exp $"); #include "mouse.h" #include "ite.h" diff --git a/sys/arch/atari/dev/zs.c b/sys/arch/atari/dev/zs.c index a54183c05347..13f7d69a35fe 100644 --- a/sys/arch/atari/dev/zs.c +++ b/sys/arch/atari/dev/zs.c @@ -1,4 +1,4 @@ -/* $NetBSD: zs.c,v 1.41 2003/08/07 16:27:02 agc Exp $ */ +/* $NetBSD: zs.c,v 1.42 2004/03/25 10:17:19 leo Exp $ */ /* * Copyright (c) 1992, 1993 @@ -41,18 +41,12 @@ * @(#)zs.c 8.1 (Berkeley) 7/19/93 */ -/* - * Copyright (c) 1995 L. Weppelman (Atari modifications) +/*- + * Copyright (c) 1995 The NetBSD Foundation, Inc. (Atari modifications) + * All rights reserved. * - * This software was developed by the Computer Systems Engineering group - * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and - * contributed to Berkeley. - * - * - * All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Lawrence Berkeley Laboratory. + * This code is derived from software contributed to The NetBSD Foundation + * by Leo Weppelman. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -62,27 +56,21 @@ * 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 the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. + * 3. Neither the name of The NetBSD Foundation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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. - * - * @(#)zs.c 8.1 (Berkeley) 7/19/93 + * 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. */ /* @@ -94,7 +82,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.41 2003/08/07 16:27:02 agc Exp $"); +__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.42 2004/03/25 10:17:19 leo Exp $"); #include #include diff --git a/sys/arch/atari/dev/zsvar.h b/sys/arch/atari/dev/zsvar.h index 2bb34b781249..f76e28c21572 100644 --- a/sys/arch/atari/dev/zsvar.h +++ b/sys/arch/atari/dev/zsvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: zsvar.h,v 1.7 2003/08/07 16:27:02 agc Exp $ */ +/* $NetBSD: zsvar.h,v 1.8 2004/03/25 10:17:19 leo Exp $ */ /* * Copyright (c) 1992, 1993 @@ -40,17 +40,12 @@ * @(#)zsvar.h 8.1 (Berkeley) 6/11/93 */ -/* - * Copyright (c) 1995 Leo Weppelman (Atari modifications) +/*- + * Copyright (c) 1995 The NetBSD Foundation, Inc. (Atari modifications) + * All rights reserved. * - * This software was developed by the Computer Systems Engineering group - * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and - * contributed to Berkeley. - * - * All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Lawrence Berkeley Laboratory. + * This code is derived from software contributed to The NetBSD Foundation + * by Leo Weppelman. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -60,27 +55,21 @@ * 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 the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. + * 3. Neither the name of The NetBSD Foundation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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. - * - * @(#)zsvar.h 8.1 (Berkeley) 6/11/93 + * 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. */ /* diff --git a/sys/arch/atari/vme/if_le_vme.c b/sys/arch/atari/vme/if_le_vme.c index e84036b14137..8f91624215a5 100644 --- a/sys/arch/atari/vme/if_le_vme.c +++ b/sys/arch/atari/vme/if_le_vme.c @@ -1,6 +1,7 @@ -/* $NetBSD: if_le_vme.c,v 1.18 2003/08/07 16:27:08 agc Exp $ */ +/* $NetBSD: if_le_vme.c,v 1.19 2004/03/25 10:17:19 leo Exp $ */ /*- + * Copyright (c) 1997 Leo Weppelman. All rights reserved. * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. * @@ -36,7 +37,6 @@ /*- * Copyright (c) 1998 maximum entropy. All rights reserved. - * Copyright (c) 1997 Leo Weppelman. All rights reserved. * Copyright (c) 1995 Charles M. Hannum. All rights reserved. * * This code is derived from software contributed to Berkeley by @@ -74,7 +74,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_le_vme.c,v 1.18 2003/08/07 16:27:08 agc Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_le_vme.c,v 1.19 2004/03/25 10:17:19 leo Exp $"); #include "opt_inet.h" #include "bpfilter.h"