diff options
| author | Matthew N. Dodd <mdodd@FreeBSD.org> | 1999-10-08 13:02:34 +0000 |
|---|---|---|
| committer | Matthew N. Dodd <mdodd@FreeBSD.org> | 1999-10-08 13:02:34 +0000 |
| commit | fad05b4cf4761480f12d89224480e50308be9965 (patch) | |
| tree | 512a1c092843f1be413e1077c24652ec1746014e /sys/dev/buslogic/bt_mca.c | |
| parent | ee565fb26e7da32225a5ed57e8938bb685162f22 (diff) | |
| download | src-fad05b4cf4761480f12d89224480e50308be9965.tar.gz src-fad05b4cf4761480f12d89224480e50308be9965.zip | |
Sync with recent changes to the MCA bus code. Resource IVARS went
away.
Notes
Notes:
svn path=/head/; revision=52026
Diffstat (limited to 'sys/dev/buslogic/bt_mca.c')
| -rw-r--r-- | sys/dev/buslogic/bt_mca.c | 26 |
1 files changed, 9 insertions, 17 deletions
diff --git a/sys/dev/buslogic/bt_mca.c b/sys/dev/buslogic/bt_mca.c index fca0218e9c2c..d0a0fc919bbd 100644 --- a/sys/dev/buslogic/bt_mca.c +++ b/sys/dev/buslogic/bt_mca.c @@ -120,25 +120,17 @@ bt_mca_alloc_resources(device_t dev) if (io == NULL) return (ENOMEM); - if (mca_get_irq(dev) != -1) { - rid = 0; - irq = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, - 0, ~0, 1, RF_ACTIVE); - if (irq == NULL) - goto bad; - } else { - irq = 0; - } + rid = 0; + irq = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, + 0, ~0, 1, RF_ACTIVE); + if (irq == NULL) + goto bad; - if (mca_get_drq(dev) != -1) { - rid = 0; - drq = bus_alloc_resource(dev, SYS_RES_DRQ, &rid, + rid = 0; + drq = bus_alloc_resource(dev, SYS_RES_DRQ, &rid, 0, ~0, 1, RF_ACTIVE); - if (drq == NULL) - goto bad; - } else { - drq = 0; - } + if (drq == NULL) + goto bad; bt_init_softc(dev, io, irq, drq); |