[src/trunk]: src/sys/arch/alpha PCI controller doesn't rely on (depend on) AG...

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

details:   https://anonhg.NetBSD.org/src/rev/3e7fb2cf9467
branches:  trunk
changeset: 333069:3e7fb2cf9467
user:      uebayasi <uebayasi%NetBSD.org@localhost>
date:      Fri Oct 17 18:31:07 2014 +0000

description:
PCI controller doesn't rely on (depend on) AGP bus, but provide it.  If one
specific architecture is known to have some specific AGP implementation, such
suggestion must be done in the "selection" part, not the "definition" part.

This is also an indirect (across bus attachment), circular dependency.

diffstat:

 sys/arch/alpha/conf/files.alpha  |   4 ++--
 sys/arch/alpha/pci/pci_machdep.c |  10 +++++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diffs (62 lines):

diff -r 0d909ca79d29 -r 3e7fb2cf9467 sys/arch/alpha/conf/files.alpha
--- a/sys/arch/alpha/conf/files.alpha   Fri Oct 17 18:14:42 2014 +0000
+++ b/sys/arch/alpha/conf/files.alpha   Fri Oct 17 18:31:07 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.alpha,v 1.187 2014/02/22 18:42:47 martin Exp $
+# $NetBSD: files.alpha,v 1.188 2014/10/17 18:31:07 uebayasi Exp $
 #
 # alpha-specific configuration info
 
@@ -240,7 +240,7 @@
 file   arch/alpha/pci/dwlpx_dma.c      dwlpx
 file   arch/alpha/pci/dwlpx_pci.c      dwlpx
 
-device irongate: pcibus, agpbus, agp_amd, isadma_bounce
+device irongate: pcibus, agpbus, isadma_bounce
 attach irongate at mainbus
 file   arch/alpha/pci/irongate.c               irongate
 file   arch/alpha/pci/irongate_bus_io.c        irongate
diff -r 0d909ca79d29 -r 3e7fb2cf9467 sys/arch/alpha/pci/pci_machdep.c
--- a/sys/arch/alpha/pci/pci_machdep.c  Fri Oct 17 18:14:42 2014 +0000
+++ b/sys/arch/alpha/pci/pci_machdep.c  Fri Oct 17 18:31:07 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.c,v 1.22 2014/03/29 19:28:25 christos Exp $ */
+/* $NetBSD: pci_machdep.c,v 1.23 2014/10/17 18:31:07 uebayasi Exp $ */
 
 /*
  * Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.22 2014/03/29 19:28:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.23 2014/10/17 18:31:07 uebayasi Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -64,12 +64,15 @@
 void
 pci_display_console(bus_space_tag_t iot, bus_space_tag_t memt, pci_chipset_tag_t pc, int bus, int device, int function)
 {
+#if NVGA_PCI || NTGA
        pcitag_t tag;
        pcireg_t id, class;
        int match, nmatch;
+#endif
        int (*fn)(bus_space_tag_t, bus_space_tag_t, pci_chipset_tag_t,
            int, int, int);
 
+#if NVGA_PCI || NTGA
        tag = pci_make_tag(pc, bus, device, function);
        id = pci_conf_read(pc, tag, PCI_ID_REG);
        if (id == 0 || id == 0xffffffff)
@@ -77,7 +80,8 @@
                    bus, device, function);
        class = pci_conf_read(pc, tag, PCI_CLASS_REG);
 
-       nmatch = match = 0; /* XXX really only if we've got FBs configured */
+       match = 0;
+#endif
        fn = NULL;
 
 #if NVGA_PCI