summaryrefslogtreecommitdiffstats
path: root/sys/pci/pci.c
diff options
context:
space:
mode:
authorfsmp <fsmp@FreeBSD.org>1997-06-25 20:56:29 +0000
committerfsmp <fsmp@FreeBSD.org>1997-06-25 20:56:29 +0000
commit5a98e53b38854233386fab5b7f048e60bfe2574a (patch)
treebcfd68c70150940bc61ec0fd87924fe4aa16d108 /sys/pci/pci.c
parent55447e1bb11282e2d408abdfe6af3c7a8f752522 (diff)
downloadFreeBSD-src-5a98e53b38854233386fab5b7f048e60bfe2574a.zip
FreeBSD-src-5a98e53b38854233386fab5b7f048e60bfe2574a.tar.gz
Modified to use renamed get_pci_apic_irq() -> pci_apic_pin() function.
Diffstat (limited to 'sys/pci/pci.c')
-rw-r--r--sys/pci/pci.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/sys/pci/pci.c b/sys/pci/pci.c
index 50b7d56..e197ee6 100644
--- a/sys/pci/pci.c
+++ b/sys/pci/pci.c
@@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: pci.c,v 1.75 1997/05/28 10:01:03 se Exp $
+ * $Id: pci.c,v 1.2 1997/06/25 20:16:02 smp Exp smp $
*
*/
@@ -51,6 +51,10 @@
#include <pci/pcivar.h>
#include <pci/pci_ioctl.h>
+#ifdef APIC_IO
+#include <machine/smp.h>
+#endif /* APIC_IO */
+
/* return highest PCI bus number known to be used, or -1 if none */
static int
@@ -337,15 +341,13 @@ pci_readcfg(pcicfgregs *probe)
if (cfg->intpin != 0) {
int airq;
- airq = get_pci_apic_irq(cfg->bus,
- cfg->slot, cfg->intpin);
-
+ airq = pci_apic_pin(cfg->bus, cfg->slot, cfg->intpin);
if ((airq >= 0) && (airq != cfg->intline)) {
undirect_pci_irq(cfg->intline);
cfg->intline = airq;
}
}
-#endif /* APIC_IO */
+#endif /* APIC_IO */
cfg->mingnt = pci_cfgread(cfg, PCIR_MINGNT, 1);
cfg->maxlat = pci_cfgread(cfg, PCIR_MAXLAT, 1);
OpenPOWER on IntegriCloud