Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Recognize another card and handle the case when both drqs are the same.

Browse Source
This commit is contained in:
augustss 1997-11-18 19:24:46 +00:00
parent ba76377205
commit f1a39fe2df
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/dev/isapnp/sb_isapnp.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: sb_isapnp.c,v 1.14 1997/11/18 19:17:21 augustss Exp $ */
/* $NetBSD: sb_isapnp.c,v 1.15 1997/11/18 19:24:46 augustss Exp $ */
/*
* Copyright (c) 1991-1993 Regents of the University of California.
@ -90,6 +90,7 @@ sb_isapnp_match(parent, match, aux)
strcmp(ipa->ipa_devlogic, "CTL0045") && /* SB AWE64 Value */
strcmp(ipa->ipa_devlogic, "ESS1868") &&
strcmp(ipa->ipa_devlogic, "@@@0001") && /* XXX broken id ALS100 */
strcmp(ipa->ipa_devlogic, "OPT9250") && /* Televideo card, Opti */
strcmp(ipa->ipa_devcompat, "PNPB000") && /* generic SB 1.5 */
strcmp(ipa->ipa_devcompat, "PNPB001") && /* generic SB 2.0 */
strcmp(ipa->ipa_devcompat, "PNPB002") && /* generic SB Pro */
@ -121,7 +122,7 @@ sb_isapnp_attach(parent, self, aux)
sc->sc_irq = ipa->ipa_irq[0].num;
sc->sc_drq8 = ipa->ipa_drq[0].num;
if (ipa->ipa_ndrq > 1) {
if (ipa->ipa_ndrq > 1 && ipa->ipa_drq[0].num != ipa->ipa_drq[1].num) {
/* Some cards have the 16 bit drq first */
if (sc->sc_drq8 >= 4) {
sc->sc_drq16 = sc->sc_drq8;