d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Modified to use renamed get_pci_apic_irq() -> pci_apic_pin() function.

Browse Source
This commit is contained in:
Steve Passe 1997-06-25 20:56:29 +00:00
parent 7bcc0f3d66
commit 91f7398bca
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/dev/pci/pci.c
View File

@ -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);

12
sys/pci/pci.c
View File

@ -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);