Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename pio_mode, etc ... to PIO_cap, etc ... for consistency with the 

ata_drive_datas struct. Suggested by Soren S. Jorvan.
This commit is contained in:
bouyer 1998-12-03 18:24:30 +00:00
parent aa66b9fc72
commit 47ab212504
11 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/arch/arm32/mainbus/wdc_pioc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: wdc_pioc.c,v 1.8 1998/11/22 14:36:38 drochner Exp $ */
/* $NetBSD: wdc_pioc.c,v 1.9 1998/12/03 18:24:30 bouyer Exp $ */
/*
* Copyright (c) 1997-1998 Mark Brinicombe.
@ -149,7 +149,7 @@ wdc_pioc_attach(parent, self, aux)
if (!sc->sc_ih)
panic("%s: Cannot claim IRQ %d\n", self->dv_xname, pa->pa_irq);
sc->sc_wdcdev.cap |= WDC_CAPABILITY_DATA16;
sc->sc_wdcdev.pio_mode = 0;
sc->sc_wdcdev.PIO_cap = 0;
sc->wdc_chanptr = &sc->wdc_channel;
sc->sc_wdcdev.channels = &sc->wdc_chanptr;
sc->sc_wdcdev.nchannels = 1;

4
sys/arch/arm32/podulebus/icside.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: icside.c,v 1.10 1998/11/22 14:55:29 drochner Exp $ */
/* $NetBSD: icside.c,v 1.11 1998/12/03 18:24:30 bouyer Exp $ */
/*
* Copyright (c) 1997-1998 Mark Brinicombe
@ -244,7 +244,7 @@ icside_attach(parent, self, aux)
}
sc->sc_wdcdev.nchannels = ide->channels;
sc->sc_wdcdev.cap |= WDC_CAPABILITY_DATA16;
sc->sc_wdcdev.pio_mode = 0;
sc->sc_wdcdev.PIO_cap = 0;
sc->sc_pa = pa;
for (channel = 0; channel < ide->channels; ++channel) {

4
sys/arch/arm32/podulebus/rapide.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: rapide.c,v 1.11 1998/11/22 14:36:38 drochner Exp $ */
/* $NetBSD: rapide.c,v 1.12 1998/12/03 18:24:30 bouyer Exp $ */
/*
* Copyright (c) 1997-1998 Mark Brinicombe
@ -244,7 +244,7 @@ rapide_attach(parent, self, aux)
/* Fill in wdc and channel infos */
sc->sc_wdcdev.cap |= WDC_CAPABILITY_DATA32;
sc->sc_wdcdev.pio_mode = 0;
sc->sc_wdcdev.PIO_cap = 0;
sc->sc_wdcdev.channels = sc->wdc_chanarray;
sc->sc_wdcdev.nchannels = 2;
for (channel = 0 ; channel < 2; channel++) {

4
sys/arch/arm32/podulebus/simide.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: simide.c,v 1.9 1998/11/22 14:36:38 drochner Exp $ */
/* $NetBSD: simide.c,v 1.10 1998/12/03 18:24:30 bouyer Exp $ */
/*
* Copyright (c) 1997-1998 Mark Brinicombe
@ -242,7 +242,7 @@ simide_attach(parent, self, aux)
/* Fill in wdc and channel infos */
sc->sc_wdcdev.cap |= WDC_CAPABILITY_DATA16;
sc->sc_wdcdev.pio_mode = 0;
sc->sc_wdcdev.PIO_cap = 0;
sc->sc_wdcdev.channels = sc->wdc_chanarray;
sc->sc_wdcdev.nchannels = 2;
for (channel = 0 ; channel < 2; channel++) {

4
sys/arch/atari/dev/wdc_mb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: wdc_mb.c,v 1.4 1998/11/22 14:36:38 drochner Exp $ */
/* $NetBSD: wdc_mb.c,v 1.5 1998/12/03 18:24:30 bouyer Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -162,7 +162,7 @@ wdc_mb_attach(parent, self, aux)
sc->sc_wdcdev.cap |= WDC_CAPABILITY_DATA16 | WDC_CAPABILITY_HWLOCK |
WDC_CAPABILITY_ATA_NOSTREAM;
sc->sc_wdcdev.pio_mode = 0;
sc->sc_wdcdev.PIO_cap = 0;
sc->sc_wdcdev.claim_hw = &claim_hw;
sc->sc_wdcdev.free_hw = &free_hw;
sc->wdc_chanptr = &sc->wdc_channel;

8
sys/dev/ic/wdc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: wdc.c,v 1.51 1998/12/03 17:30:32 bouyer Exp $ */
/* $NetBSD: wdc.c,v 1.52 1998/12/03 18:24:30 bouyer Exp $ */
/*
@ -791,7 +791,7 @@ wdc_probe_caps(drvp)
* get the highter one for the drive.
*/
if ((wdc->cap & WDC_CAPABILITY_MODE) == 0 ||
wdc->pio_mode >= i + 3) {
wdc->PIO_cap >= i + 3) {
drvp->PIO_mode = i + 3;
drvp->PIO_cap = i + 3;
break;
@ -821,7 +821,7 @@ wdc_probe_caps(drvp)
}
if (wdc->cap & WDC_CAPABILITY_DMA) {
if ((wdc->cap & WDC_CAPABILITY_MODE) &&
wdc->dma_mode < i)
wdc->DMA_cap < i)
continue;
drvp->DMA_mode = i;
drvp->DMA_cap = i;
@ -843,7 +843,7 @@ wdc_probe_caps(drvp)
sep = ",";
if (wdc->cap & WDC_CAPABILITY_UDMA) {
if ((wdc->cap & WDC_CAPABILITY_MODE) &&
wdc->udma_mode < i)
wdc->UDMA_cap < i)
continue;
drvp->UDMA_mode = i;
drvp->UDMA_cap = i;

8
sys/dev/ic/wdcvar.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: wdcvar.h,v 1.12 1998/12/03 15:38:59 bouyer Exp $ */
/* $NetBSD: wdcvar.h,v 1.13 1998/12/03 18:24:31 bouyer Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -90,9 +90,9 @@ struct wdc_softc { /* Per controller state */
#define WDC_CAPABILITY_ATA_NOSTREAM 0x0040 /* Don't use stream funcs on ATA */
#define WDC_CAPABILITY_ATAPI_NOSTREAM 0x0080 /* Don't use stream f on ATAPI */
#define WDC_CAPABILITY_NO_EXTRA_RESETS 0x0100 /* only reset once */
u_int8_t pio_mode; /* highest PIO mode supported */
u_int8_t dma_mode; /* highest DMA mode supported */
u_int8_t udma_mode; /* highest UDMA mode supported */
u_int8_t PIO_cap; /* highest PIO mode supported */
u_int8_t DMA_cap; /* highest DMA mode supported */
u_int8_t UDMA_cap; /* highest UDMA mode supported */
int nchannels; /* Number of channels on this controller */
struct channel_softc **channels; /* channels-specific datas (array) */

4
sys/dev/isa/wdc_isa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: wdc_isa.c,v 1.11 1998/11/21 15:41:42 drochner Exp $ */
/* $NetBSD: wdc_isa.c,v 1.12 1998/12/03 18:24:31 bouyer Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -151,7 +151,7 @@ wdc_isa_attach(parent, self, aux)
wdc_isa_dma_setup(sc);
}
sc->sc_wdcdev.cap |= WDC_CAPABILITY_DATA16 | WDC_CAPABILITY_DATA32;
sc->sc_wdcdev.pio_mode = 0;
sc->sc_wdcdev.PIO_cap = 0;
sc->wdc_chanptr = &sc->wdc_channel;
sc->sc_wdcdev.channels = &sc->wdc_chanptr;
sc->sc_wdcdev.nchannels = 1;

4
sys/dev/isapnp/wdc_isapnp.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: wdc_isapnp.c,v 1.9 1998/11/21 15:41:42 drochner Exp $ */
/* $NetBSD: wdc_isapnp.c,v 1.10 1998/12/03 18:24:31 bouyer Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -148,7 +148,7 @@ wdc_isapnp_attach(parent, self, aux)
}
#endif
sc->sc_wdcdev.cap |= WDC_CAPABILITY_DATA16 | WDC_CAPABILITY_DATA32;
sc->sc_wdcdev.pio_mode = 0;
sc->sc_wdcdev.PIO_cap = 0;
sc->wdc_chanptr = &sc->wdc_channel;
sc->sc_wdcdev.channels = &sc->wdc_chanptr;
sc->sc_wdcdev.nchannels = 1;

32
sys/dev/pci/pciide.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pciide.c,v 1.26 1998/12/03 17:27:57 bouyer Exp $ */
/* $NetBSD: pciide.c,v 1.27 1998/12/03 18:24:31 bouyer Exp $ */
/*
* Copyright (c) 1996, 1998 Christopher G. Demetriou. All rights reserved.
@ -1061,8 +1061,8 @@ default_setup_cap(sc)
{
if (sc->sc_dma_ok)
sc->sc_wdcdev.cap |= WDC_CAPABILITY_DMA;
sc->sc_wdcdev.pio_mode = 0;
sc->sc_wdcdev.dma_mode = 0;
sc->sc_wdcdev.PIO_cap = 0;
sc->sc_wdcdev.DMA_cap = 0;
}
void
@ -1181,9 +1181,9 @@ piix_setup_cap(sc)
sc->sc_wdcdev.cap |= WDC_CAPABILITY_UDMA;
sc->sc_wdcdev.cap |= WDC_CAPABILITY_DATA32 | WDC_CAPABILITY_MODE |
WDC_CAPABILITY_DMA;
sc->sc_wdcdev.pio_mode = 4;
sc->sc_wdcdev.dma_mode = 2;
sc->sc_wdcdev.udma_mode = 2;
sc->sc_wdcdev.PIO_cap = 4;
sc->sc_wdcdev.DMA_cap = 2;
sc->sc_wdcdev.UDMA_cap = 2;
}
void
@ -1548,9 +1548,9 @@ apollo_setup_cap(sc)
sc->sc_wdcdev.cap |= WDC_CAPABILITY_UDMA;
sc->sc_wdcdev.cap |= WDC_CAPABILITY_DATA32 | WDC_CAPABILITY_MODE |
WDC_CAPABILITY_DMA;
sc->sc_wdcdev.pio_mode = 4;
sc->sc_wdcdev.dma_mode = 2;
sc->sc_wdcdev.udma_mode = 2;
sc->sc_wdcdev.PIO_cap = 4;
sc->sc_wdcdev.DMA_cap = 2;
sc->sc_wdcdev.UDMA_cap = 2;
}
void
@ -1712,8 +1712,8 @@ cmd0643_6_setup_cap(sc)
{
sc->sc_wdcdev.cap |= WDC_CAPABILITY_DATA32 | WDC_CAPABILITY_MODE |
WDC_CAPABILITY_DMA;
sc->sc_wdcdev.pio_mode = 4;
sc->sc_wdcdev.dma_mode = 2;
sc->sc_wdcdev.PIO_cap = 4;
sc->sc_wdcdev.DMA_cap = 2;
}
void
@ -1788,8 +1788,8 @@ cy693_setup_cap(sc)
{
sc->sc_wdcdev.cap |= WDC_CAPABILITY_DATA32 | WDC_CAPABILITY_MODE |
WDC_CAPABILITY_DMA;
sc->sc_wdcdev.pio_mode = 4;
sc->sc_wdcdev.dma_mode = 2;
sc->sc_wdcdev.PIO_cap = 4;
sc->sc_wdcdev.DMA_cap = 2;
}
void
@ -1908,9 +1908,9 @@ sis_setup_cap(sc)
{
sc->sc_wdcdev.cap |= WDC_CAPABILITY_DATA32 | WDC_CAPABILITY_MODE |
WDC_CAPABILITY_DMA | WDC_CAPABILITY_UDMA;
sc->sc_wdcdev.pio_mode = 4;
sc->sc_wdcdev.dma_mode = 2;
sc->sc_wdcdev.udma_mode = 2;
sc->sc_wdcdev.PIO_cap = 4;
sc->sc_wdcdev.DMA_cap = 2;
sc->sc_wdcdev.UDMA_cap = 2;
}
void

4
sys/dev/pcmcia/wdc_pcmcia.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: wdc_pcmcia.c,v 1.17 1998/11/22 21:58:50 pk Exp $ */
/* $NetBSD: wdc_pcmcia.c,v 1.18 1998/12/03 18:24:31 bouyer Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -325,7 +325,7 @@ wdc_pcmcia_attach(parent, self, aux)
sc->wdc_channel.data32iot = sc->wdc_channel.cmd_iot;
sc->wdc_channel.data32ioh = sc->wdc_channel.cmd_ioh;
sc->sc_wdcdev.cap |= WDC_CAPABILITY_DATA16 | WDC_CAPABILITY_DATA32;
sc->sc_wdcdev.pio_mode = 0;
sc->sc_wdcdev.PIO_cap = 0;
sc->wdc_chanptr = &sc->wdc_channel;
sc->sc_wdcdev.channels = &sc->wdc_chanptr;
sc->sc_wdcdev.nchannels = 1;