Source-Changes-HG archive

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

[src/trunk]: src/sys/arch/x86/x86 Make it compilable without PCI



details:   https://anonhg.NetBSD.org/src/rev/7d531928f250
branches:  trunk
changeset: 808138:7d531928f250
user:      martin <martin%NetBSD.org@localhost>
date:      Thu May 07 12:52:46 2015 +0000

description:
Make it compilable without PCI

diffstat:

 sys/arch/x86/x86/intr.c |  10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diffs (45 lines):

diff -r 09ce4f30c56b -r 7d531928f250 sys/arch/x86/x86/intr.c
--- a/sys/arch/x86/x86/intr.c   Thu May 07 06:23:23 2015 +0000
+++ b/sys/arch/x86/x86/intr.c   Thu May 07 12:52:46 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intr.c,v 1.82 2015/05/02 14:30:27 roy Exp $    */
+/*     $NetBSD: intr.c,v 1.83 2015/05/07 12:52:46 martin Exp $ */
 
 /*-
  * Copyright (c) 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -133,7 +133,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.82 2015/05/02 14:30:27 roy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.83 2015/05/07 12:52:46 martin Exp $");
 
 #include "opt_intrdebug.h"
 #include "opt_multiprocessor.h"
@@ -178,6 +178,10 @@
 
 #include <x86/pci/msipic.h>
 
+#if NPCI == 0
+#define msipic_is_msi_pic(PIC) (false)
+#endif
+
 #ifdef DDB
 #include <ddb/db_output.h>
 #endif
@@ -468,6 +472,7 @@
 {
        int ih;
 
+#if NPCI > 0
        if ((pic->pic_type == PIC_MSI) || (pic->pic_type == PIC_MSIX)) {
                uint64_t pih;
                int dev, vec;
@@ -484,6 +489,7 @@
 
                return pci_msi_string(NULL, pih, buf, len);
        }
+#endif
 
        /*
         * If the device is pci, "legacy_irq" is alway -1. Least 8 bit of "ih"



Home | Main Index | Thread Index | Old Index