From c82ab2eb79680b2d3c586fe29c2d7afc3f1ee161 Mon Sep 17 00:00:00 2001 From: jdolecek Date: Sat, 26 Oct 2002 13:50:17 +0000 Subject: [PATCH] now that mem_no is emitted by config(8), there is no reason to keep copy of more or less identical iskmemdev() for every arch; move the function to spec_vnop.c, and g/c machine-dependant copies --- sys/arch/acorn26/acorn26/conf.c | 14 +---- sys/arch/acorn32/acorn32/conf.c | 12 +--- sys/arch/algor/algor/conf.c | 54 ---------------- sys/arch/algor/conf/files.algor | 3 +- sys/arch/alpha/alpha/conf.c | 54 ---------------- sys/arch/alpha/conf/files.alpha | 3 +- sys/arch/amiga/amiga/conf.c | 15 +---- sys/arch/arc/arc/conf.c | 53 ---------------- sys/arch/arc/conf/files.arc | 3 +- sys/arch/arm/arm32/conf.c | 58 ------------------ sys/arch/atari/atari/conf.c | 13 +--- sys/arch/bebox/bebox/conf.c | 51 ---------------- sys/arch/bebox/conf/files.bebox | 3 +- sys/arch/cats/conf/files.cats | 4 +- sys/arch/cesfic/cesfic/conf.c | 50 --------------- sys/arch/cesfic/conf/files.cesfic | 3 +- sys/arch/cobalt/cobalt/conf.c | 47 -------------- sys/arch/cobalt/conf/files.cobalt | 3 +- sys/arch/dreamcast/dreamcast/conf.c | 13 +--- sys/arch/evbarm/conf/files.evbarm | 3 +- sys/arch/evbsh3/evbsh3/conf.c | 13 +--- sys/arch/hp300/conf/files.hp300 | 3 +- sys/arch/hp300/hp300/conf.c | 53 ---------------- sys/arch/hp700/hp700/conf.c | 13 +--- sys/arch/hpcarm/conf/files.hpcarm | 4 +- sys/arch/hpcmips/conf/files.hpcmips | 3 +- sys/arch/hpcmips/hpcmips/conf.c | 52 ---------------- sys/arch/hpcsh/conf/files.hpcsh | 3 +- sys/arch/hpcsh/hpcsh/conf.c | 46 -------------- sys/arch/i386/conf/files.i386 | 3 +- sys/arch/i386/i386/conf.c | 54 ---------------- sys/arch/luna68k/conf/files.luna68k | 3 +- sys/arch/luna68k/luna68k/conf.c | 54 ---------------- sys/arch/mac68k/mac68k/conf.c | 14 +---- sys/arch/macppc/conf/files.macppc | 3 +- sys/arch/macppc/macppc/conf.c | 45 -------------- sys/arch/mipsco/conf/files.mipsco | 3 +- sys/arch/mipsco/mipsco/conf.c | 53 ---------------- sys/arch/mmeye/mmeye/conf.c | 13 +--- sys/arch/mvme68k/mvme68k/conf.c | 13 +--- sys/arch/mvmeppc/conf/files.mvmeppc | 3 +- sys/arch/mvmeppc/mvmeppc/conf.c | 51 ---------------- sys/arch/netwinder/conf/files.netwinder | 4 +- sys/arch/news68k/conf/files.news68k | 3 +- sys/arch/news68k/news68k/conf.c | 53 ---------------- sys/arch/newsmips/conf/files.newsmips | 3 +- sys/arch/newsmips/newsmips/conf.c | 53 ---------------- sys/arch/next68k/next68k/conf.c | 13 +--- sys/arch/ofppc/ofppc/conf.c | 12 +--- sys/arch/pc532/pc532/conf.c | 13 +--- sys/arch/playstation2/conf/files.playstation2 | 3 +- sys/arch/playstation2/playstation2/conf.c | 46 -------------- sys/arch/pmax/conf/files.pmax | 3 +- sys/arch/pmax/pmax/conf.c | 53 ---------------- sys/arch/pmppc/conf/files.pmppc | 3 +- sys/arch/pmppc/pmppc/conf.c | 51 ---------------- sys/arch/prep/conf/files.prep | 3 +- sys/arch/prep/prep/conf.c | 51 ---------------- sys/arch/sandpoint/conf/files.sandpoint | 3 +- sys/arch/sandpoint/sandpoint/conf.c | 51 ---------------- sys/arch/sgimips/conf/files.sgimips | 3 +- sys/arch/sgimips/sgimips/conf.c | 49 --------------- sys/arch/sh5/sh5/conf.c | 13 +--- sys/arch/shark/shark/conf.c | 12 +--- sys/arch/sparc/conf/files.sparc | 3 +- sys/arch/sparc/sparc/conf.c | 61 ------------------- sys/arch/sparc64/conf/files.sparc64 | 3 +- sys/arch/sparc64/sparc64/conf.c | 61 ------------------- sys/arch/sun2/conf/files.sun2 | 3 +- sys/arch/sun2/sun2/conf.c | 51 ---------------- sys/arch/sun3/conf/files.sun3 | 3 +- sys/arch/sun3/sun3/conf.c | 51 ---------------- sys/arch/vax/vax/conf.c | 13 +--- sys/arch/walnut/conf/files.walnut | 3 +- sys/arch/walnut/walnut/conf.c | 45 -------------- sys/arch/x68k/x68k/conf.c | 13 +--- sys/arch/x86_64/conf/files.x86_64 | 3 +- sys/arch/x86_64/x86_64/conf.c | 51 ---------------- sys/miscfs/specfs/spec_vnops.c | 17 +++++- sys/sys/conf.h | 5 +- 80 files changed, 67 insertions(+), 1778 deletions(-) delete mode 100644 sys/arch/algor/algor/conf.c delete mode 100644 sys/arch/alpha/alpha/conf.c delete mode 100644 sys/arch/arc/arc/conf.c delete mode 100644 sys/arch/arm/arm32/conf.c delete mode 100644 sys/arch/bebox/bebox/conf.c delete mode 100644 sys/arch/cesfic/cesfic/conf.c delete mode 100644 sys/arch/cobalt/cobalt/conf.c delete mode 100644 sys/arch/hp300/hp300/conf.c delete mode 100644 sys/arch/hpcmips/hpcmips/conf.c delete mode 100644 sys/arch/hpcsh/hpcsh/conf.c delete mode 100644 sys/arch/i386/i386/conf.c delete mode 100644 sys/arch/luna68k/luna68k/conf.c delete mode 100644 sys/arch/macppc/macppc/conf.c delete mode 100644 sys/arch/mipsco/mipsco/conf.c delete mode 100644 sys/arch/mvmeppc/mvmeppc/conf.c delete mode 100644 sys/arch/news68k/news68k/conf.c delete mode 100644 sys/arch/newsmips/newsmips/conf.c delete mode 100644 sys/arch/playstation2/playstation2/conf.c delete mode 100644 sys/arch/pmax/pmax/conf.c delete mode 100644 sys/arch/pmppc/pmppc/conf.c delete mode 100644 sys/arch/prep/prep/conf.c delete mode 100644 sys/arch/sandpoint/sandpoint/conf.c delete mode 100644 sys/arch/sgimips/sgimips/conf.c delete mode 100644 sys/arch/sparc/sparc/conf.c delete mode 100644 sys/arch/sparc64/sparc64/conf.c delete mode 100644 sys/arch/sun2/sun2/conf.c delete mode 100644 sys/arch/sun3/sun3/conf.c delete mode 100644 sys/arch/walnut/walnut/conf.c delete mode 100644 sys/arch/x86_64/x86_64/conf.c diff --git a/sys/arch/acorn26/acorn26/conf.c b/sys/arch/acorn26/acorn26/conf.c index 2dd52ce874c5..a3896960f32a 100644 --- a/sys/arch/acorn26/acorn26/conf.c +++ b/sys/arch/acorn26/acorn26/conf.c @@ -1,4 +1,4 @@ -/* $NetBSD: conf.c,v 1.5 2002/09/06 13:18:43 gehenna Exp $ */ +/* $NetBSD: conf.c,v 1.6 2002/10/26 13:50:18 jdolecek Exp $ */ /*- * Copyright (c) 1998, 2000 Ben Harris * All rights reserved. @@ -31,23 +31,13 @@ #include -__RCSID("$NetBSD: conf.c,v 1.5 2002/09/06 13:18:43 gehenna Exp $"); +__RCSID("$NetBSD: conf.c,v 1.6 2002/10/26 13:50:18 jdolecek Exp $"); #include #include #include "rs.h" -/* - * Returns true if dev is /dev/mem or /dev/kmem. - */ -int -iskmemdev(dev) - dev_t dev; -{ - return (major(dev) == mem_no && minor(dev) < 2); -} - struct consdev constab[] = { #if NRS > 0 cons_init(rs), diff --git a/sys/arch/acorn32/acorn32/conf.c b/sys/arch/acorn32/acorn32/conf.c index ed2cf79b8fd4..8cb1b79bb234 100644 --- a/sys/arch/acorn32/acorn32/conf.c +++ b/sys/arch/acorn32/acorn32/conf.c @@ -1,4 +1,4 @@ -/* $NetBSD: conf.c,v 1.8 2002/09/06 13:18:43 gehenna Exp $ */ +/* $NetBSD: conf.c,v 1.9 2002/10/26 13:50:19 jdolecek Exp $ */ /* * Copyright (c) 1994-1998 Mark Brinicombe. @@ -50,16 +50,6 @@ #include "vt.h" #include "com.h" -/* - * Returns true if dev is /dev/mem or /dev/kmem. - */ -int -iskmemdev(dev) - dev_t dev; -{ - return (major(dev) == mem_no && minor(dev) < 2); -} - /* * This entire table could be autoconfig()ed but that would mean that * the kernel's idea of the console would be out of sync with that of diff --git a/sys/arch/algor/algor/conf.c b/sys/arch/algor/algor/conf.c deleted file mode 100644 index 1a3464f8d6fe..000000000000 --- a/sys/arch/algor/algor/conf.c +++ /dev/null @@ -1,54 +0,0 @@ -/* $NetBSD: conf.c,v 1.8 2002/09/06 13:18:43 gehenna Exp $ */ - -/*- - * Copyright (c) 1991 The Regents of the University of California. - * All rights reserved. - * - * 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. - * - * @(#)conf.c 7.9 (Berkeley) 5/28/91 - */ - -#include /* RCS ID & Copyright macro defns */ - -__KERNEL_RCSID(0, "$NetBSD: conf.c,v 1.8 2002/09/06 13:18:43 gehenna Exp $"); - -#include -#include - -/* - * Returns true if dev is /dev/mem or /dev/kmem. - */ -int -iskmemdev(dev) - dev_t dev; -{ - - return (major(dev) == mem_no && minor(dev) < 2); -} diff --git a/sys/arch/algor/conf/files.algor b/sys/arch/algor/conf/files.algor index 47b9f1c4bd0f..67b88567549d 100644 --- a/sys/arch/algor/conf/files.algor +++ b/sys/arch/algor/conf/files.algor @@ -1,4 +1,4 @@ -# $NetBSD: files.algor,v 1.14 2002/09/06 13:18:43 gehenna Exp $ +# $NetBSD: files.algor,v 1.15 2002/10/26 13:50:20 jdolecek Exp $ # Algorithmics evaluation board specific configuration info. @@ -37,7 +37,6 @@ file arch/algor/algor/autoconf.c file arch/algor/algor/bus_dma.c file arch/algor/algor/clock.c file dev/clock_subr.c -file arch/algor/algor/conf.c file arch/algor/algor/disksubr.c file arch/algor/algor/interrupt.c file arch/algor/algor/led.c diff --git a/sys/arch/alpha/alpha/conf.c b/sys/arch/alpha/alpha/conf.c deleted file mode 100644 index 681daed05d9a..000000000000 --- a/sys/arch/alpha/alpha/conf.c +++ /dev/null @@ -1,54 +0,0 @@ -/* $NetBSD: conf.c,v 1.67 2002/09/06 13:18:43 gehenna Exp $ */ - -/*- - * Copyright (c) 1991 The Regents of the University of California. - * All rights reserved. - * - * 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. - * - * @(#)conf.c 7.9 (Berkeley) 5/28/91 - */ - -#include /* RCS ID & Copyright macro defns */ - -__KERNEL_RCSID(0, "$NetBSD: conf.c,v 1.67 2002/09/06 13:18:43 gehenna Exp $"); - -#include -#include - -/* - * Returns true if dev is /dev/mem or /dev/kmem. - */ -int -iskmemdev(dev) - dev_t dev; -{ - - return (major(dev) == mem_no && minor(dev) < 2); -} diff --git a/sys/arch/alpha/conf/files.alpha b/sys/arch/alpha/conf/files.alpha index c2002cd1adc2..c6f5819e6ec4 100644 --- a/sys/arch/alpha/conf/files.alpha +++ b/sys/arch/alpha/conf/files.alpha @@ -1,4 +1,4 @@ -# $NetBSD: files.alpha,v 1.158 2002/09/24 13:30:42 ad Exp $ +# $NetBSD: files.alpha,v 1.159 2002/10/26 13:50:21 jdolecek Exp $ # # alpha-specific configuration info @@ -470,7 +470,6 @@ file arch/alpha/jensenio/mcclock_jensenio.c mcclock_jensenio file arch/alpha/alpha/autoconf.c file arch/alpha/alpha/clock.c file dev/clock_subr.c -file arch/alpha/alpha/conf.c file arch/alpha/alpha/cpuconf.c file arch/alpha/alpha/interrupt.c file arch/alpha/alpha/ipifuncs.c multiprocessor diff --git a/sys/arch/amiga/amiga/conf.c b/sys/arch/amiga/amiga/conf.c index 5c3a71f313dc..ed3041c07134 100644 --- a/sys/arch/amiga/amiga/conf.c +++ b/sys/arch/amiga/amiga/conf.c @@ -1,4 +1,4 @@ -/* $NetBSD: conf.c,v 1.69 2002/09/06 13:18:43 gehenna Exp $ */ +/* $NetBSD: conf.c,v 1.70 2002/10/26 13:50:21 jdolecek Exp $ */ /*- * Copyright (c) 1991 The Regents of the University of California. @@ -36,7 +36,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: conf.c,v 1.69 2002/09/06 13:18:43 gehenna Exp $"); +__KERNEL_RCSID(0, "$NetBSD: conf.c,v 1.70 2002/10/26 13:50:21 jdolecek Exp $"); #include #include @@ -47,17 +47,6 @@ __KERNEL_RCSID(0, "$NetBSD: conf.c,v 1.69 2002/09/06 13:18:43 gehenna Exp $"); #include "ite.h" #include "amidisplaycc.h" -/* - * Returns true if dev is /dev/mem or /dev/kmem. - */ -int -iskmemdev(dev) - dev_t dev; -{ - - return (major(dev) == mem_no && minor(dev) < 2); -} - /* * This entire table could be autoconfig()ed but that would mean that * the kernel's idea of the console would be out of sync with that of diff --git a/sys/arch/arc/arc/conf.c b/sys/arch/arc/arc/conf.c deleted file mode 100644 index f88d703d8208..000000000000 --- a/sys/arch/arc/arc/conf.c +++ /dev/null @@ -1,53 +0,0 @@ -/* $NetBSD: conf.c,v 1.26 2002/09/06 13:18:43 gehenna Exp $ */ -/* $OpenBSD: conf.c,v 1.27 1999/08/12 13:06:33 niklas Exp $ */ - -/* - * Copyright (c) 1992, 1993 - * The Regents of the University of California. All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * Ralph Campbell. - * - * 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. - * - * from: @(#)conf.c 8.2 (Berkeley) 11/14/93 - */ - -#include -#include - -/* - * Routine that identifies /dev/mem and /dev/kmem. - */ -int -iskmemdev(dev) - dev_t dev; -{ - return (major(dev) == mem_no && minor(dev) < 2); -} diff --git a/sys/arch/arc/conf/files.arc b/sys/arch/arc/conf/files.arc index e4b62c75a1b6..7a741830ade6 100644 --- a/sys/arch/arc/conf/files.arc +++ b/sys/arch/arc/conf/files.arc @@ -1,4 +1,4 @@ -# $NetBSD: files.arc,v 1.39 2002/09/06 13:18:43 gehenna Exp $ +# $NetBSD: files.arc,v 1.40 2002/10/26 13:50:22 jdolecek Exp $ # $OpenBSD: files.arc,v 1.21 1999/09/11 10:20:20 niklas Exp $ # # maxpartitions must be first item in files.${ARCH} @@ -60,7 +60,6 @@ file arch/arc/arc/platform.c ## file arch/arc/arc/autoconf.c -file arch/arc/arc/conf.c file arch/arc/arc/disksubr.c file arch/arc/arc/machdep.c #file arch/arc/arc/minidebug.c diff --git a/sys/arch/arm/arm32/conf.c b/sys/arch/arm/arm32/conf.c deleted file mode 100644 index d69f2285e347..000000000000 --- a/sys/arch/arm/arm32/conf.c +++ /dev/null @@ -1,58 +0,0 @@ -/* $NetBSD: conf.c,v 1.19 2002/09/06 13:18:43 gehenna Exp $ */ - -/* - * Copyright (c) 1994-1998 Mark Brinicombe. - * All rights reserved. - * - * 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 Mark Brinicombe - * for the NetBSD Project. - * 4. The name of the company nor the name of the author may 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 OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR 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. - * - * RiscBSD kernel project - * - * conf.c - * - * Character and Block Device configuration - * Console configuration - * - * Defines the structures cdevsw and constab - * - * Created : 17/09/94 - */ - -#include -#include - -/* - * Returns true if dev is /dev/mem or /dev/kmem. - */ -int -iskmemdev(dev) - dev_t dev; -{ - return (major(dev) == mem_no && minor(dev) < 2); -} diff --git a/sys/arch/atari/atari/conf.c b/sys/arch/atari/atari/conf.c index b6eedf50a778..5bacc9143752 100644 --- a/sys/arch/atari/atari/conf.c +++ b/sys/arch/atari/atari/conf.c @@ -1,4 +1,4 @@ -/* $NetBSD: conf.c,v 1.55 2002/09/06 13:18:43 gehenna Exp $ */ +/* $NetBSD: conf.c,v 1.56 2002/10/26 13:50:23 jdolecek Exp $ */ /* * Copyright (c) 1991 The Regents of the University of California. @@ -44,17 +44,6 @@ #include "ser.h" #include "vga_pci.h" -/* - * Returns true if dev is /dev/mem or /dev/kmem. - */ -int -iskmemdev(dev) - dev_t dev; -{ - - return (major(dev) == mem_no && minor(dev) < 2); -} - /* * This entire table could be autoconfig()ed but that would mean that * the kernel's idea of the console would be out of sync with that of diff --git a/sys/arch/bebox/bebox/conf.c b/sys/arch/bebox/bebox/conf.c deleted file mode 100644 index 04d15f3bbea6..000000000000 --- a/sys/arch/bebox/bebox/conf.c +++ /dev/null @@ -1,51 +0,0 @@ -/* $NetBSD: conf.c,v 1.21 2002/09/06 13:18:43 gehenna Exp $ */ - -/*- - * Copyright (c) 1998 The NetBSD Foundation, Inc. - * All rights reserved. - * - * This code is derived from software contributed to The NetBSD Foundation - * by Charles M. Hannum. - * - * 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 NetBSD - * Foundation, Inc. and its contributors. - * 4. 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 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 -#include - -/* - * Returns true if dev is /dev/mem or /dev/kmem. - */ -int -iskmemdev(dev) - dev_t dev; -{ - - return (major(dev) == mem_no && (minor(dev) < 2 || minor(dev) == 14)); -} diff --git a/sys/arch/bebox/conf/files.bebox b/sys/arch/bebox/conf/files.bebox index d72886133b09..d8c7ca19b7d4 100644 --- a/sys/arch/bebox/conf/files.bebox +++ b/sys/arch/bebox/conf/files.bebox @@ -1,4 +1,4 @@ -# $NetBSD: files.bebox,v 1.35 2002/09/06 13:18:43 gehenna Exp $ +# $NetBSD: files.bebox,v 1.36 2002/10/26 13:50:24 jdolecek Exp $ # # First try for bebox specific configuration info # @@ -9,7 +9,6 @@ maxusers 2 8 64 file arch/bebox/bebox/autoconf.c file arch/bebox/bebox/bus_space.c file arch/bebox/bebox/clock.c -file arch/bebox/bebox/conf.c file arch/bebox/bebox/disksubr.c disk file arch/bebox/bebox/extintr.c file arch/bebox/bebox/machdep.c diff --git a/sys/arch/cats/conf/files.cats b/sys/arch/cats/conf/files.cats index dce8e8544d1c..fe578d55f359 100644 --- a/sys/arch/cats/conf/files.cats +++ b/sys/arch/cats/conf/files.cats @@ -1,4 +1,4 @@ -# $NetBSD: files.cats,v 1.22 2002/10/12 11:53:40 chris Exp $ +# $NetBSD: files.cats,v 1.23 2002/10/26 13:50:24 jdolecek Exp $ # # CATS-specific configuration info # @@ -49,8 +49,6 @@ file dev/md_root.c md & memory_disk_hooks include "dev/scsipi/files.scsipi" -file arch/arm/arm32/conf.c - # Generic MD files file arch/cats/cats/autoconf.c file arch/cats/cats/cats_machdep.c diff --git a/sys/arch/cesfic/cesfic/conf.c b/sys/arch/cesfic/cesfic/conf.c deleted file mode 100644 index 711c7afcb27d..000000000000 --- a/sys/arch/cesfic/cesfic/conf.c +++ /dev/null @@ -1,50 +0,0 @@ -/* $NetBSD: conf.c,v 1.5 2002/09/06 13:18:43 gehenna Exp $ */ - -/*- - * Copyright (c) 1991 The Regents of the University of California. - * All rights reserved. - * - * 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. - * - * @(#)conf.c 7.9 (Berkeley) 5/28/91 - */ - -#include -#include - -/* - * Returns true if dev is /dev/mem or /dev/kmem. - */ -int -iskmemdev(dev) - dev_t dev; -{ - - return (major(dev) == mem_no && minor(dev) < 2); -} diff --git a/sys/arch/cesfic/conf/files.cesfic b/sys/arch/cesfic/conf/files.cesfic index 482e8a24dd1a..67b91f166fc9 100644 --- a/sys/arch/cesfic/conf/files.cesfic +++ b/sys/arch/cesfic/conf/files.cesfic @@ -1,4 +1,4 @@ -# $NetBSD: files.cesfic,v 1.5 2002/10/20 02:37:24 chs Exp $ +# $NetBSD: files.cesfic,v 1.6 2002/10/26 13:50:25 jdolecek Exp $ # # cesfic-specific configuration info @@ -49,7 +49,6 @@ file arch/cesfic/dev/if_le.c le file arch/cesfic/cesfic/autoconf.c file arch/cesfic/cesfic/clock.c -file arch/cesfic/cesfic/conf.c file arch/cesfic/cesfic/db_memrw.c ddb | kgdb file arch/cesfic/cesfic/kgdb_machdep.c kgdb file arch/cesfic/cesfic/machdep.c diff --git a/sys/arch/cobalt/cobalt/conf.c b/sys/arch/cobalt/cobalt/conf.c deleted file mode 100644 index d1c9eb3e41c5..000000000000 --- a/sys/arch/cobalt/cobalt/conf.c +++ /dev/null @@ -1,47 +0,0 @@ -/* $NetBSD: conf.c,v 1.16 2002/09/06 13:18:43 gehenna Exp $ */ - -/* - * Copyright (c) 1992, 1993 - * The Regents of the University of California. All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * Ralph Campbell. - * - * 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 -#include - -int -iskmemdev(dev) - dev_t dev; -{ - return (major(dev) == mem_no && minor(dev) < 2); -} diff --git a/sys/arch/cobalt/conf/files.cobalt b/sys/arch/cobalt/conf/files.cobalt index 64450007cd3f..e2291eb861a3 100644 --- a/sys/arch/cobalt/conf/files.cobalt +++ b/sys/arch/cobalt/conf/files.cobalt @@ -1,4 +1,4 @@ -# $NetBSD: files.cobalt,v 1.13 2002/09/06 13:18:43 gehenna Exp $ +# $NetBSD: files.cobalt,v 1.14 2002/10/26 13:50:26 jdolecek Exp $ maxpartitions 16 @@ -30,7 +30,6 @@ file arch/cobalt/dev/gt.c gt file arch/cobalt/cobalt/autoconf.c file arch/cobalt/cobalt/bus.c file arch/cobalt/cobalt/clock.c -file arch/cobalt/cobalt/conf.c file arch/cobalt/cobalt/console.c file arch/cobalt/cobalt/disksubr.c file arch/cobalt/cobalt/machdep.c diff --git a/sys/arch/dreamcast/dreamcast/conf.c b/sys/arch/dreamcast/dreamcast/conf.c index 97054c5f3120..b95d055f51cb 100644 --- a/sys/arch/dreamcast/dreamcast/conf.c +++ b/sys/arch/dreamcast/dreamcast/conf.c @@ -1,4 +1,4 @@ -/* $NetBSD: conf.c,v 1.9 2002/09/06 13:18:43 gehenna Exp $ */ +/* $NetBSD: conf.c,v 1.10 2002/10/26 13:50:26 jdolecek Exp $ */ /* * Copyright (c) 1994, 1995 Charles M. Hannum. All rights reserved. @@ -36,17 +36,6 @@ #include "pvr.h" #include "wskbd.h" -/* - * Returns true if dev is /dev/mem or /dev/kmem. - */ -int -iskmemdev(dev) - dev_t dev; -{ - - return (major(dev) == mem_no && (minor(dev) < 2 || minor(dev) == 14)); -} - #include #define scifcnpollc nullcnpollc diff --git a/sys/arch/evbarm/conf/files.evbarm b/sys/arch/evbarm/conf/files.evbarm index a5d45a2c2e91..5c4c53b60c88 100644 --- a/sys/arch/evbarm/conf/files.evbarm +++ b/sys/arch/evbarm/conf/files.evbarm @@ -1,4 +1,4 @@ -# $NetBSD: files.evbarm,v 1.15 2002/09/06 13:18:43 gehenna Exp $ +# $NetBSD: files.evbarm,v 1.16 2002/10/26 13:50:26 jdolecek Exp $ # # First try for arm-specific configuration info # @@ -30,7 +30,6 @@ include "dev/scsipi/files.scsipi" # Generic MD files file arch/evbarm/evbarm/autoconf.c -file arch/arm/arm32/conf.c file arch/arm/arm/disksubr.c disk file arch/arm/arm/disksubr_acorn.c disk diff --git a/sys/arch/evbsh3/evbsh3/conf.c b/sys/arch/evbsh3/evbsh3/conf.c index 5963e93aa657..257b1549540c 100644 --- a/sys/arch/evbsh3/evbsh3/conf.c +++ b/sys/arch/evbsh3/evbsh3/conf.c @@ -1,4 +1,4 @@ -/* $NetBSD: conf.c,v 1.8 2002/09/06 13:18:43 gehenna Exp $ */ +/* $NetBSD: conf.c,v 1.9 2002/10/26 13:50:27 jdolecek Exp $ */ /* * Copyright (c) 1994, 1995 Charles M. Hannum. All rights reserved. @@ -36,17 +36,6 @@ #include "sci.h" #include "scif.h" -/* - * Returns true if dev is /dev/mem or /dev/kmem. - */ -int -iskmemdev(dev) - dev_t dev; -{ - - return (major(dev) == mem_no && (minor(dev) < 2 || minor(dev) == 14)); -} - #include #define scicnpollc nullcnpollc diff --git a/sys/arch/hp300/conf/files.hp300 b/sys/arch/hp300/conf/files.hp300 index 49a2c8d088aa..53ebc4a1237d 100644 --- a/sys/arch/hp300/conf/files.hp300 +++ b/sys/arch/hp300/conf/files.hp300 @@ -1,4 +1,4 @@ -# $NetBSD: files.hp300,v 1.57 2002/10/20 02:37:25 chs Exp $ +# $NetBSD: files.hp300,v 1.58 2002/10/26 13:50:27 jdolecek Exp $ # # hp300-specific configuration info @@ -190,7 +190,6 @@ file dev/md_root.c memory_disk_hooks file arch/hp300/hp300/autoconf.c file arch/hp300/hp300/bus_space.c file arch/hp300/hp300/clock.c -file arch/hp300/hp300/conf.c file arch/hp300/hp300/db_memrw.c ddb | kgdb file arch/hp300/hp300/dkbad.c file arch/hp300/hp300/kgdb_machdep.c kgdb diff --git a/sys/arch/hp300/hp300/conf.c b/sys/arch/hp300/hp300/conf.c deleted file mode 100644 index 255ca3d61759..000000000000 --- a/sys/arch/hp300/hp300/conf.c +++ /dev/null @@ -1,53 +0,0 @@ -/* $NetBSD: conf.c,v 1.54 2002/09/06 13:18:43 gehenna Exp $ */ - -/*- - * Copyright (c) 1991 The Regents of the University of California. - * All rights reserved. - * - * 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. - * - * @(#)conf.c 7.9 (Berkeley) 5/28/91 - */ - -#include -__KERNEL_RCSID(0, "$NetBSD: conf.c,v 1.54 2002/09/06 13:18:43 gehenna Exp $"); - -#include -#include - -/* - * Returns true if dev is /dev/mem or /dev/kmem. - */ -int -iskmemdev(dev) - dev_t dev; -{ - - return (major(dev) == mem_no && minor(dev) < 2); -} diff --git a/sys/arch/hp700/hp700/conf.c b/sys/arch/hp700/hp700/conf.c index a80754cd643b..586508fba26a 100644 --- a/sys/arch/hp700/hp700/conf.c +++ b/sys/arch/hp700/hp700/conf.c @@ -1,4 +1,4 @@ -/* $NetBSD: conf.c,v 1.4 2002/09/06 13:18:43 gehenna Exp $ */ +/* $NetBSD: conf.c,v 1.5 2002/10/26 13:50:28 jdolecek Exp $ */ /* $OpenBSD: conf.c,v 1.15 2001/09/28 02:53:13 mickey Exp $ */ @@ -39,17 +39,6 @@ #include #include - -/* - * Returns true if dev is /dev/mem or /dev/kmem. - */ -int -iskmemdev(dev) - dev_t dev; -{ - return (major(dev) == mem_no && minor(dev) < 2); -} - #include cons_decl(pdc); diff --git a/sys/arch/hpcarm/conf/files.hpcarm b/sys/arch/hpcarm/conf/files.hpcarm index 376f4d1bdc0b..3a9fb7d361a6 100644 --- a/sys/arch/hpcarm/conf/files.hpcarm +++ b/sys/arch/hpcarm/conf/files.hpcarm @@ -1,4 +1,4 @@ -# $NetBSD: files.hpcarm,v 1.47 2002/09/16 19:52:52 manu Exp $ +# $NetBSD: files.hpcarm,v 1.48 2002/10/26 13:50:28 jdolecek Exp $ # # First try for arm-specific configuration info # @@ -17,8 +17,6 @@ define todservice {} # Memory disk driver file dev/md_root.c memory_disk_hooks -file arch/arm/arm32/conf.c - # Standard keyboard driver #device kbd #file arch/hpcarm/dev/kbd.c kbd needs-flag diff --git a/sys/arch/hpcmips/conf/files.hpcmips b/sys/arch/hpcmips/conf/files.hpcmips index 419a0a1d73f0..b346613cfabb 100644 --- a/sys/arch/hpcmips/conf/files.hpcmips +++ b/sys/arch/hpcmips/conf/files.hpcmips @@ -1,4 +1,4 @@ -# $NetBSD: files.hpcmips,v 1.87 2002/09/06 13:18:43 gehenna Exp $ +# $NetBSD: files.hpcmips,v 1.88 2002/10/26 13:50:28 jdolecek Exp $ # maxpartitions must be first item in files.${ARCH}. maxpartitions 8 @@ -49,7 +49,6 @@ file arch/hpcmips/hpcmips/bus_dma.c file arch/hpcmips/hpcmips/bus_space.c file arch/hpcmips/hpcmips/bus_space_notimpl.c file arch/hpcmips/hpcmips/bus_space_through.c -file arch/hpcmips/hpcmips/conf.c file arch/hpcmips/hpcmips/interrupt.c file arch/hpcmips/hpcmips/machdep.c file arch/hpcmips/hpcmips/mainbus.c diff --git a/sys/arch/hpcmips/hpcmips/conf.c b/sys/arch/hpcmips/hpcmips/conf.c deleted file mode 100644 index 2db1ccc4fd17..000000000000 --- a/sys/arch/hpcmips/hpcmips/conf.c +++ /dev/null @@ -1,52 +0,0 @@ -/* $NetBSD: conf.c,v 1.21 2002/09/06 13:18:43 gehenna Exp $ */ - -/* - * Copyright (c) 1992, 1993 - * The Regents of the University of California. All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * Ralph Campbell. - * - * 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. - * - * @(#)conf.c 8.2 (Berkeley) 11/14/93 - */ - -#include -#include - -/* - * Routine that identifies /dev/mem and /dev/kmem. - */ -int -iskmemdev(dev_t dev) -{ - - return (major(dev) == mem_no && minor(dev) < 2); -} diff --git a/sys/arch/hpcsh/conf/files.hpcsh b/sys/arch/hpcsh/conf/files.hpcsh index 29c654c3473f..a5ce47aaac9b 100644 --- a/sys/arch/hpcsh/conf/files.hpcsh +++ b/sys/arch/hpcsh/conf/files.hpcsh @@ -1,4 +1,4 @@ -# $NetBSD: files.hpcsh,v 1.28 2002/09/06 13:18:43 gehenna Exp $ +# $NetBSD: files.hpcsh,v 1.29 2002/10/26 13:50:29 jdolecek Exp $ # maxpartitions 8 @@ -11,7 +11,6 @@ defflag debug_hpcsh.h BUS_SPACE_DEBUG defparam opt_memsize.h IOM_ROM_BEGIN IOM_ROM_SIZE IOM_RAM_BEGIN IOM_RAM_SIZE -file arch/hpcsh/hpcsh/conf.c file arch/hpcsh/hpcsh/machdep.c file arch/hpcsh/hpcsh/console.c file arch/hpcsh/hpcsh/autoconf.c diff --git a/sys/arch/hpcsh/hpcsh/conf.c b/sys/arch/hpcsh/hpcsh/conf.c deleted file mode 100644 index 46cba98a9d83..000000000000 --- a/sys/arch/hpcsh/hpcsh/conf.c +++ /dev/null @@ -1,46 +0,0 @@ -/* $NetBSD: conf.c,v 1.11 2002/09/06 13:18:43 gehenna Exp $ */ - -/*- - * Copyright (c) 2001 The NetBSD Foundation, Inc. - * All rights reserved. - * - * 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 NetBSD - * Foundation, Inc. and its contributors. - * 4. 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 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 -#include - -/* - * Routine that identifies /dev/mem and /dev/kmem. - */ -int -iskmemdev(dev_t dev) -{ - return (major(dev) == mem_no && (minor(dev) < 2 || minor(dev) == 14)); -} diff --git a/sys/arch/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386 index 740b5fbbf67d..6d883fb37b2f 100644 --- a/sys/arch/i386/conf/files.i386 +++ b/sys/arch/i386/conf/files.i386 @@ -1,4 +1,4 @@ -# $NetBSD: files.i386,v 1.219 2002/10/11 01:52:06 thorpej Exp $ +# $NetBSD: files.i386,v 1.220 2002/10/26 13:50:30 jdolecek Exp $ # # new style config file for i386 architecture # @@ -66,7 +66,6 @@ defflag opt_kstack_dr0.h KSTACK_CHECK_DR0 file arch/i386/i386/autoconf.c file arch/i386/i386/bus_machdep.c -file arch/i386/i386/conf.c file arch/i386/i386/consinit.c file arch/i386/i386/db_dbgreg.s ddb | kstack_check_dr0 file arch/i386/i386/db_disasm.c ddb diff --git a/sys/arch/i386/i386/conf.c b/sys/arch/i386/i386/conf.c deleted file mode 100644 index 54a6fab51e3f..000000000000 --- a/sys/arch/i386/i386/conf.c +++ /dev/null @@ -1,54 +0,0 @@ -/* $NetBSD: conf.c,v 1.160 2002/09/06 13:18:43 gehenna Exp $ */ - -/*- - * Copyright (c) 1998 The NetBSD Foundation, Inc. - * All rights reserved. - * - * This code is derived from software contributed to The NetBSD Foundation - * by Charles M. Hannum. - * - * 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 NetBSD - * Foundation, Inc. and its contributors. - * 4. 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 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 -__KERNEL_RCSID(0, "$NetBSD: conf.c,v 1.160 2002/09/06 13:18:43 gehenna Exp $"); - -#include -#include - -/* - * Returns true if dev is /dev/mem or /dev/kmem. - */ -int -iskmemdev(dev) - dev_t dev; -{ - - return (major(dev) == mem_no && (minor(dev) < 2 || minor(dev) == 14)); -} diff --git a/sys/arch/luna68k/conf/files.luna68k b/sys/arch/luna68k/conf/files.luna68k index aedee1c3c34e..530ef19642e2 100644 --- a/sys/arch/luna68k/conf/files.luna68k +++ b/sys/arch/luna68k/conf/files.luna68k @@ -1,12 +1,11 @@ # -# $NetBSD: files.luna68k,v 1.8 2002/10/20 02:37:27 chs Exp $ +# $NetBSD: files.luna68k,v 1.9 2002/10/26 13:50:32 jdolecek Exp $ # maxpartitions 8 maxusers 2 8 64 file arch/luna68k/luna68k/autoconf.c file arch/luna68k/luna68k/clock.c -file arch/luna68k/luna68k/conf.c file arch/luna68k/luna68k/db_memrw.c ddb | kgdb file arch/luna68k/luna68k/disksubr.c file arch/luna68k/luna68k/isr.c diff --git a/sys/arch/luna68k/luna68k/conf.c b/sys/arch/luna68k/luna68k/conf.c deleted file mode 100644 index 2779346af7fe..000000000000 --- a/sys/arch/luna68k/luna68k/conf.c +++ /dev/null @@ -1,54 +0,0 @@ -/* $NetBSD: conf.c,v 1.8 2002/09/06 13:18:43 gehenna Exp $ */ - -/*- - * Copyright (c) 2000 The NetBSD Foundation, Inc. - * All rights reserved. - * - * This code is derived from software contributed to The NetBSD Foundation - * by Tohru Nishimura. - * - * 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 NetBSD - * Foundation, Inc. and its contributors. - * 4. 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 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 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 /* RCS ID & Copyright macro defns */ - -__KERNEL_RCSID(0, "$NetBSD: conf.c,v 1.8 2002/09/06 13:18:43 gehenna Exp $"); - -#include -#include - -/* - * Returns true if dev is /dev/mem or /dev/kmem. - */ -int -iskmemdev(dev) - dev_t dev; -{ - return (major(dev) == mem_no && minor(dev) < 2); -} diff --git a/sys/arch/mac68k/mac68k/conf.c b/sys/arch/mac68k/mac68k/conf.c index dd778ab1a939..c38bec5a2887 100644 --- a/sys/arch/mac68k/mac68k/conf.c +++ b/sys/arch/mac68k/mac68k/conf.c @@ -1,4 +1,4 @@ -/* $NetBSD: conf.c,v 1.59 2002/09/06 13:18:43 gehenna Exp $ */ +/* $NetBSD: conf.c,v 1.60 2002/10/26 13:50:33 jdolecek Exp $ */ /* * Copyright (c) 1990 The Regents of the University of California. @@ -42,18 +42,6 @@ #include #include "zstty.h" - -/* - * Returns true if dev is /dev/mem or /dev/kmem. - */ -int -iskmemdev(dev) - dev_t dev; -{ - - return (major(dev) == mem_no && minor(dev) < 2); -} - #include "akbd.h" #include "macfb.h" #define maccnpollc nullcnpollc diff --git a/sys/arch/macppc/conf/files.macppc b/sys/arch/macppc/conf/files.macppc index a65cab96f893..84e10129df17 100644 --- a/sys/arch/macppc/conf/files.macppc +++ b/sys/arch/macppc/conf/files.macppc @@ -1,4 +1,4 @@ -# $NetBSD: files.macppc,v 1.53 2002/10/13 14:43:19 wiz Exp $ +# $NetBSD: files.macppc,v 1.54 2002/10/26 13:50:33 jdolecek Exp $ # # macppc-specific configuration info @@ -12,7 +12,6 @@ include "arch/powerpc/conf/files.ofw" file arch/macppc/macppc/autoconf.c file arch/macppc/macppc/bus_dma.c file arch/macppc/macppc/clock.c -file arch/macppc/macppc/conf.c file arch/macppc/macppc/disksubr.c disk file arch/macppc/macppc/extintr.c file arch/macppc/macppc/machdep.c diff --git a/sys/arch/macppc/macppc/conf.c b/sys/arch/macppc/macppc/conf.c deleted file mode 100644 index 8feb81932887..000000000000 --- a/sys/arch/macppc/macppc/conf.c +++ /dev/null @@ -1,45 +0,0 @@ -/* $NetBSD: conf.c,v 1.46 2002/09/06 13:18:43 gehenna Exp $ */ - -/* - * Copyright (C) 1995, 1996 Wolfgang Solfrank. - * Copyright (C) 1995, 1996 TooLs GmbH. - * All rights reserved. - * - * 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 TooLs GmbH. - * 4. The name of TooLs GmbH may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``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 TOOLS GMBH 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 -#include - -/* - * Check whether dev is /dev/mem or /dev/kmem. - */ -int -iskmemdev(dev) - dev_t dev; -{ - return major(dev) == mem_no && minor(dev) < 2; -} diff --git a/sys/arch/mipsco/conf/files.mipsco b/sys/arch/mipsco/conf/files.mipsco index e0bf6879abbf..2b2537d37e00 100644 --- a/sys/arch/mipsco/conf/files.mipsco +++ b/sys/arch/mipsco/conf/files.mipsco @@ -1,4 +1,4 @@ -# $NetBSD: files.mipsco,v 1.9 2002/09/06 13:18:43 gehenna Exp $ +# $NetBSD: files.mipsco,v 1.10 2002/10/26 13:50:34 jdolecek Exp $ # MIPS Computer Corp -specific configuration info @@ -50,7 +50,6 @@ attach zstty at zsc file dev/ic/z8530tty.c zstty needs-count file arch/mipsco/mipsco/autoconf.c -file arch/mipsco/mipsco/conf.c file arch/mipsco/mipsco/machdep.c file arch/mipsco/mipsco/interrupt.c file arch/mipsco/mipsco/mips_3x30.c diff --git a/sys/arch/mipsco/mipsco/conf.c b/sys/arch/mipsco/mipsco/conf.c deleted file mode 100644 index a7084f9a2f8d..000000000000 --- a/sys/arch/mipsco/mipsco/conf.c +++ /dev/null @@ -1,53 +0,0 @@ -/* $NetBSD: conf.c,v 1.8 2002/09/06 13:18:43 gehenna Exp $ */ - -/* - * Copyright (c) 1992, 1993 - * The Regents of the University of California. All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * Ralph Campbell. - * - * 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. - * - * @(#)conf.c 8.2 (Berkeley) 11/14/93 - */ - -#include -#include - -/* - * Routine that identifies /dev/mem and /dev/kmem. - */ -int -iskmemdev(dev) - dev_t dev; -{ - - return (major(dev) == mem_no && minor(dev) < 2); -} diff --git a/sys/arch/mmeye/mmeye/conf.c b/sys/arch/mmeye/mmeye/conf.c index b1fc51c49729..ac5c4f76c926 100644 --- a/sys/arch/mmeye/mmeye/conf.c +++ b/sys/arch/mmeye/mmeye/conf.c @@ -1,4 +1,4 @@ -/* $NetBSD: conf.c,v 1.10 2002/09/06 13:18:43 gehenna Exp $ */ +/* $NetBSD: conf.c,v 1.11 2002/10/26 13:50:35 jdolecek Exp $ */ /* * Copyright (c) 1994, 1995 Charles M. Hannum. All rights reserved. @@ -34,17 +34,6 @@ #include "com.h" -/* - * Returns true if dev is /dev/mem or /dev/kmem. - */ -int -iskmemdev(dev) - dev_t dev; -{ - - return (major(dev) == mem_no && (minor(dev) < 2 || minor(dev) == 14)); -} - #include #define scicnpollc nullcnpollc diff --git a/sys/arch/mvme68k/mvme68k/conf.c b/sys/arch/mvme68k/mvme68k/conf.c index 9a15d5f7bdec..d1cbfc53f456 100644 --- a/sys/arch/mvme68k/mvme68k/conf.c +++ b/sys/arch/mvme68k/mvme68k/conf.c @@ -1,4 +1,4 @@ -/* $NetBSD: conf.c,v 1.27 2002/09/06 13:18:43 gehenna Exp $ */ +/* $NetBSD: conf.c,v 1.28 2002/10/26 13:50:36 jdolecek Exp $ */ /*- * Copyright (c) 1991 The Regents of the University of California. @@ -38,17 +38,6 @@ #include #include -/* - * Returns true if dev is /dev/mem or /dev/kmem. - */ -int -iskmemdev(dev) - dev_t dev; -{ - - return (major(dev) == mem_no && minor(dev) < 2); -} - /* * This entire table could be autoconfig()ed but that would mean that * the kernel's idea of the console would be out of sync with that of diff --git a/sys/arch/mvmeppc/conf/files.mvmeppc b/sys/arch/mvmeppc/conf/files.mvmeppc index 3c03f1c6990c..4635fd73e588 100644 --- a/sys/arch/mvmeppc/conf/files.mvmeppc +++ b/sys/arch/mvmeppc/conf/files.mvmeppc @@ -1,4 +1,4 @@ -# $NetBSD: files.mvmeppc,v 1.3 2002/09/06 13:18:43 gehenna Exp $ +# $NetBSD: files.mvmeppc,v 1.4 2002/10/26 13:50:36 jdolecek Exp $ # # Motorola's MVMEPPC boards specific configuration info # @@ -14,7 +14,6 @@ defflag opt_mvmetype.h SUPPORT_MVME240X file arch/mvmeppc/mvmeppc/autoconf.c file arch/mvmeppc/mvmeppc/bus_space.c file arch/mvmeppc/mvmeppc/clock.c -file arch/mvmeppc/mvmeppc/conf.c file arch/mvmeppc/mvmeppc/disksubr.c disk file arch/mvmeppc/mvmeppc/extintr.c file arch/mvmeppc/mvmeppc/machdep.c diff --git a/sys/arch/mvmeppc/mvmeppc/conf.c b/sys/arch/mvmeppc/mvmeppc/conf.c deleted file mode 100644 index 40e23ad849cd..000000000000 --- a/sys/arch/mvmeppc/mvmeppc/conf.c +++ /dev/null @@ -1,51 +0,0 @@ -/* $NetBSD: conf.c,v 1.6 2002/09/06 13:18:43 gehenna Exp $ */ - -/*- - * Copyright (c) 1998 The NetBSD Foundation, Inc. - * All rights reserved. - * - * This code is derived from software contributed to The NetBSD Foundation - * by Charles M. Hannum. - * - * 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 NetBSD - * Foundation, Inc. and its contributors. - * 4. 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 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 -#include - -/* - * Returns true if dev is /dev/mem or /dev/kmem. - */ -int -iskmemdev(dev) - dev_t dev; -{ - - return (major(dev) == mem_no && (minor(dev) < 2 || minor(dev) == 14)); -} diff --git a/sys/arch/netwinder/conf/files.netwinder b/sys/arch/netwinder/conf/files.netwinder index a47fb695c7cd..6baed2f2e9eb 100644 --- a/sys/arch/netwinder/conf/files.netwinder +++ b/sys/arch/netwinder/conf/files.netwinder @@ -1,4 +1,4 @@ -# $NetBSD: files.netwinder,v 1.26 2002/10/12 11:53:41 chris Exp $ +# $NetBSD: files.netwinder,v 1.27 2002/10/26 13:50:36 jdolecek Exp $ # # First try for arm-specific configuration info # @@ -68,8 +68,6 @@ file arch/arm/arm/disksubr_mbr.c disk file arch/arm/arm32/intr.c file arch/arm/arm32/spl.S -file arch/arm/arm32/conf.c - # ISA support. file arch/arm/footbridge/isa/isa_machdep.c isa file arch/arm/footbridge/isa/isa_io.c isa diff --git a/sys/arch/news68k/conf/files.news68k b/sys/arch/news68k/conf/files.news68k index f7715c9a29d6..5de0db9c71bc 100644 --- a/sys/arch/news68k/conf/files.news68k +++ b/sys/arch/news68k/conf/files.news68k @@ -1,4 +1,4 @@ -# $NetBSD: files.news68k,v 1.17 2002/10/20 02:37:30 chs Exp $ +# $NetBSD: files.news68k,v 1.18 2002/10/26 13:50:37 jdolecek Exp $ # NEWS68K-specific configuration info @@ -14,7 +14,6 @@ attach mainbus at root file arch/news68k/news68k/autoconf.c file arch/news68k/news68k/bus_space.c -file arch/news68k/news68k/conf.c #file arch/news68k/news68k/cons_machdep.c file arch/news68k/news68k/clock.c file arch/news68k/news68k/db_memrw.c ddb | kgdb diff --git a/sys/arch/news68k/news68k/conf.c b/sys/arch/news68k/news68k/conf.c deleted file mode 100644 index 3bd259bb93e3..000000000000 --- a/sys/arch/news68k/news68k/conf.c +++ /dev/null @@ -1,53 +0,0 @@ -/* $NetBSD: conf.c,v 1.9 2002/09/06 13:18:43 gehenna Exp $ */ - -/* - * Copyright (c) 1992, 1993 - * The Regents of the University of California. All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * Ralph Campbell. - * - * 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. - * - * @(#)conf.c 8.2 (Berkeley) 11/14/93 - */ - -#include -#include - -/* - * Routine that identifies /dev/mem and /dev/kmem. - */ -int -iskmemdev(dev) - dev_t dev; -{ - - return (major(dev) == mem_no && minor(dev) < 2); -} diff --git a/sys/arch/newsmips/conf/files.newsmips b/sys/arch/newsmips/conf/files.newsmips index c2f96e75860f..3599c6c6238e 100644 --- a/sys/arch/newsmips/conf/files.newsmips +++ b/sys/arch/newsmips/conf/files.newsmips @@ -1,4 +1,4 @@ -# $NetBSD: files.newsmips,v 1.20 2002/09/06 13:18:43 gehenna Exp $ +# $NetBSD: files.newsmips,v 1.21 2002/10/26 13:50:38 jdolecek Exp $ # NEWSMIPS-specific configuration info @@ -89,7 +89,6 @@ file arch/newsmips/apbus/if_tlp_ap.c tlp_ap file arch/newsmips/newsmips/autoconf.c file arch/newsmips/newsmips/bus.c -file arch/newsmips/newsmips/conf.c file arch/newsmips/newsmips/machdep.c file arch/newsmips/newsmips/news3400.c hb file arch/newsmips/newsmips/news5000.c ap diff --git a/sys/arch/newsmips/newsmips/conf.c b/sys/arch/newsmips/newsmips/conf.c deleted file mode 100644 index 0259ff8db62e..000000000000 --- a/sys/arch/newsmips/newsmips/conf.c +++ /dev/null @@ -1,53 +0,0 @@ -/* $NetBSD: conf.c,v 1.12 2002/09/06 13:18:43 gehenna Exp $ */ - -/* - * Copyright (c) 1992, 1993 - * The Regents of the University of California. All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * Ralph Campbell. - * - * 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. - * - * @(#)conf.c 8.2 (Berkeley) 11/14/93 - */ - -#include -#include - -/* - * Routine that identifies /dev/mem and /dev/kmem. - */ -int -iskmemdev(dev) - dev_t dev; -{ - - return (major(dev) == mem_no && minor(dev) < 2); -} diff --git a/sys/arch/next68k/next68k/conf.c b/sys/arch/next68k/next68k/conf.c index 6759a8be1a1d..0221b664913e 100644 --- a/sys/arch/next68k/next68k/conf.c +++ b/sys/arch/next68k/next68k/conf.c @@ -1,4 +1,4 @@ -/* $NetBSD: conf.c,v 1.13 2002/09/06 13:18:43 gehenna Exp $ */ +/* $NetBSD: conf.c,v 1.14 2002/10/26 13:50:38 jdolecek Exp $ */ /* * Copyright (c) 1990 The Regents of the University of California. @@ -43,17 +43,6 @@ #include "zstty.h" -/* - * Returns true if dev is /dev/mem or /dev/kmem. - */ -int -iskmemdev(dev) - dev_t dev; -{ - - return (major(dev) == mem_no && minor(dev) < 2); -} - #define zscnpollc nullcnpollc cons_decl(zs); diff --git a/sys/arch/ofppc/ofppc/conf.c b/sys/arch/ofppc/ofppc/conf.c index ab65980ee0a2..e81fb535ea2e 100644 --- a/sys/arch/ofppc/ofppc/conf.c +++ b/sys/arch/ofppc/ofppc/conf.c @@ -1,4 +1,4 @@ -/* $NetBSD: conf.c,v 1.14 2002/09/06 13:18:43 gehenna Exp $ */ +/* $NetBSD: conf.c,v 1.15 2002/10/26 13:50:38 jdolecek Exp $ */ /* * Copyright (C) 1995, 1996 Wolfgang Solfrank. @@ -36,16 +36,6 @@ #include "ofcons.h" -/* - * Check whether dev is /dev/mem or /dev/kmem. - */ -int -iskmemdev(dev) - dev_t dev; -{ - return major(dev) == mem_no && minor(dev) < 2; -} - #include cons_decl(ofcons_); diff --git a/sys/arch/pc532/pc532/conf.c b/sys/arch/pc532/pc532/conf.c index 4b80a7b7744b..4004570fc84d 100644 --- a/sys/arch/pc532/pc532/conf.c +++ b/sys/arch/pc532/pc532/conf.c @@ -1,4 +1,4 @@ -/* $NetBSD: conf.c,v 1.42 2002/09/06 13:18:43 gehenna Exp $ */ +/* $NetBSD: conf.c,v 1.43 2002/10/26 13:50:39 jdolecek Exp $ */ /*- * Copyright (c) 1991 The Regents of the University of California. @@ -40,17 +40,6 @@ #include "scn.h" -/* - * Returns true if dev is /dev/mem or /dev/kmem. - */ -int -iskmemdev(dev) - dev_t dev; -{ - - return (major(dev) == mem_no && minor(dev) < 2); -} - /* * This entire table could be autoconfig()ed but that would mean that * the kernel's idea of the console would be out of sync with that of diff --git a/sys/arch/playstation2/conf/files.playstation2 b/sys/arch/playstation2/conf/files.playstation2 index 8bd5dc072e1f..a97cfff6f41d 100644 --- a/sys/arch/playstation2/conf/files.playstation2 +++ b/sys/arch/playstation2/conf/files.playstation2 @@ -1,4 +1,4 @@ -# $NetBSD: files.playstation2,v 1.9 2002/09/06 13:18:43 gehenna Exp $ +# $NetBSD: files.playstation2,v 1.10 2002/10/26 13:50:39 jdolecek Exp $ maxpartitions 8 @@ -20,7 +20,6 @@ file arch/playstation2/playstation2/interrupt.c file arch/playstation2/playstation2/bus_space.c file arch/playstation2/playstation2/bus_dma.c file arch/playstation2/playstation2/clock.c -file arch/playstation2/playstation2/conf.c file arch/playstation2/playstation2/disksubr.c disk file arch/playstation2/playstation2/machdep.c file arch/playstation2/playstation2/sifbios.c diff --git a/sys/arch/playstation2/playstation2/conf.c b/sys/arch/playstation2/playstation2/conf.c deleted file mode 100644 index c3380435bfe1..000000000000 --- a/sys/arch/playstation2/playstation2/conf.c +++ /dev/null @@ -1,46 +0,0 @@ -/* $NetBSD: conf.c,v 1.5 2002/09/06 13:18:43 gehenna Exp $ */ - -/*- - * Copyright (c) 2001 The NetBSD Foundation, Inc. - * All rights reserved. - * - * 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 NetBSD - * Foundation, Inc. and its contributors. - * 4. 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 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 -#include - -/* - * Routine that identifies /dev/mem and /dev/kmem. - */ -int -iskmemdev(dev_t dev) -{ - return (major(dev) == mem_no && (minor(dev) < 2 || minor(dev) == 14)); -} diff --git a/sys/arch/pmax/conf/files.pmax b/sys/arch/pmax/conf/files.pmax index 1e091bf6bcb1..2bb628a8c66f 100644 --- a/sys/arch/pmax/conf/files.pmax +++ b/sys/arch/pmax/conf/files.pmax @@ -1,4 +1,4 @@ -# $NetBSD: files.pmax,v 1.102 2002/09/06 13:18:43 gehenna Exp $ +# $NetBSD: files.pmax,v 1.103 2002/10/26 13:50:40 jdolecek Exp $ # DECstation-specific configuration info # maxpartitions must be first item in files.${ARCH}. @@ -178,7 +178,6 @@ file arch/pmax/dev/if_tt.c tt needs-count file arch/pmax/pmax/autoconf.c file arch/pmax/pmax/bus_dma.c file arch/pmax/pmax/bus_space.c -file arch/pmax/pmax/conf.c file arch/pmax/pmax/disksubr.c file arch/pmax/pmax/machdep.c file arch/pmax/pmax/mainbus.c diff --git a/sys/arch/pmax/pmax/conf.c b/sys/arch/pmax/pmax/conf.c deleted file mode 100644 index fe48182778c0..000000000000 --- a/sys/arch/pmax/pmax/conf.c +++ /dev/null @@ -1,53 +0,0 @@ -/* $NetBSD: conf.c,v 1.47 2002/09/06 13:18:43 gehenna Exp $ */ - -/* - * Copyright (c) 1992, 1993 - * The Regents of the University of California. All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * Ralph Campbell. - * - * 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. - * - * @(#)conf.c 8.2 (Berkeley) 11/14/93 - */ - -#include -#include - -/* - * Routine that identifies /dev/mem and /dev/kmem. - */ -int -iskmemdev(dev) - dev_t dev; -{ - - return (major(dev) == mem_no && minor(dev) < 2); -} diff --git a/sys/arch/pmppc/conf/files.pmppc b/sys/arch/pmppc/conf/files.pmppc index 5161359b8295..128b3d8d6abb 100644 --- a/sys/arch/pmppc/conf/files.pmppc +++ b/sys/arch/pmppc/conf/files.pmppc @@ -1,4 +1,4 @@ -# $NetBSD: files.pmppc,v 1.4 2002/09/06 13:18:43 gehenna Exp $ +# $NetBSD: files.pmppc,v 1.5 2002/10/26 13:50:41 jdolecek Exp $ # # maxpartitions 16 @@ -8,7 +8,6 @@ maxusers 2 8 64 file arch/pmppc/pmppc/autoconf.c file arch/pmppc/pmppc/bus_space.c file arch/pmppc/pmppc/clock.c -file arch/pmppc/pmppc/conf.c file arch/pmppc/pmppc/disksubr.c disk file arch/pmppc/pmppc/extintr.c file arch/pmppc/pmppc/machdep.c diff --git a/sys/arch/pmppc/pmppc/conf.c b/sys/arch/pmppc/pmppc/conf.c deleted file mode 100644 index ba9f05802017..000000000000 --- a/sys/arch/pmppc/pmppc/conf.c +++ /dev/null @@ -1,51 +0,0 @@ -/* $NetBSD: conf.c,v 1.4 2002/09/06 13:18:43 gehenna Exp $ */ - -/*- - * Copyright (c) 1998 The NetBSD Foundation, Inc. - * All rights reserved. - * - * This code is derived from software contributed to The NetBSD Foundation - * by Charles M. Hannum. - * - * 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 NetBSD - * Foundation, Inc. and its contributors. - * 4. 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 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 -#include - -/* - * Returns true if dev is /dev/mem or /dev/kmem. - */ -int -iskmemdev(dev) - dev_t dev; -{ - - return (major(dev) == mem_no && (minor(dev) < 2 || minor(dev) == 14)); -} diff --git a/sys/arch/prep/conf/files.prep b/sys/arch/prep/conf/files.prep index d6cb19d6e2c2..dd4b7c01ef32 100644 --- a/sys/arch/prep/conf/files.prep +++ b/sys/arch/prep/conf/files.prep @@ -1,4 +1,4 @@ -# $NetBSD: files.prep,v 1.37 2002/09/06 13:18:43 gehenna Exp $ +# $NetBSD: files.prep,v 1.38 2002/10/26 13:50:41 jdolecek Exp $ # # prep-specific configuration info # @@ -28,7 +28,6 @@ file arch/prep/prep/platform.c file arch/prep/prep/autoconf.c file arch/prep/prep/bus_space.c file arch/prep/prep/clock.c -file arch/prep/prep/conf.c file arch/prep/prep/consinit.c file arch/prep/prep/disksubr.c disk file arch/prep/prep/extintr.c diff --git a/sys/arch/prep/prep/conf.c b/sys/arch/prep/prep/conf.c deleted file mode 100644 index bad78016fa30..000000000000 --- a/sys/arch/prep/prep/conf.c +++ /dev/null @@ -1,51 +0,0 @@ -/* $NetBSD: conf.c,v 1.12 2002/09/06 13:18:43 gehenna Exp $ */ - -/*- - * Copyright (c) 1998 The NetBSD Foundation, Inc. - * All rights reserved. - * - * This code is derived from software contributed to The NetBSD Foundation - * by Charles M. Hannum. - * - * 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 NetBSD - * Foundation, Inc. and its contributors. - * 4. 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 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 -#include - -/* - * Returns true if dev is /dev/mem or /dev/kmem. - */ -int -iskmemdev(dev) - dev_t dev; -{ - - return (major(dev) == mem_no && (minor(dev) < 2 || minor(dev) == 14)); -} diff --git a/sys/arch/sandpoint/conf/files.sandpoint b/sys/arch/sandpoint/conf/files.sandpoint index 69891eb393ea..90a10b3af603 100644 --- a/sys/arch/sandpoint/conf/files.sandpoint +++ b/sys/arch/sandpoint/conf/files.sandpoint @@ -1,4 +1,4 @@ -# $NetBSD: files.sandpoint,v 1.12 2002/09/06 13:18:43 gehenna Exp $ +# $NetBSD: files.sandpoint,v 1.13 2002/10/26 13:50:42 jdolecek Exp $ # # Motorola's "SandPoint" evaluation board's specific configuration info # @@ -9,7 +9,6 @@ maxusers 2 8 64 file arch/sandpoint/sandpoint/autoconf.c file arch/sandpoint/sandpoint/bus_space.c file arch/sandpoint/sandpoint/clock.c -file arch/sandpoint/sandpoint/conf.c file arch/sandpoint/sandpoint/disksubr.c disk file arch/sandpoint/sandpoint/extintr.c file arch/sandpoint/sandpoint/machdep.c diff --git a/sys/arch/sandpoint/sandpoint/conf.c b/sys/arch/sandpoint/sandpoint/conf.c deleted file mode 100644 index 80429b7fc17d..000000000000 --- a/sys/arch/sandpoint/sandpoint/conf.c +++ /dev/null @@ -1,51 +0,0 @@ -/* $NetBSD: conf.c,v 1.11 2002/09/06 13:18:43 gehenna Exp $ */ - -/*- - * Copyright (c) 1998 The NetBSD Foundation, Inc. - * All rights reserved. - * - * This code is derived from software contributed to The NetBSD Foundation - * by Charles M. Hannum. - * - * 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 NetBSD - * Foundation, Inc. and its contributors. - * 4. 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 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 -#include - -/* - * Returns true if dev is /dev/mem or /dev/kmem. - */ -int -iskmemdev(dev) - dev_t dev; -{ - - return (major(dev) == mem_no && (minor(dev) < 2 || minor(dev) == 14)); -} diff --git a/sys/arch/sgimips/conf/files.sgimips b/sys/arch/sgimips/conf/files.sgimips index c64bf6056b72..273bb17bb66a 100644 --- a/sys/arch/sgimips/conf/files.sgimips +++ b/sys/arch/sgimips/conf/files.sgimips @@ -1,4 +1,4 @@ -# $NetBSD: files.sgimips,v 1.21 2002/09/06 13:18:43 gehenna Exp $ +# $NetBSD: files.sgimips,v 1.22 2002/10/26 13:50:43 jdolecek Exp $ maxpartitions 16 @@ -68,7 +68,6 @@ file arch/sgimips/sgimips/ip32.c file arch/sgimips/sgimips/autoconf.c file arch/sgimips/sgimips/bus.c file arch/sgimips/sgimips/clock.c -file arch/sgimips/sgimips/conf.c file arch/sgimips/sgimips/console.c file arch/sgimips/sgimips/disksubr.c file arch/sgimips/sgimips/machdep.c diff --git a/sys/arch/sgimips/sgimips/conf.c b/sys/arch/sgimips/sgimips/conf.c deleted file mode 100644 index 4b85594f6d2c..000000000000 --- a/sys/arch/sgimips/sgimips/conf.c +++ /dev/null @@ -1,49 +0,0 @@ -/* $NetBSD: conf.c,v 1.20 2002/09/06 13:18:43 gehenna Exp $ */ - -/* - * Copyright (c) 1992, 1993 - * The Regents of the University of California. All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * Ralph Campbell. - * - * 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. - * - * @(#)conf.c 8.2 (Berkeley) 11/14/93 - */ - -#include -#include - -int -iskmemdev(dev) - dev_t dev; -{ - return (major(dev) == mem_no && minor(dev) < 2); -} diff --git a/sys/arch/sh5/sh5/conf.c b/sys/arch/sh5/sh5/conf.c index 131b249c8900..487c0b744c48 100644 --- a/sys/arch/sh5/sh5/conf.c +++ b/sys/arch/sh5/sh5/conf.c @@ -1,4 +1,4 @@ -/* $NetBSD: conf.c,v 1.4 2002/09/06 13:18:43 gehenna Exp $ */ +/* $NetBSD: conf.c,v 1.5 2002/10/26 13:50:44 jdolecek Exp $ */ /* * Copyright (c) 1994, 1995 Charles M. Hannum. All rights reserved. @@ -36,17 +36,6 @@ #include "scif.h" #include "dtfcons.h" -/* - * Returns true if dev is /dev/mem or /dev/kmem. - */ -int -iskmemdev(dev) - dev_t dev; -{ - - return (major(dev) == mem_no && (minor(dev) < 2 || minor(dev) == 14)); -} - #include #define scifcnpollc nullcnpollc diff --git a/sys/arch/shark/shark/conf.c b/sys/arch/shark/shark/conf.c index 6380d020ddd7..c9d9c5251031 100644 --- a/sys/arch/shark/shark/conf.c +++ b/sys/arch/shark/shark/conf.c @@ -1,4 +1,4 @@ -/* $NetBSD: conf.c,v 1.6 2002/09/06 13:18:43 gehenna Exp $ */ +/* $NetBSD: conf.c,v 1.7 2002/10/26 13:50:44 jdolecek Exp $ */ /* * Copyright (c) 1994-1998 Mark Brinicombe. @@ -51,16 +51,6 @@ #include "pc.h" #include "ofcons.h" -/* - * Returns true if dev is /dev/mem or /dev/kmem. - */ -int -iskmemdev(dev) - dev_t dev; -{ - return (major(dev) == mem_no && minor(dev) < 2); -} - /* * This entire table could be autoconfig()ed but that would mean that * the kernel's idea of the console would be out of sync with that of diff --git a/sys/arch/sparc/conf/files.sparc b/sys/arch/sparc/conf/files.sparc index d541847225a0..de2caf6ca690 100644 --- a/sys/arch/sparc/conf/files.sparc +++ b/sys/arch/sparc/conf/files.sparc @@ -1,4 +1,4 @@ -# $NetBSD: files.sparc,v 1.120 2002/10/21 15:25:42 uwe Exp $ +# $NetBSD: files.sparc,v 1.121 2002/10/26 13:50:45 jdolecek Exp $ # @(#)files.sparc 8.1 (Berkeley) 7/19/93 # sparc-specific configuration info @@ -280,7 +280,6 @@ file arch/sparc/fpu/fpu_subr.c file arch/sparc/sparc/autoconf.c file arch/sparc/sparc/cache.c -file arch/sparc/sparc/conf.c file arch/sparc/sparc/emul.c file arch/sparc/sparc/in_cksum.c file arch/sparc/sparc/intr.c diff --git a/sys/arch/sparc/sparc/conf.c b/sys/arch/sparc/sparc/conf.c deleted file mode 100644 index 7576d589f61f..000000000000 --- a/sys/arch/sparc/sparc/conf.c +++ /dev/null @@ -1,61 +0,0 @@ -/* $NetBSD: conf.c,v 1.77 2002/09/06 13:18:43 gehenna Exp $ */ - -/* - * Copyright (c) 1992, 1993 - * The Regents of the University of California. 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. - * - * 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. - * - * @(#)conf.c 8.3 (Berkeley) 11/14/93 - */ - -#include -#include - -/* - * Routine that identifies /dev/mem and /dev/kmem. - * - * A minimal stub routine can always return 0. - */ -int -iskmemdev(dev) - dev_t dev; -{ - - return (major(dev) == mem_no && minor(dev) < 2); -} diff --git a/sys/arch/sparc64/conf/files.sparc64 b/sys/arch/sparc64/conf/files.sparc64 index 1c8db401547a..f6dbd78a6e77 100644 --- a/sys/arch/sparc64/conf/files.sparc64 +++ b/sys/arch/sparc64/conf/files.sparc64 @@ -1,4 +1,4 @@ -# $NetBSD: files.sparc64,v 1.69 2002/10/15 15:11:07 thorpej Exp $ +# $NetBSD: files.sparc64,v 1.70 2002/10/26 13:50:46 jdolecek Exp $ # @(#)files.sparc64 8.1 (Berkeley) 7/19/93 # sparc64-specific configuration info @@ -175,7 +175,6 @@ file arch/sparc/fpu/fpu_sqrt.c file arch/sparc/fpu/fpu_subr.c file arch/sparc64/sparc64/autoconf.c -file arch/sparc64/sparc64/conf.c file arch/sparc64/sparc64/emul.c file arch/sparc64/sparc64/in_cksum.S file arch/sparc64/sparc64/in4_cksum.c inet diff --git a/sys/arch/sparc64/sparc64/conf.c b/sys/arch/sparc64/sparc64/conf.c deleted file mode 100644 index 5688f8e65506..000000000000 --- a/sys/arch/sparc64/sparc64/conf.c +++ /dev/null @@ -1,61 +0,0 @@ -/* $NetBSD: conf.c,v 1.25 2002/09/06 13:18:43 gehenna Exp $ */ - -/* - * Copyright (c) 1992, 1993 - * The Regents of the University of California. 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. - * - * 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. - * - * @(#)conf.c 8.3 (Berkeley) 11/14/93 - */ - -#include -#include - -/* - * Routine that identifies /dev/mem and /dev/kmem. - * - * A minimal stub routine can always return 0. - */ -int -iskmemdev(dev) - dev_t dev; -{ - - return (major(dev) == mem_no && minor(dev) < 2); -} diff --git a/sys/arch/sun2/conf/files.sun2 b/sys/arch/sun2/conf/files.sun2 index 437258c2f51e..29d36fbb4ae9 100644 --- a/sys/arch/sun2/conf/files.sun2 +++ b/sys/arch/sun2/conf/files.sun2 @@ -1,4 +1,4 @@ -# $NetBSD: files.sun2,v 1.10 2002/10/20 02:37:33 chs Exp $ +# $NetBSD: files.sun2,v 1.11 2002/10/26 13:50:47 jdolecek Exp $ # # sun2-specific configuration info @@ -15,7 +15,6 @@ file arch/sun2/sun2/machdep.c file arch/sun2/sun2/pmap.c file arch/sun2/sun2/control.c file arch/sun2/sun2/mem.c -file arch/sun2/sun2/conf.c file arch/sun2/sun2/db_machdep.c ddb file arch/sun2/sun2/db_memrw.c ddb | kgdb file arch/sun2/sun2/leds.c diff --git a/sys/arch/sun2/sun2/conf.c b/sys/arch/sun2/sun2/conf.c deleted file mode 100644 index 34560f9eeec5..000000000000 --- a/sys/arch/sun2/sun2/conf.c +++ /dev/null @@ -1,51 +0,0 @@ -/* $NetBSD: conf.c,v 1.7 2002/09/06 13:18:43 gehenna Exp $ */ - -/*- - * Copyright (c) 1994 Adam Glass, Gordon W. Ross - * Copyright (c) 1991, 1993 - * The Regents of the University of California. All rights reserved. - * - * 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. - * - * @(#)conf.c 8.2 (Berkeley) 11/14/93 - */ - -#include -#include - -/* - * Returns true if dev is /dev/mem or /dev/kmem. - */ -int -iskmemdev(dev) - dev_t dev; -{ - - return (major(dev) == mem_no && minor(dev) < 2); -} diff --git a/sys/arch/sun3/conf/files.sun3 b/sys/arch/sun3/conf/files.sun3 index c5be5d9373d8..7a3a04eee517 100644 --- a/sys/arch/sun3/conf/files.sun3 +++ b/sys/arch/sun3/conf/files.sun3 @@ -1,4 +1,4 @@ -# $NetBSD: files.sun3,v 1.65 2002/10/20 02:37:34 chs Exp $ +# $NetBSD: files.sun3,v 1.66 2002/10/26 13:50:47 jdolecek Exp $ # # sun3-specific configuration info @@ -32,7 +32,6 @@ file arch/sun3/sun3x/pmap.c _sun3x_ # Standard stuff (common to Sun3 and Sun3X) file arch/sun3/sun3/autoconf.c -file arch/sun3/sun3/conf.c file arch/sun3/sun3/db_machdep.c ddb file arch/sun3/sun3/db_memrw.c ddb | kgdb file arch/sun3/sun3/disksubr.c diff --git a/sys/arch/sun3/sun3/conf.c b/sys/arch/sun3/sun3/conf.c deleted file mode 100644 index 020523caeb5f..000000000000 --- a/sys/arch/sun3/sun3/conf.c +++ /dev/null @@ -1,51 +0,0 @@ -/* $NetBSD: conf.c,v 1.69 2002/09/06 13:18:43 gehenna Exp $ */ - -/*- - * Copyright (c) 1994 Adam Glass, Gordon W. Ross - * Copyright (c) 1991, 1993 - * The Regents of the University of California. All rights reserved. - * - * 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. - * - * @(#)conf.c 8.2 (Berkeley) 11/14/93 - */ - -#include -#include - -/* - * Returns true if dev is /dev/mem or /dev/kmem. - */ -int -iskmemdev(dev) - dev_t dev; -{ - - return (major(dev) == mem_no && minor(dev) < 2); -} diff --git a/sys/arch/vax/vax/conf.c b/sys/arch/vax/vax/conf.c index 02d2efb81df0..b220c8510009 100644 --- a/sys/arch/vax/vax/conf.c +++ b/sys/arch/vax/vax/conf.c @@ -1,4 +1,4 @@ -/* $NetBSD: conf.c,v 1.60 2002/09/06 13:18:43 gehenna Exp $ */ +/* $NetBSD: conf.c,v 1.61 2002/10/26 13:50:48 jdolecek Exp $ */ /*- * Copyright (c) 1982, 1986 The Regents of the University of California. @@ -96,14 +96,3 @@ struct consdev constab[]={ #endif { 0 } }; - -/* - * Returns true if dev is /dev/mem or /dev/kmem. - */ -int -iskmemdev(dev) - dev_t dev; -{ - - return (major(dev) == mem_no && minor(dev) < 2); -} diff --git a/sys/arch/walnut/conf/files.walnut b/sys/arch/walnut/conf/files.walnut index 1406395a6fa8..0a5db3ad6b85 100644 --- a/sys/arch/walnut/conf/files.walnut +++ b/sys/arch/walnut/conf/files.walnut @@ -1,4 +1,4 @@ -# $NetBSD: files.walnut,v 1.10 2002/09/06 13:18:43 gehenna Exp $ +# $NetBSD: files.walnut,v 1.11 2002/10/26 13:50:49 jdolecek Exp $ # # walnut-specific configuration info @@ -12,7 +12,6 @@ include "arch/powerpc/conf/files.ibm4xx" file arch/walnut/walnut/autoconf.c file arch/walnut/walnut/bus_dma.c file arch/walnut/walnut/consinit.c -file arch/walnut/walnut/conf.c file arch/walnut/walnut/disksubr.c disk file arch/walnut/walnut/machdep.c file arch/walnut/dev/ibm405gp.c diff --git a/sys/arch/walnut/walnut/conf.c b/sys/arch/walnut/walnut/conf.c deleted file mode 100644 index e621b4407060..000000000000 --- a/sys/arch/walnut/walnut/conf.c +++ /dev/null @@ -1,45 +0,0 @@ -/* $NetBSD: conf.c,v 1.9 2002/09/06 13:18:43 gehenna Exp $ */ - -/* - * Copyright (C) 1995, 1996 Wolfgang Solfrank. - * Copyright (C) 1995, 1996 TooLs GmbH. - * All rights reserved. - * - * 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 TooLs GmbH. - * 4. The name of TooLs GmbH may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``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 TOOLS GMBH 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 -#include - -/* - * Check whether dev is /dev/mem or /dev/kmem. - */ -int -iskmemdev(dev_t dev) -{ - - return major(dev) == mem_no && minor(dev) < 2; -} diff --git a/sys/arch/x68k/x68k/conf.c b/sys/arch/x68k/x68k/conf.c index 511204bc2b42..b351e75d718c 100644 --- a/sys/arch/x68k/x68k/conf.c +++ b/sys/arch/x68k/x68k/conf.c @@ -1,4 +1,4 @@ -/* $NetBSD: conf.c,v 1.32 2002/09/06 13:18:43 gehenna Exp $ */ +/* $NetBSD: conf.c,v 1.33 2002/10/26 13:50:50 jdolecek Exp $ */ /*- * Copyright (c) 1991 The Regents of the University of California. @@ -42,17 +42,6 @@ #include "kbd.h" #include "zstty.h" -/* - * Returns true if dev is /dev/mem or /dev/kmem. - */ -int -iskmemdev(dev) - dev_t dev; -{ - - return (major(dev) == mem_no && minor(dev) < 2); -} - /* * This entire table could be autoconfig()ed but that would mean that * the kernel's idea of the console would be out of sync with that of diff --git a/sys/arch/x86_64/conf/files.x86_64 b/sys/arch/x86_64/conf/files.x86_64 index 78acc4f7b5de..3708103199d1 100644 --- a/sys/arch/x86_64/conf/files.x86_64 +++ b/sys/arch/x86_64/conf/files.x86_64 @@ -1,4 +1,4 @@ -# $NetBSD: files.x86_64,v 1.11 2002/09/06 13:18:43 gehenna Exp $ +# $NetBSD: files.x86_64,v 1.12 2002/10/26 13:50:50 jdolecek Exp $ # # new style config file for x86_64 architecture # @@ -24,7 +24,6 @@ defflag VM86 file arch/x86_64/x86_64/autoconf.c file arch/x86_64/x86_64/bus_machdep.c -file arch/x86_64/x86_64/conf.c file arch/x86_64/x86_64/consinit.c file arch/x86_64/x86_64/db_dbgreg.s ddb file arch/x86_64/x86_64/db_disasm.c ddb diff --git a/sys/arch/x86_64/x86_64/conf.c b/sys/arch/x86_64/x86_64/conf.c deleted file mode 100644 index 40e23ad849cd..000000000000 --- a/sys/arch/x86_64/x86_64/conf.c +++ /dev/null @@ -1,51 +0,0 @@ -/* $NetBSD: conf.c,v 1.6 2002/09/06 13:18:43 gehenna Exp $ */ - -/*- - * Copyright (c) 1998 The NetBSD Foundation, Inc. - * All rights reserved. - * - * This code is derived from software contributed to The NetBSD Foundation - * by Charles M. Hannum. - * - * 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 NetBSD - * Foundation, Inc. and its contributors. - * 4. 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 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 -#include - -/* - * Returns true if dev is /dev/mem or /dev/kmem. - */ -int -iskmemdev(dev) - dev_t dev; -{ - - return (major(dev) == mem_no && (minor(dev) < 2 || minor(dev) == 14)); -} diff --git a/sys/miscfs/specfs/spec_vnops.c b/sys/miscfs/specfs/spec_vnops.c index bc1d677bbdd3..de8089e82c81 100644 --- a/sys/miscfs/specfs/spec_vnops.c +++ b/sys/miscfs/specfs/spec_vnops.c @@ -1,4 +1,4 @@ -/* $NetBSD: spec_vnops.c,v 1.65 2002/10/23 09:14:38 jdolecek Exp $ */ +/* $NetBSD: spec_vnops.c,v 1.66 2002/10/26 13:50:17 jdolecek Exp $ */ /* * Copyright (c) 1989, 1993 @@ -36,7 +36,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: spec_vnops.c,v 1.65 2002/10/23 09:14:38 jdolecek Exp $"); +__KERNEL_RCSID(0, "$NetBSD: spec_vnops.c,v 1.66 2002/10/26 13:50:17 jdolecek Exp $"); #include #include @@ -149,6 +149,19 @@ spec_lookup(v) return (ENOTDIR); } +/* + * Returns true if dev is /dev/mem or /dev/kmem. + */ +static int +iskmemdev(dev_t dev) +{ + /* mem_no is emitted by config(8) to generated devsw.c */ + extern const int mem_no; + + /* minor 14 is /dev/io on i386 with COMPAT_10 */ + return (major(dev) == mem_no && (minor(dev) < 2 || minor(dev) == 14)); +} + /* * Open a special file. */ diff --git a/sys/sys/conf.h b/sys/sys/conf.h index 12c078f5eaa4..d6d8d5687cd5 100644 --- a/sys/sys/conf.h +++ b/sys/sys/conf.h @@ -1,4 +1,4 @@ -/* $NetBSD: conf.h,v 1.106 2002/10/23 09:14:54 jdolecek Exp $ */ +/* $NetBSD: conf.h,v 1.107 2002/10/26 13:50:18 jdolecek Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -203,9 +203,6 @@ struct swdevt { #ifdef _KERNEL extern struct swdevt swdevt[]; -extern const int mem_no; -int iskmemdev __P((dev_t)); - #define DEV_MEM 0 /* minor device 0 is physical memory */ #define DEV_KMEM 1 /* minor device 1 is kernel memory */ #define DEV_NULL 2 /* minor device 2 is EOF/rathole */