28c28
< * $Id: ata-all.c,v 1.11 1999/04/22 08:07:44 sos Exp $
---
> * $Id: ata-all.c,v 1.12 1999/05/08 21:58:58 dfr Exp $
56a57
> #if NPCI > 0
58a60
> #endif
226c228
< int32_t bmaddr_1 = 0, bmaddr_2 = 0, sysctrl = 0, irq1, irq2;
---
> int32_t bmaddr_1 = 0, bmaddr_2 = 0, irq1, irq2;
249d250
< sysctrl = (pci_read_config(dev, 0x20, 4) & 0xfffc) + 0x1c;
314,317c315,321
< irq = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 0, ~0,1,RF_ACTIVE);
< if (sysctrl)
< bus_setup_intr(dev, irq, INTR_TYPE_BIO,
< promise_intr, scp, &ih);
---
> irq = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 0, ~0, 1,
> RF_SHAREABLE | RF_ACTIVE);
> if (!irq)
> printf("ata_pciattach: Unable to alloc interrupt\n");
>
> if (type == 0x4d33105a)
> bus_setup_intr(dev, irq, INTR_TYPE_BIO, promise_intr, scp, &ih);
319,320c323
< bus_setup_intr(dev, irq, INTR_TYPE_BIO,
< ataintr, scp, &ih);
---
> bus_setup_intr(dev, irq, INTR_TYPE_BIO, ataintr, scp, &ih);
341,342c344,349
< irq = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 0, ~0,1,RF_ACTIVE);
< if (!sysctrl)
---
> if (type != 0x4d33105a) {
> irq = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 0, ~0, 1,
> RF_SHAREABLE | RF_ACTIVE);
> if (!irq)
> printf("ata_pciattach: Unable to alloc interrupt\n");
>
343a351
> }
547d554
< int unit;
550d556
< unit = scp->unit;
579c585
< unit, intr_count, status);
---
> scp->lun, intr_count, status);