diff options
| author | Bill Paul <wpaul@FreeBSD.org> | 1999-08-09 21:12:18 +0000 |
|---|---|---|
| committer | Bill Paul <wpaul@FreeBSD.org> | 1999-08-09 21:12:18 +0000 |
| commit | d9d628b000c4ee3a976de1e643aafd666f65bae3 (patch) | |
| tree | 3e893208ff33ea0f505a5ebe4e09e855a7e2a68b /sys/amd64/pci | |
| parent | 41ff460e00df9752a4d906b4b93bcf27334acb85 (diff) | |
Notes
Diffstat (limited to 'sys/amd64/pci')
| -rw-r--r-- | sys/amd64/pci/pci_bus.c | 12 | ||||
| -rw-r--r-- | sys/amd64/pci/pci_cfgreg.c | 12 |
2 files changed, 18 insertions, 6 deletions
diff --git a/sys/amd64/pci/pci_bus.c b/sys/amd64/pci/pci_bus.c index eb6cc27dcada..944d1066685f 100644 --- a/sys/amd64/pci/pci_bus.c +++ b/sys/amd64/pci/pci_bus.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: pcibus.c,v 1.43 1999/07/16 01:00:29 msmith Exp $ + * $Id: pcibus.c,v 1.44 1999/08/04 13:38:24 peter Exp $ * */ @@ -274,10 +274,10 @@ nexus_pcib_is_host_bridge(pcicfgregs *cfg, u_int32_t id, u_int8_t class, u_int8_t subclass, u_int8_t *busnum) { - const char *s = "Host to PCI bridge"; + const char *s = NULL; static u_int8_t pxb[4]; /* hack for 450nx */ - if (class != PCIC_BRIDGE || subclass != PCIS_BRIDGE_HOST) + if ((class != PCIC_BRIDGE) && (subclass != PCIS_BRIDGE_HOST)) return NULL; *busnum = 0; @@ -395,6 +395,12 @@ nexus_pcib_is_host_bridge(pcicfgregs *cfg, /* just guessing the secondary bus register number ... */ *busnum = pci_cfgread(cfg, 0x45, 1); break; + case 0x884910e0: + s = "Integrated Micro Solutions VL Bridge"; + break; + default: + s = "Host to PCI bridge"; + break; } return s; diff --git a/sys/amd64/pci/pci_cfgreg.c b/sys/amd64/pci/pci_cfgreg.c index eb6cc27dcada..944d1066685f 100644 --- a/sys/amd64/pci/pci_cfgreg.c +++ b/sys/amd64/pci/pci_cfgreg.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: pcibus.c,v 1.43 1999/07/16 01:00:29 msmith Exp $ + * $Id: pcibus.c,v 1.44 1999/08/04 13:38:24 peter Exp $ * */ @@ -274,10 +274,10 @@ nexus_pcib_is_host_bridge(pcicfgregs *cfg, u_int32_t id, u_int8_t class, u_int8_t subclass, u_int8_t *busnum) { - const char *s = "Host to PCI bridge"; + const char *s = NULL; static u_int8_t pxb[4]; /* hack for 450nx */ - if (class != PCIC_BRIDGE || subclass != PCIS_BRIDGE_HOST) + if ((class != PCIC_BRIDGE) && (subclass != PCIS_BRIDGE_HOST)) return NULL; *busnum = 0; @@ -395,6 +395,12 @@ nexus_pcib_is_host_bridge(pcicfgregs *cfg, /* just guessing the secondary bus register number ... */ *busnum = pci_cfgread(cfg, 0x45, 1); break; + case 0x884910e0: + s = "Integrated Micro Solutions VL Bridge"; + break; + default: + s = "Host to PCI bridge"; + break; } return s; |