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

Correct pcibus_setup() to return as soon as one test succeeds.

Browse Source
This commit is contained in:
Stefan Eßer 1995-03-22 21:35:39 +00:00
parent 2d333dc2dd
commit 0f29bf015c
6 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/amd64/pci/pci_bus.c
View File

@ -1,6 +1,6 @@
/************************************************************************** /**************************************************************************
** **
** $Id: pcibus.c,v 1.6 1995/03/22 10:52:05 se Exp $ ** $Id: pcibus.c,v 1.7 1995/03/22 19:51:59 se Exp $
** **
** pci bus subroutines for i386 architecture. ** pci bus subroutines for i386 architecture.
** **
@ -162,6 +162,7 @@ pcibus_setup (void)
if (!inb (CONF2_ENABLE_PORT) && !inb (CONF2_FORWARD_PORT)) { if (!inb (CONF2_ENABLE_PORT) && !inb (CONF2_FORWARD_PORT)) {
pci_mechanism = 2; pci_mechanism = 2;
pci_maxdevice = 16; pci_maxdevice = 16;
return;
}; };
/*--------------------------------------- /*---------------------------------------
@ -177,6 +178,7 @@ pcibus_setup (void)
if (result == CONF1_ENABLE) { if (result == CONF1_ENABLE) {
pci_mechanism = 1; pci_mechanism = 1;
pci_maxdevice = 32; pci_maxdevice = 32;
return;
}; };
/*--------------------------------------- /*---------------------------------------

4
sys/amd64/pci/pci_cfgreg.c
View File

@ -1,6 +1,6 @@
/************************************************************************** /**************************************************************************
** **
** $Id: pcibus.c,v 1.6 1995/03/22 10:52:05 se Exp $ ** $Id: pcibus.c,v 1.7 1995/03/22 19:51:59 se Exp $
** **
** pci bus subroutines for i386 architecture. ** pci bus subroutines for i386 architecture.
** **
@ -162,6 +162,7 @@ pcibus_setup (void)
if (!inb (CONF2_ENABLE_PORT) && !inb (CONF2_FORWARD_PORT)) { if (!inb (CONF2_ENABLE_PORT) && !inb (CONF2_FORWARD_PORT)) {
pci_mechanism = 2; pci_mechanism = 2;
pci_maxdevice = 16; pci_maxdevice = 16;
return;
}; };
/*--------------------------------------- /*---------------------------------------
@ -177,6 +178,7 @@ pcibus_setup (void)
if (result == CONF1_ENABLE) { if (result == CONF1_ENABLE) {
pci_mechanism = 1; pci_mechanism = 1;
pci_maxdevice = 32; pci_maxdevice = 32;
return;
}; };
/*--------------------------------------- /*---------------------------------------

4
sys/i386/isa/pcibus.c
View File

@ -1,6 +1,6 @@
/************************************************************************** /**************************************************************************
** **
** $Id: pcibus.c,v 1.6 1995/03/22 10:52:05 se Exp $ ** $Id: pcibus.c,v 1.7 1995/03/22 19:51:59 se Exp $
** **
** pci bus subroutines for i386 architecture. ** pci bus subroutines for i386 architecture.
** **
@ -162,6 +162,7 @@ pcibus_setup (void)
if (!inb (CONF2_ENABLE_PORT) && !inb (CONF2_FORWARD_PORT)) { if (!inb (CONF2_ENABLE_PORT) && !inb (CONF2_FORWARD_PORT)) {
pci_mechanism = 2; pci_mechanism = 2;
pci_maxdevice = 16; pci_maxdevice = 16;
return;
}; };
/*--------------------------------------- /*---------------------------------------
@ -177,6 +178,7 @@ pcibus_setup (void)
if (result == CONF1_ENABLE) { if (result == CONF1_ENABLE) {
pci_mechanism = 1; pci_mechanism = 1;
pci_maxdevice = 32; pci_maxdevice = 32;
return;
}; };
/*--------------------------------------- /*---------------------------------------

4
sys/i386/pci/pci_bus.c
View File

@ -1,6 +1,6 @@
/************************************************************************** /**************************************************************************
** **
** $Id: pcibus.c,v 1.6 1995/03/22 10:52:05 se Exp $ ** $Id: pcibus.c,v 1.7 1995/03/22 19:51:59 se Exp $
** **
** pci bus subroutines for i386 architecture. ** pci bus subroutines for i386 architecture.
** **
@ -162,6 +162,7 @@ pcibus_setup (void)
if (!inb (CONF2_ENABLE_PORT) && !inb (CONF2_FORWARD_PORT)) { if (!inb (CONF2_ENABLE_PORT) && !inb (CONF2_FORWARD_PORT)) {
pci_mechanism = 2; pci_mechanism = 2;
pci_maxdevice = 16; pci_maxdevice = 16;
return;
}; };
/*--------------------------------------- /*---------------------------------------
@ -177,6 +178,7 @@ pcibus_setup (void)
if (result == CONF1_ENABLE) { if (result == CONF1_ENABLE) {
pci_mechanism = 1; pci_mechanism = 1;
pci_maxdevice = 32; pci_maxdevice = 32;
return;
}; };
/*--------------------------------------- /*---------------------------------------

4
sys/i386/pci/pci_cfgreg.c
View File

@ -1,6 +1,6 @@
/************************************************************************** /**************************************************************************
** **
** $Id: pcibus.c,v 1.6 1995/03/22 10:52:05 se Exp $ ** $Id: pcibus.c,v 1.7 1995/03/22 19:51:59 se Exp $
** **
** pci bus subroutines for i386 architecture. ** pci bus subroutines for i386 architecture.
** **
@ -162,6 +162,7 @@ pcibus_setup (void)
if (!inb (CONF2_ENABLE_PORT) && !inb (CONF2_FORWARD_PORT)) { if (!inb (CONF2_ENABLE_PORT) && !inb (CONF2_FORWARD_PORT)) {
pci_mechanism = 2; pci_mechanism = 2;
pci_maxdevice = 16; pci_maxdevice = 16;
return;
}; };
/*--------------------------------------- /*---------------------------------------
@ -177,6 +178,7 @@ pcibus_setup (void)
if (result == CONF1_ENABLE) { if (result == CONF1_ENABLE) {
pci_mechanism = 1; pci_mechanism = 1;
pci_maxdevice = 32; pci_maxdevice = 32;
return;
}; };
/*--------------------------------------- /*---------------------------------------

4
sys/i386/pci/pci_pir.c
View File

@ -1,6 +1,6 @@
/************************************************************************** /**************************************************************************
** **
** $Id: pcibus.c,v 1.6 1995/03/22 10:52:05 se Exp $ ** $Id: pcibus.c,v 1.7 1995/03/22 19:51:59 se Exp $
** **
** pci bus subroutines for i386 architecture. ** pci bus subroutines for i386 architecture.
** **
@ -162,6 +162,7 @@ pcibus_setup (void)
if (!inb (CONF2_ENABLE_PORT) && !inb (CONF2_FORWARD_PORT)) { if (!inb (CONF2_ENABLE_PORT) && !inb (CONF2_FORWARD_PORT)) {
pci_mechanism = 2; pci_mechanism = 2;
pci_maxdevice = 16; pci_maxdevice = 16;
return;
}; };
/*--------------------------------------- /*---------------------------------------
@ -177,6 +178,7 @@ pcibus_setup (void)
if (result == CONF1_ENABLE) { if (result == CONF1_ENABLE) {
pci_mechanism = 1; pci_mechanism = 1;
pci_maxdevice = 32; pci_maxdevice = 32;
return;
}; };
/*--------------------------------------- /*---------------------------------------