Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/dev/pci Fix compile error on non-__HAVE_PCI_MSI_MSIX mac...
details: https://anonhg.NetBSD.org/src/rev/ba2c8888649c
branches: trunk
changeset: 338298:ba2c8888649c
user: msaitoh <msaitoh%NetBSD.org@localhost>
date: Sun May 17 14:23:15 2015 +0000
description:
Fix compile error on non-__HAVE_PCI_MSI_MSIX machines.
diffstat:
sys/dev/pci/if_bge.c | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diffs (54 lines):
diff -r 1c969400778d -r ba2c8888649c sys/dev/pci/if_bge.c
--- a/sys/dev/pci/if_bge.c Sun May 17 14:17:52 2015 +0000
+++ b/sys/dev/pci/if_bge.c Sun May 17 14:23:15 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bge.c,v 1.288 2015/05/17 12:06:26 msaitoh Exp $ */
+/* $NetBSD: if_bge.c,v 1.289 2015/05/17 14:23:15 msaitoh Exp $ */
/*
* Copyright (c) 2001 Wind River Systems
@@ -79,7 +79,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.288 2015/05/17 12:06:26 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.289 2015/05/17 14:23:15 msaitoh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -183,7 +183,9 @@
typedef int (*bge_eaddr_fcn_t)(struct bge_softc *, uint8_t[]);
static uint32_t bge_chipid(const struct pci_attach_args *);
+#ifdef __HAVE_PCI_MSI_MSIX
static int bge_can_use_msi(struct bge_softc *);
+#endif
static int bge_probe(device_t, cfdata_t, void *);
static void bge_attach(device_t, device_t, void *);
static int bge_detach(device_t, int);
@@ -3279,6 +3281,7 @@
return id;
}
+#ifdef __HAVE_PCI_MSI_MSIX
/*
* Return true if MSI can be used with this device.
*/
@@ -3306,6 +3309,7 @@
}
return (can_use_msi);
}
+#endif
/*
* Probe for a Broadcom chip. Check the PCI vendor and device IDs
@@ -3352,7 +3356,9 @@
int capmask;
int mii_flags;
int map_flags;
+#ifdef __HAVE_PCI_MSI_MSIX
int rv;
+#endif
char intrbuf[PCI_INTRSTR_LEN];
bp = bge_lookup(pa);
Home |
Main Index |
Thread Index |
Old Index