28c28
< * $Id: ata-all.c,v 1.4 1999/03/07 21:49:14 sos Exp $
---
> * $Id: ata-all.c,v 1.5 1999/03/28 18:57:18 sos Exp $
77c77
< static int32_t atanlun = 0, sysctrl = 0;
---
> static int32_t atanlun = 0;
154c154
< int32_t bmaddr_1 = 0, bmaddr_2 = 0, irq1, irq2;
---
> int32_t bmaddr_1 = 0, bmaddr_2 = 0, sysctrl = 0, irq1, irq2;
166c166
< /* if this is at Promise controller handle it specially */
---
> /* if this is a Promise controller handle it specially */
175a176
> outb(bmaddr_1 + 0x1f, inb(bmaddr_1 + 0x1f) | 0x01);
253c254,257
< if (inl(sysctrl) & 0x00000400)
---
> struct ata_softc *scp = atadevices[unit];
> int32_t channel = inl((pci_conf_read(scp->tag, 0x20) & 0xfffc) + 0x1c);
>
> if (channel & 0x00000400)
255c259,260
< if (inl(sysctrl) & 0x00004000)
---
>
> if (channel & 0x00004000)
261c266
< ata_probe(int32_t ioaddr, int32_t altioaddr, int32_t bmaddr,
---
> ata_probe(int32_t ioaddr, int32_t altioaddr, int32_t bmaddr,
425c430,431
< static int32_t intcount = 0;
---
> u_int8_t status;
> static int32_t intr_count = 0;
458,460c464,467
< if (intcount++ < 10)
< printf("ata%d: unwanted interrupt %d\n", unit, intcount);
< inb(scp->ioaddr + ATA_STATUS);
---
> status = inb(scp->ioaddr + ATA_STATUS);
> if (intr_count++ < 10)
> printf("ata%d: unwanted interrupt %d status = %02x\n",
> unit, intr_count, status);