Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys Rename:
details: https://anonhg.NetBSD.org/src/rev/f5f04f027f23
branches: trunk
changeset: 557035:f5f04f027f23
user: thorpej <thorpej%NetBSD.org@localhost>
date: Thu Jan 01 17:18:53 2004 +0000
description:
Rename:
- wdc_xfer to ata_xfer
- channel_queue to ata_queue
and move them to <dev/ata/atavar.h> so they can be used by non-wdc ATA
controllers. Clean up the member names of these structures while at it.
diffstat:
sys/arch/acorn32/mainbus/wdc_pioc.c | 6 +-
sys/arch/acorn32/podulebus/icside.c | 6 +-
sys/arch/acorn32/podulebus/rapide.c | 8 +-
sys/arch/acorn32/podulebus/simide.c | 8 +-
sys/arch/amiga/dev/wdc_amiga.c | 6 +-
sys/arch/atari/dev/wdc_mb.c | 6 +-
sys/arch/i386/pnpbios/pciide_pnpbios.c | 8 +-
sys/arch/mac68k/obio/wdc_obio.c | 6 +-
sys/arch/macppc/dev/kauai.c | 6 +-
sys/arch/macppc/dev/wdc_obio.c | 6 +-
sys/arch/playstation2/dev/wdc_spd.c | 6 +-
sys/arch/prep/dev/wdc_obio.c | 6 +-
sys/dev/ata/ata.c | 8 +-
sys/dev/ata/ata_wdc.c | 127 ++++++++++++++++----------------
sys/dev/ata/atavar.h | 39 +++++++++-
sys/dev/ic/wdc.c | 116 +++++++++++++++--------------
sys/dev/ic/wdc_upc.c | 6 +-
sys/dev/ic/wdcvar.h | 44 +---------
sys/dev/isa/wdc_isa.c | 6 +-
sys/dev/isapnp/wdc_isapnp.c | 6 +-
sys/dev/ofisa/wdc_ofisa.c | 6 +-
sys/dev/pci/cmdide.c | 6 +-
sys/dev/pci/cypide.c | 4 +-
sys/dev/pci/pciide_common.c | 6 +-
sys/dev/pci/satalink.c | 4 +-
sys/dev/pcmcia/wdc_pcmcia.c | 6 +-
sys/dev/podulebus/dtide.c | 6 +-
sys/dev/podulebus/hcide.c | 6 +-
sys/dev/scsipi/atapi_wdc.c | 122 +++++++++++++++---------------
29 files changed, 302 insertions(+), 294 deletions(-)
diffs (truncated from 1930 to 300 lines):
diff -r 7f31c7cd269e -r f5f04f027f23 sys/arch/acorn32/mainbus/wdc_pioc.c
--- a/sys/arch/acorn32/mainbus/wdc_pioc.c Thu Jan 01 16:50:05 2004 +0000
+++ b/sys/arch/acorn32/mainbus/wdc_pioc.c Thu Jan 01 17:18:53 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: wdc_pioc.c,v 1.12 2003/12/31 02:41:22 thorpej Exp $ */
+/* $NetBSD: wdc_pioc.c,v 1.13 2004/01/01 17:18:54 thorpej Exp $ */
/*
* Copyright (c) 1997-1998 Mark Brinicombe.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdc_pioc.c,v 1.12 2003/12/31 02:41:22 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc_pioc.c,v 1.13 2004/01/01 17:18:54 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -60,7 +60,7 @@
struct wdc_softc sc_wdcdev;
struct channel_softc *wdc_chanlist[1];
struct channel_softc wdc_channel;
- struct channel_queue wdc_chqueue;
+ struct ata_queue wdc_chqueue;
void *sc_ih;
};
diff -r 7f31c7cd269e -r f5f04f027f23 sys/arch/acorn32/podulebus/icside.c
--- a/sys/arch/acorn32/podulebus/icside.c Thu Jan 01 16:50:05 2004 +0000
+++ b/sys/arch/acorn32/podulebus/icside.c Thu Jan 01 17:18:53 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: icside.c,v 1.17 2003/12/31 02:41:22 thorpej Exp $ */
+/* $NetBSD: icside.c,v 1.18 2004/01/01 17:18:54 thorpej Exp $ */
/*
* Copyright (c) 1997-1998 Mark Brinicombe
@@ -42,7 +42,7 @@
#include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: icside.c,v 1.17 2003/12/31 02:41:22 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: icside.c,v 1.18 2004/01/01 17:18:54 thorpej Exp $");
#include <sys/systm.h>
#include <sys/conf.h>
@@ -86,7 +86,7 @@
struct channel_softc *sc_chp[ICSIDE_MAX_CHANNELS];
struct icside_channel {
struct channel_softc wdc_channel; /* generic part */
- struct channel_queue wdc_chqueue; /* channel queue */
+ struct ata_queue wdc_chqueue; /* channel queue */
void *ic_ih; /* interrupt handler */
struct evcnt ic_intrcnt; /* interrupt count */
u_int ic_irqaddr; /* interrupt flag */
diff -r 7f31c7cd269e -r f5f04f027f23 sys/arch/acorn32/podulebus/rapide.c
--- a/sys/arch/acorn32/podulebus/rapide.c Thu Jan 01 16:50:05 2004 +0000
+++ b/sys/arch/acorn32/podulebus/rapide.c Thu Jan 01 17:18:53 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: rapide.c,v 1.16 2003/12/31 02:41:22 thorpej Exp $ */
+/* $NetBSD: rapide.c,v 1.17 2004/01/01 17:18:54 thorpej Exp $ */
/*
* Copyright (c) 1997-1998 Mark Brinicombe
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rapide.c,v 1.16 2003/12/31 02:41:22 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rapide.c,v 1.17 2004/01/01 17:18:54 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -118,8 +118,8 @@
bus_space_tag_t sc_ctliot; /* Bus tag */
bus_space_handle_t sc_ctlioh; /* control handler */
struct rapide_channel {
- struct channel_softc wdc_channel; /* generic part */
- struct channel_queue wdc_chqueue; /* channel queue */
+ struct channel_softc wdc_channel; /* generic part */
+ struct ata_queue wdc_chqueue; /* channel queue */
irqhandler_t rc_ih; /* interrupt handler */
int rc_irqmask; /* IRQ mask for this channel */
} rapide_channels[2];
diff -r 7f31c7cd269e -r f5f04f027f23 sys/arch/acorn32/podulebus/simide.c
--- a/sys/arch/acorn32/podulebus/simide.c Thu Jan 01 16:50:05 2004 +0000
+++ b/sys/arch/acorn32/podulebus/simide.c Thu Jan 01 17:18:53 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: simide.c,v 1.15 2003/12/31 02:41:22 thorpej Exp $ */
+/* $NetBSD: simide.c,v 1.16 2004/01/01 17:18:54 thorpej Exp $ */
/*
* Copyright (c) 1997-1998 Mark Brinicombe
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: simide.c,v 1.15 2003/12/31 02:41:22 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: simide.c,v 1.16 2004/01/01 17:18:54 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -88,8 +88,8 @@
bus_space_handle_t sc_ctlioh; /* control handle */
struct bus_space sc_tag; /* custom tag */
struct simide_channel {
- struct channel_softc wdc_channel; /* generic part */
- struct channel_queue wdc_chqueue; /* channel queue */
+ struct channel_softc wdc_channel; /* generic part */
+ struct ata_queue wdc_chqueue; /* channel queue */
irqhandler_t sc_ih; /* interrupt handler */
int sc_irqmask; /* IRQ mask for this channel */
} simide_channels[2];
diff -r 7f31c7cd269e -r f5f04f027f23 sys/arch/amiga/dev/wdc_amiga.c
--- a/sys/arch/amiga/dev/wdc_amiga.c Thu Jan 01 16:50:05 2004 +0000
+++ b/sys/arch/amiga/dev/wdc_amiga.c Thu Jan 01 17:18:53 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: wdc_amiga.c,v 1.16 2003/12/31 02:44:02 thorpej Exp $ */
+/* $NetBSD: wdc_amiga.c,v 1.17 2004/01/01 17:18:54 thorpej Exp $ */
/*-
* Copyright (c) 2000, 2003 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdc_amiga.c,v 1.16 2003/12/31 02:44:02 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc_amiga.c,v 1.17 2004/01/01 17:18:54 thorpej Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -63,7 +63,7 @@
struct wdc_softc sc_wdcdev;
struct channel_softc wdc_chanlist[1];
struct channel_softc wdc_channel;
- struct channel_queue wdc_chqueue;
+ struct ata_queue wdc_chqueue;
struct isr sc_isr;
volatile u_char *sc_intreg;
struct bus_space_tag cmd_iot;
diff -r 7f31c7cd269e -r f5f04f027f23 sys/arch/atari/dev/wdc_mb.c
--- a/sys/arch/atari/dev/wdc_mb.c Thu Jan 01 16:50:05 2004 +0000
+++ b/sys/arch/atari/dev/wdc_mb.c Thu Jan 01 17:18:53 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: wdc_mb.c,v 1.17 2003/12/31 02:45:04 thorpej Exp $ */
+/* $NetBSD: wdc_mb.c,v 1.18 2004/01/01 17:18:54 thorpej Exp $ */
/*-
* Copyright (c) 1998, 2003 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdc_mb.c,v 1.17 2003/12/31 02:45:04 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc_mb.c,v 1.18 2004/01/01 17:18:54 thorpej Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -74,7 +74,7 @@
struct wdc_softc sc_wdcdev;
struct channel_softc wdc_chanlist[1];
struct channel_softc wdc_channel;
- struct channel_queue wdc_chqueue;
+ struct ata_queue wdc_chqueue;
void *sc_ih;
};
diff -r 7f31c7cd269e -r f5f04f027f23 sys/arch/i386/pnpbios/pciide_pnpbios.c
--- a/sys/arch/i386/pnpbios/pciide_pnpbios.c Thu Jan 01 16:50:05 2004 +0000
+++ b/sys/arch/i386/pnpbios/pciide_pnpbios.c Thu Jan 01 17:18:53 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pciide_pnpbios.c,v 1.11 2003/12/05 19:00:07 christos Exp $ */
+/* $NetBSD: pciide_pnpbios.c,v 1.12 2004/01/01 17:18:53 thorpej Exp $ */
/*
* Copyright (c) 1999 Soren S. Jorvang. All rights reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pciide_pnpbios.c,v 1.11 2003/12/05 19:00:07 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pciide_pnpbios.c,v 1.12 2004/01/01 17:18:53 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -136,8 +136,8 @@
sc->wdc_chanarray[0] = &cp->wdc_channel;
cp->wdc_channel.channel = 0;
cp->wdc_channel.wdc = &sc->sc_wdcdev;
- cp->wdc_channel.ch_queue = malloc(sizeof(struct channel_queue),
- M_DEVBUF, M_NOWAIT);
+ cp->wdc_channel.ch_queue = malloc(sizeof(struct ata_queue),
+ M_DEVBUF, M_NOWAIT);
if (cp->wdc_channel.ch_queue == NULL) {
printf("%s: unable to allocate memory for command queue\n",
self->dv_xname);
diff -r 7f31c7cd269e -r f5f04f027f23 sys/arch/mac68k/obio/wdc_obio.c
--- a/sys/arch/mac68k/obio/wdc_obio.c Thu Jan 01 16:50:05 2004 +0000
+++ b/sys/arch/mac68k/obio/wdc_obio.c Thu Jan 01 17:18:53 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: wdc_obio.c,v 1.9 2003/12/31 02:47:44 thorpej Exp $ */
+/* $NetBSD: wdc_obio.c,v 1.10 2004/01/01 17:18:54 thorpej Exp $ */
/*
* Copyright (c) 2002 Takeshi Shibagaki All rights reserved.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdc_obio.c,v 1.9 2003/12/31 02:47:44 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc_obio.c,v 1.10 2004/01/01 17:18:54 thorpej Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -68,7 +68,7 @@
struct wdc_softc sc_wdcdev;
struct channel_softc wdc_chanlist[1];
struct channel_softc wdc_channel;
- struct channel_queue wdc_chqueue;
+ struct ata_queue wdc_chqueue;
void *sc_ih;
};
diff -r 7f31c7cd269e -r f5f04f027f23 sys/arch/macppc/dev/kauai.c
--- a/sys/arch/macppc/dev/kauai.c Thu Jan 01 16:50:05 2004 +0000
+++ b/sys/arch/macppc/dev/kauai.c Thu Jan 01 17:18:53 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: kauai.c,v 1.8 2003/12/31 02:50:34 thorpej Exp $ */
+/* $NetBSD: kauai.c,v 1.9 2004/01/01 17:18:54 thorpej Exp $ */
/*-
* Copyright (c) 2003 Tsubai Masanari. All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kauai.c,v 1.8 2003/12/31 02:50:34 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kauai.c,v 1.9 2004/01/01 17:18:54 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -60,7 +60,7 @@
struct wdc_softc sc_wdcdev;
struct channel_softc wdc_chanlist[1];
struct channel_softc wdc_channel;
- struct channel_queue wdc_queue;
+ struct ata_queue wdc_queue;
dbdma_regmap_t *sc_dmareg;
dbdma_command_t *sc_dmacmd;
u_int sc_piotiming_r[2];
diff -r 7f31c7cd269e -r f5f04f027f23 sys/arch/macppc/dev/wdc_obio.c
--- a/sys/arch/macppc/dev/wdc_obio.c Thu Jan 01 16:50:05 2004 +0000
+++ b/sys/arch/macppc/dev/wdc_obio.c Thu Jan 01 17:18:53 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: wdc_obio.c,v 1.32 2003/12/31 02:50:34 thorpej Exp $ */
+/* $NetBSD: wdc_obio.c,v 1.33 2004/01/01 17:18:54 thorpej Exp $ */
/*-
* Copyright (c) 1998, 2003 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdc_obio.c,v 1.32 2003/12/31 02:50:34 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc_obio.c,v 1.33 2004/01/01 17:18:54 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -72,7 +72,7 @@
struct wdc_softc sc_wdcdev;
struct channel_softc wdc_chanptr[1];
struct channel_softc wdc_channel;
- struct channel_queue wdc_chqueue;
+ struct ata_queue wdc_chqueue;
dbdma_regmap_t *sc_dmareg;
dbdma_command_t *sc_dmacmd;
u_int sc_dmaconf[2]; /* per target value of CONFIG_REG */
diff -r 7f31c7cd269e -r f5f04f027f23 sys/arch/playstation2/dev/wdc_spd.c
--- a/sys/arch/playstation2/dev/wdc_spd.c Thu Jan 01 16:50:05 2004 +0000
+++ b/sys/arch/playstation2/dev/wdc_spd.c Thu Jan 01 17:18:53 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: wdc_spd.c,v 1.9 2003/12/31 02:51:59 thorpej Exp $ */
+/* $NetBSD: wdc_spd.c,v 1.10 2004/01/01 17:18:54 thorpej Exp $ */
/*-
* Copyright (c) 2001, 2003 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdc_spd.c,v 1.9 2003/12/31 02:51:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc_spd.c,v 1.10 2004/01/01 17:18:54 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -77,7 +77,7 @@
struct wdc_softc sc_wdcdev;
struct channel_softc wdc_chanlist[1];
struct channel_softc wdc_channel;
- struct channel_queue wdc_chqueue;
+ struct ata_queue wdc_chqueue;
Home |
Main Index |
Thread Index |
Old Index