diff options
| author | wiz <wiz@NetBSD.org> | 2003-05-03 18:10:37 +0000 |
|---|---|---|
| committer | wiz <wiz@NetBSD.org> | 2003-05-03 18:10:37 +0000 |
| commit | 1ffa7b76c40339c17a0fb2a09fac93f287cfc046 (patch) | |
| tree | d14cd3f1dc311c68519da26dd29ff6ed146758e4 /sys/dev | |
| parent | 92a566bbbd94240d51ea9ffe525a6ba2014092c4 (diff) | |
DMA, not dma nor Dma.
Diffstat (limited to 'sys/dev')
118 files changed, 507 insertions, 507 deletions
diff --git a/sys/dev/acpi/acpica/Subsystem/dmresrc.c b/sys/dev/acpi/acpica/Subsystem/dmresrc.c index c810dbadeb8..bbfa455af48 100644 --- a/sys/dev/acpi/acpica/Subsystem/dmresrc.c +++ b/sys/dev/acpi/acpica/Subsystem/dmresrc.c @@ -115,7 +115,7 @@ *****************************************************************************/ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dmresrc.c,v 1.2 2003/02/13 14:16:17 kanaoka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dmresrc.c,v 1.3 2003/05/03 18:11:09 wiz Exp $"); #include "acpi.h" #include "amlcode.h" @@ -136,7 +136,7 @@ __KERNEL_RCSID(0, "$NetBSD: dmresrc.c,v 1.2 2003/02/13 14:16:17 kanaoka Exp $"); * * RETURN: None * - * DESCRIPTION: Dump a bit mask as a list of individual interrupt/dma levels. + * DESCRIPTION: Dump a bit mask as a list of individual interrupt/DMA levels. * ******************************************************************************/ diff --git a/sys/dev/audio.c b/sys/dev/audio.c index 2176c709198..ec3610a4949 100644 --- a/sys/dev/audio.c +++ b/sys/dev/audio.c @@ -1,4 +1,4 @@ -/* $NetBSD: audio.c,v 1.176 2003/04/25 03:02:11 gmcgarry Exp $ */ +/* $NetBSD: audio.c,v 1.177 2003/05/03 18:11:08 wiz Exp $ */ /* * Copyright (c) 1991-1993 Regents of the University of California. @@ -61,7 +61,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.176 2003/04/25 03:02:11 gmcgarry Exp $"); +__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.177 2003/05/03 18:11:08 wiz Exp $"); #include "audio.h" #if NAUDIO > 0 @@ -2218,7 +2218,7 @@ audio_pint_silence(struct audio_softc *sc, struct audio_ringbuffer *cb, } /* - * Called from HW driver module on completion of dma output. + * Called from HW driver module on completion of DMA output. * Start output of new block, wrap in ring buffer if needed. * If no more buffers to play, output zero instead. * Do a wakeup if necessary. @@ -2348,7 +2348,7 @@ audio_pint(void *v) } /* - * Called from HW driver module on completion of dma input. + * Called from HW driver module on completion of DMA input. * Mark it as input in the ring buffer (fiddle pointers). * Do a wakeup if necessary. */ diff --git a/sys/dev/audiovar.h b/sys/dev/audiovar.h index c09594dd063..024d4edc2b0 100644 --- a/sys/dev/audiovar.h +++ b/sys/dev/audiovar.h @@ -1,4 +1,4 @@ -/* $NetBSD: audiovar.h,v 1.27 2002/03/18 00:42:36 enami Exp $ */ +/* $NetBSD: audiovar.h,v 1.28 2003/05/03 18:11:09 wiz Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -183,8 +183,8 @@ struct audio_softc { u_char *sc_sil_start; /* start of silence in buffer */ int sc_sil_count; /* # of silence bytes */ - u_char sc_rbus; /* input dma in progress */ - u_char sc_pbus; /* output dma in progress */ + u_char sc_rbus; /* input DMA in progress */ + u_char sc_pbus; /* output DMA in progress */ struct audio_params sc_pparams; /* play encoding parameters */ struct audio_params sc_rparams; /* record encoding parameters */ diff --git a/sys/dev/ebus/cs4231_ebus.c b/sys/dev/ebus/cs4231_ebus.c index a6258abe23e..dc3c064a4a2 100644 --- a/sys/dev/ebus/cs4231_ebus.c +++ b/sys/dev/ebus/cs4231_ebus.c @@ -1,4 +1,4 @@ -/* $NetBSD: cs4231_ebus.c,v 1.10 2002/12/10 13:44:49 pk Exp $ */ +/* $NetBSD: cs4231_ebus.c,v 1.11 2003/05/03 18:11:09 wiz Exp $ */ /* * Copyright (c) 2002 Valeriy E. Ushakov @@ -69,7 +69,7 @@ int cs4231_ebus_match(struct device *, struct cfdata *, void *); CFATTACH_DECL(audiocs_ebus, sizeof(struct cs4231_ebus_softc), cs4231_ebus_match, cs4231_ebus_attach, NULL, NULL); -/* audio_hw_if methods specific to ebus dma */ +/* audio_hw_if methods specific to ebus DMA */ static int cs4231_ebus_trigger_output(void *, void *, void *, int, void (*)(void *), void *, struct audio_params *); @@ -218,7 +218,7 @@ cs4231_ebus_regdump(label, ebsc) /* char bits[128]; */ printf("cs4231regdump(%s): regs:", label); - /* XXX: dump ebus dma and aux registers */ + /* XXX: dump ebus DMA and aux registers */ ad1848_dump_regs(&ebsc->sc_cs4231.sc_ad1848); } #endif /* AUDIO_DEBUG */ @@ -469,7 +469,7 @@ cs4231_ebus_dma_intr(t, dt, dh) cs4231_ebus_dma_advance(t, dt, dh); - /* call audio(9) framework while dma is chugging along */ + /* call audio(9) framework while DMA is chugging along */ if (t->t_intr != NULL) (*t->t_intr)(t->t_arg); return (1); diff --git a/sys/dev/eisa/ahbreg.h b/sys/dev/eisa/ahbreg.h index 6b5cc30cf1c..b1e9f11e474 100644 --- a/sys/dev/eisa/ahbreg.h +++ b/sys/dev/eisa/ahbreg.h @@ -1,4 +1,4 @@ -/* $NetBSD: ahbreg.h,v 1.10 2000/07/12 21:15:33 thorpej Exp $ */ +/* $NetBSD: ahbreg.h,v 1.11 2003/05/03 18:11:10 wiz Exp $ */ /*- * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. @@ -137,7 +137,7 @@ typedef u_int32_t physlen; #define G2STAT2_HOST_READY 0x01 -#define AHB_NSEG 33 /* number of dma segments supported */ +#define AHB_NSEG 33 /* number of DMA segments supported */ struct ahb_dma_seg { physaddr seg_addr; diff --git a/sys/dev/i2o/iop.c b/sys/dev/i2o/iop.c index ed20b2b2b6c..b9db3bb3f61 100644 --- a/sys/dev/i2o/iop.c +++ b/sys/dev/i2o/iop.c @@ -1,4 +1,4 @@ -/* $NetBSD: iop.c,v 1.35 2003/01/20 04:26:02 simonb Exp $ */ +/* $NetBSD: iop.c,v 1.36 2003/05/03 18:11:10 wiz Exp $ */ /*- * Copyright (c) 2000, 2001, 2002 The NetBSD Foundation, Inc. @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: iop.c,v 1.35 2003/01/20 04:26:02 simonb Exp $"); +__KERNEL_RCSID(0, "$NetBSD: iop.c,v 1.36 2003/05/03 18:11:10 wiz Exp $"); #include "opt_i2o.h" #include "iop.h" @@ -1048,7 +1048,7 @@ iop_ofifo_init(struct iop_softc *sc) rv = bus_dmamem_alloc(sc->sc_dmat, sc->sc_rep_size, PAGE_SIZE, 0, &seg, 1, &rseg, BUS_DMA_NOWAIT); if (rv != 0) { - printf("%s: dma alloc = %d\n", sc->sc_dv.dv_xname, + printf("%s: DMA alloc = %d\n", sc->sc_dv.dv_xname, rv); return (rv); } @@ -1056,14 +1056,14 @@ iop_ofifo_init(struct iop_softc *sc) rv = bus_dmamem_map(sc->sc_dmat, &seg, rseg, sc->sc_rep_size, &sc->sc_rep, BUS_DMA_NOWAIT | BUS_DMA_COHERENT); if (rv != 0) { - printf("%s: dma map = %d\n", sc->sc_dv.dv_xname, rv); + printf("%s: DMA map = %d\n", sc->sc_dv.dv_xname, rv); return (rv); } rv = bus_dmamap_create(sc->sc_dmat, sc->sc_rep_size, 1, sc->sc_rep_size, 0, BUS_DMA_NOWAIT, &sc->sc_rep_dmamap); if (rv != 0) { - printf("%s: dma create = %d\n", sc->sc_dv.dv_xname, + printf("%s: DMA create = %d\n", sc->sc_dv.dv_xname, rv); return (rv); } @@ -1071,7 +1071,7 @@ iop_ofifo_init(struct iop_softc *sc) rv = bus_dmamap_load(sc->sc_dmat, sc->sc_rep_dmamap, sc->sc_rep, sc->sc_rep_size, NULL, BUS_DMA_NOWAIT); if (rv != 0) { - printf("%s: dma load = %d\n", sc->sc_dv.dv_xname, rv); + printf("%s: DMA load = %d\n", sc->sc_dv.dv_xname, rv); return (rv); } diff --git a/sys/dev/ic/aac.c b/sys/dev/ic/aac.c index 8ea36ac7c5c..f8235f9ec1d 100644 --- a/sys/dev/ic/aac.c +++ b/sys/dev/ic/aac.c @@ -1,4 +1,4 @@ -/* $NetBSD: aac.c,v 1.8 2003/01/31 00:26:25 thorpej Exp $ */ +/* $NetBSD: aac.c,v 1.9 2003/05/03 18:11:11 wiz Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -77,7 +77,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: aac.c,v 1.8 2003/01/31 00:26:25 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: aac.c,v 1.9 2003/05/03 18:11:11 wiz Exp $"); #include "locators.h" @@ -1048,9 +1048,9 @@ aac_ccb_map(struct aac_softc *sc, struct aac_ccb *ac) if (error) { printf("%s: aac_ccb_map: ", sc->sc_dv.dv_xname); if (error == EFBIG) - printf("more than %d dma segs\n", AAC_MAX_SGENTRIES); + printf("more than %d DMA segs\n", AAC_MAX_SGENTRIES); else - printf("error %d loading dma map\n", error); + printf("error %d loading DMA map\n", error); return (error); } diff --git a/sys/dev/ic/adv.c b/sys/dev/ic/adv.c index 82c61d6ea66..78a1c4d3eca 100644 --- a/sys/dev/ic/adv.c +++ b/sys/dev/ic/adv.c @@ -1,4 +1,4 @@ -/* $NetBSD: adv.c,v 1.32 2003/01/31 00:26:26 thorpej Exp $ */ +/* $NetBSD: adv.c,v 1.33 2003/05/03 18:11:11 wiz Exp $ */ /* * Generic driver for the Advanced Systems Inc. Narrow SCSI controllers @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: adv.c,v 1.32 2003/01/31 00:26:26 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: adv.c,v 1.33 2003/05/03 18:11:11 wiz Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -663,12 +663,12 @@ adv_scsipi_request(chan, req, arg) xs->error = XS_DRIVER_STUFFUP; if (error == EFBIG) { printf("%s: adv_scsi_cmd, more than %d" - " dma segments\n", + " DMA segments\n", sc->sc_dev.dv_xname, ASC_MAX_SG_LIST); } else { printf("%s: adv_scsi_cmd, error %d" - " loading dma map\n", + " loading DMA map\n", sc->sc_dev.dv_xname, error); } diff --git a/sys/dev/ic/adw.c b/sys/dev/ic/adw.c index 0a9a642c265..3270fb063a9 100644 --- a/sys/dev/ic/adw.c +++ b/sys/dev/ic/adw.c @@ -1,4 +1,4 @@ -/* $NetBSD: adw.c,v 1.39 2003/01/31 00:26:26 thorpej Exp $ */ +/* $NetBSD: adw.c,v 1.40 2003/05/03 18:11:11 wiz Exp $ */ /* * Generic driver for the Advanced Systems Inc. SCSI controllers @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: adw.c,v 1.39 2003/01/31 00:26:26 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: adw.c,v 1.40 2003/05/03 18:11:11 wiz Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -761,7 +761,7 @@ adw_build_sglist(ADW_CCB *ccb, ADW_SCSI_REQ_Q *scsiqp, ADW_SG_BLOCK *sg_block) scsiqp->sg_real_addr = htole32(sg_block_physical_addr); /* - * If there are more than NO_OF_SG_PER_BLOCK dma segments (hw sg-list) + * If there are more than NO_OF_SG_PER_BLOCK DMA segments (hw sg-list) * then split the request into multiple sg-list blocks. */ diff --git a/sys/dev/ic/aha.c b/sys/dev/ic/aha.c index b099cd59111..800a9369973 100644 --- a/sys/dev/ic/aha.c +++ b/sys/dev/ic/aha.c @@ -1,4 +1,4 @@ -/* $NetBSD: aha.c,v 1.39 2002/04/05 18:27:50 bouyer Exp $ */ +/* $NetBSD: aha.c,v 1.40 2003/05/03 18:11:12 wiz Exp $ */ /*- * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. @@ -53,7 +53,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: aha.c,v 1.39 2002/04/05 18:27:50 bouyer Exp $"); +__KERNEL_RCSID(0, "$NetBSD: aha.c,v 1.40 2003/05/03 18:11:12 wiz Exp $"); #include "opt_ddb.h" @@ -133,7 +133,7 @@ int aha_create_ccbs __P((struct aha_softc *, struct aha_ccb *, int)); * wait: number of seconds to wait for response * * Performs an adapter command through the ports. Not to be confused with a - * scsi command, which is read in via the dma; one of the adapter commands + * scsi command, which is read in via the DMA; one of the adapter commands * tells it to read in a scsi command. */ int @@ -802,7 +802,7 @@ aha_find(iot, ioh, sc) } /* - * setup dma channel from jumpers and save int + * setup DMA channel from jumpers and save int * level */ delay(1000); /* for Bustek 545 */ @@ -912,7 +912,7 @@ aha_init(sc) #if 0 /* - * Change the bus on/off times to not clash with other dma users. + * Change the bus on/off times to not clash with other DMA users. */ aha_cmd(iot, ioh, 1, 0, 0, 0, AHA_BUS_ON_TIME_SET, 7); aha_cmd(iot, ioh, 1, 0, 0, 0, AHA_BUS_OFF_TIME_SET, 4); @@ -1234,7 +1234,7 @@ aha_scsipi_request(chan, req, arg) xs->error = XS_DRIVER_STUFFUP; if (error == EFBIG) { printf("%s: aha_scsi_cmd, more than %d" - " dma segments\n", + " DMA segments\n", sc->sc_dev.dv_xname, AHA_NSEG); } else { printf("%s: error %d loading DMA map\n", diff --git a/sys/dev/ic/aic79xx.c b/sys/dev/ic/aic79xx.c index 8e39e6fd225..e8c9b05d6d5 100644 --- a/sys/dev/ic/aic79xx.c +++ b/sys/dev/ic/aic79xx.c @@ -1,4 +1,4 @@ -/* $NetBSD: aic79xx.c,v 1.3 2003/04/21 22:00:44 fvdl Exp $ */ +/* $NetBSD: aic79xx.c,v 1.4 2003/05/03 18:11:13 wiz Exp $ */ /* * Core routines and tables shareable across OS platforms. @@ -379,7 +379,7 @@ ahd_clear_fifo(struct ahd_softc *ahd, u_int fifo) /************************* Input/Output Queues ********************************/ /* * Flush and completed commands that are sitting in the command - * complete queues down on the chip but have yet to be dma'ed back up. + * complete queues down on the chip but have yet to be DMA'ed back up. */ void ahd_flush_qoutfifo(struct ahd_softc *ahd) @@ -6819,7 +6819,7 @@ ahd_search_qinfifo(struct ahd_softc *ahd, int target, char channel, /* * Halt any pending SCB DMA. The sequencer will reinitiate - * this dma if the qinfifo is not empty once we unpause. + * this DMA if the qinfifo is not empty once we unpause. */ if ((ahd_inb(ahd, CCSCBCTL) & (CCARREN|CCSCBEN|CCSCBDIR)) == (CCARREN|CCSCBEN|CCSCBDIR)) { diff --git a/sys/dev/ic/aic79xx_inline.h b/sys/dev/ic/aic79xx_inline.h index 0bfc480f21a..182c6c8bf1a 100644 --- a/sys/dev/ic/aic79xx_inline.h +++ b/sys/dev/ic/aic79xx_inline.h @@ -1,4 +1,4 @@ -/* $NetBSD: aic79xx_inline.h,v 1.1 2003/04/21 16:53:59 fvdl Exp $ */ +/* $NetBSD: aic79xx_inline.h,v 1.2 2003/05/03 18:11:13 wiz Exp $ */ /* * Inline routines shareable across OS platforms. @@ -985,7 +985,7 @@ ahd_minphys(bp) { /* * Even though the card can transfer up to 16megs per command - * we are limited by the number of segments in the dma segment + * we are limited by the number of segments in the DMA segment * list that we can hold. The worst case is that all pages are * discontinuous physically, hense the "page per segment" limit * enforced here. diff --git a/sys/dev/ic/aic79xx_osm.h b/sys/dev/ic/aic79xx_osm.h index 8e68244e77e..0bd6965d2ef 100644 --- a/sys/dev/ic/aic79xx_osm.h +++ b/sys/dev/ic/aic79xx_osm.h @@ -1,4 +1,4 @@ -/* $NetBSD: aic79xx_osm.h,v 1.1 2003/04/21 00:14:52 fvdl Exp $ */ +/* $NetBSD: aic79xx_osm.h,v 1.2 2003/05/03 18:11:14 wiz Exp $ */ /* * NetBSD platform specific driver option settings, data structures, @@ -32,9 +32,9 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $NetBSD: aic79xx_osm.h,v 1.1 2003/04/21 00:14:52 fvdl Exp $ + * $NetBSD: aic79xx_osm.h,v 1.2 2003/05/03 18:11:14 wiz Exp $ * - * //depot/aic7xxx/freebsd/dev/aic7xxx/aic79xx_osm.h#19 $$NetBSD: aic79xx_osm.h,v 1.1 2003/04/21 00:14:52 fvdl Exp $ + * //depot/aic7xxx/freebsd/dev/aic7xxx/aic79xx_osm.h#19 $$NetBSD: aic79xx_osm.h,v 1.2 2003/05/03 18:11:14 wiz Exp $ * * $FreeBSD: src/sys/dev/aic7xxx/aic79xx_osm.h,v 1.8 2002/12/04 22:51:29 scottl Exp $ */ @@ -135,7 +135,7 @@ typedef pcireg_t ahd_dev_softc_t; /************************ Tunable Driver Parameters **************************/ /* - * The number of dma segments supported. The sequencer can handle any number + * The number of DMA segments supported. The sequencer can handle any number * of physically contiguous S/G entrys. To reduce the driver's memory * consumption, we limit the number supported to be sufficient to handle * the largest mapping supported by the kernel, MAXPHYS. Assuming the diff --git a/sys/dev/ic/aic79xxvar.h b/sys/dev/ic/aic79xxvar.h index 10add8ae37a..1edd85faaa5 100644 --- a/sys/dev/ic/aic79xxvar.h +++ b/sys/dev/ic/aic79xxvar.h @@ -37,7 +37,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGES. * - * $Id: aic79xxvar.h,v 1.2 2003/04/21 20:05:26 fvdl Exp $ + * $Id: aic79xxvar.h,v 1.3 2003/05/03 18:11:14 wiz Exp $ * * //depot/aic7xxx/aic7xxx/aic79xx.h#84 $ * @@ -478,7 +478,7 @@ struct hardware_scb { * residual sg ptr and the transfer is considered complete. If the * sequencer determines that there is a residual in the tranfer, or * there is non-zero status, it will set the SG_STATUS_VALID flag in - * sgptr and dma the scb back into host memory. To sumarize: + * sgptr and DMA the scb back into host memory. To summarize: * * Sequencer: * o A residual has occurred if SG_FULL_RESID is set in sgptr, diff --git a/sys/dev/ic/aic7xxx.c b/sys/dev/ic/aic7xxx.c index cb6888426bf..74cc0522812 100644 --- a/sys/dev/ic/aic7xxx.c +++ b/sys/dev/ic/aic7xxx.c @@ -1,4 +1,4 @@ -/* $NetBSD: aic7xxx.c,v 1.104 2003/04/25 16:03:45 fvdl Exp $ */ +/* $NetBSD: aic7xxx.c,v 1.105 2003/05/03 18:11:14 wiz Exp $ */ /* * Core routines and tables shareable across OS platforms. @@ -39,7 +39,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGES. * - * $Id: aic7xxx.c,v 1.104 2003/04/25 16:03:45 fvdl Exp $ + * $Id: aic7xxx.c,v 1.105 2003/05/03 18:11:14 wiz Exp $ * * //depot/aic7xxx/aic7xxx/aic7xxx.c#112 $ * @@ -450,7 +450,7 @@ ahc_handle_seqint(struct ahc_softc *ahc, u_int intstat) * the kernel. This allows us to leave the sequencer * running in the common case of command completes * without error. The sequencer will already have - * dma'd the SCB back up to us, so we can reference + * DMA'd the SCB back up to us, so we can reference * the in kernel copy directly. */ scb_index = ahc_inb(ahc, SCB_TAG); @@ -4496,7 +4496,7 @@ ahc_init(struct ahc_softc *ahc) * The qinfifo and qoutfifo are composed of 256 1 byte elements. * When providing for the target mode role, we must additionally * provide space for the incoming target command fifo and an extra - * byte to deal with a dma bug in some chip versions. + * byte to deal with a DMA bug in some chip versions. */ driver_data_size = 2 * 256 * sizeof(uint8_t); if ((ahc->features & AHC_TARGETMODE) != 0) @@ -5375,15 +5375,15 @@ ahc_search_qinfifo(struct ahc_softc *ahc, int target, char channel, && (found != 0) && (qinstart != ahc->qinfifonext)) { /* - * The sequencer may be in the process of dmaing + * The sequencer may be in the process of DMA'ing * down the SCB at the beginning of the queue. * This could be problematic if either the first, * or the second SCB is removed from the queue * (the first SCB includes a pointer to the "next" - * SCB to dma). If we have removed any entries, swap + * SCB to DMA). If we have removed any entries, swap * the first element in the queue with the next HSCB * so the sequencer will notice that NEXT_QUEUED_SCB - * has changed during its dma attempt and will retry + * has changed during its DMA attempt and will retry * the DMA. */ scb = ahc_lookup_scb(ahc, ahc->qinfifo[qinstart]); diff --git a/sys/dev/ic/aic7xxx_inline.h b/sys/dev/ic/aic7xxx_inline.h index 067cf189aa4..609f11bf264 100644 --- a/sys/dev/ic/aic7xxx_inline.h +++ b/sys/dev/ic/aic7xxx_inline.h @@ -1,4 +1,4 @@ -/* $NetBSD: aic7xxx_inline.h,v 1.2 2003/04/19 19:38:21 fvdl Exp $ */ +/* $NetBSD: aic7xxx_inline.h,v 1.3 2003/05/03 18:11:15 wiz Exp $ */ /* * Inline routines shareable across OS platforms. @@ -513,7 +513,7 @@ ahc_minphys(bp) { /* * Even though the card can transfer up to 16megs per command - * we are limited by the number of segments in the dma segment + * we are limited by the number of segments in the DMA segment * list that we can hold. The worst case is that all pages are * discontinuous physically, hense the "page per segment" limit * enforced here. diff --git a/sys/dev/ic/aic7xxx_osm.h b/sys/dev/ic/aic7xxx_osm.h index 36646fc0d64..efd2fe55aad 100644 --- a/sys/dev/ic/aic7xxx_osm.h +++ b/sys/dev/ic/aic7xxx_osm.h @@ -1,4 +1,4 @@ -/* $NetBSD: aic7xxx_osm.h,v 1.3 2003/04/20 15:32:10 fvdl Exp $ */ +/* $NetBSD: aic7xxx_osm.h,v 1.4 2003/05/03 18:11:15 wiz Exp $ */ /* * NetBSD platform specific driver option settings, data structures, @@ -136,7 +136,7 @@ typedef pcireg_t ahc_dev_softc_t; /************************ Tunable Driver Parameters **************************/ /* - * The number of dma segments supported. The sequencer can handle any number + * The number of DMA segments supported. The sequencer can handle any number * of physically contiguous S/G entrys. To reduce the driver's memory * consumption, we limit the number supported to be sufficient to handle * the largest mapping supported by the kernel, MAXPHYS. Assuming the diff --git a/sys/dev/ic/aic7xxxvar.h b/sys/dev/ic/aic7xxxvar.h index 2e4548e4235..00d322dbf9e 100644 --- a/sys/dev/ic/aic7xxxvar.h +++ b/sys/dev/ic/aic7xxxvar.h @@ -37,7 +37,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGES. * - * $Id: aic7xxxvar.h,v 1.37 2003/04/21 19:59:48 fvdl Exp $ + * $Id: aic7xxxvar.h,v 1.38 2003/05/03 18:11:15 wiz Exp $ * * $FreeBSD: /repoman/r/ncvs/src/sys/dev/aic7xxx/aic7xxx.h,v 1.44 2003/01/20 20:44:55 gibbs Exp $ */ @@ -531,7 +531,7 @@ struct hardware_scb { * if the LAST_SEG flag is set. If so, SG_LIST_NULL is set in the * residual sg ptr and the transfer is considered complete. If the * sequencer determines that there is a residual in the tranfer, it - * will set the SG_RESID_VALID flag in sgptr and dma the scb back into + * will set the SG_RESID_VALID flag in sgptr and DMA the scb back into * host memory. To sumarize: * * Sequencer: diff --git a/sys/dev/ic/bha.c b/sys/dev/ic/bha.c index 482dc0da14a..aba29eedeac 100644 --- a/sys/dev/ic/bha.c +++ b/sys/dev/ic/bha.c @@ -1,4 +1,4 @@ -/* $NetBSD: bha.c,v 1.53 2003/04/16 20:26:00 thorpej Exp $ */ +/* $NetBSD: bha.c,v 1.54 2003/05/03 18:11:15 wiz Exp $ */ /*- * Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc. @@ -53,7 +53,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: bha.c,v 1.53 2003/04/16 20:26:00 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bha.c,v 1.54 2003/05/03 18:11:15 wiz Exp $"); #include "opt_ddb.h" @@ -1009,7 +1009,7 @@ bha_inquire_config(bus_space_tag_t iot, bus_space_handle_t ioh, struct bha_config config; /* - * Assume we have a board at this stage setup dma channel from + * Assume we have a board at this stage setup DMA channel from * jumpers and save int level */ delay(1000); diff --git a/sys/dev/ic/bt8xx.h b/sys/dev/ic/bt8xx.h index 09238e70cc8..aca7e7841f4 100644 --- a/sys/dev/ic/bt8xx.h +++ b/sys/dev/ic/bt8xx.h @@ -1,4 +1,4 @@ -/* $NetBSD: bt8xx.h,v 1.6 2003/03/12 00:14:54 wiz Exp $ */ +/* $NetBSD: bt8xx.h,v 1.7 2003/05/03 18:11:16 wiz Exp $ */ /* This file is merged from ioctl_meteor.h and ioctl_bt848.h from FreeBSD. */ /* The copyright below only applies to the ioctl_meteor.h part of this file. */ @@ -63,10 +63,10 @@ struct meteor_geomet { u_long oformat; }; -/* structure for METEORGCOUNT-get count of frames, fifo errors and dma errors */ +/* structure for METEORGCOUNT-get count of frames, fifo errors and DMA errors */ struct meteor_counts { u_long fifo_errors; /* count of fifo errors since open */ - u_long dma_errors; /* count of dma errors since open */ + u_long dma_errors; /* count of DMA errors since open */ u_long frames_captured; /* count of frames captured since open */ u_long even_fields_captured; /* count of even fields captured */ u_long odd_fields_captured; /* count of odd fields captured */ @@ -74,7 +74,7 @@ struct meteor_counts { /* structure for getting and setting direct transfers to vram */ struct meteor_video { - u_long addr; /* Address of location to dma to */ + u_long addr; /* Address of location to DMA to */ u_long width; /* Width of memory area */ u_long banksize; /* Size of Vram bank */ u_long ramsize; /* Size of Vram */ diff --git a/sys/dev/ic/cs4231.c b/sys/dev/ic/cs4231.c index 5a9564c958c..8c24d7d748d 100644 --- a/sys/dev/ic/cs4231.c +++ b/sys/dev/ic/cs4231.c @@ -1,4 +1,4 @@ -/* $NetBSD: cs4231.c,v 1.11 2003/02/01 13:23:28 martin Exp $ */ +/* $NetBSD: cs4231.c,v 1.12 2003/05/03 18:11:16 wiz Exp $ */ /*- * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cs4231.c,v 1.11 2003/02/01 13:23:28 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cs4231.c,v 1.12 2003/05/03 18:11:16 wiz Exp $"); #include "audio.h" #if NAUDIO > 0 @@ -260,7 +260,7 @@ cs4231_free(addr, ptr, pool) /* * Set up transfer and return DMA address and byte count in paddr and psize - * for bus dependent trigger_{in,out}put to load into the dma controller. + * for bus dependent trigger_{in,out}put to load into the DMA controller. */ int cs4231_transfer_init(sc, t, paddr, psize, start, end, blksize, intr, arg) @@ -304,12 +304,12 @@ cs4231_transfer_init(sc, t, paddr, psize, start, end, blksize, intr, arg) t->t_cnt = n; - /* for caller to load into dma controller */ + /* for caller to load into DMA controller */ *paddr = t->t_dma->dmamap->dm_segs[0].ds_addr; *psize = n; DPRINTF(("%s: init %s: [%p..%p] %lu bytes %lu blocks;" - " dma at 0x%lx count %lu\n", + " DMA at 0x%lx count %lu\n", sc->sc_ad1848.sc_dev.dv_xname, t->t_name, start, end, (u_long)t->t_segsz, (u_long)t->t_blksz, (u_long)*paddr, (u_long)*psize)); @@ -343,7 +343,7 @@ cs4231_transfer_advance(t, paddr, psize) t->t_cnt += togo; } - /* for caller to load into dma controller */ + /* for caller to load into DMA controller */ *paddr = nextaddr; *psize = togo; } diff --git a/sys/dev/ic/cs89x0.c b/sys/dev/ic/cs89x0.c index abb14d67f60..ebc8b9c7840 100644 --- a/sys/dev/ic/cs89x0.c +++ b/sys/dev/ic/cs89x0.c @@ -1,4 +1,4 @@ -/* $NetBSD: cs89x0.c,v 1.8 2003/02/02 10:24:40 wiz Exp $ */ +/* $NetBSD: cs89x0.c,v 1.9 2003/05/03 18:11:16 wiz Exp $ */ /* * Copyright 1997 @@ -186,7 +186,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cs89x0.c,v 1.8 2003/02/02 10:24:40 wiz Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cs89x0.c,v 1.9 2003/05/03 18:11:16 wiz Exp $"); #include "opt_inet.h" @@ -1310,7 +1310,7 @@ cs_buffer_event(struct cs_softc *sc, u_int16_t bufEvent) (*sc->sc_dma_process_rx)(sc); else /* should panic? */ - printf("%s: unexpected dma event\n", sc->sc_dev.dv_xname); + printf("%s: unexpected DMA event\n", sc->sc_dev.dv_xname); } if (bufEvent & BUF_EVENT_TX_UNDR) { diff --git a/sys/dev/ic/cs89x0var.h b/sys/dev/ic/cs89x0var.h index d22ffa50709..bd85b40e5d0 100644 --- a/sys/dev/ic/cs89x0var.h +++ b/sys/dev/ic/cs89x0var.h @@ -1,4 +1,4 @@ -/* $NetBSD: cs89x0var.h,v 1.4 2003/01/06 13:05:10 wiz Exp $ */ +/* $NetBSD: cs89x0var.h,v 1.5 2003/05/03 18:11:16 wiz Exp $ */ /* * Copyright 1997 @@ -111,7 +111,7 @@ struct cs_softc { void (*sc_disable)(struct cs_softc *); void *sc_powerhook; - /* dma hooks */ + /* DMA hooks */ void (*sc_dma_process_rx)(struct cs_softc *); void (*sc_dma_chipinit)(struct cs_softc *); void (*sc_dma_attach)(struct cs_softc *); diff --git a/sys/dev/ic/elink3var.h b/sys/dev/ic/elink3var.h index bd758e16be0..612a38c3320 100644 --- a/sys/dev/ic/elink3var.h +++ b/sys/dev/ic/elink3var.h @@ -1,4 +1,4 @@ -/* $NetBSD: elink3var.h,v 1.29 2001/07/23 17:08:18 thorpej Exp $ */ +/* $NetBSD: elink3var.h,v 1.30 2003/05/03 18:11:17 wiz Exp $ */ /* * Copyright (c) 1994 Herb Peyerl <hpeyerl@beer.org> @@ -83,8 +83,8 @@ struct ep_softc { u_short ep_chipset; /* Chipset family on this board */ #define ELINK_CHIPSET_3C509 0x00 /* PIO: 3c509, 3c589 */ -#define ELINK_CHIPSET_VORTEX 0x01 /* 100mbit, single-pkt dma */ -#define ELINK_CHIPSET_BOOMERANG 0x02 /* Saner dma plus PIO */ +#define ELINK_CHIPSET_VORTEX 0x01 /* 100mbit, single-pkt DMA */ +#define ELINK_CHIPSET_BOOMERANG 0x02 /* Saner DMA plus PIO */ #define ELINK_CHIPSET_ROADRUNNER 0x03 /* like Boomerang, but for PCMCIA; has shared memory plus FIFO buffer */ diff --git a/sys/dev/ic/esiop.c b/sys/dev/ic/esiop.c index eb3ab820f24..b5f289c072f 100644 --- a/sys/dev/ic/esiop.c +++ b/sys/dev/ic/esiop.c @@ -1,4 +1,4 @@ -/* $NetBSD: esiop.c,v 1.18 2003/01/31 00:26:30 thorpej Exp $ */ +/* $NetBSD: esiop.c,v 1.19 2003/05/03 18:11:17 wiz Exp $ */ /* * Copyright (c) 2002 Manuel Bouyer. @@ -33,7 +33,7 @@ /* SYM53c7/8xx PCI-SCSI I/O Processors driver */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: esiop.c,v 1.18 2003/01/31 00:26:30 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: esiop.c,v 1.19 2003/05/03 18:11:17 wiz Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -542,7 +542,7 @@ none: if (dstat & DSTAT_MDPE) printf(" parity"); if (dstat & DSTAT_DFE) - printf(" dma fifo empty"); + printf(" DMA fifo empty"); else siop_clearfifo(&sc->sc_c); printf(", DSP=0x%x DSA=0x%x: ", diff --git a/sys/dev/ic/gem.c b/sys/dev/ic/gem.c index 543e416f939..87c667c74bd 100644 --- a/sys/dev/ic/gem.c +++ b/sys/dev/ic/gem.c @@ -1,4 +1,4 @@ -/* $NetBSD: gem.c,v 1.26 2003/02/26 06:31:09 matt Exp $ */ +/* $NetBSD: gem.c,v 1.27 2003/05/03 18:11:17 wiz Exp $ */ /* * @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: gem.c,v 1.26 2003/02/26 06:31:09 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: gem.c,v 1.27 2003/05/03 18:11:17 wiz Exp $"); #include "bpfilter.h" @@ -559,7 +559,7 @@ gem_reset_rx(struct gem_softc *sc) if ((bus_space_read_4(t, h, GEM_RX_CONFIG) & 1) == 0) break; if ((bus_space_read_4(t, h, GEM_RX_CONFIG) & 1) != 0) - printf("%s: cannot disable read dma\n", + printf("%s: cannot disable read DMA\n", sc->sc_dev.dv_xname); /* Wait 5ms extra. */ @@ -601,7 +601,7 @@ gem_reset_tx(struct gem_softc *sc) if ((bus_space_read_4(t, h, GEM_TX_CONFIG) & 1) == 0) break; if ((bus_space_read_4(t, h, GEM_TX_CONFIG) & 1) != 0) - printf("%s: cannot disable read dma\n", + printf("%s: cannot disable read DMA\n", sc->sc_dev.dv_xname); /* Wait 5ms extra. */ @@ -1512,7 +1512,7 @@ gem_add_rxbuf(struct gem_softc *sc, int idx) } #ifdef GEM_DEBUG -/* bzero the packet to check dma */ +/* bzero the packet to check DMA */ memset(m->m_ext.ext_buf, 0, m->m_ext.ext_size); #endif diff --git a/sys/dev/ic/hd64570.c b/sys/dev/ic/hd64570.c index f27831c1414..7bb12d7faa0 100644 --- a/sys/dev/ic/hd64570.c +++ b/sys/dev/ic/hd64570.c @@ -1,4 +1,4 @@ -/* $NetBSD: hd64570.c,v 1.22 2003/02/21 17:14:05 tsutsui Exp $ */ +/* $NetBSD: hd64570.c,v 1.23 2003/05/03 18:11:17 wiz Exp $ */ /* * Copyright (c) 1999 Christian E. Hopps @@ -60,12 +60,12 @@ * than cheating and always sync'ing the whole region. * * o perhaps allow rx and tx to be in more than one page - * if not using dma. currently the assumption is that + * if not using DMA. currently the assumption is that * rx uses a page and tx uses a page. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: hd64570.c,v 1.22 2003/02/21 17:14:05 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hd64570.c,v 1.23 2003/05/03 18:11:17 wiz Exp $"); #include "bpfilter.h" #include "opt_inet.h" @@ -606,13 +606,13 @@ sca_msci_init(struct sca_softc *sc, sca_port_t *scp) * the correct values here are important for avoiding underruns * for any value less than or equal to TRC0 txrdy is activated * which will start the dmac transfer to the fifo. - * for buffer size >= TRC1 + 1 txrdy is cleared which will stop dma. + * for buffer size >= TRC1 + 1 txrdy is cleared which will stop DMA. * * thus if we are using a very fast clock that empties the fifo * quickly, delays in the dmac starting to fill the fifo can * lead to underruns so we want a fairly full fifo to still * cause the dmac to start. for cards with on board ram this - * has no effect on system performance. For cards that dma + * has no effect on system performance. For cards that DMA * to/from system memory it will cause more, shorter, * bus accesses rather than fewer longer ones. */ diff --git a/sys/dev/ic/hd64570var.h b/sys/dev/ic/hd64570var.h index 2d9428cbf5c..07830bdbf03 100644 --- a/sys/dev/ic/hd64570var.h +++ b/sys/dev/ic/hd64570var.h @@ -1,4 +1,4 @@ -/* $NetBSD: hd64570var.h,v 1.4 2000/12/12 18:00:23 thorpej Exp $ */ +/* $NetBSD: hd64570var.h,v 1.5 2003/05/03 18:11:18 wiz Exp $ */ /* * Copyright (c) 1999 Christian E. Hopps @@ -103,7 +103,7 @@ struct sca_port { * start of each important bit of information for transmit and * receive buffers. * - * note: for non-dma the phys and virtual version should be + * note: for non-DMA the phys and virtual version should be * the same value and should be an _offset_ from the beginning * of mapped memory described by sc_memt/sc_memh. */ @@ -168,8 +168,8 @@ struct sca_softc { int sc_usedma; union { struct { - bus_space_tag_t p_memt; /* mem for non-dma */ - bus_space_handle_t p_memh; /* mem for non-dma */ + bus_space_tag_t p_memt; /* mem for non-DMA */ + bus_space_handle_t p_memh; /* mem for non-DMA */ bus_space_handle_t p_sca_ioh[16]; /* io for sca regs */ bus_size_t p_pagesize; /* memory page size */ bus_size_t p_pagemask; /* memory page mask */ @@ -181,9 +181,9 @@ struct sca_softc { void (*p_page_off)(struct sca_softc *); } u_paged; struct { - bus_dma_tag_t d_dmat; /* bus dma tag */ - bus_dmamap_t d_dmam; /* bus dma map */ - bus_dma_segment_t d_seg; /* bus dma segment */ + bus_dma_tag_t d_dmat; /* bus DMA tag */ + bus_dmamap_t d_dmam; /* bus DMA map */ + bus_dma_segment_t d_seg; /* bus DMA segment */ caddr_t d_dma_addr; /* kva of segment */ bus_size_t d_allocsize; /* size of region */ } u_dma; diff --git a/sys/dev/ic/hme.c b/sys/dev/ic/hme.c index 32a5928486b..2768eb79f5b 100644 --- a/sys/dev/ic/hme.c +++ b/sys/dev/ic/hme.c @@ -1,4 +1,4 @@ -/* $NetBSD: hme.c,v 1.36 2003/04/26 22:08:29 wiz Exp $ */ +/* $NetBSD: hme.c,v 1.37 2003/05/03 18:11:18 wiz Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: hme.c,v 1.36 2003/04/26 22:08:29 wiz Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hme.c,v 1.37 2003/05/03 18:11:18 wiz Exp $"); #define HMEDEBUG @@ -150,7 +150,7 @@ hme_config(sc) * the bus tag: * sc_bustag * - * the dma bus tag: + * the DMA bus tag: * sc_dmatag * * the bus handles: diff --git a/sys/dev/ic/hmereg.h b/sys/dev/ic/hmereg.h index 5f1afbc05c1..6e93c7c6aa2 100644 --- a/sys/dev/ic/hmereg.h +++ b/sys/dev/ic/hmereg.h @@ -1,4 +1,4 @@ -/* $NetBSD: hmereg.h,v 1.12 2002/05/07 05:56:47 uwe Exp $ */ +/* $NetBSD: hmereg.h,v 1.13 2003/05/03 18:11:18 wiz Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -73,18 +73,18 @@ #define HME_SEB_STAT_DTIMEXP 0x00008000 /* defer timer expired */ #define HME_SEB_STAT_RXTOHOST 0x00010000 /* pkt moved from rx fifo->memory */ #define HME_SEB_STAT_NORXD 0x00020000 /* out of receive descriptors */ -#define HME_SEB_STAT_RXERR 0x00040000 /* rx dma error */ -#define HME_SEB_STAT_RXLATERR 0x00080000 /* late error during rx dma */ -#define HME_SEB_STAT_RXPERR 0x00100000 /* parity error during rx dma */ -#define HME_SEB_STAT_RXTERR 0x00200000 /* tag error during rx dma */ +#define HME_SEB_STAT_RXERR 0x00040000 /* rx DMA error */ +#define HME_SEB_STAT_RXLATERR 0x00080000 /* late error during rx DMA */ +#define HME_SEB_STAT_RXPERR 0x00100000 /* parity error during rx DMA */ +#define HME_SEB_STAT_RXTERR 0x00200000 /* tag error during rx DMA */ #define HME_SEB_STAT_EOPERR 0x00400000 /* tx descriptor did not set EOP */ #define HME_SEB_STAT_MIFIRQ 0x00800000 /* mif needs attention */ #define HME_SEB_STAT_HOSTTOTX 0x01000000 /* pkt moved from memory->tx fifo */ #define HME_SEB_STAT_TXALL 0x02000000 /* all pkts in fifo transmitted */ -#define HME_SEB_STAT_TXEACK 0x04000000 /* error during tx dma */ -#define HME_SEB_STAT_TXLERR 0x08000000 /* late error during tx dma */ -#define HME_SEB_STAT_TXPERR 0x10000000 /* parity error during tx dma */ -#define HME_SEB_STAT_TXTERR 0x20000000 /* tag error durig tx dma */ +#define HME_SEB_STAT_TXEACK 0x04000000 /* error during tx DMA */ +#define HME_SEB_STAT_TXLERR 0x08000000 /* late error during tx DMA */ +#define HME_SEB_STAT_TXPERR 0x10000000 /* parity error during tx DMA */ +#define HME_SEB_STAT_TXTERR 0x20000000 /* tag error durig tx DMA */ #define HME_SEB_STAT_SLVERR 0x40000000 /* pio access error */ #define HME_SEB_STAT_SLVPERR 0x80000000 /* pio access parity error */ #define HME_SEB_STAT_BITS "\177\020" \ @@ -144,7 +144,7 @@ #define HME_ETX_TP_DMAWAKEUP 0x00000001 /* Start tx (rw, auto-clear) */ /* TXI_CFG bits */ -#define HME_ETX_CFG_DMAENABLE 0x00000001 /* Enable TX dma */ +#define HME_ETX_CFG_DMAENABLE 0x00000001 /* Enable TX DMA */ #define HME_ETX_CFG_FIFOTHRESH 0x000003fe /* TX fifo threshold */ #define HME_ETX_CFG_IRQDAFTER 0x00000400 /* Intr after tx-fifo empty */ #define HME_ETX_CFG_IRQDBEFORE 0x00000000 /* Intr before tx-fifo empty */ @@ -163,7 +163,7 @@ #define HME_ERXI_STATEMACHINE (7*4) /* State machine */ /* RXI_CFG bits */ -#define HME_ERX_CFG_DMAENABLE 0x00000001 /* Enable RX dma */ +#define HME_ERX_CFG_DMAENABLE 0x00000001 /* Enable RX DMA */ #define HME_ERX_CFG_BYTEOFFSET 0x00000038 /* RX first byte offset */ #define HME_ERX_CFG_RINGSIZE32 0x00000000 /* Descriptor ring size: 32 */ #define HME_ERX_CFG_RINGSIZE64 0x00000200 /* Descriptor ring size: 64 */ diff --git a/sys/dev/ic/i8253reg.h b/sys/dev/ic/i8253reg.h index 3a8ba04cf5f..2730aa49431 100644 --- a/sys/dev/ic/i8253reg.h +++ b/sys/dev/ic/i8253reg.h @@ -1,4 +1,4 @@ -/* $NetBSD: i8253reg.h,v 1.6 2003/02/21 17:14:07 tsutsui Exp $ */ +/* $NetBSD: i8253reg.h,v 1.7 2003/05/03 18:11:18 wiz Exp $ */ /*- * Copyright (c) 1993 The Regents of the University of California. @@ -60,7 +60,7 @@ * The outputs of the three timers are connected as follows: * * timer 0 -> irq 0 - * timer 1 -> dma chan 0 (for dram refresh) + * timer 1 -> DMA chan 0 (for dram refresh) * timer 2 -> speaker (via keyboard controller) * * Timer 0 is used to call hardclock. diff --git a/sys/dev/ic/iha.c b/sys/dev/ic/iha.c index c24952fb33f..6341fafa46f 100644 --- a/sys/dev/ic/iha.c +++ b/sys/dev/ic/iha.c @@ -1,4 +1,4 @@ -/* $NetBSD: iha.c,v 1.21 2003/01/20 05:30:06 simonb Exp $ */ +/* $NetBSD: iha.c,v 1.22 2003/05/03 18:11:18 wiz Exp $ */ /*- * Device driver for the INI-9XXXU/UW or INIC-940/950 PCI SCSI Controller. @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: iha.c,v 1.21 2003/01/20 05:30:06 simonb Exp $"); +__KERNEL_RCSID(0, "$NetBSD: iha.c,v 1.22 2003/05/03 18:11:18 wiz Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -629,7 +629,7 @@ iha_alloc_sglist(sc) int error, rseg; /* - * Allocate dma-safe memory for the SCB's sglist + * Allocate DMA-safe memory for the SCB's sglist */ if ((error = bus_dmamem_alloc(sc->sc_dmat, IHA_SG_SIZE * IHA_MAX_SCB, @@ -732,7 +732,7 @@ iha_scsipi_request(chan, req, arg) BUS_DMA_READ : BUS_DMA_WRITE)); if (error) { - printf("%s: error %d loading dma map\n", + printf("%s: error %d loading DMA map\n", sc->sc_dev.dv_xname, error); iha_append_free_scb(sc, scb); xs->error = XS_DRIVER_STUFFUP; diff --git a/sys/dev/ic/interwave.c b/sys/dev/ic/interwave.c index a93774a839c..a4b8ad59499 100644 --- a/sys/dev/ic/interwave.c +++ b/sys/dev/ic/interwave.c @@ -1,4 +1,4 @@ -/* $NetBSD: interwave.c,v 1.17 2003/04/06 18:20:13 wiz Exp $ */ +/* $NetBSD: interwave.c,v 1.18 2003/05/03 18:11:19 wiz Exp $ */ /* * Copyright (c) 1997, 1999 The NetBSD Foundation, Inc. @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: interwave.c,v 1.17 2003/04/06 18:20:13 wiz Exp $"); +__KERNEL_RCSID(0, "$NetBSD: interwave.c,v 1.18 2003/05/03 18:11:19 wiz Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -126,7 +126,7 @@ iwintr(arg) /* * The proper order to do this seems to be to read CSR3 to get the * int cause and fifo over underrrun status, then deal with the ints - * (new dma set up), and to clear ints by writing the respective bit + * (new DMA set up), and to clear ints by writing the respective bit * to 0. */ @@ -462,7 +462,7 @@ iwreset(sc, warm) IW_WRITE_DIRECT_1(sc->codec_index + 2, sc->p2xr_h, 0x00); - IW_WRITE_CODEC_1(CFIG1I | IW_MCE, 0x00); /* dma 2 chan access */ + IW_WRITE_CODEC_1(CFIG1I | IW_MCE, 0x00); /* DMA 2 chan access */ IW_WRITE_CODEC_1(CEXTI, 0x00); /* disable ints for now */ @@ -473,7 +473,7 @@ iwreset(sc, warm) * don't center output in case or * FIFO underrun */ IW_WRITE_CODEC_1(CFIG3I, 0xc0); /* enable record/playback irq (still - * turned off from CEXTI), max dma + * turned off from CEXTI), max DMA * rate */ IW_WRITE_CODEC_1(CSR3I, 0x00); /* clear status 3 reg */ @@ -525,7 +525,7 @@ iwreset(sc, warm) * (from codec?) bit 1 = 0 -> output on bit 2 = 1 -> mic in on bit 3 * = 1 -> irq&drq pin enable bit 4 = 1 -> channel interrupts to chan * 1 bit 5 = 1 -> enable midi loop back bit 6 = 0 -> irq latches - * URCR[2:0] bit 6 = 1 -> dma latches URCR[2:0] + * URCR[2:0] bit 6 = 1 -> DMA latches URCR[2:0] */ @@ -1051,7 +1051,7 @@ iw_start_output(addr, p, cc, intr, arg) #ifdef AUDIO_DEBUG if (sc->sc_playlocked) { - DPRINTF(("iw_start_output: playback dma already going on\n")); + DPRINTF(("iw_start_output: playback DMA already going on\n")); /* return 0; */ } #endif @@ -1116,7 +1116,7 @@ iw_start_input(addr, p, cc, intr, arg) #if AUDIO_DEBUG if (sc->sc_reclocked) { - DPRINTF(("iw_start_input: record dma already going on\n")); + DPRINTF(("iw_start_input: record DMA already going on\n")); /* return 0; */ } #endif diff --git a/sys/dev/ic/interwavereg.h b/sys/dev/ic/interwavereg.h index cb605a16b87..c11109f068e 100644 --- a/sys/dev/ic/interwavereg.h +++ b/sys/dev/ic/interwavereg.h @@ -1,7 +1,7 @@ #ifndef INTERWAVEREG_H #define INTERWAVEREG_H -/* $NetBSD: interwavereg.h,v 1.5 2003/04/06 18:20:13 wiz Exp $ */ +/* $NetBSD: interwavereg.h,v 1.6 2003/05/03 18:11:19 wiz Exp $ */ /* * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -104,7 +104,7 @@ #define IW_MIX_OUT_SRC 3 -/* dma flags */ +/* DMA flags */ #define IW_PLAYBACK 1L #define IW_RECORD 2L diff --git a/sys/dev/ic/isp.c b/sys/dev/ic/isp.c index 5990acf81af..8c267feda84 100644 --- a/sys/dev/ic/isp.c +++ b/sys/dev/ic/isp.c @@ -1,4 +1,4 @@ -/* $NetBSD: isp.c,v 1.101 2003/03/03 20:53:14 mjacob Exp $ */ +/* $NetBSD: isp.c,v 1.102 2003/05/03 18:11:19 wiz Exp $ */ /* * This driver, which is contained in NetBSD in the files: * @@ -68,7 +68,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: isp.c,v 1.101 2003/03/03 20:53:14 mjacob Exp $"); +__KERNEL_RCSID(0, "$NetBSD: isp.c,v 1.102 2003/05/03 18:11:19 wiz Exp $"); #ifdef __NetBSD__ #include <dev/ic/isp_netbsd.h> @@ -3886,7 +3886,7 @@ again: } /* - * Free any dma resources. As a side effect, this may + * Free any DMA resources. As a side effect, this may * also do any cache flushing necessary for data coherence. */ if (XS_XFRLEN(xs)) { ISP_DMAFREE(isp, xs, sp->req_handle); diff --git a/sys/dev/ic/ispvar.h b/sys/dev/ic/ispvar.h index 611d97a8dd2..92b6fd8e603 100644 --- a/sys/dev/ic/ispvar.h +++ b/sys/dev/ic/ispvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: ispvar.h,v 1.59 2002/10/18 23:35:25 mjacob Exp $ */ +/* $NetBSD: ispvar.h,v 1.60 2003/05/03 18:11:21 wiz Exp $ */ /* * This driver, which is contained in NetBSD in the files: * @@ -457,7 +457,7 @@ typedef struct ispsoftc { XS_T **isp_xflist; /* - * request/result queue pointers and dma handles for them. + * request/result queue pointers and DMA handles for them. */ caddr_t isp_rquest; caddr_t isp_result; diff --git a/sys/dev/ic/lsi64854.c b/sys/dev/ic/lsi64854.c index 92d80d5879f..ac0f9cf0b7d 100644 --- a/sys/dev/ic/lsi64854.c +++ b/sys/dev/ic/lsi64854.c @@ -1,4 +1,4 @@ -/* $NetBSD: lsi64854.c,v 1.22 2002/10/01 07:07:03 petrov Exp $ */ +/* $NetBSD: lsi64854.c,v 1.23 2003/05/03 18:11:21 wiz Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: lsi64854.c,v 1.22 2002/10/01 07:07:03 petrov Exp $"); +__KERNEL_RCSID(0, "$NetBSD: lsi64854.c,v 1.23 2003/05/03 18:11:21 wiz Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -117,7 +117,7 @@ lsi64854_attach(sc) /* Allocate a dmamap */ if (bus_dmamap_create(sc->sc_dmatag, MAX_DMA_SZ, 1, MAX_DMA_SZ, 0, BUS_DMA_WAITOK, &sc->sc_dmamap) != 0) { - printf("%s: dma map create failed\n", sc->sc_dev.dv_xname); + printf("%s: DMA map create failed\n", sc->sc_dev.dv_xname); return; } @@ -126,7 +126,7 @@ lsi64854_attach(sc) if (sc->sc_rev == DMAREV_HME) { return; } - printf(": dma rev "); + printf(": DMA rev "); switch (sc->sc_rev) { case DMAREV_0: printf("0"); @@ -288,7 +288,7 @@ lsi64854_reset(sc) #define DMAMAX(a) (MAX_DMA_SZ - ((a) & (MAX_DMA_SZ-1))) /* - * setup a dma transfer + * setup a DMA transfer */ int lsi64854_setup(sc, addr, len, datain, dmasize) @@ -546,7 +546,7 @@ lsi64854_enet_intr(arg) } /* - * setup a dma transfer + * setup a DMA transfer */ int lsi64854_setup_pp(sc, addr, len, datain, dmasize) diff --git a/sys/dev/ic/lsi64854var.h b/sys/dev/ic/lsi64854var.h index 3e6697388dd..8202e7ff167 100644 --- a/sys/dev/ic/lsi64854var.h +++ b/sys/dev/ic/lsi64854var.h @@ -1,4 +1,4 @@ -/* $NetBSD: lsi64854var.h,v 1.4 2001/03/29 02:58:39 petrov Exp $ */ +/* $NetBSD: lsi64854var.h,v 1.5 2003/05/03 18:11:21 wiz Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -60,7 +60,7 @@ struct lsi64854_softc { void (*reset) __P((struct lsi64854_softc *));/* reset routine */ int (*setup) __P((struct lsi64854_softc *, caddr_t *, size_t *, - int, size_t *)); /* dma setup */ + int, size_t *)); /* DMA setup */ int (*intr) __P((void *)); /* interrupt handler */ int (*sc_intrchain) __P((void *)); /* next handler in intr chain */ diff --git a/sys/dev/ic/midway.c b/sys/dev/ic/midway.c index c4c680b23ed..d0e0b1a697a 100644 --- a/sys/dev/ic/midway.c +++ b/sys/dev/ic/midway.c @@ -1,4 +1,4 @@ -/* $NetBSD: midway.c,v 1.59 2003/01/31 00:26:31 thorpej Exp $ */ +/* $NetBSD: midway.c,v 1.60 2003/05/03 18:11:21 wiz Exp $ */ /* (sync'd to midway.c 1.68) */ /* @@ -68,7 +68,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: midway.c,v 1.59 2003/01/31 00:26:31 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: midway.c,v 1.60 2003/05/03 18:11:21 wiz Exp $"); #undef EN_DEBUG #undef EN_DEBUG_RANGE /* check ranges on en_read/en_write's? */ @@ -76,10 +76,10 @@ __KERNEL_RCSID(0, "$NetBSD: midway.c,v 1.59 2003/01/31 00:26:31 thorpej Exp $"); #define EN_DIAG #define EN_STAT #ifndef EN_DMA -#define EN_DMA 1 /* use dma? */ +#define EN_DMA 1 /* use DMA? */ #endif -#define EN_NOTXDMA 0 /* hook to disable tx dma only */ -#define EN_NORXDMA 0 /* hook to disable rx dma only */ +#define EN_NOTXDMA 0 /* hook to disable tx DMA only */ +#define EN_NORXDMA 0 /* hook to disable rx DMA only */ #define EN_NOWMAYBE 1 /* hook to disable word maybe DMA */ /* XXX: WMAYBE doesn't work, needs debugging */ #define EN_DDBHOOK 1 /* compile in ddb functions */ @@ -256,7 +256,7 @@ __KERNEL_RCSID(0, "$NetBSD: midway.c,v 1.59 2003/01/31 00:26:31 thorpej Exp $"); #define EN_OBTRL ATM_PH_DRIVER8 /* PDU trailier in last mbuf ! */ #define ENOTHER_FREE 0x01 /* free rxslot */ -#define ENOTHER_DRAIN 0x02 /* almost free (drain DRQ dma) */ +#define ENOTHER_DRAIN 0x02 /* almost free (drain DRQ DMA) */ #define ENOTHER_RAW 0x04 /* 'raw' access (aka boodi mode) */ #define ENOTHER_SWSL 0x08 /* in software service list */ @@ -291,7 +291,7 @@ struct en_launch { /* - * dma table (index by # of words) + * DMA table (index by # of words) * * plan A: use WMAYBE * plan B: avoid WMAYBE @@ -983,7 +983,7 @@ struct en_softc *sc; } /* - * test that WMAYBE dma works like we think it should + * test that WMAYBE DMA works like we think it should * (i.e. no alignment restrictions on host address other than alburst) */ @@ -1045,8 +1045,8 @@ int wmtry; /* * try it now . . . DMA it out, then DMA it back in and compare * - * note: in order to get the dma stuff to reverse directions it wants - * the "end" flag set! since we are not dma'ing valid data we may + * note: in order to get the DMA stuff to reverse directions it wants + * the "end" flag set! since we are not DMA'ing valid data we may * get an ident mismatch interrupt (which we will ignore). * * note: we've got two different tests rolled up in the same loop @@ -1466,7 +1466,7 @@ struct en_softc *sc; EN_WRITE(sc, MID_RESID, 0x0); /* reset hardware */ /* - * recv: dump any mbufs we are dma'ing into, if DRAINing, then a reset + * recv: dump any mbufs we are DMA'ing into, if DRAINing, then a reset * will free us! */ @@ -1574,7 +1574,7 @@ struct en_softc *sc; EN_WRITE(sc, MID_RESID, 0x0); /* reset */ /* - * init obmem data structures: vc tab, dma q's, slist. + * init obmem data structures: vc tab, DMA q's, slist. * * note that we set drq_free/dtq_free to one less than the total number * of DTQ/DRQs present. we do this because the card uses the condition @@ -2145,7 +2145,7 @@ again: dtqneed = 1; /* header still needs to be added */ launch.need = MID_TBD_SIZE; /* not includeded with mbuf */ } else { - dtqneed = 0; /* header on-board, dma with mbuf */ + dtqneed = 0; /* header on-board, DMA with mbuf */ launch.need = 0; } @@ -2307,7 +2307,7 @@ dequeue_drop: /* - * en_txlaunch: launch an mbuf into the dma pool! + * en_txlaunch: launch an mbuf into the DMA pool! */ STATIC void en_txlaunch(sc, chan, l) @@ -2460,7 +2460,7 @@ struct en_launch *l; EN_DTQADD(sc, len, chan, 0, vtophys((vaddr_t)data), l->mlen, end); if (end) goto done; - dma = cur; /* update dma pointer */ + dma = cur; /* update DMA pointer */ continue; } #endif /* !MIDWAY_ENIONLY */ @@ -2588,7 +2588,7 @@ struct en_launch *l; goto done; } - dma = cur; /* update dma pointer */ + dma = cur; /* update DMA pointer */ #endif /* !MIDWAY_ADPONLY */ } /* next mbuf, please */ @@ -2621,7 +2621,7 @@ struct en_launch *l; EN_DTQADD(sc, pad, chan, bcode, vtophys((vaddr_t)l->t->m_data), 0, 0); need -= pad; #ifdef EN_DEBUG - printf("%s: tx%d: pad/FLUSH dma %d bytes (%d left, cur now 0x%x)\n", + printf("%s: tx%d: pad/FLUSH DMA %d bytes (%d left, cur now 0x%x)\n", sc->sc_dev.dv_xname, chan, pad, need, cur); #endif } @@ -2774,7 +2774,7 @@ void *arg; if (!m) panic("enintr: dtqsync"); sc->txslot[slot].mbsize -= EN_DQ_LEN(dtq); #ifdef EN_DEBUG - printf("%s: tx%d: free %d dma bytes, mbsize now %d\n", + printf("%s: tx%d: free %d DMA bytes, mbsize now %d\n", sc->sc_dev.dv_xname, slot, EN_DQ_LEN(dtq), sc->txslot[slot].mbsize); #endif @@ -3262,7 +3262,7 @@ defer: /* defer processing */ EN_DRQADD(sc, tlen, vci, 0, vtophys((vaddr_t)data), mlen, slot, end); if (end) goto done; - dma = cur; /* update dma pointer */ + dma = cur; /* update DMA pointer */ continue; } #endif /* !MIDWAY_ENIONLY */ @@ -3337,7 +3337,7 @@ defer: /* defer processing */ goto done; } - dma = cur; /* update dma pointer */ + dma = cur; /* update DMA pointer */ #endif /* !MIDWAY_ADPONLY */ @@ -3436,7 +3436,7 @@ int unit, level; printf(" en_stats:\n"); printf(" %d mfix (%d failed); %d/%d head/tail byte DMAs, %d flushes\n", sc->mfix, sc->mfixfail, sc->headbyte, sc->tailbyte, sc->tailflush); - printf(" %d rx dma overflow interrupts\n", sc->dmaovr); + printf(" %d rx DMA overflow interrupts\n", sc->dmaovr); printf(" %d times we ran out of TX space and stalled\n", sc->txoutspace); printf(" %d times we ran out of DTQs\n", sc->txdtqout); @@ -3483,7 +3483,7 @@ int unit, level; printf("serv_write = [chip=%d] [us=%d]\n", EN_READ(sc, MID_SERV_WRITE), MID_SL_A2REG(sc->hwslistp)); - printf("dma addr = 0x%x\n", EN_READ(sc, MID_DMA_ADDR)); + printf("DMA addr = 0x%x\n", EN_READ(sc, MID_DMA_ADDR)); printf("DRQ: chip[rd=0x%x,wr=0x%x], sc[chip=0x%x,us=0x%x]\n", MID_DRQ_REG2A(EN_READ(sc, MID_DMA_RDRX)), MID_DRQ_REG2A(EN_READ(sc, MID_DMA_WRRX)), sc->drq_chip, sc->drq_us); diff --git a/sys/dev/ic/midwayreg.h b/sys/dev/ic/midwayreg.h index 20fd9a32a44..a0f5ba3964e 100644 --- a/sys/dev/ic/midwayreg.h +++ b/sys/dev/ic/midwayreg.h @@ -1,4 +1,4 @@ -/* $NetBSD: midwayreg.h,v 1.9 1999/07/01 08:12:46 itojun Exp $ */ +/* $NetBSD: midwayreg.h,v 1.10 2003/05/03 18:11:22 wiz Exp $ */ /* * m i d w a y r e g . h @@ -45,7 +45,7 @@ typedef caddr_t bus_addr_t; * bus_space_write_4(sc->en_memt, sc->en_base, BYTE_OFFSET, VALUE); * * en_card: the whole card (prom + phy + midway + obmem) - * obmem contains: vci tab + dma queues (rx & tx) + service list + bufs + * obmem contains: vci tab + DMA queues (rx & tx) + service list + bufs */ /* byte offsets from en_base of various items */ @@ -193,7 +193,7 @@ typedef caddr_t bus_addr_t; #define MID_CRC(N) (MID_VC(N)|0xc) /* CRC */ /* - * dma recv q. + * DMA recv q. */ #define MID_DMA_END (1 << 5) /* for both tx and rx */ @@ -214,7 +214,7 @@ typedef caddr_t bus_addr_t; #define MID_MK_RXQ_ADP(CNT,VC,END,JK) \ ( ((CNT) << 12)|((VC) << 2)|((END) >> 4)|(((JK) != 0) ? 1 : 0)) /* - * dma xmit q. + * DMA xmit q. */ #define MID_DTQ_N 512 /* # of descriptors */ @@ -231,7 +231,7 @@ typedef caddr_t bus_addr_t; ( ((CNT) << 12)|((CHN) << 2)|((END) >> 4)|(((JK) != 0) ? 1 : 0) ) /* - * dma types + * DMA types */ #define MIDDMA_JK 0x3 /* just kidding */ @@ -247,7 +247,7 @@ typedef caddr_t bus_addr_t; #define MIDDMA_8WMAYBE 0xd /* 8 words, maybe */ #define MIDDMA_16WMAYBE 0xe /* 16 words, maybe */ -#define MIDDMA_MAYBE 0xc /* mask to detect WMAYBE dma code */ +#define MIDDMA_MAYBE 0xc /* mask to detect WMAYBE DMA code */ #define MIDDMA_MAXBURST (16 * sizeof(u_int32_t)) /* largest burst */ /* diff --git a/sys/dev/ic/midwayvar.h b/sys/dev/ic/midwayvar.h index 15884900f97..3fab442c02a 100644 --- a/sys/dev/ic/midwayvar.h +++ b/sys/dev/ic/midwayvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: midwayvar.h,v 1.11 1999/07/01 08:12:46 itojun Exp $ */ +/* $NetBSD: midwayvar.h,v 1.12 2003/05/03 18:11:22 wiz Exp $ */ /* * @@ -125,15 +125,15 @@ struct en_softc { u_int32_t swsl_size; /* # of items in swsl */ - /* xmit dma */ - u_int32_t dtq[MID_DTQ_N]; /* sw copy of dma q (see ENIDQ macros) */ + /* xmit DMA */ + u_int32_t dtq[MID_DTQ_N]; /* sw copy of DMA q (see ENIDQ macros) */ u_int32_t dtq_free; /* # of dtq's free */ u_int32_t dtq_us; /* software copy of our pointer (byte offset) */ u_int32_t dtq_chip; /* chip's pointer (byte offset) */ u_int32_t need_dtqs; /* true if we ran out of DTQs */ - /* recv dma */ - u_int32_t drq[MID_DRQ_N]; /* sw copy of dma q (see ENIDQ macros) */ + /* recv DMA */ + u_int32_t drq[MID_DRQ_N]; /* sw copy of DMA q (see ENIDQ macros) */ u_int32_t drq_free; /* # of drq's free */ u_int32_t drq_us; /* software copy of our pointer (byte offset) */ u_int32_t drq_chip; /* chip's pointer (byte offset) */ @@ -142,12 +142,12 @@ struct en_softc { /* xmit buf ctrl. (per channel) */ struct { u_int32_t mbsize; /* # mbuf bytes we are using (max=TXHIWAT) */ - u_int32_t bfree; /* # free bytes in buffer (not dma or xmit) */ + u_int32_t bfree; /* # free bytes in buffer (not DMA or xmit) */ u_int32_t start, stop; /* ends of buffer area (byte offset) */ u_int32_t cur; /* next free area (byte offset) */ u_int32_t nref; /* # of VCs using this channel */ - struct ifqueue indma; /* mbufs being dma'd now */ - struct ifqueue q; /* mbufs waiting for dma now */ + struct ifqueue indma; /* mbufs being DMA'd now */ + struct ifqueue q; /* mbufs waiting for DMA now */ } txslot[MID_NTX_CH]; /* xmit vc ctrl. (per vc) */ @@ -172,8 +172,8 @@ struct en_softc { u_int8_t atm_flags; /* copy of atm_flags from atm_ph */ u_int8_t oth_flags; /* other flags */ u_int32_t raw_threshold; /* for raw mode */ - struct ifqueue indma; /* mbufs being dma'd now */ - struct ifqueue q; /* mbufs waiting for dma now */ + struct ifqueue indma; /* mbufs being DMA'd now */ + struct ifqueue q; /* mbufs waiting for DMA now */ } rxslot[EN_MAXNRX]; /* recv info */ u_int8_t macaddr[6]; /* card unique mac address */ @@ -188,7 +188,7 @@ struct en_softc { u_int32_t tailbyte; /* # of times we used BYTE DMA at end */ u_int32_t tailflush; /* # of times we had to FLUSH out DMA bytes */ u_int32_t txmbovr; /* # of times we dropped due to mbsize */ - u_int32_t dmaovr; /* tx dma overflow count */ + u_int32_t dmaovr; /* tx DMA overflow count */ u_int32_t txoutspace; /* out of space in xmit buffer */ u_int32_t txdtqout; /* out of DTQs */ u_int32_t launch; /* total # of launches */ @@ -208,7 +208,7 @@ struct en_softc { u_int8_t bestburstlen; /* length of best burst (bytes) */ u_int8_t bestburstshift; /* (x >> shift) == (x / bestburstlen) */ u_int8_t bestburstmask; /* bits to check if not multiple of burst */ - u_int8_t alburst; /* align dma bursts? */ + u_int8_t alburst; /* align DMA bursts? */ u_int8_t is_adaptec; /* adaptec version of midway? */ #if 1 /* for ATM_PVCEXT */ diff --git a/sys/dev/ic/mx98905.c b/sys/dev/ic/mx98905.c index 0e05bbaee60..300b8923741 100644 --- a/sys/dev/ic/mx98905.c +++ b/sys/dev/ic/mx98905.c @@ -1,4 +1,4 @@ -/* $NetBSD: mx98905.c,v 1.3 2003/01/15 22:20:06 bouyer Exp $ */ +/* $NetBSD: mx98905.c,v 1.4 2003/05/03 18:11:22 wiz Exp $ */ /*- * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. @@ -57,16 +57,16 @@ /* * <URL:http://mail-index.netbsd.org/port-arm32/1996/06/23/0005.html>: * There are 2 types of etherh card. One uses the macronics chipset MX98905 - * and that chipset has a bug in it, in that it the MSB remote dma + * and that chipset has a bug in it, in that it the MSB remote DMA * register does not work. There is a workaround for this which * should be around soon. In fact, I think only the buffer ram test - * ever transfers more than 256 bytes across the dma channel, so diabling + * ever transfers more than 256 bytes across the DMA channel, so diabling * it will make the mx stuff work. */ #include <sys/param.h> -__KERNEL_RCSID(0, "$NetBSD: mx98905.c,v 1.3 2003/01/15 22:20:06 bouyer Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mx98905.c,v 1.4 2003/05/03 18:11:22 wiz Exp $"); #include <sys/device.h> #include <sys/mbuf.h> diff --git a/sys/dev/ic/ncr5380reg.h b/sys/dev/ic/ncr5380reg.h index c2bd1c27949..ff93c3da999 100644 --- a/sys/dev/ic/ncr5380reg.h +++ b/sys/dev/ic/ncr5380reg.h @@ -1,4 +1,4 @@ -/* $NetBSD: ncr5380reg.h,v 1.4 1999/04/12 20:38:21 pk Exp $ */ +/* $NetBSD: ncr5380reg.h,v 1.5 2003/05/03 18:11:22 wiz Exp $ */ /* * Mach Operating System @@ -81,13 +81,13 @@ struct ncr5380regs { #define sci_sel_enb sci_r4 /* w: Select enable */ #define sci_csr sci_r5 /* r: Status */ -#define sci_dma_send sci_r5 /* w: Start dma send data */ +#define sci_dma_send sci_r5 /* w: Start DMA send data */ #define sci_idata sci_r6 /* r: Input data */ -#define sci_trecv sci_r6 /* w: Start dma receive, target */ +#define sci_trecv sci_r6 /* w: Start DMA receive, target */ #define sci_iack sci_r7 /* r: Interrupt Acknowledge */ -#define sci_irecv sci_r7 /* w: Start dma receive, initiator */ +#define sci_irecv sci_r7 /* w: Start DMA receive, initiator */ /* diff --git a/sys/dev/ic/ncr5380sbc.c b/sys/dev/ic/ncr5380sbc.c index f9c18b84dd6..4c2b21372fb 100644 --- a/sys/dev/ic/ncr5380sbc.c +++ b/sys/dev/ic/ncr5380sbc.c @@ -1,4 +1,4 @@ -/* $NetBSD: ncr5380sbc.c,v 1.48 2002/04/05 18:27:53 bouyer Exp $ */ +/* $NetBSD: ncr5380sbc.c,v 1.49 2003/05/03 18:11:22 wiz Exp $ */ /* * Copyright (c) 1995 David Jones, Gordon W. Ross @@ -71,7 +71,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ncr5380sbc.c,v 1.48 2002/04/05 18:27:53 bouyer Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ncr5380sbc.c,v 1.49 2003/05/03 18:11:22 wiz Exp $"); #include "opt_ddb.h" @@ -743,7 +743,7 @@ ncr5380_done(sc) } #ifdef DIAGNOSTIC if (sr->sr_dma_hand) - panic("ncr5380_done: dma free did not"); + panic("ncr5380_done: DMA free did not"); #endif if (sc->sc_state & NCR_ABORTING) { diff --git a/sys/dev/ic/ncr53c9xreg.h b/sys/dev/ic/ncr53c9xreg.h index 60b4476c0ea..b970e88db48 100644 --- a/sys/dev/ic/ncr53c9xreg.h +++ b/sys/dev/ic/ncr53c9xreg.h @@ -1,4 +1,4 @@ -/* $NetBSD: ncr53c9xreg.h,v 1.11 2003/02/21 17:14:05 tsutsui Exp $ */ +/* $NetBSD: ncr53c9xreg.h,v 1.12 2003/05/03 18:11:23 wiz Exp $ */ /* * Copyright (c) 1994 Peter Galbavy. All rights reserved. @@ -183,7 +183,7 @@ #define NCRF9XCFG3_T8M 0x01 /* Threshold 8 Mode */ /* Config #3 on FAS366 */ -#define NCRFASCFG3_OBAUTO 0x80 /* auto push odd-byte to dma */ +#define NCRFASCFG3_OBAUTO 0x80 /* auto push odd-byte to DMA */ #define NCRFASCFG3_EWIDE 0x40 /* Enable Wide-SCSI */ #define NCRFASCFG3_IDBIT3 0x20 /* Bit 3 of HME SCSI-ID */ #define NCRFASCFG3_IDRESCHK 0x10 /* ID message checking */ diff --git a/sys/dev/ic/nec765reg.h b/sys/dev/ic/nec765reg.h index 21d799a40f0..e53df8916fb 100644 --- a/sys/dev/ic/nec765reg.h +++ b/sys/dev/ic/nec765reg.h @@ -1,4 +1,4 @@ -/* $NetBSD: nec765reg.h,v 1.4 1995/10/20 00:02:20 pk Exp $ */ +/* $NetBSD: nec765reg.h,v 1.5 2003/05/03 18:11:23 wiz Exp $ */ /*- * Copyright (c) 1991 The Regents of the University of California. @@ -43,7 +43,7 @@ #define NE7_DAB 0x01 /* Diskette drive A is seeking, thus busy */ #define NE7_DBB 0x02 /* Diskette drive B is seeking, thus busy */ #define NE7_CB 0x10 /* Diskette Controller Busy */ -#define NE7_NDM 0x20 /* Diskette Controller in Non Dma Mode */ +#define NE7_NDM 0x20 /* Diskette Controller in Non DMA Mode */ #define NE7_DIO 0x40 /* Diskette Controller Data register I/O */ #define NE7_RQM 0x80 /* Diskette Controller ReQuest for Master */ diff --git a/sys/dev/ic/oosiopvar.h b/sys/dev/ic/oosiopvar.h index 8237b2497e0..a57fcd4c09d 100644 --- a/sys/dev/ic/oosiopvar.h +++ b/sys/dev/ic/oosiopvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: oosiopvar.h,v 1.1 2003/04/06 09:48:43 tsutsui Exp $ */ +/* $NetBSD: oosiopvar.h,v 1.2 2003/05/03 18:11:23 wiz Exp $ */ /* * Copyright (c) 2001 Shuichiro URATA. All rights reserved. @@ -109,10 +109,10 @@ struct oosiop_softc { bus_space_tag_t sc_bst; /* bus space tag */ bus_space_handle_t sc_bsh; /* bus space handle */ - bus_dma_tag_t sc_dmat; /* bus dma tag */ - bus_dmamap_t sc_scrdma; /* script dma map */ + bus_dma_tag_t sc_dmat; /* bus DMA tag */ + bus_dmamap_t sc_scrdma; /* script DMA map */ - bus_addr_t sc_scrbase; /* script dma base address */ + bus_addr_t sc_scrbase; /* script DMA base address */ u_int32_t *sc_scr; /* ptr to script memory */ int sc_chip; /* 700 or 700-66 */ diff --git a/sys/dev/ic/siop.c b/sys/dev/ic/siop.c index 968db7bcc05..d138daf02ef 100644 --- a/sys/dev/ic/siop.c +++ b/sys/dev/ic/siop.c @@ -1,4 +1,4 @@ -/* $NetBSD: siop.c,v 1.65 2002/11/08 22:04:41 bouyer Exp $ */ +/* $NetBSD: siop.c,v 1.66 2003/05/03 18:11:23 wiz Exp $ */ /* * Copyright (c) 2000 Manuel Bouyer. @@ -33,7 +33,7 @@ /* SYM53c7/8xx PCI-SCSI I/O Processors driver */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: siop.c,v 1.65 2002/11/08 22:04:41 bouyer Exp $"); +__KERNEL_RCSID(0, "$NetBSD: siop.c,v 1.66 2003/05/03 18:11:23 wiz Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -423,7 +423,7 @@ siop_intr(v) if (dstat & DSTAT_MDPE) printf(" parity"); if (dstat & DSTAT_DFE) - printf(" dma fifo empty"); + printf(" DMA fifo empty"); else siop_clearfifo(&sc->sc_c); printf(", DSP=0x%x DSA=0x%x: ", diff --git a/sys/dev/ic/sunscpal.c b/sys/dev/ic/sunscpal.c index 308e0f45fd2..bbaf99b16a8 100644 --- a/sys/dev/ic/sunscpal.c +++ b/sys/dev/ic/sunscpal.c @@ -1,4 +1,4 @@ -/* $NetBSD: sunscpal.c,v 1.13 2002/09/27 15:37:19 provos Exp $ */ +/* $NetBSD: sunscpal.c,v 1.14 2003/05/03 18:11:24 wiz Exp $ */ /* * Copyright (c) 2001 Matthew Fredette @@ -76,7 +76,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sunscpal.c,v 1.13 2002/09/27 15:37:19 provos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sunscpal.c,v 1.14 2003/05/03 18:11:24 wiz Exp $"); #include "opt_ddb.h" @@ -293,7 +293,7 @@ sunscpal_dma_poll(sc) if (sc->sc_state & SUNSCPAL_ABORTING) return; - /* Wait for any "dma complete" or error bits. */ + /* Wait for any "DMA complete" or error bits. */ tmo = POLL_TIMO; for (;;) { if (SUNSCPAL_READ_2(sc, sunscpal_icr) & ICR_MASK) @@ -329,7 +329,7 @@ sunscpal_dma_stop(sc) if ((sc->sc_state & SUNSCPAL_DOINGDMA) == 0) { #ifdef DEBUG - printf("sunscpal_dma_stop: dma not running\n"); + printf("sunscpal_dma_stop: DMA not running\n"); #endif return; } @@ -882,7 +882,7 @@ sunscpal_done(sc) } #ifdef DIAGNOSTIC if (sr->sr_dma_hand) - panic("sunscpal_done: dma free did not"); + panic("sunscpal_done: DMA free did not"); #endif if (sc->sc_state & SUNSCPAL_ABORTING) { diff --git a/sys/dev/ic/uhareg.h b/sys/dev/ic/uhareg.h index 2b0350bf7c8..7f2fcc7e1fd 100644 --- a/sys/dev/ic/uhareg.h +++ b/sys/dev/ic/uhareg.h @@ -1,4 +1,4 @@ -/* $NetBSD: uhareg.h,v 1.8 2000/06/08 18:22:15 cgd Exp $ */ +/* $NetBSD: uhareg.h,v 1.9 2003/05/03 18:11:24 wiz Exp $ */ /*- * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. @@ -185,7 +185,7 @@ typedef u_long physlen; #define UHA_SBUS_RES_ERR 0xa3 /* scsi bus reset error */ #define UHA_BAD_SG_LIST 0xff /* invalid scatter gath list */ -#define UHA_NSEG 33 /* number of dma segments supported */ +#define UHA_NSEG 33 /* number of DMA segments supported */ struct uha_dma_seg { physaddr seg_addr; diff --git a/sys/dev/ieee1394/fwohci.c b/sys/dev/ieee1394/fwohci.c index f470d4567e7..b5246a8d988 100644 --- a/sys/dev/ieee1394/fwohci.c +++ b/sys/dev/ieee1394/fwohci.c @@ -1,4 +1,4 @@ -/* $NetBSD: fwohci.c,v 1.74 2003/04/02 21:53:15 christos Exp $ */ +/* $NetBSD: fwohci.c,v 1.75 2003/05/03 18:11:24 wiz Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -49,7 +49,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: fwohci.c,v 1.74 2003/04/02 21:53:15 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fwohci.c,v 1.75 2003/05/03 18:11:24 wiz Exp $"); #define FWOHCI_WAIT_DEBUG 1 @@ -2274,7 +2274,7 @@ fwohci_as_input(struct fwohci_softc *sc, struct fwohci_ctx *fc) int i; u_int32_t reg; - /* stop dma engine before read buffer */ + /* stop DMA engine before read buffer */ reg = OHCI_SYNC_RX_DMA_READ(sc, fc->fc_ctx, OHCI_SUBREG_ContextControlClear); DPRINTFN(5, ("ir_input %08x =>", reg)); @@ -2288,16 +2288,16 @@ fwohci_as_input(struct fwohci_softc *sc, struct fwohci_ctx *fc) while ((reg = OHCI_SYNC_RX_DMA_READ(sc, fc->fc_ctx, OHCI_SUBREG_ContextControlSet)) & OHCI_CTXCTL_ACTIVE) { delay(10); if (++i > 10000) { - printf("cannot stop dma engine 0x%08x\n", reg); + printf("cannot stop DMA engine 0x%08x\n", reg); return; } } - /* rotate dma buffer */ + /* rotate DMA buffer */ fb = TAILQ_FIRST(&fc->fc_buf2); OHCI_SYNC_RX_DMA_WRITE(sc, fc->fc_ctx, OHCI_SUBREG_CommandPtr, fb->fb_daddr | 1); - /* start dma engine */ + /* start DMA engine */ OHCI_SYNC_RX_DMA_WRITE(sc, fc->fc_ctx, OHCI_SUBREG_ContextControlSet, OHCI_CTXCTL_RUN); OHCI_CSR_WRITE(sc, OHCI_REG_IsoRecvIntEventClear, @@ -5998,7 +5998,7 @@ fwohci_it_ctx_flush(ieee1394_it_tag_t it) * This function is the interrupt handler for isochronous * transmit interrupt. This function will 1) unlink used * (already transmitted) buffers, 2) link new filled buffers, if - * necessary and 3) say some free dma buffers exist to + * necessary and 3) say some free DMA buffers exist to * fwiso_write() */ static void diff --git a/sys/dev/isa/README.seagate b/sys/dev/isa/README.seagate index 25057a18c77..93b5173ae54 100644 --- a/sys/dev/isa/README.seagate +++ b/sys/dev/isa/README.seagate @@ -1,4 +1,4 @@ -# $NetBSD: README.seagate,v 1.2 1998/01/05 07:31:07 perry Exp $ +# $NetBSD: README.seagate,v 1.3 2003/05/03 18:11:25 wiz Exp $ The hardware: @@ -42,7 +42,7 @@ of data without checking for changed phase. During polled transfers, the phase is checked between every character transfered. The polled transfers are always used for status information and command transfers. -Because the card does not use dma in any way, there is no need to handle +Because the card does not use DMA in any way, there is no need to handle physical addresses. There is no problem with the isa-bus address limit of 16MB, making bounce-buffers unnecessary. diff --git a/sys/dev/isa/ad1848var.h b/sys/dev/isa/ad1848var.h index ffbbd4c0c4e..d322dc1bc4e 100644 --- a/sys/dev/isa/ad1848var.h +++ b/sys/dev/isa/ad1848var.h @@ -1,4 +1,4 @@ -/* $NetBSD: ad1848var.h,v 1.36 2003/02/01 06:23:37 thorpej Exp $ */ +/* $NetBSD: ad1848var.h,v 1.37 2003/05/03 18:11:25 wiz Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -89,9 +89,9 @@ struct ad1848_isa_softc { bus_size_t sc_rec_maxsize; /* record/capture DMA size */ u_long sc_interrupts; /* number of interrupts taken */ - void (*sc_pintr)(void *); /* play dma completion intr handler */ + void (*sc_pintr)(void *); /* play DMA completion intr handler */ void *sc_parg; /* arg for sc_pintr() */ - void (*sc_rintr)(void *); /* rec. dma completion intr handler */ + void (*sc_rintr)(void *); /* rec. DMA completion intr handler */ void *sc_rarg; /* arg for sc_rintr() */ /* Only used by pss XXX */ diff --git a/sys/dev/isa/aria.c b/sys/dev/isa/aria.c index cd5986e458d..39df1e161cc 100644 --- a/sys/dev/isa/aria.c +++ b/sys/dev/isa/aria.c @@ -1,4 +1,4 @@ -/* $NetBSD: aria.c,v 1.17 2003/04/06 18:20:13 wiz Exp $ */ +/* $NetBSD: aria.c,v 1.18 2003/05/03 18:11:26 wiz Exp $ */ /*- * Copyright (c) 1995, 1996, 1998 Roland C. Dowdeswell. All rights reserved. @@ -34,7 +34,7 @@ * o Test the driver on cards other than a single * Prometheus Aria 16. * o Look into where aria_prometheus_kludge() belongs. - * o Add some dma code. It accomplishes its goal by + * o Add some DMA code. It accomplishes its goal by * direct IO at the moment. * o Different programs should be able to open the device * with O_RDONLY and O_WRONLY at the same time. But I @@ -50,7 +50,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: aria.c,v 1.17 2003/04/06 18:20:13 wiz Exp $"); +__KERNEL_RCSID(0, "$NetBSD: aria.c,v 1.18 2003/05/03 18:11:26 wiz Exp $"); #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/dev/isa/cs89x0isa.c b/sys/dev/isa/cs89x0isa.c index 21bee8f43ab..ef472740476 100644 --- a/sys/dev/isa/cs89x0isa.c +++ b/sys/dev/isa/cs89x0isa.c @@ -1,4 +1,4 @@ -/* $NetBSD: cs89x0isa.c,v 1.5 2003/02/02 10:24:40 wiz Exp $ */ +/* $NetBSD: cs89x0isa.c,v 1.6 2003/05/03 18:11:26 wiz Exp $ */ /* * Copyright 1997 @@ -33,10 +33,10 @@ * even if advised of the possibility of such damage. */ -/* isa dma routines for cs89x0 */ +/* isa DMA routines for cs89x0 */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cs89x0isa.c,v 1.5 2003/02/02 10:24:40 wiz Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cs89x0isa.c,v 1.6 2003/05/03 18:11:26 wiz Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -188,7 +188,7 @@ void cs_process_rx_dma(struct cs_softc *sc) dma_mem_ptr = isc->sc_dmacur; /* - * process all of the dma frames in memory + * process all of the DMA frames in memory * * This loop relies on the dma_mem_ptr variable being set to the * next frames start address. @@ -215,7 +215,7 @@ void cs_process_rx_dma(struct cs_softc *sc) */ /* * should increment the error count and reset - * the dma operation. + * the DMA operation. */ printf("%s: cs_process_rx_dma: DMA buffer out of sync about to reset\n", sc->sc_dev.dv_xname); diff --git a/sys/dev/isa/ess.c b/sys/dev/isa/ess.c index 3a4de04b3b8..1d713896913 100644 --- a/sys/dev/isa/ess.c +++ b/sys/dev/isa/ess.c @@ -1,4 +1,4 @@ -/* $NetBSD: ess.c,v 1.56 2003/02/01 06:23:37 thorpej Exp $ */ +/* $NetBSD: ess.c,v 1.57 2003/05/03 18:11:26 wiz Exp $ */ /* * Copyright 1997 @@ -66,7 +66,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ess.c,v 1.56 2003/02/01 06:23:37 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ess.c,v 1.57 2003/05/03 18:11:26 wiz Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -281,12 +281,12 @@ ess_printsc(sc) (int)sc->sc_open, sc->sc_iobase, sc->out_port, sc->in_port, sc->spkr_state ? "on" : "off"); - printf("audio1: dmachan %d irq %d nintr %lu intr %p arg %p\n", + printf("audio1: DMA chan %d irq %d nintr %lu intr %p arg %p\n", sc->sc_audio1.drq, sc->sc_audio1.irq, sc->sc_audio1.nintr, sc->sc_audio1.intr, sc->sc_audio1.arg); if (!ESS_USE_AUDIO1(sc->sc_model)) { - printf("audio2: dmachan %d irq %d nintr %lu intr %p arg %p\n", + printf("audio2: DMA chan %d irq %d nintr %lu intr %p arg %p\n", sc->sc_audio2.drq, sc->sc_audio2.irq, sc->sc_audio2.nintr, sc->sc_audio2.intr, sc->sc_audio2.arg); } @@ -554,7 +554,7 @@ ess_config_drq(sc) break; #ifdef DIAGNOSTIC default: - printf("ess_config_drq: configured dma chan %d not supported for Audio 1\n", + printf("ess_config_drq: configured DMA chan %d not supported for Audio 1\n", sc->sc_audio1.drq); return; #endif @@ -582,7 +582,7 @@ ess_config_drq(sc) break; #ifdef DIAGNOSTIC default: - printf("ess_config_drq: configured dma chan %d not supported for Audio 2\n", + printf("ess_config_drq: configured DMA chan %d not supported for Audio 2\n", sc->sc_audio2.drq); return; #endif diff --git a/sys/dev/isa/gus.c b/sys/dev/isa/gus.c index 22335191d19..6de4d6d901e 100644 --- a/sys/dev/isa/gus.c +++ b/sys/dev/isa/gus.c @@ -1,4 +1,4 @@ -/* $NetBSD: gus.c,v 1.79 2003/04/06 18:20:13 wiz Exp $ */ +/* $NetBSD: gus.c,v 1.80 2003/05/03 18:11:26 wiz Exp $ */ /*- * Copyright (c) 1996, 1999 The NetBSD Foundation, Inc. @@ -76,12 +76,12 @@ * | | | +--------+ * | | play (dram) | +----+ | | * | |--------------(------|-\ | | +-+ | - * +---------+ | | >-|----|---|C|--|------ dma chan 1 + * +---------+ | | >-|----|---|C|--|------ DMA chan 1 * | +---|-/ | | +-+ | * | | +----+ | | | * | | +----+ | | | * +---------+ +-+ +--(---|-\ | | | | - * | | play |8| | | >-|----|----+---|------ dma chan 2 + * | | play |8| | | >-|----|----+---|------ DMA chan 2 * | ---C----|--------|/|------(---|-/ | | | * | ^ |record |1| | +----+ | | * | | | /----|6|------+ +--------+ @@ -95,7 +95,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: gus.c,v 1.79 2003/04/06 18:20:13 wiz Exp $"); +__KERNEL_RCSID(0, "$NetBSD: gus.c,v 1.80 2003/05/03 18:11:26 wiz Exp $"); #include "gus.h" #if NGUS > 0 @@ -1411,7 +1411,7 @@ gusintr(arg) if (HAS_CODEC(sc)) retval = ad1848_isa_intr(&sc->sc_codec); if ((intr = bus_space_read_1(iot, ioh1, GUS_IRQ_STATUS)) & GUSMASK_IRQ_DMATC) { - DMAPRINTF(("gusintr dma flags=%x\n", sc->sc_flags)); + DMAPRINTF(("gusintr DMA flags=%x\n", sc->sc_flags)); #ifdef DIAGNOSTIC gusdmaintrcnt++; #endif @@ -2917,7 +2917,7 @@ gus_init_cs4231(sc) ctrl = (port & 0xf0) >> 4; /* set port address middle nibble */ /* - * The codec is a bit weird--swapped dma channels. + * The codec is a bit weird--swapped DMA channels. */ ctrl |= GUS_MAX_CODEC_ENABLE; if (sc->sc_playdrq >= 4) diff --git a/sys/dev/isa/if_hp.c b/sys/dev/isa/if_hp.c index 55516061988..335ff509e1c 100644 --- a/sys/dev/isa/if_hp.c +++ b/sys/dev/isa/if_hp.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_hp.c,v 1.35 2003/01/15 22:38:59 bouyer Exp $ */ +/* $NetBSD: if_hp.c,v 1.36 2003/05/03 18:11:27 wiz Exp $ */ /* XXX THIS DRIVER IS BROKEN. IT WILL NOT EVEN COMPILE. */ @@ -53,7 +53,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_hp.c,v 1.35 2003/01/15 22:38:59 bouyer Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_hp.c,v 1.36 2003/05/03 18:11:27 wiz Exp $"); #include "hp.h" #if NHP > 0 @@ -235,7 +235,7 @@ hpfetch(ns, up, ad, len) cmd = inb(hpc + ds_cmd); outb(hpc + ds_cmd, DSCM_NODMA | DSCM_PG0 | DSCM_START); - /* Setup remote dma */ + /* Setup remote DMA */ outb(hpc + ds0_isr, DSIS_RDC); if (ns->ns_mode & DSDC_WTS) @@ -297,7 +297,7 @@ hpput(ns, up, ad, len) cmd = inb(hpc + ds_cmd); outb(hpc + ds_cmd, DSCM_NODMA | DSCM_PG0 | DSCM_START); - /* Setup for remote dma */ + /* Setup for remote DMA */ outb(hpc + ds0_isr, DSIS_RDC); if (ns->ns_mode & DSDC_WTS) diff --git a/sys/dev/isa/if_ntwoc_isa.c b/sys/dev/isa/if_ntwoc_isa.c index 6aeda84aacf..584d5eccea0 100644 --- a/sys/dev/isa/if_ntwoc_isa.c +++ b/sys/dev/isa/if_ntwoc_isa.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ntwoc_isa.c,v 1.6 2002/10/02 03:10:48 thorpej Exp $ */ +/* $NetBSD: if_ntwoc_isa.c,v 1.7 2003/05/03 18:11:27 wiz Exp $ */ /* * Copyright (c) 1999 Christian E. Hopps * Copyright (c) 1996 John Hay. @@ -29,11 +29,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: if_ntwoc_isa.c,v 1.6 2002/10/02 03:10:48 thorpej Exp $ + * $Id: if_ntwoc_isa.c,v 1.7 2003/05/03 18:11:27 wiz Exp $ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ntwoc_isa.c,v 1.6 2002/10/02 03:10:48 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ntwoc_isa.c,v 1.7 2003/05/03 18:11:27 wiz Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -555,7 +555,7 @@ ntwoc_isa_attach(struct device *parent, struct device *self, void *aux) /* disable the memory window */ ntwoc_isa_set_off(sca); - /* enabled sca dma */ + /* enabled sca DMA */ bus_space_write_1(sca->sc_iot, sca->sc_ioh, NTWOC_PSR, bus_space_read_1(sca->sc_iot, sca->sc_ioh, NTWOC_PSR) | NTWOC_PSR_EN_SCA_DMA); diff --git a/sys/dev/isa/pas.c b/sys/dev/isa/pas.c index fcbea1bd592..3b9215fdf8c 100644 --- a/sys/dev/isa/pas.c +++ b/sys/dev/isa/pas.c @@ -1,4 +1,4 @@ -/* $NetBSD: pas.c,v 1.56 2002/10/02 03:10:49 thorpej Exp $ */ +/* $NetBSD: pas.c,v 1.57 2003/05/03 18:11:27 wiz Exp $ */ /* * Copyright (c) 1991-1993 Regents of the University of California. @@ -57,7 +57,7 @@ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pas.c,v 1.56 2002/10/02 03:10:49 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pas.c,v 1.57 2003/05/03 18:11:27 wiz Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -417,7 +417,7 @@ pasfind(parent, sc, ia, probing) * Cannot auto-discover DMA channel. */ if (!SB_DRQ_VALID(ia->ia_drq[0].ir_drq)) { - printf("pas: configured dma chan %d invalid\n", + printf("pas: configured DMA chan %d invalid\n", ia->ia_drq[0].ir_drq); goto unmap; } diff --git a/sys/dev/isa/pss.c b/sys/dev/isa/pss.c index a2d7bb05270..b9fc95fb95c 100644 --- a/sys/dev/isa/pss.c +++ b/sys/dev/isa/pss.c @@ -1,4 +1,4 @@ -/* $NetBSD: pss.c,v 1.63 2002/10/02 03:10:49 thorpej Exp $ */ +/* $NetBSD: pss.c,v 1.64 2003/05/03 18:11:28 wiz Exp $ */ /* XXX THIS DRIVER IS BROKEN. IT WILL NOT EVEN COMPILE. */ @@ -53,7 +53,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pss.c,v 1.63 2002/10/02 03:10:49 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pss.c,v 1.64 2003/05/03 18:11:28 wiz Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -114,7 +114,7 @@ struct pss_softc { void *sc_ih; /* interrupt vectoring */ int sc_iobase; /* I/O port base address */ - int sc_drq; /* dma channel */ + int sc_drq; /* DMA channel */ struct ad1848_softc *ad1848_sc; @@ -494,7 +494,7 @@ pss_testirq(struct pss_softc *sc, int intNum) } /* - * This function tests a dma channel to see if + * This function tests a DMA channel to see if * it is available. It takes the DMA channel button * as its argument and returns TRUE if the channel * is ok. @@ -797,7 +797,7 @@ pss_found: ia->ia_io[0].ir_size = PSS_NPORT; - /* Initialize PSS irq and dma */ + /* Initialize PSS irq and DMA */ pss_setint(ia->ia_irq[0].ir_irq, sc->sc_iobase+PSS_CONFIG); pss_setdma(ia->ia_drq[0].ir_drq, sc->sc_iobase+PSS_CONFIG); diff --git a/sys/dev/isa/sb.c b/sys/dev/isa/sb.c index 6c9defb8d46..7226781c9a1 100644 --- a/sys/dev/isa/sb.c +++ b/sys/dev/isa/sb.c @@ -1,4 +1,4 @@ -/* $NetBSD: sb.c,v 1.73 2002/11/02 10:47:49 kristerw Exp $ */ +/* $NetBSD: sb.c,v 1.74 2003/05/03 18:11:28 wiz Exp $ */ /* * Copyright (c) 1991-1993 Regents of the University of California. @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sb.c,v 1.73 2002/11/02 10:47:49 kristerw Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sb.c,v 1.74 2003/05/03 18:11:28 wiz Exp $"); #include "midi.h" @@ -135,13 +135,13 @@ sbmatch(sc) */ if (ISSBPROCLASS(sc)) { if (!SBP_DRQ_VALID(sc->sc_drq8)) { - printf("%s: configured dma chan %d invalid\n", + printf("%s: configured DMA chan %d invalid\n", sc->sc_dev.dv_xname, sc->sc_drq8); return 0; } } else { if (!SB_DRQ_VALID(sc->sc_drq8)) { - printf("%s: configured dma chan %d invalid\n", + printf("%s: configured DMA chan %d invalid\n", sc->sc_dev.dv_xname, sc->sc_drq8); return 0; } @@ -159,7 +159,7 @@ sbmatch(sc) if (sc->sc_drq16 == -1) sc->sc_drq16 = sc->sc_drq8; if (!SB16_DRQ_VALID(sc->sc_drq16)) { - printf("%s: configured dma chan %d invalid\n", + printf("%s: configured DMA chan %d invalid\n", sc->sc_dev.dv_xname, sc->sc_drq16); return 0; } diff --git a/sys/dev/isa/sbdsp.c b/sys/dev/isa/sbdsp.c index 518a0c0a90b..bb18237f235 100644 --- a/sys/dev/isa/sbdsp.c +++ b/sys/dev/isa/sbdsp.c @@ -1,4 +1,4 @@ -/* $NetBSD: sbdsp.c,v 1.110 2003/02/01 06:23:37 thorpej Exp $ */ +/* $NetBSD: sbdsp.c,v 1.111 2003/05/03 18:11:28 wiz Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -81,7 +81,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sbdsp.c,v 1.110 2003/02/01 06:23:37 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sbdsp.c,v 1.111 2003/05/03 18:11:28 wiz Exp $"); #include "midi.h" #include "mpu.h" @@ -242,7 +242,7 @@ sb_printsc(sc) { int i; - printf("open %d dmachan %d/%d %d/%d iobase 0x%x irq %d\n", + printf("open %d DMA chan %d/%d %d/%d iobase 0x%x irq %d\n", (int)sc->sc_open, sc->sc_i.run, sc->sc_o.run, sc->sc_drq8, sc->sc_drq16, sc->sc_iobase, sc->sc_irq); @@ -1282,7 +1282,7 @@ sbdsp_trigger_input(addr, start, end, blksize, intr, arg, param) } } - DPRINTF(("sbdsp: dma start loop input start=%p end=%p chan=%d\n", + DPRINTF(("sbdsp: DMA start loop input start=%p end=%p chan=%d\n", start, end, sc->sc_i.dmachan)); isa_dmastart(sc->sc_ic, sc->sc_i.dmachan, start, (char *)end - (char *)start, NULL, @@ -1418,7 +1418,7 @@ sbdsp_trigger_output(addr, start, end, blksize, intr, arg, param) } } - DPRINTF(("sbdsp: dma start loop output start=%p end=%p chan=%d\n", + DPRINTF(("sbdsp: DMA start loop output start=%p end=%p chan=%d\n", start, end, sc->sc_o.dmachan)); isa_dmastart(sc->sc_ic, sc->sc_o.dmachan, start, (char *)end - (char *)start, NULL, @@ -1514,8 +1514,8 @@ sbdsp_halt_input(addr) /* * Only the DSP unit on the sound blaster generates interrupts. * There are three cases of interrupt: reception of a midi byte - * (when mode is enabled), completion of dma transmission, or - * completion of a dma reception. + * (when mode is enabled), completion of DMA transmission, or + * completion of a DMA reception. * * If there is interrupt sharing or a spurious interrupt occurs * there is no way to distinguish this on an SB2. So if you have diff --git a/sys/dev/isa/sbdspvar.h b/sys/dev/isa/sbdspvar.h index 9b15527e76c..c048fe38ae1 100644 --- a/sys/dev/isa/sbdspvar.h +++ b/sys/dev/isa/sbdspvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: sbdspvar.h,v 1.51 2003/02/01 06:23:38 thorpej Exp $ */ +/* $NetBSD: sbdspvar.h,v 1.52 2003/05/03 18:11:29 wiz Exp $ */ /* * Copyright (c) 1991-1993 Regents of the University of California. @@ -143,8 +143,8 @@ struct sbdsp_softc { u_long sc_interrupts; /* number of interrupts taken */ - int (*sc_intr8)(void*); /* dma completion intr handler */ - int (*sc_intr16)(void*); /* dma completion intr handler */ + int (*sc_intr8)(void*); /* DMA completion intr handler */ + int (*sc_intr16)(void*); /* DMA completion intr handler */ void (*sc_intrp)(void*); /* PCM output intr handler */ void *sc_argp; /* arg for sc_intrp() */ void (*sc_intrr)(void*); /* PCM input intr handler */ diff --git a/sys/dev/isa/wds.c b/sys/dev/isa/wds.c index ecd64b5ed59..547c081db96 100644 --- a/sys/dev/isa/wds.c +++ b/sys/dev/isa/wds.c @@ -1,4 +1,4 @@ -/* $NetBSD: wds.c,v 1.53 2003/02/23 04:10:11 simonb Exp $ */ +/* $NetBSD: wds.c,v 1.54 2003/05/03 18:11:29 wiz Exp $ */ /* * XXX @@ -86,7 +86,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: wds.c,v 1.53 2003/02/23 04:10:11 simonb Exp $"); +__KERNEL_RCSID(0, "$NetBSD: wds.c,v 1.54 2003/05/03 18:11:29 wiz Exp $"); #include "opt_ddb.h" @@ -1011,7 +1011,7 @@ wds_init(sc, isreset) sizeof(struct wds_mbx), 0, BUS_DMA_NOWAIT, &sc->sc_dmamap_mbox) || bus_dmamap_load(sc->sc_dmat, sc->sc_dmamap_mbox, wmbx, sizeof(struct wds_mbx), NULL, BUS_DMA_NOWAIT)) - panic("wds_ionit: can't craete or load mailbox dma map"); + panic("wds_ionit: can't craete or load mailbox DMA map"); doinit: /* diff --git a/sys/dev/isa/wss_isa.c b/sys/dev/isa/wss_isa.c index f59faa092c2..21fe6a7f258 100644 --- a/sys/dev/isa/wss_isa.c +++ b/sys/dev/isa/wss_isa.c @@ -1,4 +1,4 @@ -/* $NetBSD: wss_isa.c,v 1.15 2002/10/02 03:10:50 thorpej Exp $ */ +/* $NetBSD: wss_isa.c,v 1.16 2003/05/03 18:11:29 wiz Exp $ */ /* * Copyright (c) 1994 John Brezak @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: wss_isa.c,v 1.15 2002/10/02 03:10:50 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: wss_isa.c,v 1.16 2003/05/03 18:11:29 wiz Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -161,7 +161,7 @@ wssfind(parent, sc, probing, ia) #if 0 /* Setup WSS interrupt and DMA */ if (!WSS_DRQ_VALID(ia->ia_drq[0].ir_drq)) { - DPRINTF(("wss: configured dma chan %d invalid\n", + DPRINTF(("wss: configured DMA chan %d invalid\n", ia->ia_drq[0].ir_drq)); goto bad; } diff --git a/sys/dev/isa/wt.c b/sys/dev/isa/wt.c index 2c1c8c97767..281ac4894d1 100644 --- a/sys/dev/isa/wt.c +++ b/sys/dev/isa/wt.c @@ -1,4 +1,4 @@ -/* $NetBSD: wt.c,v 1.59 2002/10/23 09:13:25 jdolecek Exp $ */ +/* $NetBSD: wt.c,v 1.60 2003/05/03 18:11:30 wiz Exp $ */ /* * Streamer tape driver. @@ -51,7 +51,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: wt.c,v 1.59 2002/10/23 09:13:25 jdolecek Exp $"); +__KERNEL_RCSID(0, "$NetBSD: wt.c,v 1.60 2003/05/03 18:11:30 wiz Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -96,8 +96,8 @@ static struct wtregs { CMDPORT, /* command, write only */ STATPORT, /* status, read only */ CTLPORT, /* control, write only */ - SDMAPORT, /* start dma */ - RDMAPORT; /* reset dma */ + SDMAPORT, /* start DMA */ + RDMAPORT; /* reset DMA */ /* status port bits */ u_char BUSY, /* not ready bit define */ NOEXCEP, /* no exception bit define */ @@ -129,16 +129,16 @@ struct wt_softc { struct callout sc_timer_ch; enum wttype type; /* type of controller */ - int chan; /* dma channel number, 1..3 */ + int chan; /* DMA channel number, 1..3 */ int flags; /* state of tape drive */ unsigned dens; /* tape density */ int bsize; /* tape block size */ void *buf; /* internal i/o buffer */ - void *dmavaddr; /* virtual address of dma i/o buffer */ + void *dmavaddr; /* virtual address of DMA i/o buffer */ size_t dmatotal; /* size of i/o buffer */ int dmaflags; /* i/o direction */ - size_t dmacount; /* resulting length of dma i/o */ + size_t dmacount; /* resulting length of DMA i/o */ u_short error; /* code for error encountered */ u_short ercnt; /* number of error blocks */ @@ -745,7 +745,7 @@ wtintr(arg) sc->dmacount += sc->bsize; /* increment counter */ /* - * Clean up dma. + * Clean up DMA. */ if ((sc->dmaflags & DMAMODE_READ) && (sc->dmatotal - sc->dmacount) < sc->bsize) { @@ -938,7 +938,7 @@ wtwait(sc, catch, msg) return 0; } -/* initialize dma for the i/o operation */ +/* initialize DMA for the i/o operation */ void wtdma(sc) struct wt_softc *sc; @@ -1002,7 +1002,7 @@ wtclock(sc) return; sc->flags |= TPTIMER; /* - * Some controllers seem to lose dma interrupts too often. To make the + * Some controllers seem to lose DMA interrupts too often. To make the * tape stream we need 1 tick timeout. */ callout_reset(&sc->sc_timer_ch, (sc->flags & TPACTIVE) ? 1 : hz, diff --git a/sys/dev/isa/wtreg.h b/sys/dev/isa/wtreg.h index 5cf2d773752..d74b3f30994 100644 --- a/sys/dev/isa/wtreg.h +++ b/sys/dev/isa/wtreg.h @@ -1,4 +1,4 @@ -/* $NetBSD: wtreg.h,v 1.5 1994/10/27 04:18:33 cgd Exp $ */ +/* $NetBSD: wtreg.h,v 1.6 2003/05/03 18:11:30 wiz Exp $ */ /* * Streamer tape driver. @@ -87,7 +87,7 @@ #define TPRANY 0x1000 /* read command requested */ #define TPWP 0x2000 /* write protect error seen */ #define TPTIMER 0x4000 /* timer() is active */ -#define TPACTIVE 0x8000 /* dma i/o active */ +#define TPACTIVE 0x8000 /* DMA i/o active */ /* controller error register bits */ #define TP_FIL 0x0001 /* File mark detected */ diff --git a/sys/dev/isapnp/gus_isapnp.c b/sys/dev/isapnp/gus_isapnp.c index aa057e7ff2c..344e5abdf9a 100644 --- a/sys/dev/isapnp/gus_isapnp.c +++ b/sys/dev/isapnp/gus_isapnp.c @@ -1,4 +1,4 @@ -/* $NetBSD: gus_isapnp.c,v 1.21 2002/10/11 19:14:07 fvdl Exp $ */ +/* $NetBSD: gus_isapnp.c,v 1.22 2003/05/03 18:11:30 wiz Exp $ */ /* * Copyright (c) 1997, 1999 The NetBSD Foundation, Inc. @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: gus_isapnp.c,v 1.21 2002/10/11 19:14:07 fvdl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: gus_isapnp.c,v 1.22 2003/05/03 18:11:30 wiz Exp $"); #include "guspnp.h" #if NGUSPNP > 0 @@ -217,7 +217,7 @@ gus_isapnp_attach(parent, self, aux) } /* - * isapnp is a child if isa, and we need isa for the dma + * isapnp is a child if isa, and we need isa for the DMA * routines. */ sc->iw_cd = &guspnp_cd; diff --git a/sys/dev/microcode/aic7xxx/aic79xx.seq b/sys/dev/microcode/aic7xxx/aic79xx.seq index f05cd2d2ef6..4071fb4c442 100644 --- a/sys/dev/microcode/aic7xxx/aic79xx.seq +++ b/sys/dev/microcode/aic7xxx/aic79xx.seq @@ -40,7 +40,7 @@ * $FreeBSD: /repoman/r/ncvs/src/sys/dev/aic7xxx/aic79xx.seq,v 1.7 2003/02/27 23:23:16 gibbs Exp $ */ -VERSION = "$NetBSD: aic79xx.seq,v 1.1 2003/04/19 19:26:10 fvdl Exp $" +VERSION = "$NetBSD: aic79xx.seq,v 1.2 2003/05/03 18:11:30 wiz Exp $" PATCH_ARG_LIST = "struct ahd_softc *ahd" PREFIX = "ahd_" @@ -206,7 +206,7 @@ fill_qoutfifo_dmadone: qoutfifo_updated: /* - * If there are more commands waiting to be dma'ed + * If there are more commands waiting to be DMA'ed * to the host, always coaless. Otherwise honor the * host's wishes. */ @@ -300,7 +300,7 @@ BEGIN_CRITICAL; /* FALLTHROUGH */ fill_qoutfifo: /* - * Keep track of the SCBs we are dmaing just + * Keep track of the SCBs we are DMA'ing just * in case the DMA fails or is aborted. */ mov A, QOUTFIFO_ENTRY_VALID_TAG; @@ -1465,7 +1465,7 @@ data_group_fifoflush: data_phase_finish: /* * If the target has left us in data phase, loop through - * the dma code again. We will only loop if there is a + * the DMA code again. We will only loop if there is a * data overrun. */ if ((ahd->flags & AHD_TARGETROLE) != 0) { diff --git a/sys/dev/microcode/aic7xxx/aic7xxx.seq b/sys/dev/microcode/aic7xxx/aic7xxx.seq index d05a00a48d8..c20fea2e03a 100644 --- a/sys/dev/microcode/aic7xxx/aic7xxx.seq +++ b/sys/dev/microcode/aic7xxx/aic7xxx.seq @@ -40,7 +40,7 @@ * $FreeBSD: /repoman/r/ncvs/src/sys/dev/aic7xxx/aic7xxx.seq,v 1.123 2003/01/20 20:44:55 gibbs Exp $ */ -VERSION = "$NetBSD: aic7xxx.seq,v 1.14 2003/04/19 19:26:10 fvdl Exp $" +VERSION = "$NetBSD: aic7xxx.seq,v 1.15 2003/05/03 18:11:31 wiz Exp $" PATCH_ARG_LIST = "struct ahc_softc *ahc" PREFIX = "ahc_" @@ -597,7 +597,7 @@ command_phase_done: target_dphase: /* * Data phases on the bus are from the - * perspective of the initiator. The dma + * perspective of the initiator. The DMA * code looks at LASTPHASE to determine the * data direction of the DMA. Toggle it for * target transfers. @@ -1257,7 +1257,7 @@ sg_load_done: data_phase_finish: /* * If the target has left us in data phase, loop through - * the dma code again. In the case of ULTRA2 adapters, + * the DMA code again. In the case of ULTRA2 adapters, * we should only loop if there is a data overrun. For * all other adapters, we'll loop after each S/G element * is loaded as well as if there is an overrun. diff --git a/sys/dev/mvme/mvmebus.c b/sys/dev/mvme/mvmebus.c index c5cf2f7a8d3..671ff006c26 100644 --- a/sys/dev/mvme/mvmebus.c +++ b/sys/dev/mvme/mvmebus.c @@ -1,4 +1,4 @@ -/* $NetBSD: mvmebus.c,v 1.2 2002/09/27 15:37:24 provos Exp $ */ +/* $NetBSD: mvmebus.c,v 1.3 2003/05/03 18:11:31 wiz Exp $ */ /*- * Copyright (c) 2000, 2002 The NetBSD Foundation, Inc. @@ -842,9 +842,9 @@ mvmebus_dmamem_alloc(vsc, len, am, datasize, swap, segs, nsegs, rsegs, flags) * * Note: This fills in the segments with cpu-relative physical * addresses. A further call to bus_dmamap_load_raw() (with a - * dma map which specifies the same VMEbus address space and + * DMA map which specifies the same VMEbus address space and * constraints as the call to here) must be made. The segments - * of the dma map will then contain VMEbus-relative physical + * of the DMA map will then contain VMEbus-relative physical * addresses of the memory allocated here. */ return _bus_dmamem_alloc_common(sc->sc_dmat, low, high, diff --git a/sys/dev/ofisa/ess_ofisa.c b/sys/dev/ofisa/ess_ofisa.c index 7602e1dc985..69b35ae6cd0 100644 --- a/sys/dev/ofisa/ess_ofisa.c +++ b/sys/dev/ofisa/ess_ofisa.c @@ -1,4 +1,4 @@ -/* $NetBSD: ess_ofisa.c,v 1.11 2002/10/02 16:34:28 thorpej Exp $ */ +/* $NetBSD: ess_ofisa.c,v 1.12 2003/05/03 18:11:31 wiz Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ess_ofisa.c,v 1.11 2002/10/02 16:34:28 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ess_ofisa.c,v 1.12 2003/05/03 18:11:31 wiz Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -108,7 +108,7 @@ ess_ofisa_attach(parent, self, aux) * * 1 i/o register region * 1 or 2 interrupts - * 2 dma channels + * 2 DMA channels */ n = ofisa_reg_get(aa->oba.oba_phandle, ®, 1); diff --git a/sys/dev/ofisa/if_cs_ofisa.c b/sys/dev/ofisa/if_cs_ofisa.c index fc01b98d4be..98d0f876022 100644 --- a/sys/dev/ofisa/if_cs_ofisa.c +++ b/sys/dev/ofisa/if_cs_ofisa.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_cs_ofisa.c,v 1.10 2002/10/02 16:34:28 thorpej Exp $ */ +/* $NetBSD: if_cs_ofisa.c,v 1.11 2003/05/03 18:11:32 wiz Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_cs_ofisa.c,v 1.10 2002/10/02 16:34:28 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_cs_ofisa.c,v 1.11 2003/05/03 18:11:32 wiz Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -130,7 +130,7 @@ cs_ofisa_attach(parent, self, aux) * 1 i/o register region * 0 or 1 memory region * 1 interrupt - * 0 or 1 dma channel + * 0 or 1 DMA channel */ io_addr = mem_addr = -1; diff --git a/sys/dev/ofisa/sb_ofisa.c b/sys/dev/ofisa/sb_ofisa.c index ab9546afc27..44a5ee97dc1 100644 --- a/sys/dev/ofisa/sb_ofisa.c +++ b/sys/dev/ofisa/sb_ofisa.c @@ -1,4 +1,4 @@ -/* $NetBSD: sb_ofisa.c,v 1.10 2002/10/02 16:34:31 thorpej Exp $ */ +/* $NetBSD: sb_ofisa.c,v 1.11 2003/05/03 18:11:32 wiz Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sb_ofisa.c,v 1.10 2002/10/02 16:34:31 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sb_ofisa.c,v 1.11 2003/05/03 18:11:32 wiz Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -114,7 +114,7 @@ sb_ofisa_attach(parent, self, aux) * * 1 i/o register region * 1 interrupt - * 1 or 2 dma channels + * 1 or 2 DMA channels */ n = ofisa_reg_get(aa->oba.oba_phandle, ®, 1); diff --git a/sys/dev/pci/auich.c b/sys/dev/pci/auich.c index 9d1ba1364eb..60253233bbe 100644 --- a/sys/dev/pci/auich.c +++ b/sys/dev/pci/auich.c @@ -1,4 +1,4 @@ -/* $NetBSD: auich.c,v 1.36 2003/02/01 06:23:38 thorpej Exp $ */ +/* $NetBSD: auich.c,v 1.37 2003/05/03 18:11:32 wiz Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -115,7 +115,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: auich.c,v 1.36 2003/02/01 06:23:38 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: auich.c,v 1.37 2003/05/03 18:11:32 wiz Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -1096,7 +1096,7 @@ auich_intr(void *v) if (sts & ICH_FIFOE) printf("%s: fifo overrun\n", sc->sc_dev.dv_xname); - /* TODO mic input dma */ + /* TODO mic input DMA */ bus_space_write_2(sc->iot, sc->aud_ioh, ICH_GSTS, ICH_MIINT); } diff --git a/sys/dev/pci/auichreg.h b/sys/dev/pci/auichreg.h index dcd6378f89d..2e81a61f740 100644 --- a/sys/dev/pci/auichreg.h +++ b/sys/dev/pci/auichreg.h @@ -1,4 +1,4 @@ -/* $NetBSD: auichreg.h,v 1.4 2002/10/08 10:25:45 kent Exp $ */ +/* $NetBSD: auichreg.h,v 1.5 2003/05/03 18:11:32 wiz Exp $ */ /* * Copyright (c) 2000 Michael Shalayeff @@ -54,7 +54,7 @@ #define ICH_BCIS 0x08 /* r- buf cmplt int sts; wr ack */ #define ICH_LVBCI 0x04 /* r- last valid bci, wr ack */ #define ICH_CELV 0x02 /* current equals last valid */ -#define ICH_DCH 0x01 /* dma halted */ +#define ICH_DCH 0x01 /* DMA halted */ #define ICH_ISTS_BITS "\020\01dch\02celv\03lvbci\04bcis\05fifoe" #define ICH_PICB 0x08 /* 16 bits */ #define ICH_PIV 0x0a /* 5 bits prefetched index value */ diff --git a/sys/dev/pci/auvia.c b/sys/dev/pci/auvia.c index 0c45056b1c6..7dc7760eb47 100644 --- a/sys/dev/pci/auvia.c +++ b/sys/dev/pci/auvia.c @@ -1,4 +1,4 @@ -/* $NetBSD: auvia.c,v 1.30 2003/02/01 06:23:38 thorpej Exp $ */ +/* $NetBSD: auvia.c,v 1.31 2003/05/03 18:11:32 wiz Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -47,7 +47,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: auvia.c,v 1.30 2003/02/01 06:23:38 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: auvia.c,v 1.31 2003/05/03 18:11:32 wiz Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -820,28 +820,28 @@ auvia_malloc(void *addr, int direction, size_t size, struct malloc_type * pool, p->size = size; if ((error = bus_dmamem_alloc(sc->sc_dmat, size, PAGE_SIZE, 0, &p->seg, 1, &rseg, BUS_DMA_NOWAIT)) != 0) { - printf("%s: unable to allocate dma, error = %d\n", + printf("%s: unable to allocate DMA, error = %d\n", sc->sc_dev.dv_xname, error); goto fail_alloc; } if ((error = bus_dmamem_map(sc->sc_dmat, &p->seg, rseg, size, &p->addr, BUS_DMA_NOWAIT | BUS_DMA_COHERENT)) != 0) { - printf("%s: unable to map dma, error = %d\n", + printf("%s: unable to map DMA, error = %d\n", sc->sc_dev.dv_xname, error); goto fail_map; } if ((error = bus_dmamap_create(sc->sc_dmat, size, 1, size, 0, BUS_DMA_NOWAIT, &p->map)) != 0) { - printf("%s: unable to create dma map, error = %d\n", + printf("%s: unable to create DMA map, error = %d\n", sc->sc_dev.dv_xname, error); goto fail_create; } if ((error = bus_dmamap_load(sc->sc_dmat, p->map, p->addr, size, NULL, BUS_DMA_NOWAIT)) != 0) { - printf("%s: unable to load dma map, error = %d\n", + printf("%s: unable to load DMA map, error = %d\n", sc->sc_dev.dv_xname, error); goto fail_load; } diff --git a/sys/dev/pci/bktr/bktr_core.c b/sys/dev/pci/bktr/bktr_core.c index f8e4892289b..d0129827a03 100644 --- a/sys/dev/pci/bktr/bktr_core.c +++ b/sys/dev/pci/bktr/bktr_core.c @@ -1,6 +1,6 @@ /* $SourceForge: bktr_core.c,v 1.6 2003/03/11 23:11:22 thomasklausner Exp $ */ -/* $NetBSD: bktr_core.c,v 1.30 2003/04/28 14:43:32 fvdl Exp $ */ +/* $NetBSD: bktr_core.c,v 1.31 2003/05/03 18:11:37 wiz Exp $ */ /* $FreeBSD: src/sys/dev/bktr/bktr_core.c,v 1.114 2000/10/31 13:09:56 roger Exp$ */ /* @@ -98,7 +98,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: bktr_core.c,v 1.30 2003/04/28 14:43:32 fvdl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bktr_core.c,v 1.31 2003/05/03 18:11:37 wiz Exp $"); #include "opt_bktr.h" /* Include any kernel config options */ @@ -240,9 +240,9 @@ typedef u_char bool_t; */ #define DMA_PROG_ALLOC (8 * PAGE_SIZE) -/* When to split a dma transfer , the bt848 has timing as well as - dma transfer size limitations so that we have to split dma - transfers into two dma requests +/* When to split a DMA transfer , the bt848 has timing as well as + DMA transfer size limitations so that we have to split DMA + transfers into two DMA requests */ #define DMA_BT848_SPLIT 319*2 @@ -484,7 +484,7 @@ common_bktr_attach(bktr_ptr_t bktr, int unit, u_long pci_id, u_int rev) /* *** OS Specific memory routines *** */ /***************************************/ #if defined(__NetBSD__) || defined(__OpenBSD__) - /* allocate space for dma program */ + /* allocate space for DMA program */ bktr->dma_prog = get_bktr_mem(bktr, &bktr->dm_prog, DMA_PROG_ALLOC); bktr->odd_dma_prog = get_bktr_mem(bktr, &bktr->dm_oprog, @@ -520,7 +520,7 @@ common_bktr_attach(bktr_ptr_t bktr, int unit, u_long pci_id, u_int rev) #endif if (need_to_allocate_memory == 1) { - /* allocate space for dma program */ + /* allocate space for DMA program */ bktr->dma_prog = get_bktr_mem(unit, DMA_PROG_ALLOC); bktr->odd_dma_prog = get_bktr_mem(unit, DMA_PROG_ALLOC); @@ -892,7 +892,7 @@ common_bktr_intr(void *arg) */ if (bktr->flags & METEOR_SINGLE) { - /* stop dma */ + /* stop DMA */ OUTL(bktr, BKTR_INT_MASK, ALL_INTS_DISABLED); /* disable risc, leave fifo running */ @@ -1620,7 +1620,7 @@ video_ioctl(bktr_ptr_t bktr, int unit, ioctl_cmd_t cmd, caddr_t arg, struct proc INL(bktr, BKTR_RISC_COUNT)); #endif - /* stop dma */ + /* stop DMA */ OUTL(bktr, BKTR_INT_MASK, ALL_INTS_DISABLED); /* disable risc, leave fifo running */ diff --git a/sys/dev/pci/cs4280.c b/sys/dev/pci/cs4280.c index d0e1664196e..e71a9fc04b0 100644 --- a/sys/dev/pci/cs4280.c +++ b/sys/dev/pci/cs4280.c @@ -1,4 +1,4 @@ -/* $NetBSD: cs4280.c,v 1.25 2003/01/31 00:07:41 thorpej Exp $ */ +/* $NetBSD: cs4280.c,v 1.26 2003/05/03 18:11:33 wiz Exp $ */ /* * Copyright (c) 1999, 2000 Tatoku Ogaito. All rights reserved. @@ -52,7 +52,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cs4280.c,v 1.25 2003/01/31 00:07:41 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cs4280.c,v 1.26 2003/05/03 18:11:33 wiz Exp $"); #include "midi.h" @@ -343,9 +343,9 @@ cs4280_intr(p) /* * XXX * - * Since CS4280 has only 4kB dma buffer and + * Since CS4280 has only 4kB DMA buffer and * interrupt occurs every 2kB block, I create dummy buffer - * which returns to audio driver and actual dma buffer + * which returns to audio driver and actual DMA buffer * using in DMA transfer. * * @@ -356,8 +356,8 @@ cs4280_intr(p) * | | | | | | <- call audio_intp every * sc->sc_[pr]_count time. * - * actual dma buffer is pointed by KERNADDR - * <-> dma buffer size = 4kB + * actual DMA buffer is pointed by KERNADDR + * <-> DMA buffer size = 4kB * |= =| * * @@ -757,7 +757,7 @@ cs4280_trigger_output(addr, start, end, blksize, intr, arg, param) memcpy(sc->sc_pbuf, start, sc->hw_blocksize); } - /* initiate playback dma */ + /* initiate playback DMA */ BA1WRITE4(sc, CS4280_PBA, DMAADDR(p)); /* set PFIE */ @@ -833,7 +833,7 @@ cs4280_trigger_input(addr, start, end, blksize, intr, arg, param) sc->sc_ri = 0; sc->sc_rn = sc->sc_rs; - /* initiate capture dma */ + /* initiate capture DMA */ BA1WRITE4(sc, CS4280_CBA, DMAADDR(p)); /* setup format information for internal converter */ diff --git a/sys/dev/pci/cs4281.c b/sys/dev/pci/cs4281.c index 6a18ce18b95..8a359d7fcfb 100644 --- a/sys/dev/pci/cs4281.c +++ b/sys/dev/pci/cs4281.c @@ -1,4 +1,4 @@ -/* $NetBSD: cs4281.c,v 1.15 2003/01/31 00:07:41 thorpej Exp $ */ +/* $NetBSD: cs4281.c,v 1.16 2003/05/03 18:11:33 wiz Exp $ */ /* * Copyright (c) 2000 Tatoku Ogaito. All rights reserved. @@ -43,7 +43,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cs4281.c,v 1.15 2003/01/31 00:07:41 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cs4281.c,v 1.16 2003/05/03 18:11:33 wiz Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -356,7 +356,7 @@ cs4281_intr(p) } if (intr & HISR_DMA1) { handled = 1; - /* copy from dma */ + /* copy from DMA */ DPRINTF((" CP DMA 0x%x(%d)", (int)BA0READ4(sc, CS4281_DCA1), (int)BA0READ4(sc, CS4281_DCC1))); ++sc->sc_ri; diff --git a/sys/dev/pci/cs428x.c b/sys/dev/pci/cs428x.c index 5c9ddf4db31..df8510424fc 100644 --- a/sys/dev/pci/cs428x.c +++ b/sys/dev/pci/cs428x.c @@ -1,4 +1,4 @@ -/* $NetBSD: cs428x.c,v 1.5 2003/02/01 06:23:38 thorpej Exp $ */ +/* $NetBSD: cs428x.c,v 1.6 2003/05/03 18:11:33 wiz Exp $ */ /* * Copyright (c) 2000 Tatoku Ogaito. All rights reserved. @@ -33,7 +33,7 @@ /* Common functions for CS4280 and CS4281 */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cs428x.c,v 1.5 2003/02/01 06:23:38 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cs428x.c,v 1.6 2003/05/03 18:11:33 wiz Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -181,7 +181,7 @@ cs428x_free(void *addr, void *ptr, struct malloc_type *pool) size_t cs428x_round_buffersize(void *addr, int direction, size_t size) { - /* The real dma buffersize are 4KB for CS4280 + /* The real DMA buffersize are 4KB for CS4280 * and 64kB/MAX_CHANNELS for CS4281. * But they are too small for high quality audio, * let the upper layer(audio) use a larger buffer. @@ -329,7 +329,7 @@ cs428x_allocmem(struct cs428x_softc *sc, p->segs, sizeof(p->segs)/sizeof(p->segs[0]), &p->nsegs, BUS_DMA_NOWAIT); if (error) { - printf("%s: unable to allocate dma. error=%d\n", + printf("%s: unable to allocate DMA. error=%d\n", sc->sc_dev.dv_xname, error); goto allfree; } @@ -337,7 +337,7 @@ cs428x_allocmem(struct cs428x_softc *sc, error = bus_dmamem_map(sc->sc_dmatag, p->segs, p->nsegs, p->size, &p->addr, BUS_DMA_NOWAIT|BUS_DMA_COHERENT); if (error) { - printf("%s: unable to map dma, error=%d\n", + printf("%s: unable to map DMA, error=%d\n", sc->sc_dev.dv_xname, error); goto free; } @@ -345,7 +345,7 @@ cs428x_allocmem(struct cs428x_softc *sc, error = bus_dmamap_create(sc->sc_dmatag, p->size, 1, p->size, 0, BUS_DMA_NOWAIT, &p->map); if (error) { - printf("%s: unable to create dma map, error=%d\n", + printf("%s: unable to create DMA map, error=%d\n", sc->sc_dev.dv_xname, error); goto unmap; } @@ -353,7 +353,7 @@ cs428x_allocmem(struct cs428x_softc *sc, error = bus_dmamap_load(sc->sc_dmatag, p->map, p->addr, p->size, NULL, BUS_DMA_NOWAIT); if (error) { - printf("%s: unable to load dma map, error=%d\n", + printf("%s: unable to load DMA map, error=%d\n", sc->sc_dev.dv_xname, error); goto destroy; } diff --git a/sys/dev/pci/cs428x.h b/sys/dev/pci/cs428x.h index ba270580b82..9e529f13323 100644 --- a/sys/dev/pci/cs428x.h +++ b/sys/dev/pci/cs428x.h @@ -1,4 +1,4 @@ -/* $NetBSD: cs428x.h,v 1.5 2003/02/01 06:23:38 thorpej Exp $ */ +/* $NetBSD: cs428x.h,v 1.6 2003/05/03 18:11:33 wiz Exp $ */ /* * Copyright (c) 2000 Tatoku Ogaito. All rights reserved. @@ -48,7 +48,7 @@ /* DMA */ struct cs428x_dma { bus_dmamap_t map; - caddr_t addr; /* real dma buffer */ + caddr_t addr; /* real DMA buffer */ caddr_t dum; /* dummy buffer for audio driver */ bus_dma_segment_t segs[1]; int nsegs; @@ -56,7 +56,7 @@ struct cs428x_dma { struct cs428x_dma *next; }; #define DMAADDR(p) ((p)->map->dm_segs[0].ds_addr) -#define KERNADDR(p) ((void *)((p)->addr)) /* buffer for real dma */ +#define KERNADDR(p) ((void *)((p)->addr)) /* buffer for real DMA */ #define BUFADDR(p) ((void *)((p)->dum)) /* buffer for audio driver */ /* @@ -85,7 +85,7 @@ struct cs428x_softc { int type; /* playback */ - void (*sc_pintr)(void *); /* dma completion intr handler */ + void (*sc_pintr)(void *); /* DMA completion intr handler */ void *sc_parg; /* arg for sc_intr() */ char *sc_ps, *sc_pe, *sc_pn; int sc_pcount; @@ -97,7 +97,7 @@ struct cs428x_softc { int sc_prate; /* playback sample rate */ /* capturing */ - void (*sc_rintr)(void *); /* dma completion intr handler */ + void (*sc_rintr)(void *); /* DMA completion intr handler */ void *sc_rarg; /* arg for sc_intr() */ char *sc_rs, *sc_re, *sc_rn; int sc_rcount; diff --git a/sys/dev/pci/eap.c b/sys/dev/pci/eap.c index bfe223b803c..22d9d775e5e 100644 --- a/sys/dev/pci/eap.c +++ b/sys/dev/pci/eap.c @@ -1,4 +1,4 @@ -/* $NetBSD: eap.c,v 1.65 2003/02/01 06:23:38 thorpej Exp $ */ +/* $NetBSD: eap.c,v 1.66 2003/05/03 18:11:33 wiz Exp $ */ /* $OpenBSD: eap.c,v 1.6 1999/10/05 19:24:42 csapuntz Exp $ */ /* @@ -57,7 +57,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: eap.c,v 1.65 2003/02/01 06:23:38 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: eap.c,v 1.66 2003/05/03 18:11:33 wiz Exp $"); #include "midi.h" @@ -126,7 +126,7 @@ struct eap_instance { struct device *parent; int index; - void (*ei_pintr)(void *); /* dma completion intr handler */ + void (*ei_pintr)(void *); /* DMA completion intr handler */ void *ei_parg; /* arg for ei_intr() */ struct device *ei_audiodev; /* audio device, for detach */ #ifdef DIAGNOSTIC @@ -144,7 +144,7 @@ struct eap_softc { struct eap_dma *sc_dmas; - void (*sc_rintr)(void *); /* dma completion intr handler */ + void (*sc_rintr)(void *); /* DMA completion intr handler */ void *sc_rarg; /* arg for sc_intr() */ #ifdef DIAGNOSTIC char sc_rrun; @@ -872,7 +872,7 @@ eap_intr(void *p) while (((EREAD4(sc, EAP_ADC_SIZE) >> 16) + 8) % nw == 0) { delay(10); if (++n > 100) { - printf("eapintr: dma fix timeout"); + printf("eapintr: DMA fix timeout"); break; } } diff --git a/sys/dev/pci/emuxki.c b/sys/dev/pci/emuxki.c index 5b3c9a242ca..e28b26b4982 100644 --- a/sys/dev/pci/emuxki.c +++ b/sys/dev/pci/emuxki.c @@ -1,4 +1,4 @@ -/* $NetBSD: emuxki.c,v 1.25 2003/04/26 22:08:27 wiz Exp $ */ +/* $NetBSD: emuxki.c,v 1.26 2003/05/03 18:11:34 wiz Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -56,7 +56,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: emuxki.c,v 1.25 2003/04/26 22:08:27 wiz Exp $"); +__KERNEL_RCSID(0, "$NetBSD: emuxki.c,v 1.26 2003/05/03 18:11:34 wiz Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -78,12 +78,12 @@ __KERNEL_RCSID(0, "$NetBSD: emuxki.c,v 1.25 2003/04/26 22:08:27 wiz Exp $"); #include <dev/pci/emuxkireg.h> #include <dev/pci/emuxkivar.h> -/* autconf goo */ +/* autoconf goo */ static int emuxki_match(struct device *, struct cfdata *, void *); static void emuxki_attach(struct device *, struct device *, void *); static int emuxki_detach(struct device *, int); -/* dma mem mgmt */ +/* DMA mem mgmt */ static struct dmamem *dmamem_alloc(bus_dma_tag_t, size_t, bus_size_t, int, struct malloc_type *, int); static void dmamem_free(struct dmamem *, struct malloc_type *); @@ -230,7 +230,7 @@ static const int emuxki_recbuf_sz[] = { }; /* - * Dma memory mgmt + * DMA memory mgmt */ static void diff --git a/sys/dev/pci/emuxkivar.h b/sys/dev/pci/emuxkivar.h index 5ae23166976..14728809eb1 100644 --- a/sys/dev/pci/emuxkivar.h +++ b/sys/dev/pci/emuxkivar.h @@ -1,4 +1,4 @@ -/* $NetBSD: emuxkivar.h,v 1.5 2003/04/26 22:08:28 wiz Exp $ */ +/* $NetBSD: emuxkivar.h,v 1.6 2003/05/03 18:11:34 wiz Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -42,7 +42,7 @@ #define EMU_PCI_CBIO 0x10 /* - * dma memory management + * DMA memory management */ struct dmamem { diff --git a/sys/dev/pci/fms.c b/sys/dev/pci/fms.c index 01fbd5e90d6..82e4e554295 100644 --- a/sys/dev/pci/fms.c +++ b/sys/dev/pci/fms.c @@ -1,4 +1,4 @@ -/* $NetBSD: fms.c,v 1.17 2003/02/01 06:23:39 thorpej Exp $ */ +/* $NetBSD: fms.c,v 1.18 2003/05/03 18:11:34 wiz Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: fms.c,v 1.17 2003/02/01 06:23:39 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fms.c,v 1.18 2003/05/03 18:11:34 wiz Exp $"); #include "mpu.h" @@ -777,28 +777,28 @@ fms_malloc(addr, direction, size, pool, flags) p->size = size; if ((error = bus_dmamem_alloc(sc->sc_dmat, size, PAGE_SIZE, 0, &p->seg, 1, &rseg, BUS_DMA_NOWAIT)) != 0) { - printf("%s: unable to allocate dma, error = %d\n", + printf("%s: unable to allocate DMA, error = %d\n", sc->sc_dev.dv_xname, error); goto fail_alloc; } if ((error = bus_dmamem_map(sc->sc_dmat, &p->seg, rseg, size, &p->addr, BUS_DMA_NOWAIT | BUS_DMA_COHERENT)) != 0) { - printf("%s: unable to map dma, error = %d\n", + printf("%s: unable to map DMA, error = %d\n", sc->sc_dev.dv_xname, error); goto fail_map; } if ((error = bus_dmamap_create(sc->sc_dmat, size, 1, size, 0, BUS_DMA_NOWAIT, &p->map)) != 0) { - printf("%s: unable to create dma map, error = %d\n", + printf("%s: unable to create DMA map, error = %d\n", sc->sc_dev.dv_xname, error); goto fail_create; } if ((error = bus_dmamap_load(sc->sc_dmat, p->map, p->addr, size, NULL, BUS_DMA_NOWAIT)) != 0) { - printf("%s: unable to load dma map, error = %d\n", + printf("%s: unable to load DMA map, error = %d\n", sc->sc_dev.dv_xname, error); goto fail_load; } diff --git a/sys/dev/pci/hifn7751.c b/sys/dev/pci/hifn7751.c index f1a1a67efdf..9cb7b425239 100644 --- a/sys/dev/pci/hifn7751.c +++ b/sys/dev/pci/hifn7751.c @@ -1,4 +1,4 @@ -/* $NetBSD: hifn7751.c,v 1.13 2003/01/31 00:07:42 thorpej Exp $ */ +/* $NetBSD: hifn7751.c,v 1.14 2003/05/03 18:11:34 wiz Exp $ */ /* $OpenBSD: hifn7751.c,v 1.47 2000/10/11 13:15:41 itojun Exp $ */ /* @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: hifn7751.c,v 1.13 2003/01/31 00:07:42 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hifn7751.c,v 1.14 2003/05/03 18:11:34 wiz Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -195,26 +195,26 @@ hifn_attach(parent, self, aux) sc->sc_dmat = pa->pa_dmat; if (bus_dmamem_alloc(sc->sc_dmat, sizeof(*sc->sc_dma), PAGE_SIZE, 0, &seg, 1, &rseg, BUS_DMA_NOWAIT)) { - aprint_error(": can't alloc dma buffer\n"); + aprint_error(": can't alloc DMA buffer\n"); goto fail_io1; } if (bus_dmamem_map(sc->sc_dmat, &seg, rseg, sizeof(*sc->sc_dma), &kva, BUS_DMA_NOWAIT)) { - aprint_error(": can't map dma buffers (%lu bytes)\n", + aprint_error(": can't map DMA buffers (%lu bytes)\n", (u_long)sizeof(*sc->sc_dma)); bus_dmamem_free(sc->sc_dmat, &seg, rseg); goto fail_io1; } if (bus_dmamap_create(sc->sc_dmat, sizeof(*sc->sc_dma), 1, sizeof(*sc->sc_dma), 0, BUS_DMA_NOWAIT, &dmamap)) { - aprint_error(": can't create dma map\n"); + aprint_error(": can't create DMA map\n"); bus_dmamem_unmap(sc->sc_dmat, kva, sizeof(*sc->sc_dma)); bus_dmamem_free(sc->sc_dmat, &seg, rseg); goto fail_io1; } if (bus_dmamap_load(sc->sc_dmat, dmamap, kva, sizeof(*sc->sc_dma), NULL, BUS_DMA_NOWAIT)) { - aprint_error(": can't load dma map\n"); + aprint_error(": can't load DMA map\n"); bus_dmamap_destroy(sc->sc_dmat, dmamap); bus_dmamem_unmap(sc->sc_dmat, kva, sizeof(*sc->sc_dma)); bus_dmamem_free(sc->sc_dmat, &seg, rseg); diff --git a/sys/dev/pci/if_bge.c b/sys/dev/pci/if_bge.c index 2e11889e885..69b0648d26d 100644 --- a/sys/dev/pci/if_bge.c +++ b/sys/dev/pci/if_bge.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_bge.c,v 1.38 2003/03/24 12:06:05 tron Exp $ */ +/* $NetBSD: if_bge.c,v 1.39 2003/05/03 18:11:34 wiz Exp $ */ /* * Copyright (c) 2001 Wind River Systems @@ -573,7 +573,7 @@ bge_alloc_jumbo_mem(sc) state = 1; if (bus_dmamem_map(sc->bge_dmatag, &seg, rseg, BGE_JMEM, &kva, BUS_DMA_NOWAIT)) { - printf("%s: can't map dma buffers (%d bytes)\n", + printf("%s: can't map DMA buffers (%d bytes)\n", sc->bge_dev.dv_xname, (int)BGE_JMEM); error = ENOBUFS; goto out; @@ -582,7 +582,7 @@ bge_alloc_jumbo_mem(sc) state = 2; if (bus_dmamap_create(sc->bge_dmatag, BGE_JMEM, 1, BGE_JMEM, 0, BUS_DMA_NOWAIT, &sc->bge_cdata.bge_rx_jumbo_map)) { - printf("%s: can't create dma map\n", sc->bge_dev.dv_xname); + printf("%s: can't create DMA map\n", sc->bge_dev.dv_xname); error = ENOBUFS; goto out; } @@ -590,7 +590,7 @@ bge_alloc_jumbo_mem(sc) state = 3; if (bus_dmamap_load(sc->bge_dmatag, sc->bge_cdata.bge_rx_jumbo_map, kva, BGE_JMEM, NULL, BUS_DMA_NOWAIT)) { - printf("%s: can't load dma map\n", sc->bge_dev.dv_xname); + printf("%s: can't load DMA map\n", sc->bge_dev.dv_xname); error = ENOBUFS; goto out; } @@ -1139,13 +1139,13 @@ bge_chipinit(sc) if (pci_conf_read(pa->pa_pc, pa->pa_tag,BGE_PCI_PCISTATE) & BGE_PCISTATE_PCI_BUSMODE) { /* Conventional PCI bus */ - DPRINTFN(4, ("(%s: PCI 2.2 dma setting)\n", sc->bge_dev.dv_xname)); + DPRINTFN(4, ("(%s: PCI 2.2 DMA setting)\n", sc->bge_dev.dv_xname)); dma_rw_ctl = (BGE_PCI_READ_CMD | BGE_PCI_WRITE_CMD | (0x7 << BGE_PCIDMARWCTL_RD_WAT_SHIFT) | (0x7 << BGE_PCIDMARWCTL_WR_WAT_SHIFT) | (0x0F)); } else { - DPRINTFN(4, ("(:%s: PCI-X dma setting)\n", sc->bge_dev.dv_xname)); + DPRINTFN(4, ("(:%s: PCI-X DMA setting)\n", sc->bge_dev.dv_xname)); /* PCI-X bus */ dma_rw_ctl = BGE_PCI_READ_CMD|BGE_PCI_WRITE_CMD | (0x3 << BGE_PCIDMARWCTL_RD_WAT_SHIFT) | @@ -2018,7 +2018,7 @@ bge_attach(parent, self, aux) if (bus_dmamem_map(sc->bge_dmatag, &seg, rseg, sizeof(struct bge_ring_data), &kva, BUS_DMA_NOWAIT)) { - aprint_error("%s: can't map dma buffers (%d bytes)\n", + aprint_error("%s: can't map DMA buffers (%d bytes)\n", sc->bge_dev.dv_xname, (int)sizeof(struct bge_ring_data)); bus_dmamem_free(sc->bge_dmatag, &seg, rseg); return; @@ -2027,7 +2027,7 @@ bge_attach(parent, self, aux) if (bus_dmamap_create(sc->bge_dmatag, sizeof(struct bge_ring_data), 1, sizeof(struct bge_ring_data), 0, BUS_DMA_NOWAIT, &sc->bge_ring_map)) { - aprint_error("%s: can't create dma map\n", + aprint_error("%s: can't create DMA map\n", sc->bge_dev.dv_xname); bus_dmamem_unmap(sc->bge_dmatag, kva, sizeof(struct bge_ring_data)); diff --git a/sys/dev/pci/if_de.c b/sys/dev/pci/if_de.c index f5186a6d75c..38c6548fa42 100644 --- a/sys/dev/pci/if_de.c +++ b/sys/dev/pci/if_de.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_de.c,v 1.109 2003/01/20 05:30:07 simonb Exp $ */ +/* $NetBSD: if_de.c,v 1.110 2003/05/03 18:11:35 wiz Exp $ */ /*- * Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com) @@ -37,7 +37,7 @@ * board which support 21040, 21041, or 21140 (mostly). */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_de.c,v 1.109 2003/01/20 05:30:07 simonb Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_de.c,v 1.110 2003/05/03 18:11:35 wiz Exp $"); #define TULIP_HDR_DATA @@ -4373,7 +4373,7 @@ tulip_txput( #if defined(TULIP_BUS_DMA) && !defined(TULIP_BUS_DMA_NOTX) /* - * Reclaim some dma maps from if we are out. + * Reclaim some DMA maps from if we are out. */ if (sc->tulip_txmaps_free == 0) { #if defined(TULIP_DEBUG) diff --git a/sys/dev/pci/if_lmc.c b/sys/dev/pci/if_lmc.c index 4818f2049e4..afb5f7269bb 100644 --- a/sys/dev/pci/if_lmc.c +++ b/sys/dev/pci/if_lmc.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_lmc.c,v 1.19 2003/01/20 04:25:46 simonb Exp $ */ +/* $NetBSD: if_lmc.c,v 1.20 2003/05/03 18:11:36 wiz Exp $ */ /*- * Copyright (c) 1997-1999 LAN Media Corporation (LMC) @@ -63,7 +63,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_lmc.c,v 1.19 2003/01/20 04:25:46 simonb Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_lmc.c,v 1.20 2003/05/03 18:11:36 wiz Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -1142,7 +1142,7 @@ again: free = ri->ri_free; #if defined(LMC_BUS_DMA) && !defined(LMC_BUS_DMA_NOTX) /* - * Reclaim some dma maps from if we are out. + * Reclaim some DMA maps from if we are out. */ if (sc->lmc_txmaps_free == 0) { #if defined(LMC_DEBUG) diff --git a/sys/dev/pci/if_ntwoc_pci.c b/sys/dev/pci/if_ntwoc_pci.c index 2ed8846ca49..c72d78bc902 100644 --- a/sys/dev/pci/if_ntwoc_pci.c +++ b/sys/dev/pci/if_ntwoc_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ntwoc_pci.c,v 1.11 2003/01/20 05:30:07 simonb Exp $ */ +/* $NetBSD: if_ntwoc_pci.c,v 1.12 2003/05/03 18:11:36 wiz Exp $ */ /* * Copyright (c) 1998 Vixie Enterprises @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ntwoc_pci.c,v 1.11 2003/01/20 05:30:07 simonb Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ntwoc_pci.c,v 1.12 2003/05/03 18:11:36 wiz Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -283,7 +283,7 @@ ntwoc_pci_attach(struct device *parent, struct device *self, void *aux) 0x68, 0x10900); /* - * pass the dma tag to the SCA + * pass the DMA tag to the SCA */ sca->sc_usedma = 1; sca->scu_dmat = pa->pa_dmat; @@ -365,7 +365,7 @@ ntwoc_pci_attach(struct device *parent, struct device *self, void *aux) (flags & NTWOC_FLAGS_CLK1_MASK) >> NTWOC_FLAGS_CLK1_SHIFT, tmc, rdiv, tdiv); - /* allocate dma'able memory for card to use */ + /* allocate DMA'able memory for card to use */ ntwoc_pci_alloc_dma(sca); ntwoc_pci_setup_dma(sca); diff --git a/sys/dev/pci/isp_pci.c b/sys/dev/pci/isp_pci.c index c598eb25247..553c90cdd11 100644 --- a/sys/dev/pci/isp_pci.c +++ b/sys/dev/pci/isp_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: isp_pci.c,v 1.87 2002/11/25 02:16:50 thorpej Exp $ */ +/* $NetBSD: isp_pci.c,v 1.88 2003/05/03 18:11:36 wiz Exp $ */ /* * This driver, which is contained in NetBSD in the files: * @@ -57,7 +57,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: isp_pci.c,v 1.87 2002/11/25 02:16:50 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: isp_pci.c,v 1.88 2003/05/03 18:11:36 wiz Exp $"); #include <dev/ic/isp_netbsd.h> #include <dev/pci/pcireg.h> @@ -927,13 +927,13 @@ isp_pci_mbxdma(struct ispsoftc *isp) if (pcs->pci_xfer_dmap == NULL) { free(isp->isp_xflist, M_DEVBUF); isp->isp_xflist = NULL; - isp_prt(isp, ISP_LOGERR, "cannot malloc dma map array"); + isp_prt(isp, ISP_LOGERR, "cannot malloc DMA map array"); return (1); } for (i = 0; i < isp->isp_maxcmds; i++) { if (bus_dmamap_create(dmat, MAXPHYS, (MAXPHYS / PAGE_SIZE) + 1, MAXPHYS, 0, BUS_DMA_NOWAIT, &pcs->pci_xfer_dmap[i])) { - isp_prt(isp, ISP_LOGERR, "cannot create dma maps"); + isp_prt(isp, ISP_LOGERR, "cannot create DMA maps"); break; } } @@ -1006,7 +1006,7 @@ isp_pci_mbxdma(struct ispsoftc *isp) fcp->isp_scdma = isp->isp_scdmap->dm_segs[0].ds_addr; return (0); dmafail: - isp_prt(isp, ISP_LOGERR, "mailbox dma setup failure"); + isp_prt(isp, ISP_LOGERR, "mailbox DMA setup failure"); for (i = 0; i < isp->isp_maxcmds; i++) { bus_dmamap_destroy(dmat, pcs->pci_xfer_dmap[i]); } @@ -1056,7 +1056,7 @@ isp_pci_dmasetup(struct ispsoftc *isp, struct scsipi_xfer *xs, ispreq_t *rq, BUS_DMA_NOWAIT : BUS_DMA_WAITOK) | BUS_DMA_STREAMING | ((xs->xs_control & XS_CTL_DATA_IN) ? BUS_DMA_READ : BUS_DMA_WRITE)); if (error) { - isp_prt(isp, ISP_LOGWARN, "unable to load dma (%d)", error); + isp_prt(isp, ISP_LOGWARN, "unable to load DMA (%d)", error); XS_SETERR(xs, HBA_BOTCH); if (error == EAGAIN || error == ENOMEM) return (CMD_EAGAIN); diff --git a/sys/dev/pci/neo.c b/sys/dev/pci/neo.c index 29e12cc0058..d215a483737 100644 --- a/sys/dev/pci/neo.c +++ b/sys/dev/pci/neo.c @@ -1,4 +1,4 @@ -/* $NetBSD: neo.c,v 1.18 2003/02/22 04:57:49 tsutsui Exp $ */ +/* $NetBSD: neo.c,v 1.19 2003/05/03 18:11:36 wiz Exp $ */ /* * Copyright (c) 1999 Cameron Grant <gandalf@vilnya.demon.co.uk> @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: neo.c,v 1.18 2003/02/22 04:57:49 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: neo.c,v 1.19 2003/05/03 18:11:36 wiz Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -130,10 +130,10 @@ struct neo_softc { u_int32_t type; void *ih; - void (*pintr)(void *); /* dma completion intr handler */ + void (*pintr)(void *); /* DMA completion intr handler */ void *parg; /* arg for intr() */ - void (*rintr)(void *); /* dma completion intr handler */ + void (*rintr)(void *); /* DMA completion intr handler */ void *rarg; /* arg for intr() */ vaddr_t buf_vaddr; diff --git a/sys/dev/pci/pcscp.c b/sys/dev/pci/pcscp.c index 6622741c0a9..40b59c68e45 100644 --- a/sys/dev/pci/pcscp.c +++ b/sys/dev/pci/pcscp.c @@ -1,4 +1,4 @@ -/* $NetBSD: pcscp.c,v 1.23 2002/12/28 07:11:24 tsutsui Exp $ */ +/* $NetBSD: pcscp.c,v 1.24 2003/05/03 18:11:37 wiz Exp $ */ /*- * Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc. @@ -46,7 +46,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pcscp.c,v 1.23 2002/12/28 07:11:24 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pcscp.c,v 1.24 2003/05/03 18:11:37 wiz Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -273,7 +273,7 @@ pcscp_attach(parent, self, aux) if (bus_dmamap_create(esc->sc_dmat, MAXPHYS, MDL_SIZE, MAXPHYS, 0, BUS_DMA_NOWAIT, &esc->sc_xfermap)) { - printf("%s: can't create dma maps\n", sc->sc_dev.dv_xname); + printf("%s: can't create DMA maps\n", sc->sc_dev.dv_xname); return; } @@ -317,7 +317,7 @@ pcscp_attach(parent, self, aux) sc->sc_adapter.adapt_request = ncr53c9x_scsipi_request; ncr53c9x_attach(sc); - /* Turn on target selection using the `dma' method */ + /* Turn on target selection using the `DMA' method */ sc->sc_features |= NCR_F_DMASELECT; } @@ -647,7 +647,7 @@ pcscp_dma_stop(sc) { struct pcscp_softc *esc = (struct pcscp_softc *)sc; - /* dma stop */ + /* DMA stop */ /* XXX What should we do here ? */ WRITE_DMAREG(esc, DMA_CMD, DMACMD_ABORT | (esc->sc_datain ? DMACMD_DIR : 0)); diff --git a/sys/dev/pci/sv.c b/sys/dev/pci/sv.c index 2671acb2540..425af3a2b8a 100644 --- a/sys/dev/pci/sv.c +++ b/sys/dev/pci/sv.c @@ -1,4 +1,4 @@ -/* $NetBSD: sv.c,v 1.21 2003/02/22 04:58:43 tsutsui Exp $ */ +/* $NetBSD: sv.c,v 1.22 2003/05/03 18:11:37 wiz Exp $ */ /* $OpenBSD: sv.c,v 1.2 1998/07/13 01:50:15 csapuntz Exp $ */ /* @@ -74,7 +74,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sv.c,v 1.21 2003/02/22 04:58:43 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sv.c,v 1.22 2003/05/03 18:11:37 wiz Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -100,7 +100,7 @@ __KERNEL_RCSID(0, "$NetBSD: sv.c,v 1.21 2003/02/22 04:58:43 tsutsui Exp $"); /* XXX * The SonicVibes DMA is broken and only works on 24-bit addresses. * As long as bus_dmamem_alloc_range() is missing we use the ISA - * dma tag on i386. + * DMA tag on i386. */ #if defined(i386) #include "isa.h" @@ -404,7 +404,7 @@ sv_attach(parent, self, aux) /* XXX * The SonicVibes DMA is broken and only works on 24-bit addresses. * As long as bus_dmamem_alloc_range() is missing we use the ISA - * dma tag on i386. + * DMA tag on i386. */ sc->sc_dmatag = &isa_bus_dma_tag; #else @@ -888,7 +888,7 @@ sv_trigger_output(addr, start, end, blksize, intr, arg, param) } dma_count = ((char *)end - (char *)start) - 1; - DPRINTF(("sv_trigger_output: dma start loop input addr=%x cc=%d\n", + DPRINTF(("sv_trigger_output: DMA start loop input addr=%x cc=%d\n", (int)DMAADDR(p), dma_count)); bus_space_write_4(sc->sc_iot, sc->sc_dmaa_ioh, SV_DMA_ADDR0, @@ -947,7 +947,7 @@ sv_trigger_input(addr, start, end, blksize, intr, arg, param) } dma_count = (((char *)end - (char *)start) >> 1) - 1; - DPRINTF(("sv_trigger_input: dma start loop input addr=%x cc=%d\n", + DPRINTF(("sv_trigger_input: DMA start loop input addr=%x cc=%d\n", (int)DMAADDR(p), dma_count)); bus_space_write_4(sc->sc_iot, sc->sc_dmac_ioh, SV_DMA_ADDR0, diff --git a/sys/dev/pci/svvar.h b/sys/dev/pci/svvar.h index 269cf7ef6af..1983cb6bce9 100644 --- a/sys/dev/pci/svvar.h +++ b/sys/dev/pci/svvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: svvar.h,v 1.3 1999/02/18 00:55:36 mycroft Exp $ */ +/* $NetBSD: svvar.h,v 1.4 2003/05/03 18:11:37 wiz Exp $ */ /* * Copyright (c) 1998 Constantine Paul Sapuntzakis @@ -49,10 +49,10 @@ struct sv_softc { struct sv_dma *sc_dmas; - void (*sc_pintr)(void *); /* dma completion intr handler */ + void (*sc_pintr)(void *); /* DMA completion intr handler */ void *sc_parg; /* arg for sc_intr() */ - void (*sc_rintr)(void *); /* dma completion intr handler */ + void (*sc_rintr)(void *); /* DMA completion intr handler */ void *sc_rarg; /* arg for sc_intr() */ u_int sc_record_source; /* recording source mask */ diff --git a/sys/dev/qbus/if_ilreg.h b/sys/dev/qbus/if_ilreg.h index 7f79875b3c7..0a4f6d70422 100644 --- a/sys/dev/qbus/if_ilreg.h +++ b/sys/dev/qbus/if_ilreg.h @@ -1,4 +1,4 @@ -/* $NetBSD: if_ilreg.h,v 1.1 2001/05/06 15:30:47 ragge Exp $ */ +/* $NetBSD: if_ilreg.h,v 1.2 2003/05/03 18:11:38 wiz Exp $ */ /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. @@ -140,7 +140,7 @@ char *ilerrs[NILERRS] = { char *ildiag[NILDIAGS] = { "success", /* 0 */ "checksum error", /* 1 */ - "NM10 dma error", /* 2 */ + "NM10 DMA error", /* 2 */ "transmitter error", /* 3 */ "receiver error", /* 4 */ "loopback failure", /* 5 */ diff --git a/sys/dev/qbus/rf.c b/sys/dev/qbus/rf.c index 030cd9c0d92..4804ce4ee84 100644 --- a/sys/dev/qbus/rf.c +++ b/sys/dev/qbus/rf.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf.c,v 1.1 2003/03/23 11:01:16 ragge Exp $ */ +/* $NetBSD: rf.c,v 1.2 2003/05/03 18:11:38 wiz Exp $ */ /* * Copyright (c) 2002 Jochen Kunz. * All rights reserved. @@ -340,7 +340,7 @@ rfc_attach(struct device *parent, struct device *self, void *aux) i = bus_dmamap_create(rfc_sc->sc_dmat, RX2_BYTE_DD, 1, RX2_BYTE_DD, 0, BUS_DMA_ALLOCNOW, &rfc_sc->sc_dmam); if (i != 0) { - printf("rfc_attach: Error creating bus dma map: %d\n", i); + printf("rfc_attach: Error creating bus DMA map: %d\n", i); return; } @@ -825,7 +825,7 @@ rfc_intr(void *intarg) ? RX2_BYTE_SD : RX2_BYTE_DD, rfc_sc->sc_curbuf->b_proc, BUS_DMA_NOWAIT); if (i != 0) { - printf("rfc_intr: Error while loading bus dma map: " + printf("rfc_intr: Error while loading bus DMA map: " "%d\n", i); rfc_sc->sc_curbuf->b_flags |= B_ERROR; break; @@ -848,7 +848,7 @@ rfc_intr(void *intarg) ? RX2_BYTE_SD : RX2_BYTE_DD, rfc_sc->sc_curbuf->b_proc, BUS_DMA_NOWAIT); if (i != 0) { - printf("rfc_intr: Error while loading bus dma map: " + printf("rfc_intr: Error while loading bus DMA map: " "%d\n", i); rfc_sc->sc_curbuf->b_flags |= B_ERROR; break; diff --git a/sys/dev/sbus/be.c b/sys/dev/sbus/be.c index 4807c7c7f58..0948583f8c3 100644 --- a/sys/dev/sbus/be.c +++ b/sys/dev/sbus/be.c @@ -1,4 +1,4 @@ -/* $NetBSD: be.c,v 1.38 2002/12/10 13:44:47 pk Exp $ */ +/* $NetBSD: be.c,v 1.39 2003/05/03 18:11:38 wiz Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -64,7 +64,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: be.c,v 1.38 2002/12/10 13:44:47 pk Exp $"); +__KERNEL_RCSID(0, "$NetBSD: be.c,v 1.39 2003/05/03 18:11:38 wiz Exp $"); #include "opt_ddb.h" #include "opt_inet.h" @@ -130,7 +130,7 @@ __KERNEL_RCSID(0, "$NetBSD: be.c,v 1.38 2002/12/10 13:44:47 pk Exp $"); struct be_softc { struct device sc_dev; struct sbusdev sc_sd; /* sbus device */ - bus_space_tag_t sc_bustag; /* bus & dma tags */ + bus_space_tag_t sc_bustag; /* bus & DMA tags */ bus_dma_tag_t sc_dmatag; bus_dmamap_t sc_dmamap; struct ethercom sc_ethercom; @@ -795,7 +795,7 @@ beqint(sc, why) if (why & (BE_CR_STAT_TXLERR | BE_CR_STAT_TXPERR | BE_CR_STAT_TXSERR)) { r |= 1; rst = 1; - printf("%s: tx dma error ( ", sc->sc_dev.dv_xname); + printf("%s: tx DMA error ( ", sc->sc_dev.dv_xname); if (why & BE_CR_STAT_TXLERR) printf("Late "); if (why & BE_CR_STAT_TXPERR) @@ -820,7 +820,7 @@ beqint(sc, why) if (why & (BE_CR_STAT_RXLERR | BE_CR_STAT_RXPERR | BE_CR_STAT_RXSERR)) { r |= 1; rst = 1; - printf("%s: rx dma error ( ", sc->sc_dev.dv_xname); + printf("%s: rx DMA error ( ", sc->sc_dev.dv_xname); if (why & BE_CR_STAT_RXLERR) printf("Late "); if (why & BE_CR_STAT_RXPERR) diff --git a/sys/dev/sbus/bereg.h b/sys/dev/sbus/bereg.h index d2e1db1a143..8b762e2876c 100644 --- a/sys/dev/sbus/bereg.h +++ b/sys/dev/sbus/bereg.h @@ -1,4 +1,4 @@ -/* $NetBSD: bereg.h,v 1.4 2000/07/24 04:28:51 mycroft Exp $ */ +/* $NetBSD: bereg.h,v 1.5 2003/05/03 18:11:38 wiz Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -241,7 +241,7 @@ struct be_cregs { #define BE_CRI_CCNT (12*4) /* be_cregs.ctrl: control. */ -#define BE_CR_CTRL_TWAKEUP 0x00000001 /* tx dma wakeup */ +#define BE_CR_CTRL_TWAKEUP 0x00000001 /* tx DMA wakeup */ /* be_cregs.stat: status. */ #define BE_CR_STAT_BERROR 0x80000000 /* be error */ diff --git a/sys/dev/sbus/cs4231_sbus.c b/sys/dev/sbus/cs4231_sbus.c index cfc8856e1df..88782c52fcf 100644 --- a/sys/dev/sbus/cs4231_sbus.c +++ b/sys/dev/sbus/cs4231_sbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: cs4231_sbus.c,v 1.27 2003/02/27 13:33:23 pk Exp $ */ +/* $NetBSD: cs4231_sbus.c,v 1.28 2003/05/03 18:11:39 wiz Exp $ */ /*- * Copyright (c) 1998, 1999, 2002 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cs4231_sbus.c,v 1.27 2003/02/27 13:33:23 pk Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cs4231_sbus.c,v 1.28 2003/05/03 18:11:39 wiz Exp $"); #include "audio.h" #if NAUDIO > 0 @@ -91,7 +91,7 @@ static void cs4231_sbus_attach(struct device *, struct device *, void *); CFATTACH_DECL(audiocs_sbus, sizeof(struct cs4231_sbus_softc), cs4231_sbus_match, cs4231_sbus_attach, NULL, NULL); -/* audio_hw_if methods specific to apc dma */ +/* audio_hw_if methods specific to apc DMA */ static int cs4231_sbus_trigger_output(void *, void *, void *, int, void (*)(void *), void *, struct audio_params *); diff --git a/sys/dev/sbus/isp_sbus.c b/sys/dev/sbus/isp_sbus.c index 7e369590dd0..bae094f9cff 100644 --- a/sys/dev/sbus/isp_sbus.c +++ b/sys/dev/sbus/isp_sbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: isp_sbus.c,v 1.59 2002/12/10 13:44:48 pk Exp $ */ +/* $NetBSD: isp_sbus.c,v 1.60 2003/05/03 18:11:39 wiz Exp $ */ /* * This driver, which is contained in NetBSD in the files: * @@ -59,7 +59,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: isp_sbus.c,v 1.59 2002/12/10 13:44:48 pk Exp $"); +__KERNEL_RCSID(0, "$NetBSD: isp_sbus.c,v 1.60 2003/05/03 18:11:39 wiz Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -532,7 +532,7 @@ isp_sbus_dmasetup(struct ispsoftc *isp, XS_T *xs, ispreq_t *rq, dmap = sbc->sbus_dmamap[isp_handle_index(rq->req_handle)]; if (dmap->dm_nsegs != 0) { - panic("%s: dma map already allocated", isp->isp_name); + panic("%s: DMA map already allocated", isp->isp_name); /* NOTREACHED */ } error = bus_dmamap_load(isp->isp_dmatag, dmap, xs->data, xs->datalen, @@ -601,7 +601,7 @@ isp_sbus_dmateardown(struct ispsoftc *isp, XS_T *xs, u_int16_t handle) dmap = sbc->sbus_dmamap[isp_handle_index(handle)]; if (dmap->dm_nsegs == 0) { - panic("%s: dma map not already allocated", isp->isp_name); + panic("%s: DMA map not already allocated", isp->isp_name); /* NOTREACHED */ } bus_dmamap_sync(isp->isp_dmatag, dmap, 0, diff --git a/sys/dev/sbus/qe.c b/sys/dev/sbus/qe.c index 36656149fc3..b14645652a3 100644 --- a/sys/dev/sbus/qe.c +++ b/sys/dev/sbus/qe.c @@ -1,4 +1,4 @@ -/* $NetBSD: qe.c,v 1.29 2002/12/10 13:44:48 pk Exp $ */ +/* $NetBSD: qe.c,v 1.30 2003/05/03 18:11:39 wiz Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -73,7 +73,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: qe.c,v 1.29 2002/12/10 13:44:48 pk Exp $"); +__KERNEL_RCSID(0, "$NetBSD: qe.c,v 1.30 2003/05/03 18:11:39 wiz Exp $"); #define QEDEBUG @@ -136,7 +136,7 @@ __KERNEL_RCSID(0, "$NetBSD: qe.c,v 1.29 2002/12/10 13:44:48 pk Exp $"); struct qe_softc { struct device sc_dev; /* base device */ struct sbusdev sc_sd; /* sbus device */ - bus_space_tag_t sc_bustag; /* bus & dma tags */ + bus_space_tag_t sc_bustag; /* bus & DMA tags */ bus_dma_tag_t sc_dmatag; bus_dmamap_t sc_dmamap; struct ethercom sc_ethercom; @@ -824,14 +824,14 @@ qe_eint(sc, why) } if (why & QE_CR_STAT_TXPERR) { - printf("%s: tx dma parity error\n", sc->sc_dev.dv_xname); + printf("%s: tx DMA parity error\n", sc->sc_dev.dv_xname); ifp->if_oerrors++; rst = 1; r |= 1; } if (why & QE_CR_STAT_TXSERR) { - printf("%s: tx dma sbus error ack\n", sc->sc_dev.dv_xname); + printf("%s: tx DMA sbus error ack\n", sc->sc_dev.dv_xname); ifp->if_oerrors++; rst = 1; r |= 1; @@ -897,14 +897,14 @@ qe_eint(sc, why) } if (why & QE_CR_STAT_RXPERR) { - printf("%s: rx dma parity error\n", sc->sc_dev.dv_xname); + printf("%s: rx DMA parity error\n", sc->sc_dev.dv_xname); ifp->if_ierrors++; r |= 1; rst = 1; } if (why & QE_CR_STAT_RXSERR) { - printf("%s: rx dma sbus error ack\n", sc->sc_dev.dv_xname); + printf("%s: rx DMA sbus error ack\n", sc->sc_dev.dv_xname); ifp->if_ierrors++; r |= 1; rst = 1; diff --git a/sys/dev/sbus/qecvar.h b/sys/dev/sbus/qecvar.h index e784e4364de..af3ae7f3fc1 100644 --- a/sys/dev/sbus/qecvar.h +++ b/sys/dev/sbus/qecvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: qecvar.h,v 1.5 2002/08/23 02:53:11 thorpej Exp $ */ +/* $NetBSD: qecvar.h,v 1.6 2003/05/03 18:11:39 wiz Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -39,7 +39,7 @@ struct qec_softc { struct device sc_dev; /* us as a device */ struct sbusdev sc_sd; /* sbus device */ - bus_space_tag_t sc_bustag; /* bus & dma tags */ + bus_space_tag_t sc_bustag; /* bus & DMA tags */ bus_dma_tag_t sc_dmatag; struct openprom_range *sc_range;/* PROM ranges */ int sc_nrange; /* */ diff --git a/sys/dev/sbus/qereg.h b/sys/dev/sbus/qereg.h index cf0d6e7539c..7de29aa6296 100644 --- a/sys/dev/sbus/qereg.h +++ b/sys/dev/sbus/qereg.h @@ -1,4 +1,4 @@ -/* $NetBSD: qereg.h,v 1.4 2002/12/25 08:24:30 jdolecek Exp $ */ +/* $NetBSD: qereg.h,v 1.5 2003/05/03 18:11:39 wiz Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -103,7 +103,7 @@ struct qe_cregs { /* qe_cregs.ctrl: control. */ #define QE_CR_CTRL_RXOFF 0x00000004 /* disable receiver */ #define QE_CR_CTRL_RESET 0x00000002 /* reset this channel */ -#define QE_CR_CTRL_TWAKEUP 0x00000001 /* tx dma wakeup */ +#define QE_CR_CTRL_TWAKEUP 0x00000001 /* tx DMA wakeup */ /* qe_cregs.stat: status. */ #define QE_CR_STAT_EDEFER 0x10000000 /* excessive defers */ diff --git a/sys/dev/scsipi/scsipiconf.h b/sys/dev/scsipi/scsipiconf.h index d772b866d5b..9921ab34c6a 100644 --- a/sys/dev/scsipi/scsipiconf.h +++ b/sys/dev/scsipi/scsipiconf.h @@ -1,4 +1,4 @@ -/* $NetBSD: scsipiconf.h,v 1.73 2003/04/19 19:16:06 fvdl Exp $ */ +/* $NetBSD: scsipiconf.h,v 1.74 2003/05/03 18:11:40 wiz Exp $ */ /*- * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc. @@ -515,7 +515,7 @@ struct scsipi_xfer { int timeout; /* in milliseconds */ struct scsipi_generic *cmd; /* The scsipi command to execute */ int cmdlen; /* how long it is */ - u_char *data; /* dma address OR a uio address */ + u_char *data; /* DMA address OR a uio address */ int datalen; /* data len (blank if uio) */ int resid; /* how much buffer was not touched */ scsipi_xfer_result_t error; /* an error value */ diff --git a/sys/dev/tc/asc_tcds.c b/sys/dev/tc/asc_tcds.c index 7d14b9ef614..3c974402275 100644 --- a/sys/dev/tc/asc_tcds.c +++ b/sys/dev/tc/asc_tcds.c @@ -1,4 +1,4 @@ -/* $NetBSD: asc_tcds.c,v 1.10 2003/04/01 02:07:13 thorpej Exp $ */ +/* $NetBSD: asc_tcds.c,v 1.11 2003/05/03 18:11:40 wiz Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -67,7 +67,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: asc_tcds.c,v 1.10 2003/04/01 02:07:13 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: asc_tcds.c,v 1.11 2003/05/03 18:11:40 wiz Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -93,7 +93,7 @@ struct asc_softc { struct ncr53c9x_softc sc_ncr53c9x; /* glue to MI code */ bus_space_tag_t sc_bst; /* bus space tag */ bus_space_handle_t sc_scsi_bsh; /* ASC register handle */ - bus_dma_tag_t sc_dmat; /* bus dma tag */ + bus_dma_tag_t sc_dmat; /* bus DMA tag */ bus_dmamap_t sc_dmamap; /* bus dmamap */ caddr_t *sc_dmaaddr; size_t *sc_dmalen; @@ -183,7 +183,7 @@ asc_tcds_attach(parent, self, aux) asc->sc_dmat = tcdsdev->tcdsda_dmat; if ((error = bus_dmamap_create(asc->sc_dmat, PAGE_SIZE, 1, PAGE_SIZE, PAGE_SIZE, BUS_DMA_NOWAIT, &asc->sc_dmamap)) < 0) { - printf("failed to create dma map, error = %d\n", error); + printf("failed to create DMA map, error = %d\n", error); } sc->sc_id = tcdsdev->tcdsda_id; @@ -254,7 +254,7 @@ tcds_dma_reset(sc) } /* - * start a dma transfer or keep it going + * start a DMA transfer or keep it going */ int tcds_dma_setup(sc, addr, len, ispullup, dmasize) diff --git a/sys/dev/tc/ascvar.h b/sys/dev/tc/ascvar.h index ce166056e4e..4ede10f9f49 100644 --- a/sys/dev/tc/ascvar.h +++ b/sys/dev/tc/ascvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: ascvar.h,v 1.7 2000/10/31 15:16:26 simonb Exp $ */ +/* $NetBSD: ascvar.h,v 1.8 2003/05/03 18:11:40 wiz Exp $ */ /* @@ -58,16 +58,16 @@ struct asc_softc { struct script *script; /* next expected interrupt & action */ ScsiCmd *cmd[ASC_NCMD]; /* active command indexed by SCSI ID */ State st[ASC_NCMD]; /* state info for each active command */ - /* Start dma routine */ + /* Start DMA routine */ int (*dma_start) __P((struct asc_softc *asc, struct scsi_state *state, caddr_t cp, int flag, int len, int off)); - /* End dma routine */ + /* End DMA routine */ void (*dma_end) __P((struct asc_softc *asc, struct scsi_state *state, int flag)); u_char *dma_next; - int dma_xfer; /* Dma len still to go */ + int dma_xfer; /* DMA len still to go */ int min_period; /* Min transfer period clk/byte */ int max_period; /* Max transfer period clk/byte */ int ccf; /* CCF, whatever that really is? */ @@ -89,7 +89,7 @@ void ascattach __P((struct asc_softc *asc, int bus_speed)); int asc_intr __P ((void *asc)); /* - * Dma operations. + * DMA operations. */ #define ASCDMA_READ 1 #define ASCDMA_WRITE 2 diff --git a/sys/dev/tc/bba.c b/sys/dev/tc/bba.c index cad11efbd05..020405f4852 100644 --- a/sys/dev/tc/bba.c +++ b/sys/dev/tc/bba.c @@ -1,4 +1,4 @@ -/* $NetBSD: bba.c,v 1.19 2003/02/04 05:24:51 matt Exp $ */ +/* $NetBSD: bba.c,v 1.20 2003/05/03 18:11:41 wiz Exp $ */ /* * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -36,7 +36,7 @@ /* maxine/alpha baseboard audio (bba) */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: bba.c,v 1.19 2003/02/04 05:24:51 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bba.c,v 1.20 2003/05/03 18:11:41 wiz Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -77,9 +77,9 @@ struct bba_mem { }; struct bba_dma_state { - bus_dmamap_t dmam; /* dma map */ + bus_dmamap_t dmam; /* DMA map */ int active; - int curseg; /* current segment in dma buffer */ + int curseg; /* current segment in DMA buffer */ void (*intr)__P((void *)); /* higher-level audio handler */ void *intr_arg; }; diff --git a/sys/dev/tc/tcdsreg.h b/sys/dev/tc/tcdsreg.h index d1141e6ffa3..777b15cb500 100644 --- a/sys/dev/tc/tcdsreg.h +++ b/sys/dev/tc/tcdsreg.h @@ -1,4 +1,4 @@ -/* $NetBSD: tcdsreg.h,v 1.2 2003/01/06 13:05:16 wiz Exp $ */ +/* $NetBSD: tcdsreg.h,v 1.3 2003/05/03 18:11:41 wiz Exp $ */ /* * Copyright (c) 1994, 1995 Carnegie-Mellon University. @@ -197,14 +197,14 @@ void tcds_scsi_reset __P((int)); #define KN15AA_REG_SCSI_IMER (KN15AA_SYS_SCSI + 0x80008) -/* these are the bits that were unalligned at the beginning of the dma */ +/* these are the bits that were unalligned at the beginning of the DMA */ #define KN15AA_REG_SCSI_DUDB0 (KN15AA_SYS_SCSI + 0x82010) #define KN15AA_REG_SCSI_DUDB1 (KN15AA_SYS_SCSI + 0x82210) # define SCSI_DUDB_MASK01 0x00000001 /* Mask bit for byte[01] */ # define SCSI_DUDB_MASK10 0x00000002 /* Mask bit for byte[10] */ # define SCSI_DUDB_MASK11 0x00000004 /* Mask bit for byte[11] */ -/* these are the bits that were unalligned at the end of the dma */ +/* these are the bits that were unalligned at the end of the DMA */ #define KN15AA_REG_SCSI_DUDE0 (KN15AA_SYS_SCSI + 0x82018) #define KN15AA_REG_SCSI_DUDE1 (KN15AA_SYS_SCSI + 0x82218) # define SCSI_DUDE_MASK00 0x1000000 /* Mask bit for byte[00] */ diff --git a/sys/dev/usb/uaudio.c b/sys/dev/usb/uaudio.c index a9293c18ba4..e53ff21dbb4 100644 --- a/sys/dev/usb/uaudio.c +++ b/sys/dev/usb/uaudio.c @@ -1,4 +1,4 @@ -/* $NetBSD: uaudio.c,v 1.66 2003/04/17 16:38:02 jdolecek Exp $ */ +/* $NetBSD: uaudio.c,v 1.67 2003/05/03 18:11:41 wiz Exp $ */ /* * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -44,7 +44,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uaudio.c,v 1.66 2003/04/17 16:38:02 jdolecek Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uaudio.c,v 1.67 2003/05/03 18:11:41 wiz Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -121,7 +121,7 @@ struct as_info { }; struct chan { - void (*intr)(void *); /* dma completion intr handler */ + void (*intr)(void *); /* DMA completion intr handler */ void *arg; /* arg for intr() */ usbd_pipe_handle pipe; diff --git a/sys/dev/usb/usb_mem.h b/sys/dev/usb/usb_mem.h index f3eff5c1a60..cf674bd5934 100644 --- a/sys/dev/usb/usb_mem.h +++ b/sys/dev/usb/usb_mem.h @@ -1,4 +1,4 @@ -/* $NetBSD: usb_mem.h,v 1.19 2002/07/11 21:14:34 augustss Exp $ */ +/* $NetBSD: usb_mem.h,v 1.20 2003/05/03 18:11:42 wiz Exp $ */ /* $FreeBSD: src/sys/dev/usb/usb_mem.h,v 1.9 1999/11/17 22:33:47 n_hibma Exp $ */ /* @@ -61,7 +61,7 @@ void usb_freemem(usbd_bus_handle, usb_dma_t *); #elif defined(__FreeBSD__) /* - * FreeBSD does not have special functions for dma memory, so let's keep it + * FreeBSD does not have special functions for DMA memory, so let's keep it * simple for now. */ diff --git a/sys/dev/vme/sc_vme.c b/sys/dev/vme/sc_vme.c index d372edc0b53..32ada7d00d3 100644 --- a/sys/dev/vme/sc_vme.c +++ b/sys/dev/vme/sc_vme.c @@ -1,4 +1,4 @@ -/* $NetBSD: sc_vme.c,v 1.8 2002/10/02 16:53:12 thorpej Exp $ */ +/* $NetBSD: sc_vme.c,v 1.9 2003/05/03 18:11:42 wiz Exp $ */ /*- * Copyright (c) 1996,2000,2001 The NetBSD Foundation, Inc. @@ -69,7 +69,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sc_vme.c,v 1.8 2002/10/02 16:53:12 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sc_vme.c,v 1.9 2003/05/03 18:11:42 wiz Exp $"); #include "opt_ddb.h" @@ -201,7 +201,7 @@ sc_vme_attach(parent, self, aux) i = SUNSCPAL_OPENINGS * sizeof(struct sunscpal_dma_handle); sc->sc_dma_handles = (struct sunscpal_dma_handle *)malloc(i, M_DEVBUF, M_NOWAIT); if (sc->sc_dma_handles == NULL) - panic("sc: dma handle malloc failed"); + panic("sc: DMA handle malloc failed"); for (i = 0; i < SUNSCPAL_OPENINGS; i++) { sc->sc_dma_handles[i].dh_flags = 0; diff --git a/sys/dev/vme/si.c b/sys/dev/vme/si.c index efd5bcb8462..81023a33c44 100644 --- a/sys/dev/vme/si.c +++ b/sys/dev/vme/si.c @@ -1,4 +1,4 @@ -/* $NetBSD: si.c,v 1.12 2002/10/02 16:53:13 thorpej Exp $ */ +/* $NetBSD: si.c,v 1.13 2003/05/03 18:11:42 wiz Exp $ */ /*- * Copyright (c) 1996,2000 The NetBSD Foundation, Inc. @@ -80,7 +80,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: si.c,v 1.12 2002/10/02 16:53:13 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: si.c,v 1.13 2003/05/03 18:11:42 wiz Exp $"); #include "opt_ddb.h" @@ -319,7 +319,7 @@ si_attach(parent, self, aux) i = SCI_OPENINGS * sizeof(struct si_dma_handle); sc->sc_dma = (struct si_dma_handle *)malloc(i, M_DEVBUF, M_NOWAIT); if (sc->sc_dma == NULL) - panic("si: dma handle malloc failed"); + panic("si: DMA handle malloc failed"); for (i = 0; i < SCI_OPENINGS; i++) { sc->sc_dma[i].dh_flags = 0; @@ -825,7 +825,7 @@ si_dma_stop(ncr_sc) if ((ncr_sc->sc_state & NCR_DOINGDMA) == 0) { #ifdef DEBUG - printf("si_dma_stop: dma not running\n"); + printf("si_dma_stop: DMA not running\n"); #endif return; } @@ -856,7 +856,7 @@ si_dma_stop(ncr_sc) * actually transferred for VME. * * SCSI-3 VME interface is a little funny on writes: - * if we have a disconnect, the dma has overshot by + * if we have a disconnect, the DMA has overshot by * one byte and the resid needs to be incremented. * Only happens for partial transfers. * (Thanks to Matt Jacob) diff --git a/sys/dev/vme/sireg.h b/sys/dev/vme/sireg.h index 5e8e89dd050..82c91b30d85 100644 --- a/sys/dev/vme/sireg.h +++ b/sys/dev/vme/sireg.h @@ -1,4 +1,4 @@ -/* $NetBSD: sireg.h,v 1.1 2000/07/03 23:30:33 pk Exp $ */ +/* $NetBSD: sireg.h,v 1.2 2003/05/03 18:11:42 wiz Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -56,9 +56,9 @@ struct si_regs { struct ncr5380regs sci; /* DMA controller registers */ - u_short dma_addrh; /* dma address (VME only) */ + u_short dma_addrh; /* DMA address (VME only) */ u_short dma_addrl; /* (high word, low word) */ - u_short dma_counth; /* dma count (VME only) */ + u_short dma_counth; /* DMA count (VME only) */ u_short dma_countl; /* (high word, low word) */ u_int pad0; /* no-existent register */ @@ -114,23 +114,23 @@ struct si_regs { * systems, the (v), (o) and (b) qualifications are left in for * cross-reference. */ -#define SI_CSR_DMA_ACTIVE 0x8000 /* (r,o) dma transfer active */ -#define SI_CSR_DMA_CONFLICT 0x4000 /* (r,b) reg accessed while dmaing */ -#define SI_CSR_DMA_BUS_ERR 0x2000 /* (r,b) bus error during dma */ +#define SI_CSR_DMA_ACTIVE 0x8000 /* (r,o) DMA transfer active */ +#define SI_CSR_DMA_CONFLICT 0x4000 /* (r,b) reg accessed while DMA'ing */ +#define SI_CSR_DMA_BUS_ERR 0x2000 /* (r,b) bus error during DMA */ #define SI_CSR_ID 0x1000 /* (r,b) 0 for 3/50, 1 for SCSI-3, */ /* 0 if SCSI-3 unmodified */ #define SI_CSR_FIFO_FULL 0x0800 /* (r,b) fifo full */ #define SI_CSR_FIFO_EMPTY 0x0400 /* (r,b) fifo empty */ #define SI_CSR_SBC_IP 0x0200 /* (r,b) sbc interrupt pending */ -#define SI_CSR_DMA_IP 0x0100 /* (r,b) dma interrupt pending */ +#define SI_CSR_DMA_IP 0x0100 /* (r,b) DMA interrupt pending */ #define SI_CSR_LOB 0x00c0 /* (r,v) number of leftover bytes */ #define SI_CSR_LOB_THREE 0x00c0 /* (r,v) three leftover bytes */ #define SI_CSR_LOB_TWO 0x0080 /* (r,v) two leftover bytes */ #define SI_CSR_LOB_ONE 0x0040 /* (r,v) one leftover byte */ #define SI_CSR_BPCON 0x0020 /* (rw,v) byte packing control */ - /* dma is in 0=longwords, 1=words */ -#define SI_CSR_DMA_EN 0x0010 /* (rw,v) dma/interrupt enable */ -#define SI_CSR_SEND 0x0008 /* (rw,b) dma dir, 1=to device */ + /* DMA is in 0=longwords, 1=words */ +#define SI_CSR_DMA_EN 0x0010 /* (rw,v) DMA/interrupt enable */ +#define SI_CSR_SEND 0x0008 /* (rw,b) DMA dir, 1=to device */ #define SI_CSR_INTR_EN 0x0004 /* (rw,b) interrupts enable */ #define SI_CSR_FIFO_RES 0x0002 /* (rw,b) inits fifo, 0=reset */ #define SI_CSR_SCSI_RES 0x0001 /* (rw,b) reset sbc and udc, 0=reset */ diff --git a/sys/dev/vme/xdreg.h b/sys/dev/vme/xdreg.h index 92f4c842222..ebe797885cc 100644 --- a/sys/dev/vme/xdreg.h +++ b/sys/dev/vme/xdreg.h @@ -1,4 +1,4 @@ -/* $NetBSD: xdreg.h,v 1.2 2003/01/06 13:05:16 wiz Exp $ */ +/* $NetBSD: xdreg.h,v 1.3 2003/05/03 18:11:42 wiz Exp $ */ /* * @@ -45,7 +45,7 @@ #define XDC_MAXIOPB 31 /* max number of iopbs that can be active */ #define XDC_MAXTIME 4*1000000 /* four seconds before we give up and reset */ #define XDC_MAXTRIES 4 /* max number of times to retry an operation */ -#define XDC_THROTTLE 32 /* dma throttle */ +#define XDC_THROTTLE 32 /* DMA throttle */ #define XDC_INTERLEAVE 0 /* interleave (for format param) */ #define XDC_DPARAM 0 /* dparam (drive param) XDDP_EC32 or 0 */ @@ -250,7 +250,7 @@ struct xd_iopb_ctrl { #define XDPC_ECC1 0x01 /* ECC mode 1 */ #define XDPC_ECC2 0x02 /* ECC mode 2 */ /* section 4.2.4: byte b */ - volatile u_char throttle; /* max dma xfers per master (0==256) */ + volatile u_char throttle; /* max DMA xfers per master (0==256) */ /* section 4.2.5: byte c */ volatile u_char eprom_lvl; /* EPROM release level */ volatile u_char delay; /* delay (see note below) */ @@ -417,7 +417,7 @@ struct xd_iopb_format { #define XD_ERR_MT7 0xe7 /* maint test 7 failed (buff. parity) */ #define XD_ERR_MT8 0xe8 /* maint test 8 failed (fifo) */ #define XD_ERR_IOCK 0xf0 /* iopb checksume miscompare */ -#define XD_ERR_IODM 0xf1 /* iopb dma fatal */ +#define XD_ERR_IODM 0xf1 /* iopb DMA fatal */ #define XD_ERR_IOAL 0xf2 /* iopb allignment error */ #define XD_ERR_FIRM 0xf3 /* firmware error n*/ #define XD_ERR_MMOD 0xf5 /* illegal maint mode test number */ diff --git a/sys/dev/vme/xyreg.h b/sys/dev/vme/xyreg.h index f88a66c87d0..0445e70c1e8 100644 --- a/sys/dev/vme/xyreg.h +++ b/sys/dev/vme/xyreg.h @@ -1,4 +1,4 @@ -/* $NetBSD: xyreg.h,v 1.2 1998/08/22 11:47:46 pk Exp $ */ +/* $NetBSD: xyreg.h,v 1.3 2003/05/03 18:11:43 wiz Exp $ */ /* * @@ -145,8 +145,8 @@ struct xy_iopb { /* section 2.4.5: byte 4 */ volatile u_char bw:1; /* byte(1)/word(0) xfer size */ volatile u_char intlv:4; /* interleave factor (0=1:1, 1=2:1, etc.) */ - volatile u_char thro:3; /* dma throttle (0=2,1=4,2=8, etc...) */ -#define XY_THRO 4 /* 4 == 32 dma cycles */ + volatile u_char thro:3; /* DMA throttle (0=2,1=4,2=8, etc...) */ +#define XY_THRO 4 /* 4 == 32 DMA cycles */ /* section 2.4.8: byte 7 */ volatile u_char sect; /* sector # */ /* section 2.4.7: byte 6 */ |
