diff options
| author | Steve Passe <fsmp@FreeBSD.org> | 1997-06-25 20:56:29 +0000 |
|---|---|---|
| committer | Steve Passe <fsmp@FreeBSD.org> | 1997-06-25 20:56:29 +0000 |
| commit | 91f7398bca3d04a1a0db92a25770d0ca621ccca5 (patch) | |
| tree | 092517ed8001ac0634d8054ed8a67f7f18d37955 | |
| parent | 7bcc0f3d6669b63a2b7945c8442aad5bd3cb470b (diff) | |
Notes
| -rw-r--r-- | sys/dev/pci/pci.c | 12 | ||||
| -rw-r--r-- | sys/pci/pci.c | 12 |
2 files changed, 14 insertions, 10 deletions
diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c index 50b7d5682f9d..e197ee696f78 100644 --- a/sys/dev/pci/pci.c +++ b/sys/dev/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); diff --git a/sys/pci/pci.c b/sys/pci/pci.c index 50b7d5682f9d..e197ee696f78 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); |