Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/alpha/pci Fix build without vga at pci.



details:   https://anonhg.NetBSD.org/src/rev/ac5630abc250
branches:  trunk
changeset: 964618:ac5630abc250
user:      rin <rin%NetBSD.org@localhost>
date:      Fri Aug 09 08:04:16 2019 +0000

description:
Fix build without vga at pci.

diffstat:

 sys/arch/alpha/pci/pci_machdep.c |  11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diffs (42 lines):

diff -r 30b2253d8c5d -r ac5630abc250 sys/arch/alpha/pci/pci_machdep.c
--- a/sys/arch/alpha/pci/pci_machdep.c  Fri Aug 09 08:02:23 2019 +0000
+++ b/sys/arch/alpha/pci/pci_machdep.c  Fri Aug 09 08:04:16 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.c,v 1.23 2014/10/17 18:31:07 uebayasi Exp $ */
+/* $NetBSD: pci_machdep.c,v 1.24 2019/08/09 08:04:16 rin 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.23 2014/10/17 18:31:07 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.24 2019/08/09 08:04:16 rin Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -66,9 +66,12 @@
 {
 #if NVGA_PCI || NTGA
        pcitag_t tag;
-       pcireg_t id, class;
+       pcireg_t id;
        int match, nmatch;
 #endif
+#if NVGA_PCI
+       pcireg_t class;
+#endif
        int (*fn)(bus_space_tag_t, bus_space_tag_t, pci_chipset_tag_t,
            int, int, int);
 
@@ -78,7 +81,9 @@
        if (id == 0 || id == 0xffffffff)
                panic("pci_display_console: no device at %d/%d/%d",
                    bus, device, function);
+#  if NVGA_PCI
        class = pci_conf_read(pc, tag, PCI_CLASS_REG);
+#  endif
 
        match = 0;
 #endif



Home | Main Index | Thread Index | Old Index