28c28
< * $FreeBSD: head/sys/dev/ata/ata-all.c 53719 1999-11-26 19:24:26Z sos $
---
> * $FreeBSD: head/sys/dev/ata/ata-all.c 54270 1999-12-07 22:07:18Z sos $
191c191
< return "Intel PIIX IDE controller";
---
> return "Intel PIIX ATA controller";
193c193
< return "Intel PIIX3 IDE controller";
---
> return "Intel PIIX3 ATA controller";
195c195
< return "Intel PIIX4 IDE controller";
---
> return "Intel PIIX4 ATA controller";
197c197
< return "AcerLabs Aladdin IDE controller";
---
> return "AcerLabs Aladdin ATA controller";
199c199
< return "Promise Ultra/33 IDE controller";
---
> return "Promise Ultra/33 ATA controller";
201c201
< return "Promise Ultra/66 IDE controller";
---
> return "Promise Ultra/66 ATA controller";
203c203
< return "HighPoint HPT366 IDE controller";
---
> return "HighPoint HPT366 ATA controller";
205c205,211
< return "VIA Apollo IDE controller";
---
> switch (pci_read_config(dev, 0x08, 1)) {
> case 1:
> return "VIA 82C586 ATA controller";
> case 6:
> return "VIA 82C686 ATA controller";
> }
> return "VIA Apollo ATA controller";
208,209c214,215
< case 0x05961106: /* 82c596 */
< return "VIA Apollo IDE controller (generic mode)";
---
> case 0x05961106:
> return "VIA 82C596 ATA controller (generic mode)";
211c217
< return "CMD 640 IDE controller (generic mode)";
---
> return "CMD 640 ATA controller (generic mode)";
213c219
< return "CMD 646 IDE controller (generic mode)";
---
> return "CMD 646 ATA controller (generic mode)";
215c221
< return "Cypress 82C693 IDE controller (generic mode)";
---
> return "Cypress 82C693 ATA controller (generic mode)";
217c223
< return "Cyrix 5530 IDE controller (generic mode)";
---
> return "Cyrix 5530 ATA controller (generic mode)";
221c227
< return "Unknown PCI IDE controller (generic mode)";
---
> return "Unknown PCI ATA controller (generic mode)";
229a236
>
841a849
> scp->active = ATA_IDLE;
843a852
> scp->active = ATA_IDLE;