[src/trunk]: src/sys A few "isa" files are so tightly integrated into the x86...

[soren <soren%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c76398c8e3dd
branches:  trunk
changeset: 788663:c76398c8e3dd
user:      soren <soren%NetBSD.org@localhost>
date:      Wed Jul 17 21:26:28 2013 +0000

description:
A few "isa" files are so tightly integrated into the x86 platform code
as to not really be part of the optional isa bus autoconf machinery.

Allows configuring a kernel like so:

include "arch/amd64/conf/GENERIC"
no isa

diffstat:

 sys/arch/amd64/conf/files.amd64 |   9 +--------
 sys/arch/i386/conf/files.i386   |   9 +--------
 sys/arch/x86/conf/files.x86     |   9 +++++++--
 sys/dev/pci/eso.c               |   7 ++-----
 sys/dev/pci/sv.c                |  11 ++++-------
 5 files changed, 15 insertions(+), 30 deletions(-)

diffs (152 lines):

diff -r 2a858916de80 -r c76398c8e3dd sys/arch/amd64/conf/files.amd64
--- a/sys/arch/amd64/conf/files.amd64   Wed Jul 17 21:21:34 2013 +0000
+++ b/sys/arch/amd64/conf/files.amd64   Wed Jul 17 21:26:28 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.amd64,v 1.79 2012/10/13 19:42:02 alnsn Exp $
+#      $NetBSD: files.amd64,v 1.80 2013/07/17 21:26:28 soren Exp $
 #
 # new style config file for amd64 architecture
 #
@@ -107,13 +107,6 @@
 
 include        "dev/isa/files.isa"
 
-# PC clock
-file   arch/x86/isa/clock.c                    isa
-file   arch/x86/isa/rtc.c                      isa
-
-# TSC timecounter support
-file   arch/x86/x86/tsc.c
-
 # attribute used to represent the "keyboard controller"
 # XXX should be a real device
 define pckbcport { [irq = -1], [port = -1] }
diff -r 2a858916de80 -r c76398c8e3dd sys/arch/i386/conf/files.i386
--- a/sys/arch/i386/conf/files.i386     Wed Jul 17 21:21:34 2013 +0000
+++ b/sys/arch/i386/conf/files.i386     Wed Jul 17 21:26:28 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.i386,v 1.370 2012/12/25 10:51:03 mbalmer Exp $
+#      $NetBSD: files.i386,v 1.371 2013/07/17 21:26:28 soren Exp $
 #
 # new style config file for i386 architecture
 #
@@ -245,18 +245,11 @@
 
 include        "dev/isa/files.isa"
 
-# PC clock
-file   arch/x86/isa/clock.c            isa
-file   arch/x86/isa/rtc.c              isa
-
 # Protech PS3100 cash drawer
 device ptcd: gpiobus
 attach ptcd at isa
 file   dev/isa/ptcd.c                  ptcd
 
-# TSC support
-file   arch/x86/x86/tsc.c
-
 # Numeric Processing Extension; Math Co-processor
 device npx
 file   arch/i386/isa/npx.c             npx needs-flag
diff -r 2a858916de80 -r c76398c8e3dd sys/arch/x86/conf/files.x86
--- a/sys/arch/x86/conf/files.x86       Wed Jul 17 21:21:34 2013 +0000
+++ b/sys/arch/x86/conf/files.x86       Wed Jul 17 21:26:28 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.x86,v 1.79 2012/08/29 17:13:21 drochner Exp $
+#      $NetBSD: files.x86,v 1.80 2013/07/17 21:26:29 soren Exp $
 
 # options for MP configuration through the MP spec
 defflag opt_mpbios.h MPBIOS MPVERBOSE MPDEBUG MPBIOS_SCANPCI
@@ -89,6 +89,7 @@
 file   arch/x86/x86/procfs_machdep.c   procfs
 file   arch/x86/x86/sys_machdep.c
 file   arch/x86/x86/syscall.c
+file   arch/x86/x86/tsc.c
 file   arch/x86/x86/vm_machdep.c
 file   arch/x86/x86/x86_autoconf.c
 file   arch/x86/x86/x86_userconf.c             userconf
@@ -118,7 +119,11 @@
 file   arch/x86/acpi/acpi_wakeup.c     acpi
 file   arch/x86/acpi/acpi_machdep.c    acpi
 
-file   arch/x86/isa/isa_machdep.c      isa
+file   arch/x86/isa/isa_machdep.c
+
+# PC clock
+file   arch/x86/isa/clock.c
+file   arch/x86/isa/rtc.c
 
 # Stubs for x86 routines not included in the system
 file   arch/x86/x86/x86_stub.c
diff -r 2a858916de80 -r c76398c8e3dd sys/dev/pci/eso.c
--- a/sys/dev/pci/eso.c Wed Jul 17 21:21:34 2013 +0000
+++ b/sys/dev/pci/eso.c Wed Jul 17 21:26:28 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: eso.c,v 1.62 2012/10/27 17:18:31 chs Exp $     */
+/*     $NetBSD: eso.c,v 1.63 2013/07/17 21:26:29 soren Exp $   */
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: eso.c,v 1.62 2012/10/27 17:18:31 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: eso.c,v 1.63 2013/07/17 21:26:29 soren Exp $");
 
 #include "mpu.h"
 
@@ -96,11 +96,8 @@
  * XXX engine by allocating through the ISA DMA tag.
  */
 #if defined(amd64) || defined(i386)
-#include "isa.h"
-#if NISA > 0
 #include <dev/isa/isavar.h>
 #endif
-#endif
 
 #if defined(AUDIO_DEBUG) || defined(DEBUG)
 #define DPRINTF(x) printf x
diff -r 2a858916de80 -r c76398c8e3dd sys/dev/pci/sv.c
--- a/sys/dev/pci/sv.c  Wed Jul 17 21:21:34 2013 +0000
+++ b/sys/dev/pci/sv.c  Wed Jul 17 21:26:28 2013 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: sv.c,v 1.47 2012/10/27 17:18:35 chs Exp $ */
+/*      $NetBSD: sv.c,v 1.48 2013/07/17 21:26:29 soren Exp $ */
 /*      $OpenBSD: sv.c,v 1.2 1998/07/13 01:50:15 csapuntz Exp $ */
 
 /*
@@ -67,7 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sv.c,v 1.47 2012/10/27 17:18:35 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sv.c,v 1.48 2013/07/17 21:26:29 soren Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -95,12 +95,9 @@
  * As long as bus_dmamem_alloc_range() is missing we use the ISA
  * DMA tag on i386.
  */
-#if defined(i386)
-#include "isa.h"
-#if NISA > 0
+#if defined(amd64) || defined(i386)
 #include <dev/isa/isavar.h>
 #endif
-#endif
 
 #ifdef AUDIO_DEBUG
 #define DPRINTF(x)     if (svdebug) printf x
@@ -379,7 +376,7 @@
 #if defined(alpha)
        /* XXX Force allocation through the SGMAP. */
        sc->sc_dmatag = alphabus_dma_get_tag(pa->pa_dmat, ALPHA_BUS_ISA);
-#elif defined(i386) && NISA > 0
+#elif defined(amd64) || defined(i386)
 /* XXX
  * The SonicVibes DMA is broken and only works on 24-bit addresses.
  * As long as bus_dmamem_alloc_range() is missing we use the ISA