Module Name: src
Committed By: flxd
Date: Thu Jun 22 16:46:53 UTC 2017
Modified Files:
src/distrib/notes/alpha: hardware install
src/distrib/notes/pmax: hardware install
src/share/man/man4: scc.4
src/share/man/man8/man8.pmax: boot.8
src/sys/arch/alpha/include: bus_defs.h cfbreg.h tc_machdep.h
src/sys/arch/alpha/tc: tc_3000_300.h tc_3000_500.h tc_bus_mem.c
tc_conf.h tc_dma_3000_500.c tc_sgmap.h tcasic.c
src/sys/arch/arc/arc: arcbios.h
src/sys/arch/mipsco/mipsco: autoconf.c
src/sys/arch/news68k/news68k: autoconf.c
src/sys/arch/newsmips/newsmips: autoconf.c
src/sys/arch/pmax/pmax: kn03.h
src/sys/arch/pmax/stand/common: rz.c
src/sys/arch/vax/conf: files.vax
src/sys/conf: files
src/sys/dev/dec: if_le_dec.c
src/sys/dev/ic: pdqvar.h
src/sys/dev/tc: if_fta.c if_le_tc.c tcdevs tcds.c tcreg.h
Log Message:
spelling (DEC called it "TURBOchannel")
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/distrib/notes/alpha/hardware
cvs rdiff -u -r1.37 -r1.38 src/distrib/notes/alpha/install
cvs rdiff -u -r1.18 -r1.19 src/distrib/notes/pmax/hardware
cvs rdiff -u -r1.41 -r1.42 src/distrib/notes/pmax/install
cvs rdiff -u -r1.8 -r1.9 src/share/man/man4/scc.4
cvs rdiff -u -r1.15 -r1.16 src/share/man/man8/man8.pmax/boot.8
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/alpha/include/bus_defs.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/alpha/include/cfbreg.h
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/alpha/include/tc_machdep.h
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/alpha/tc/tc_3000_300.h \
src/sys/arch/alpha/tc/tc_3000_500.h
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/alpha/tc/tc_bus_mem.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/alpha/tc/tc_conf.h
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/alpha/tc/tc_dma_3000_500.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/alpha/tc/tc_sgmap.h
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/alpha/tc/tcasic.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arc/arc/arcbios.h
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/mipsco/mipsco/autoconf.c
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/news68k/news68k/autoconf.c
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/newsmips/newsmips/autoconf.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/pmax/pmax/kn03.h
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/pmax/stand/common/rz.c
cvs rdiff -u -r1.121 -r1.122 src/sys/arch/vax/conf/files.vax
cvs rdiff -u -r1.1178 -r1.1179 src/sys/conf/files
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/dec/if_le_dec.c
cvs rdiff -u -r1.47 -r1.48 src/sys/dev/ic/pdqvar.h
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/tc/if_fta.c
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/tc/if_le_tc.c
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/tc/tcdevs
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/tc/tcds.c
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/tc/tcreg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/notes/alpha/hardware
diff -u src/distrib/notes/alpha/hardware:1.18 src/distrib/notes/alpha/hardware:1.19
--- src/distrib/notes/alpha/hardware:1.18 Tue May 19 19:30:26 2015
+++ src/distrib/notes/alpha/hardware Thu Jun 22 16:46:52 2017
@@ -1,10 +1,10 @@
-.\" $NetBSD: hardware,v 1.18 2015/05/19 19:30:26 snj Exp $
+.\" $NetBSD: hardware,v 1.19 2017/06/22 16:46:52 flxd Exp $
.
.Nx*M
\*V runs on most of the
.Tn DEC
Alpha PCI platforms, on all
-of the TURBOChannel models, on the high end 8200 and 8400 systems,
+of the TURBOchannel models, on the high end 8200 and 8400 systems,
and on the 4100 series.
.Pp
The SRM console is required.
@@ -40,7 +40,7 @@ it is actually possible to boot and inst
in only
16 MB of RAM, you will want to have at least 32 MB.
.
-We support add-in devices on the PCI, ISA, EISA and TurboChannel buses.
+We support add-in devices on the PCI, ISA, EISA and TURBOchannel buses.
Because
.Nx
has an extremely machine-independent device driver
@@ -192,7 +192,7 @@ BusLogic 7xx SCSI
.bullet)
.bullet)
.
-.Ss2 Supported Turbochannel bus devices
+.Ss2 Supported TURBOchannel bus devices
.(bullet -offset indent
Graphics Adapters
.(bullet -compact
@@ -206,7 +206,7 @@ SFB video (PMAGB-BA,
Although these boards are supported by
.Nx*M
since there is no keyboard or mouse support available for the
-TurboChannel systems, they aren't very useful.
+TURBOchannel systems, they aren't very useful.
.\" XXX: is this still true now that the MI sfb.c is used???
.Note)
.It
Index: src/distrib/notes/alpha/install
diff -u src/distrib/notes/alpha/install:1.37 src/distrib/notes/alpha/install:1.38
--- src/distrib/notes/alpha/install:1.37 Sat Apr 25 21:21:47 2009
+++ src/distrib/notes/alpha/install Thu Jun 22 16:46:52 2017
@@ -1,4 +1,4 @@
-.\" $NetBSD: install,v 1.37 2009/04/25 21:21:47 snj Exp $
+.\" $NetBSD: install,v 1.38 2017/06/22 16:46:52 flxd Exp $
.\"
.\" Copyright (c) 1999-2002 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -358,7 +358,7 @@ with:
.Pp
.Dl \*[Gt]\*[Gt]\*[Gt] Ic "set ewa0_protocols bootp"
.Pp
-The 3000 series of Turbochannel systems and certain other models use
+The 3000 series of TURBOchannel systems and certain other models use
.Em old SRM ,
do not have a
.Fl proto
Index: src/distrib/notes/pmax/hardware
diff -u src/distrib/notes/pmax/hardware:1.18 src/distrib/notes/pmax/hardware:1.19
--- src/distrib/notes/pmax/hardware:1.18 Tue May 19 19:30:28 2015
+++ src/distrib/notes/pmax/hardware Thu Jun 22 16:46:52 2017
@@ -1,4 +1,4 @@
-.\" $NetBSD: hardware,v 1.18 2015/05/19 19:30:28 snj Exp $
+.\" $NetBSD: hardware,v 1.19 2017/06/22 16:46:52 flxd Exp $
.
.Ss2 Supported machines
.(bullet -offset indent
@@ -52,7 +52,7 @@ DECstation 2100 and 3100 baseboard video
one-bit mono or 8-bit pseudocolor frame buffers.
.bullet)
.It
-DECstation 5000 series TurboChannel video
+DECstation 5000 series TURBOchannel video
.(bullet -compact
PMAG-DV Personal DECstation baseboard 1024x768 frame buffer
.It
@@ -105,7 +105,7 @@ on-board
.Em asc
SCSI controller (5000 series machines)
.It
-TurboChannel
+TURBOchannel
.Em asc No SCSI controller
.Pq the Em PMAZ
.bullet)
@@ -128,7 +128,7 @@ Audio drivers for Personal DECstation ma
.It
Floppy driver for Personal DECstation machines
.It
-TurboChannel audio hardware (LoFi)
+TURBOchannel audio hardware (LoFi)
.bullet)
.(Note
The primary obstacle to supporting the above is non-availability of sample
Index: src/distrib/notes/pmax/install
diff -u src/distrib/notes/pmax/install:1.41 src/distrib/notes/pmax/install:1.42
--- src/distrib/notes/pmax/install:1.41 Thu Apr 23 01:56:50 2009
+++ src/distrib/notes/pmax/install Thu Jun 22 16:46:52 2017
@@ -1,4 +1,4 @@
-.\" $NetBSD: install,v 1.41 2009/04/23 01:56:50 snj Exp $
+.\" $NetBSD: install,v 1.42 2017/06/22 16:46:52 flxd Exp $
.\"
.\" Copyright (c) 1999-2002 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -87,7 +87,7 @@ section later in these INSTALL notes.
You should familiarize yourself with the console PROM environment
and the hardware configuration.
The PROMs on the older DECstation 2100 and 3100 use one syntax.
-The PROMs on the TurboChannel machines use a completely different syntax.
+The PROMs on the TURBOchannel machines use a completely different syntax.
Be sure you know how to print the configuration of your machine,
and how to boot from disk or network, as appropriate.
.Pp
Index: src/share/man/man4/scc.4
diff -u src/share/man/man4/scc.4:1.8 src/share/man/man4/scc.4:1.9
--- src/share/man/man4/scc.4:1.8 Tue May 6 08:09:36 2003
+++ src/share/man/man4/scc.4 Thu Jun 22 16:46:52 2017
@@ -27,7 +27,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $NetBSD: scc.4,v 1.8 2003/05/06 08:09:36 wiz Exp $
+.\" $NetBSD: scc.4,v 1.9 2017/06/22 16:46:52 flxd Exp $
.\"
.Dd April 24, 2003
.Dt SCC 4
@@ -119,7 +119,7 @@ found in
.Tn DEC
.Tn Alpha
model 3000
-.Tn TurboCHANNEL
+.Tn TURBOchannel
based systems;
.Nx Ns /alpha
has since been converted to use the machine-independent
Index: src/share/man/man8/man8.pmax/boot.8
diff -u src/share/man/man8/man8.pmax/boot.8:1.15 src/share/man/man8/man8.pmax/boot.8:1.16
--- src/share/man/man8/man8.pmax/boot.8:1.15 Sat Sep 5 11:37:52 2009
+++ src/share/man/man8/man8.pmax/boot.8 Thu Jun 22 16:46:52 2017
@@ -1,4 +1,4 @@
-.\" $NetBSD: boot.8,v 1.15 2009/09/05 11:37:52 wiz Exp $
+.\" $NetBSD: boot.8,v 1.16 2017/06/22 16:46:52 flxd Exp $
.\"
.\" Copyright (c) 1990, 1991 The Regents of the University of California.
.\" All rights reserved.
@@ -130,8 +130,8 @@ with the
flag, followed by the path of the kernel to boot, as described above.
For example:
.Dl Ic boot -f rz(0,4,0)netbsd.new
-.Sh TURBOCHANNEL DECstations
-On TurboChannel machines (all DECstation 5000 models), the boot path
+.Sh TURBOchannel DECstations
+On TURBOchannel machines (all DECstation 5000 models), the boot path
is specified in the boot environment variable, along with any arguments
to be passed to the kernel.
Note that to specify boot arguments (e.g.,
@@ -143,17 +143,17 @@ must be enclosed in quotes.
For example:
.Dl Ic setenv boot Dq Ic "3/rz4/netbsd -a"
.Pp
-The device from which to boot is specified as the TurboChannel slot
-number, a TurboChannel-option-specific device name, and a path to the
+The device from which to boot is specified as the TURBOchannel slot
+number, a TURBOchannel-option-specific device name, and a path to the
file to load, all separated by slashes.
You can get a list of the
-devices installed in your TurboChannel slots (as well as any built-in
-devices which appear as TurboChannel slots) by typing the
+devices installed in your TURBOchannel slots (as well as any built-in
+devices which appear as TURBOchannel slots) by typing the
.Nm cnfg
command
at the boot prompt.
You can get more detailed information about a specific
-TurboChannel option by typing
+TURBOchannel option by typing
.Nm cnfg
followed by the slot number of that
option.
Index: src/sys/arch/alpha/include/bus_defs.h
diff -u src/sys/arch/alpha/include/bus_defs.h:1.3 src/sys/arch/alpha/include/bus_defs.h:1.4
--- src/sys/arch/alpha/include/bus_defs.h:1.3 Mon Feb 6 02:14:13 2012
+++ src/sys/arch/alpha/include/bus_defs.h Thu Jun 22 16:46:52 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_defs.h,v 1.3 2012/02/06 02:14:13 matt Exp $ */
+/* $NetBSD: bus_defs.h,v 1.4 2017/06/22 16:46:52 flxd Exp $ */
/*-
* Copyright (c) 1997, 1998, 2000, 2001 The NetBSD Foundation, Inc.
@@ -341,7 +341,7 @@ struct alpha_bus_dma_tag {
* direct -> NULL
*
* If the window size is 0, it will not be checked (e.g.
- * TurboChannel DMA).
+ * TURBOchannel DMA).
*/
bus_size_t _wsize;
struct alpha_bus_dma_tag *_next_window;
Index: src/sys/arch/alpha/include/cfbreg.h
diff -u src/sys/arch/alpha/include/cfbreg.h:1.2 src/sys/arch/alpha/include/cfbreg.h:1.3
--- src/sys/arch/alpha/include/cfbreg.h:1.2 Sun Apr 6 08:47:20 1997
+++ src/sys/arch/alpha/include/cfbreg.h Thu Jun 22 16:46:52 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: cfbreg.h,v 1.2 1997/04/06 08:47:20 cgd Exp $ */
+/* $NetBSD: cfbreg.h,v 1.3 2017/06/22 16:46:52 flxd Exp $ */
/*
* Copyright (c) 1996 Carnegie-Mellon University.
@@ -32,7 +32,7 @@
* ``PMAG-BA TURBOchannel Color Frame Buffer Functional Specification
* (Revision 1.2)'', availalable via anonymous FTP from gatekeeper.dec.com.
*
- * All definitions are in "dense" TurboChannel space.
+ * All definitions are in "dense" TURBOchannel space.
*/
/*
Index: src/sys/arch/alpha/include/tc_machdep.h
diff -u src/sys/arch/alpha/include/tc_machdep.h:1.6 src/sys/arch/alpha/include/tc_machdep.h:1.7
--- src/sys/arch/alpha/include/tc_machdep.h:1.6 Mon Nov 4 16:56:50 2013
+++ src/sys/arch/alpha/include/tc_machdep.h Thu Jun 22 16:46:52 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: tc_machdep.h,v 1.6 2013/11/04 16:56:50 christos Exp $ */
+/* $NetBSD: tc_machdep.h,v 1.7 2017/06/22 16:46:52 flxd Exp $ */
/*
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -28,12 +28,12 @@
*/
/*
- * Machine-specific definitions for TurboChannel support.
+ * Machine-specific definitions for TURBOchannel support.
*
* This file must typedef the following types:
*
- * tc_addr_t TurboChannel bus address
- * tc_offset_t TurboChannel bus address difference (offset)
+ * tc_addr_t TURBOchannel bus address
+ * tc_offset_t TURBOchannel bus address difference (offset)
*
* This file must prototype or define the following functions
* or macros (one or more of which may be no-ops):
@@ -45,12 +45,12 @@
* before must complete before any CPU<->memory
* writes after).
* tc_syncbus() sync TC bus; make sure CPU writes are
- * propagated across the TurboChannel bus.
+ * propagated across the TURBOchannel bus.
* tc_badaddr() return non-zero if the given address is invalid.
* TC_DENSE_TO_SPARSE()
* convert the given physical address in
- * TurboChannel dense space to the corresponding
- * address in TurboChannel sparse space.
+ * TURBOchannel dense space to the corresponding
+ * address in TURBOchannel sparse space.
* TC_PHYS_TO_UNCACHED()
* convert the given system memory physical address
* to the physical address of the corresponding
Index: src/sys/arch/alpha/tc/tc_3000_300.h
diff -u src/sys/arch/alpha/tc/tc_3000_300.h:1.6 src/sys/arch/alpha/tc/tc_3000_300.h:1.7
--- src/sys/arch/alpha/tc/tc_3000_300.h:1.6 Mon Feb 6 02:14:16 2012
+++ src/sys/arch/alpha/tc/tc_3000_300.h Thu Jun 22 16:46:52 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: tc_3000_300.h,v 1.6 2012/02/06 02:14:16 matt Exp $ */
+/* $NetBSD: tc_3000_300.h,v 1.7 2017/06/22 16:46:52 flxd Exp $ */
/*
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
*/
/*
- * TurboChannel-specific functions and structures for 3000_500.
+ * TURBOchannel-specific functions and structures for 3000_500.
*/
/*
Index: src/sys/arch/alpha/tc/tc_3000_500.h
diff -u src/sys/arch/alpha/tc/tc_3000_500.h:1.6 src/sys/arch/alpha/tc/tc_3000_500.h:1.7
--- src/sys/arch/alpha/tc/tc_3000_500.h:1.6 Mon Feb 6 02:14:16 2012
+++ src/sys/arch/alpha/tc/tc_3000_500.h Thu Jun 22 16:46:52 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: tc_3000_500.h,v 1.6 2012/02/06 02:14:16 matt Exp $ */
+/* $NetBSD: tc_3000_500.h,v 1.7 2017/06/22 16:46:52 flxd Exp $ */
/*
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
*/
/*
- * TurboChannel-specific functions and structures for 3000_500.
+ * TURBOchannel-specific functions and structures for 3000_500.
*/
/*
Index: src/sys/arch/alpha/tc/tc_bus_mem.c
diff -u src/sys/arch/alpha/tc/tc_bus_mem.c:1.37 src/sys/arch/alpha/tc/tc_bus_mem.c:1.38
--- src/sys/arch/alpha/tc/tc_bus_mem.c:1.37 Wed Aug 3 17:16:07 2016
+++ src/sys/arch/alpha/tc/tc_bus_mem.c Thu Jun 22 16:46:52 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: tc_bus_mem.c,v 1.37 2016/08/03 17:16:07 christos Exp $ */
+/* $NetBSD: tc_bus_mem.c,v 1.38 2017/06/22 16:46:52 flxd Exp $ */
/*
* Copyright (c) 1996 Carnegie-Mellon University.
@@ -28,12 +28,12 @@
*/
/*
- * Common TurboChannel Chipset "bus memory" functions.
+ * Common TURBOchannel Chipset "bus memory" functions.
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: tc_bus_mem.c,v 1.37 2016/08/03 17:16:07 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tc_bus_mem.c,v 1.38 2017/06/22 16:46:52 flxd Exp $");
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/arch/alpha/tc/tc_conf.h
diff -u src/sys/arch/alpha/tc/tc_conf.h:1.13 src/sys/arch/alpha/tc/tc_conf.h:1.14
--- src/sys/arch/alpha/tc/tc_conf.h:1.13 Mon Feb 6 02:14:16 2012
+++ src/sys/arch/alpha/tc/tc_conf.h Thu Jun 22 16:46:52 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: tc_conf.h,v 1.13 2012/02/06 02:14:16 matt Exp $ */
+/* $NetBSD: tc_conf.h,v 1.14 2017/06/22 16:46:52 flxd Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
*/
/*
- * Machine-specific TurboChannel configuration definitions.
+ * Machine-specific TURBOchannel configuration definitions.
*/
#include "opt_dec_3000_300.h"
Index: src/sys/arch/alpha/tc/tc_dma_3000_500.c
diff -u src/sys/arch/alpha/tc/tc_dma_3000_500.c:1.19 src/sys/arch/alpha/tc/tc_dma_3000_500.c:1.20
--- src/sys/arch/alpha/tc/tc_dma_3000_500.c:1.19 Mon Nov 4 16:56:17 2013
+++ src/sys/arch/alpha/tc/tc_dma_3000_500.c Thu Jun 22 16:46:52 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: tc_dma_3000_500.c,v 1.19 2013/11/04 16:56:17 christos Exp $ */
+/* $NetBSD: tc_dma_3000_500.c,v 1.20 2017/06/22 16:46:52 flxd Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: tc_dma_3000_500.c,v 1.19 2013/11/04 16:56:17 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tc_dma_3000_500.c,v 1.20 2017/06/22 16:46:52 flxd Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -108,7 +108,7 @@ tc_dma_get_tag_3000_500(int slot)
}
/*
- * Create a TurboChannel SGMAP-mapped DMA map.
+ * Create a TURBOchannel SGMAP-mapped DMA map.
*/
int
tc_bus_dmamap_create_sgmap(
@@ -135,7 +135,7 @@ tc_bus_dmamap_create_sgmap(
}
/*
- * Destroy a TurboChannel SGMAP-mapped DMA map.
+ * Destroy a TURBOchannel SGMAP-mapped DMA map.
*/
void
tc_bus_dmamap_destroy_sgmap(bus_dma_tag_t t, bus_dmamap_t map)
@@ -147,7 +147,7 @@ tc_bus_dmamap_destroy_sgmap(bus_dma_tag_
}
/*
- * Load a TurboChannel SGMAP-mapped DMA map with a linear buffer.
+ * Load a TURBOchannel SGMAP-mapped DMA map with a linear buffer.
*/
int
tc_bus_dmamap_load_sgmap(bus_dma_tag_t t, bus_dmamap_t map, void *buf, bus_size_t buflen, struct proc *p, int flags)
@@ -159,7 +159,7 @@ tc_bus_dmamap_load_sgmap(bus_dma_tag_t t
}
/*
- * Load a TurboChannel SGMAP-mapped DMA map with an mbuf chain.
+ * Load a TURBOchannel SGMAP-mapped DMA map with an mbuf chain.
*/
int
tc_bus_dmamap_load_mbuf_sgmap(bus_dma_tag_t t, bus_dmamap_t map, struct mbuf *m, int flags)
@@ -170,7 +170,7 @@ tc_bus_dmamap_load_mbuf_sgmap(bus_dma_ta
}
/*
- * Load a TurboChannel SGMAP-mapped DMA map with a uio.
+ * Load a TURBOchannel SGMAP-mapped DMA map with a uio.
*/
int
tc_bus_dmamap_load_uio_sgmap(bus_dma_tag_t t, bus_dmamap_t map, struct uio *uio, int flags)
@@ -181,7 +181,7 @@ tc_bus_dmamap_load_uio_sgmap(bus_dma_tag
}
/*
- * Load a TurboChannel SGMAP-mapped DMA map with raw memory.
+ * Load a TURBOchannel SGMAP-mapped DMA map with raw memory.
*/
int
tc_bus_dmamap_load_raw_sgmap(bus_dma_tag_t t, bus_dmamap_t map, bus_dma_segment_t *segs, int nsegs, bus_size_t size, int flags)
@@ -193,7 +193,7 @@ tc_bus_dmamap_load_raw_sgmap(bus_dma_tag
}
/*
- * Unload a TurboChannel SGMAP-mapped DMA map.
+ * Unload a TURBOchannel SGMAP-mapped DMA map.
*/
void
tc_bus_dmamap_unload_sgmap(bus_dma_tag_t t, bus_dmamap_t map)
Index: src/sys/arch/alpha/tc/tc_sgmap.h
diff -u src/sys/arch/alpha/tc/tc_sgmap.h:1.4 src/sys/arch/alpha/tc/tc_sgmap.h:1.5
--- src/sys/arch/alpha/tc/tc_sgmap.h:1.4 Mon Feb 6 02:14:16 2012
+++ src/sys/arch/alpha/tc/tc_sgmap.h Thu Jun 22 16:46:52 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: tc_sgmap.h,v 1.4 2012/02/06 02:14:16 matt Exp $ */
+/* $NetBSD: tc_sgmap.h,v 1.5 2017/06/22 16:46:52 flxd Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
#define SGMAP_PTE_SPACING 2
/*
- * A TurboChannel SGMAP page table entry looks like this:
+ * A TURBOchannel SGMAP page table entry looks like this:
*
* 31 23 22 21 20 4 3 0
* | Discarded | V | F | P | Page address | UNP |
Index: src/sys/arch/alpha/tc/tcasic.c
diff -u src/sys/arch/alpha/tc/tcasic.c:1.46 src/sys/arch/alpha/tc/tcasic.c:1.47
--- src/sys/arch/alpha/tc/tcasic.c:1.46 Fri Jun 9 17:55:18 2017
+++ src/sys/arch/alpha/tc/tcasic.c Thu Jun 22 16:46:52 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: tcasic.c,v 1.46 2017/06/09 17:55:18 flxd Exp $ */
+/* $NetBSD: tcasic.c,v 1.47 2017/06/22 16:46:52 flxd Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: tcasic.c,v 1.46 2017/06/09 17:55:18 flxd Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcasic.c,v 1.47 2017/06/22 16:46:52 flxd Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -64,11 +64,11 @@ tcasicmatch(device_t parent, cfdata_t cf
{
struct mainbus_attach_args *ma = aux;
- /* Make sure that we're looking for a TurboChannel ASIC. */
+ /* Make sure that we're looking for a TURBOchannel ASIC. */
if (strcmp(ma->ma_name, tcasic_cd.cd_name))
return (0);
- /* Make sure that the system supports a TurboChannel ASIC. */
+ /* Make sure that the system supports a TURBOchannel ASIC. */
if ((cputype != ST_DEC_3000_500) && (cputype != ST_DEC_3000_300))
return (0);
Index: src/sys/arch/arc/arc/arcbios.h
diff -u src/sys/arch/arc/arc/arcbios.h:1.10 src/sys/arch/arc/arc/arcbios.h:1.11
--- src/sys/arch/arc/arc/arcbios.h:1.10 Sun Mar 4 05:59:32 2007
+++ src/sys/arch/arc/arc/arcbios.h Thu Jun 22 16:46:53 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: arcbios.h,v 1.10 2007/03/04 05:59:32 christos Exp $ */
+/* $NetBSD: arcbios.h,v 1.11 2017/06/22 16:46:53 flxd Exp $ */
/* $OpenBSD: arcbios.h,v 1.1 1998/01/29 15:06:22 pefo Exp $ */
/*-
@@ -62,7 +62,7 @@ typedef enum arc_config_type
arc_SecondaryCache,
arc_EisaAdapter, /* Eisa adapter */
- arc_TcAdapter, /* Turbochannel adapter */
+ arc_TcAdapter, /* TURBOchannel adapter */
arc_ScsiAdapter, /* SCSI adapter */
arc_DtiAdapter, /* AccessBus adapter */
arc_MultiFunctionAdapter,
Index: src/sys/arch/mipsco/mipsco/autoconf.c
diff -u src/sys/arch/mipsco/mipsco/autoconf.c:1.27 src/sys/arch/mipsco/mipsco/autoconf.c:1.28
--- src/sys/arch/mipsco/mipsco/autoconf.c:1.27 Thu May 29 10:11:41 2014
+++ src/sys/arch/mipsco/mipsco/autoconf.c Thu Jun 22 16:46:53 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.27 2014/05/29 10:11:41 skrll Exp $ */
+/* $NetBSD: autoconf.c,v 1.28 2017/06/22 16:46:53 flxd Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -48,7 +48,7 @@
#define __INTR_PRIVATE
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.27 2014/05/29 10:11:41 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.28 2017/06/22 16:46:53 flxd Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -81,7 +81,7 @@ struct mipsco_intrhand intrtab[MAX_INTR_
/*
* Determine mass storage and memory configuration for a machine.
* Print CPU type, and then iterate over an array of devices
- * found on the baseboard or in turbochannel option slots.
+ * found on the baseboard or in TURBOchannel option slots.
* Once devices are configured, enable interrupts, and probe
* for attached scsi devices.
*/
Index: src/sys/arch/news68k/news68k/autoconf.c
diff -u src/sys/arch/news68k/news68k/autoconf.c:1.23 src/sys/arch/news68k/news68k/autoconf.c:1.24
--- src/sys/arch/news68k/news68k/autoconf.c:1.23 Mon Mar 24 19:54:28 2014
+++ src/sys/arch/news68k/news68k/autoconf.c Thu Jun 22 16:46:53 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.23 2014/03/24 19:54:28 christos Exp $ */
+/* $NetBSD: autoconf.c,v 1.24 2017/06/22 16:46:53 flxd Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -51,7 +51,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.23 2014/03/24 19:54:28 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.24 2017/06/22 16:46:53 flxd Exp $");
#include "scsibus.h"
@@ -81,7 +81,7 @@ static void findroot(void);
/*
* Determine mass storage and memory configuration for a machine.
* Print CPU type, and then iterate over an array of devices
- * found on the baseboard or in turbochannel option slots.
+ * found on the baseboard or in TURBOchannel option slots.
* Once devices are configured, enable interrupts, and probe
* for attached scsi devices.
*/
Index: src/sys/arch/newsmips/newsmips/autoconf.c
diff -u src/sys/arch/newsmips/newsmips/autoconf.c:1.38 src/sys/arch/newsmips/newsmips/autoconf.c:1.39
--- src/sys/arch/newsmips/newsmips/autoconf.c:1.38 Mon Mar 24 20:05:20 2014
+++ src/sys/arch/newsmips/newsmips/autoconf.c Thu Jun 22 16:46:53 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.38 2014/03/24 20:05:20 christos Exp $ */
+/* $NetBSD: autoconf.c,v 1.39 2017/06/22 16:46:53 flxd Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -49,7 +49,7 @@
#define __INTR_PRIVATE
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.38 2014/03/24 20:05:20 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.39 2017/06/22 16:46:53 flxd Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -83,7 +83,7 @@ static void findroot(void);
/*
* Determine mass storage and memory configuration for a machine.
* Print CPU type, and then iterate over an array of devices
- * found on the baseboard or in turbochannel option slots.
+ * found on the baseboard or in TURBOchannel option slots.
* Once devices are configured, enable interrupts, and probe
* for attached scsi devices.
*/
Index: src/sys/arch/pmax/pmax/kn03.h
diff -u src/sys/arch/pmax/pmax/kn03.h:1.12 src/sys/arch/pmax/pmax/kn03.h:1.13
--- src/sys/arch/pmax/pmax/kn03.h:1.12 Sun Dec 11 12:18:39 2005
+++ src/sys/arch/pmax/pmax/kn03.h Thu Jun 22 16:46:53 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: kn03.h,v 1.12 2005/12/11 12:18:39 christos Exp $ */
+/* $NetBSD: kn03.h,v 1.13 2017/06/22 16:46:53 flxd Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -128,7 +128,7 @@
#define KN03_INT_HALTB IP_LEV6 /* Halt button */
#define KN03_INT_MEM IP_LEV5 /* Memory Errors */
#define KN03_INT_RTC IP_LEV3 /* RTC clock */
-#define KN03_INT_ASIC IP_LEV2 /* All turbochannel */
+#define KN03_INT_ASIC IP_LEV2 /* All TURBOchannel */
#define KN03_REG_SCSI_DMAPTR ( KN03_SYS_ASIC + IOASIC_SCSI_DMAPTR )
#define KN03_REG_SCSI_DMANPTR ( KN03_SYS_ASIC + IOASIC_SCSI_NEXTPTR )
Index: src/sys/arch/pmax/stand/common/rz.c
diff -u src/sys/arch/pmax/stand/common/rz.c:1.26 src/sys/arch/pmax/stand/common/rz.c:1.27
--- src/sys/arch/pmax/stand/common/rz.c:1.26 Sun Jul 17 20:54:45 2011
+++ src/sys/arch/pmax/stand/common/rz.c Thu Jun 22 16:46:53 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: rz.c,v 1.26 2011/07/17 20:54:45 joerg Exp $ */
+/* $NetBSD: rz.c,v 1.27 2017/06/22 16:46:53 flxd Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -123,11 +123,11 @@ rzopen(struct open_file *f, ...)
return (ENXIO);
device[5] = '0' + unit;
/* NOTE: only support reads for now */
- /* Another NOTE: bootinit on the TurboChannel doesn't look at
+ /* Another NOTE: bootinit on the TURBOchannel doesn't look at
the device string - it's provided for compatibility with
the DS3100 PROMs. As a consequence, it may be possible to
boot from some other drive with these bootblocks on the 3100,
- but will not be possible on any TurboChannel machine. */
+ but will not be possible on any TURBOchannel machine. */
if (callv == &callvec)
i = prom_open(device, 0);
Index: src/sys/arch/vax/conf/files.vax
diff -u src/sys/arch/vax/conf/files.vax:1.121 src/sys/arch/vax/conf/files.vax:1.122
--- src/sys/arch/vax/conf/files.vax:1.121 Fri Jun 9 17:55:18 2017
+++ src/sys/arch/vax/conf/files.vax Thu Jun 22 16:46:53 2017
@@ -1,4 +1,4 @@
-# $NetBSD: files.vax,v 1.121 2017/06/09 17:55:18 flxd Exp $
+# $NetBSD: files.vax,v 1.122 2017/06/22 16:46:53 flxd Exp $
#
# new style config file for vax architecture
#
@@ -107,7 +107,7 @@ include "dev/mscp/files.mscp"
# Unibus/Q22 bus definitions
include "dev/qbus/files.uba"
-# TurboCHANNEL bus support and device drivers
+# TURBOchannel bus support and device drivers
include "dev/tc/files.tc"
attach tc at vsbus with tc_vsbus
Index: src/sys/conf/files
diff -u src/sys/conf/files:1.1178 src/sys/conf/files:1.1179
--- src/sys/conf/files:1.1178 Fri Jun 16 21:36:35 2017
+++ src/sys/conf/files Thu Jun 22 16:46:53 2017
@@ -1,4 +1,4 @@
-# $NetBSD: files,v 1.1178 2017/06/16 21:36:35 jmcneill Exp $
+# $NetBSD: files,v 1.1179 2017/06/22 16:46:53 flxd Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
version 20170615
@@ -1240,7 +1240,7 @@ include "dev/wsfb/files.wsfb"
define isabus { } # ISA attachment
define eisabus { } # EISA attachment
define pcibus {[bus = -1]} # PCI attachment
-define tcbus { } # TurboChannel attachment
+define tcbus { } # TURBOchannel attachment
define mcabus { } # MicroChannel attachment
define usbus { } # USB attachment
define fwbus { } # IEEE 1394 attachment
Index: src/sys/dev/dec/if_le_dec.c
diff -u src/sys/dev/dec/if_le_dec.c:1.20 src/sys/dev/dec/if_le_dec.c:1.21
--- src/sys/dev/dec/if_le_dec.c:1.20 Tue Jan 19 22:06:23 2010
+++ src/sys/dev/dec/if_le_dec.c Thu Jun 22 16:46:53 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: if_le_dec.c,v 1.20 2010/01/19 22:06:23 pooka Exp $ */
+/* $NetBSD: if_le_dec.c,v 1.21 2017/06/22 16:46:53 flxd Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_le_dec.c,v 1.20 2010/01/19 22:06:23 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_le_dec.c,v 1.21 2017/06/22 16:46:53 flxd Exp $");
#include "opt_inet.h"
@@ -194,7 +194,7 @@ le_dec_writereg(volatile uint16_t *regpt
* by am7990.c, because of the LE_NEED_BUF_* macros defined above.
* Unfortunately, CPU addressing of these buffers is done in one of
* 3 ways:
- * - contiguous (for the 3max and turbochannel option card)
+ * - contiguous (for the 3max and TURBOchannel option card)
* - gap2, which means shorts (2 bytes) interspersed with short (2 byte)
* spaces (for the pmax, vax 3400, and ioasic LANCE descriptors)
* - gap16, which means 16bytes interspersed with 16byte spaces
Index: src/sys/dev/ic/pdqvar.h
diff -u src/sys/dev/ic/pdqvar.h:1.47 src/sys/dev/ic/pdqvar.h:1.48
--- src/sys/dev/ic/pdqvar.h:1.47 Sat Oct 27 17:18:22 2012
+++ src/sys/dev/ic/pdqvar.h Thu Jun 22 16:46:53 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: pdqvar.h,v 1.47 2012/10/27 17:18:22 chs Exp $ */
+/* $NetBSD: pdqvar.h,v 1.48 2017/06/22 16:46:53 flxd Exp $ */
/*-
* Copyright (c) 1995, 1996 Matt Thomas <m...@3am-software.com>
@@ -47,7 +47,7 @@ enum _pdq_boolean_t {
enum _pdq_type_t {
PDQ_DEFPA, /* PCI-bus */
PDQ_DEFEA, /* EISA-bus */
- PDQ_DEFTA, /* TurboChannel */
+ PDQ_DEFTA, /* TURBOchannel */
PDQ_DEFAA, /* FutureBus+ */
PDQ_DEFQA /* Q-bus */
};
Index: src/sys/dev/tc/if_fta.c
diff -u src/sys/dev/tc/if_fta.c:1.28 src/sys/dev/tc/if_fta.c:1.29
--- src/sys/dev/tc/if_fta.c:1.28 Sat Oct 27 17:18:38 2012
+++ src/sys/dev/tc/if_fta.c Thu Jun 22 16:46:53 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: if_fta.c,v 1.28 2012/10/27 17:18:38 chs Exp $ */
+/* $NetBSD: if_fta.c,v 1.29 2017/06/22 16:46:53 flxd Exp $ */
/*-
* Copyright (c) 1996 Matt Thomas <m...@3am-software.com>
@@ -28,15 +28,15 @@
*/
/*
- * DEC TurboChannel FDDI Controller; code for BSD derived operating systems
+ * DEC TURBOchannel FDDI Controller; code for BSD derived operating systems
*
* Written by Matt Thomas
*
- * This module supports the DEC DEFTA TurboChannel FDDI Controller
+ * This module supports the DEC DEFTA TURBOchannel FDDI Controller
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_fta.c,v 1.28 2012/10/27 17:18:38 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_fta.c,v 1.29 2017/06/22 16:46:53 flxd Exp $");
#include "opt_inet.h"
Index: src/sys/dev/tc/if_le_tc.c
diff -u src/sys/dev/tc/if_le_tc.c:1.21 src/sys/dev/tc/if_le_tc.c:1.22
--- src/sys/dev/tc/if_le_tc.c:1.21 Fri Apr 4 12:25:07 2008
+++ src/sys/dev/tc/if_le_tc.c Thu Jun 22 16:46:53 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: if_le_tc.c,v 1.21 2008/04/04 12:25:07 tsutsui Exp $ */
+/* $NetBSD: if_le_tc.c,v 1.22 2017/06/22 16:46:53 flxd Exp $ */
/*
* Copyright (c) 1996 Carnegie-Mellon University.
@@ -28,11 +28,11 @@
*/
/*
- * LANCE on TurboChannel.
+ * LANCE on TURBOchannel.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_le_tc.c,v 1.21 2008/04/04 12:25:07 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_le_tc.c,v 1.22 2017/06/22 16:46:53 flxd Exp $");
#include "opt_inet.h"
@@ -91,7 +91,7 @@ le_tc_attach(device_t parent, device_t s
sc->sc_dev = self;
/*
- * It's on the turbochannel proper, or a kn02
+ * It's on the TURBOchannel proper, or a kn02
* baseboard implementation of a TC option card.
*/
lesc->sc_r1 = (struct lereg1 *)
Index: src/sys/dev/tc/tcdevs
diff -u src/sys/dev/tc/tcdevs:1.22 src/sys/dev/tc/tcdevs:1.23
--- src/sys/dev/tc/tcdevs:1.22 Thu Aug 11 09:05:42 2016
+++ src/sys/dev/tc/tcdevs Thu Jun 22 16:46:53 2017
@@ -1,4 +1,4 @@
-$NetBSD: tcdevs,v 1.22 2016/08/11 09:05:42 christos Exp $
+$NetBSD: tcdevs,v 1.23 2017/06/22 16:46:53 flxd Exp $
/*
* Copyright (c) 1996 Christopher G. Demetriou
@@ -72,7 +72,7 @@ device PMAGD-AA sfbp Smart Frame Buffer
device PMAGD-BA sfbp Smart Frame Buffer Plus, 32bpp
device PMAGD-CA sfbp Smart Frame Buffer Plus, 32bpp, 24bit Z-Buffer
device PMAP-AA ??? Prestoserve
-device PMAT-AA tra DEC TurboChannel Token Ring Controller
+device PMAT-AA tra DEC TURBOchannel Token Ring Controller
device PMAZ-AA asc 53c94 SCSI
device PMAZ-AB asc 53c94 SCSI
device PMAZ-DS tcds 53c94 TCDS SCSI (baseboard)
@@ -81,8 +81,8 @@ device PMAZB-AA tcds 53c94 TCDS SCSI opt
device PMAZB-AB tcds 53c94 TCDS SCSI option card
device PMAZC-AA tcds 53c94 TCDS Fast SCSI option card
device PMTNV-AA ??? Non-volatile RAM option card
-device T1D4PKT ds DECWRL Turbochannel T1
-device T3PKT tt DECWRL Turbochannel T3
+device T1D4PKT ds DECWRL TURBOchannel T1
+device T3PKT tt DECWRL TURBOchannel T3
device TC-USB tcu flxd TC-USB
# the following entries are unconfirmed
Index: src/sys/dev/tc/tcds.c
diff -u src/sys/dev/tc/tcds.c:1.25 src/sys/dev/tc/tcds.c:1.26
--- src/sys/dev/tc/tcds.c:1.25 Sat Aug 22 17:38:06 2009
+++ src/sys/dev/tc/tcds.c Thu Jun 22 16:46:53 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: tcds.c,v 1.25 2009/08/22 17:38:06 tsutsui Exp $ */
+/* $NetBSD: tcds.c,v 1.26 2017/06/22 16:46:53 flxd Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcds.c,v 1.25 2009/08/22 17:38:06 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcds.c,v 1.26 2017/06/22 16:46:53 flxd Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -163,7 +163,7 @@ tcdsattach(device_t parent, device_t sel
if (td == NULL)
panic("\ntcdsattach: impossible");
- printf(": TurboChannel Dual SCSI");
+ printf(": TURBOchannel Dual SCSI");
if (td->td_flags & TCDSF_BASEBOARD)
printf(" (baseboard)");
printf("\n");
Index: src/sys/dev/tc/tcreg.h
diff -u src/sys/dev/tc/tcreg.h:1.3 src/sys/dev/tc/tcreg.h:1.4
--- src/sys/dev/tc/tcreg.h:1.3 Sun Dec 11 12:24:00 2005
+++ src/sys/dev/tc/tcreg.h Thu Jun 22 16:46:53 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: tcreg.h,v 1.3 2005/12/11 12:24:00 christos Exp $ */
+/* $NetBSD: tcreg.h,v 1.4 2017/06/22 16:46:53 flxd Exp $ */
/*
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -31,7 +31,7 @@
#define __DEV_TC_TCREG_H__
/*
- * TurboChannel bus and register definitions.
+ * TURBOchannel bus and register definitions.
*/
#define TC_ROM_LLEN 8
