summaryrefslogtreecommitdiff
path: root/sys/arch/macppc/dev
diff options
context:
space:
mode:
authorthorpej <thorpej@NetBSD.org>2004-01-01 17:18:53 +0000
committerthorpej <thorpej@NetBSD.org>2004-01-01 17:18:53 +0000
commit527c829fa00bf52b39ef97b7dabeafc8aa271052 (patch)
tree3ac11748c262d4a7eaa6442e7c4582ced5dc4c14 /sys/arch/macppc/dev
parent0eb77d4bef950ea7a3669968a3d0695edf15dc3b (diff)
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 (limited to 'sys/arch/macppc/dev')
-rw-r--r--sys/arch/macppc/dev/kauai.c6
-rw-r--r--sys/arch/macppc/dev/wdc_obio.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/arch/macppc/dev/kauai.c b/sys/arch/macppc/dev/kauai.c
index 419c10ad0ad..c014539f128 100644
--- a/sys/arch/macppc/dev/kauai.c
+++ b/sys/arch/macppc/dev/kauai.c
@@ -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 kauai_softc {
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 --git a/sys/arch/macppc/dev/wdc_obio.c b/sys/arch/macppc/dev/wdc_obio.c
index 75d28f6fbcd..dd2dbbe1723 100644
--- a/sys/arch/macppc/dev/wdc_obio.c
+++ b/sys/arch/macppc/dev/wdc_obio.c
@@ -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_obio_softc {
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 */