28c28
< * $FreeBSD: head/sys/dev/ata/ata-dma.c 75516 2001-04-14 18:33:08Z sos $
---
> * $FreeBSD: head/sys/dev/ata/ata-dma.c 75553 2001-04-16 21:22:34Z sos $
109a110
> case 0x244a8086: /* Intel ICH2 mobile */
121c122
< "%s setting UDMA5 on ICH2 chip\n",
---
> "%s setting UDMA5 on Intel chip\n",
151,153c152,153
< "%s setting UDMA4 on ICH%s chip\n",
< (error) ? "failed" : "success",
< (scp->chiptype == 0x244b8086) ? "2" : "");
---
> "%s setting UDMA4 on Intel chip\n",
> (error) ? "failed" : "success");
180,184c180,181
< ata_printf(scp, device, "%s setting UDMA2 on %s chip\n",
< (error) ? "failed" : "success",
< (scp->chiptype == 0x244b8086) ? "ICH2" :
< (scp->chiptype == 0x24118086) ? "ICH" :
< (scp->chiptype == 0x24218086) ? "ICH0" :"PIIX4");
---
> ata_printf(scp, device, "%s setting UDMA2 on Intel chip\n",
> (error) ? "failed" : "success");
223,228c220,221
< ata_printf(scp, device, "%s setting WDMA2 on %s chip\n",
< (error) ? "failed" : "success",
< (scp->chiptype == 0x244b8086) ? "ICH2" :
< (scp->chiptype == 0x24118086) ? "ICH" :
< (scp->chiptype == 0x24218086) ? "ICH0" :
< (scp->chiptype == 0x70108086) ? "PIIX3":"PIIX4");
---
> ata_printf(scp, device, "%s setting WDMA2 on Intel chip\n",
> (error) ? "failed" : "success");
277c270
< "%s setting WDMA2 on PIIX chip\n",
---
> "%s setting WDMA2 on Intel chip\n",
299c292
< "%s setting UDMA5 on Aladdin chip\n",
---
> "%s setting UDMA5 on Acer chip\n",
320c313
< "%s setting UDMA4 on Aladdin chip\n",
---
> "%s setting UDMA4 on Acer chip\n",
341c334
< "%s setting UDMA2 on Aladdin chip\n",
---
> "%s setting UDMA2 on Acer chip\n",
366c359
< "%s setting WDMA2 on Aladdin chip\n",
---
> "%s setting WDMA2 on Acer chip\n",
< * $FreeBSD: head/sys/dev/ata/ata-dma.c 75516 2001-04-14 18:33:08Z sos $
---
> * $FreeBSD: head/sys/dev/ata/ata-dma.c 75553 2001-04-16 21:22:34Z sos $
109a110
> case 0x244a8086: /* Intel ICH2 mobile */
121c122
< "%s setting UDMA5 on ICH2 chip\n",
---
> "%s setting UDMA5 on Intel chip\n",
151,153c152,153
< "%s setting UDMA4 on ICH%s chip\n",
< (error) ? "failed" : "success",
< (scp->chiptype == 0x244b8086) ? "2" : "");
---
> "%s setting UDMA4 on Intel chip\n",
> (error) ? "failed" : "success");
180,184c180,181
< ata_printf(scp, device, "%s setting UDMA2 on %s chip\n",
< (error) ? "failed" : "success",
< (scp->chiptype == 0x244b8086) ? "ICH2" :
< (scp->chiptype == 0x24118086) ? "ICH" :
< (scp->chiptype == 0x24218086) ? "ICH0" :"PIIX4");
---
> ata_printf(scp, device, "%s setting UDMA2 on Intel chip\n",
> (error) ? "failed" : "success");
223,228c220,221
< ata_printf(scp, device, "%s setting WDMA2 on %s chip\n",
< (error) ? "failed" : "success",
< (scp->chiptype == 0x244b8086) ? "ICH2" :
< (scp->chiptype == 0x24118086) ? "ICH" :
< (scp->chiptype == 0x24218086) ? "ICH0" :
< (scp->chiptype == 0x70108086) ? "PIIX3":"PIIX4");
---
> ata_printf(scp, device, "%s setting WDMA2 on Intel chip\n",
> (error) ? "failed" : "success");
277c270
< "%s setting WDMA2 on PIIX chip\n",
---
> "%s setting WDMA2 on Intel chip\n",
299c292
< "%s setting UDMA5 on Aladdin chip\n",
---
> "%s setting UDMA5 on Acer chip\n",
320c313
< "%s setting UDMA4 on Aladdin chip\n",
---
> "%s setting UDMA4 on Acer chip\n",
341c334
< "%s setting UDMA2 on Aladdin chip\n",
---
> "%s setting UDMA2 on Acer chip\n",
366c359
< "%s setting WDMA2 on Aladdin chip\n",
---
> "%s setting WDMA2 on Acer chip\n",