changed dc to dz to avoid conflict with if_dc. -moj

20 files changed, 98 insertions, 98 deletions

diff --git a/sys/arch/pmax/conf/DS3100 b/sys/arch/pmax/conf/DS3100
index b401cda87d8..7b693e84944 100644
--- a/sys/arch/pmax/conf/DS3100
+++ b/sys/arch/pmax/conf/DS3100
@@ -1,4 +1,4 @@
-#	$OpenBSD: DS3100,v 1.7 1999/10/01 21:59:33 maja Exp $
+#	$OpenBSD: DS3100,v 1.8 2000/05/01 22:25:46 maja Exp $
 #
 # DECstation (3100 or 2100) config file
 #
@@ -75,7 +75,7 @@ mainbus0	at root
 cpu*		at mainbus0
 clock0		at mainbus0		# rtc
 pm0		at mainbus0		# 3100 onboard fb
-dc0		at mainbus0		# dc7083 four-port dz device
+dz0		at mainbus0		# dc7083 four-port dz device
 le*		at mainbus0		# 3100 onboard lance
 sii0		at mainbus0		# onboard scsi
 # the scsi busses
diff --git a/sys/arch/pmax/conf/DS5000_200 b/sys/arch/pmax/conf/DS5000_200
index c049fecade1..99f3c44820f 100644
--- a/sys/arch/pmax/conf/DS5000_200
+++ b/sys/arch/pmax/conf/DS5000_200
@@ -1,4 +1,4 @@
-#	$OpenBSD: DS5000_200,v 1.6 1999/10/01 21:59:33 maja Exp $
+#	$OpenBSD: DS5000_200,v 1.7 2000/05/01 22:25:46 maja Exp $
 #
 # DECstation 5000/200 (KN02 motherboard, codname 3MAX) kernel config
 #
@@ -82,7 +82,7 @@ le0		at tc?			# decstation 5000/200 baseboard
 le*		at tc?			# other lance network interfaces
 # 5000/200-only (aka 3MAX aka KN02) baseboard devices (tc but no ioasic)
 clock0		at mainbus0		# rtc
-dc0		at mainbus0
+dz0		at mainbus0
 le0		at tc?			# tc ether "option" on baseboard
 asc0		at tc?			# tc scsi  "option" on baseboard
 # the scsi busses
diff --git a/sys/arch/pmax/conf/DS5000_240 b/sys/arch/pmax/conf/DS5000_240
index bebac576c83..5f60e2ff479 100644
--- a/sys/arch/pmax/conf/DS5000_240
+++ b/sys/arch/pmax/conf/DS5000_240
@@ -1,4 +1,4 @@
-#	$OpenBSD: DS5000_240,v 1.6 1999/10/01 21:59:33 maja Exp $
+#	$OpenBSD: DS5000_240,v 1.7 2000/05/01 22:25:46 maja Exp $
 #
 # DECstation 5000/240 kernel config
 #
@@ -82,11 +82,11 @@ le0		at tc?			# decstation 5000/200 baseboard
 le*		at tc?			# other lance network interfaces
 # 5000/200-only (aka 3MAX aka KN02) baseboard devices (tc but no ioasic)
 clock0		at mainbus0		# rtc
-dc0		at mainbus0
+dz0		at mainbus0
 le0		at tc?			# tc ether "option" on baseboard
 asc0		at tc?			# tc scsi  "option" on baseboard
 # for now, pretend this machine has an ioasic
-dc0		at ioasic? offset?	# dc7083 four-port dz device
+dz0		at ioasic? offset?	# dc7083 four-port dz device
 # the scsi busses
 oldscsibus*	at asc?
 # scsi configuration for old 4.4bsd/pmax decstation scsi driver
diff --git a/sys/arch/pmax/conf/ELLE b/sys/arch/pmax/conf/ELLE
index 43431db17ee..c8a655e9e78 100644
--- a/sys/arch/pmax/conf/ELLE
+++ b/sys/arch/pmax/conf/ELLE
@@ -1,4 +1,4 @@
-#	$OpenBSD: ELLE,v 1.1 1999/10/01 21:59:33 maja Exp $
+#	$OpenBSD: ELLE,v 1.2 2000/05/01 22:25:46 maja Exp $
 #
 # ELLE kernel. Like GENERIC.rz0 but for rz1. 
 #
@@ -97,15 +97,15 @@ xcfb0		at tc?			# tc framebuffer "option"
 dtop0		at ioasic0 offset?	# destop bus,  lk501 kbd,  mouse
 # 5000/200-only (aka 3MAX aka KN02) baseboard devices (tc but no ioasic)
 clock0		at mainbus0		# rtc
-dc0		at mainbus0
+dz0		at mainbus0
 le0		at tc?			# tc ether "option" on baseboard
 asc0		at tc?			# tc scsi  "option" on baseboard
 # for now, pretend this machine has an ioasic
-dc0		at ioasic? offset?	# dc7083 four-port dz device
+dz0		at ioasic? offset?	# dc7083 four-port dz device
 # 2100/3100-only (aka PMAX aka KN01) baseboard devices.
 clock0		at mainbus0		# rtc
 pm0		at mainbus0		# 3100 onboard fb
-dc0		at mainbus0		# dc7083 four-port dz device
+dz0		at mainbus0		# dc7083 four-port dz device
 le*		at mainbus0		# 3100 onboard lance
 sii0		at mainbus0		# onboard scsi
 # the scsi busses
diff --git a/sys/arch/pmax/conf/GENERIC b/sys/arch/pmax/conf/GENERIC
index 0b1dcd44b70..225f15993d1 100644
--- a/sys/arch/pmax/conf/GENERIC
+++ b/sys/arch/pmax/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.16 2000/01/09 22:00:22 itojun Exp $
+#	$OpenBSD: GENERIC,v 1.17 2000/05/01 22:25:46 maja Exp $
 #
 # GENERIC kernel for the distribition simpleroot
 #
@@ -99,15 +99,15 @@ xcfb0		at tc?			# tc framebuffer "option"
 dtop0		at ioasic0 offset?	# destop bus,  lk501 kbd,  mouse
 # 5000/200-only (aka 3MAX aka KN02) baseboard devices (tc but no ioasic)
 clock0		at mainbus0		# rtc
-dc0		at mainbus0
+dz0		at mainbus0
 le0		at tc?			# tc ether "option" on baseboard
 asc0		at tc?			# tc scsi  "option" on baseboard
 # for now, pretend this machine has an ioasic
-dc0		at ioasic? offset? 	# dc7083 four-port dz device
+dz0		at ioasic? offset? 	# dc7083 four-port dz device
 # 2100/3100-only (aka PMAX aka KN01) baseboard devices.
 clock0		at mainbus0		# rtc
 pm0		at mainbus0		# 3100 onboard fb
-dc0		at mainbus0		# dc7083 four-port dz device
+dz0		at mainbus0		# dc7083 four-port dz device
 le*		at mainbus0		# 3100 onboard lance
 sii0		at mainbus0		# onboard scsi
 # the scsi busses
diff --git a/sys/arch/pmax/conf/GENERIC.NFS b/sys/arch/pmax/conf/GENERIC.NFS
index e62e24f44a1..a46440fb4e3 100644
--- a/sys/arch/pmax/conf/GENERIC.NFS
+++ b/sys/arch/pmax/conf/GENERIC.NFS
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC.NFS,v 1.5 1999/10/01 21:59:33 maja Exp $
+#	$OpenBSD: GENERIC.NFS,v 1.6 2000/05/01 22:25:46 maja Exp $
 #
 # GENERIC netboot / nfs root + swap kernel for the distribition simpleroot
 #
@@ -97,15 +97,15 @@ xcfb0		at tc?			# tc framebuffer "option"
 dtop0		at ioasic0 offset?	# destop bus,  lk501 kbd,  mouse
 # 5000/200-only (aka 3MAX aka KN02) baseboard devices (tc but no ioasic)
 clock0		at mainbus0		# rtc
-dc0		at mainbus0
+dz0		at mainbus0
 le0		at tc?			# tc ether "option" on baseboard
 asc0		at tc?			# tc scsi  "option" on baseboard
 # for now, pretend this machine has an ioasic
-dc0		at ioasic? offset?	# dc7083 four-port dz device
+dz0		at ioasic? offset?	# dc7083 four-port dz device
 # 2100/3100-only (aka PMAX aka KN01) baseboard devices.
 clock0		at mainbus0		# rtc
 pm0		at mainbus0		# 3100 onboard fb
-dc0		at mainbus0		# dc7083 four-port dz device
+dz0		at mainbus0		# dc7083 four-port dz device
 le*		at mainbus0		# 3100 onboard lance
 sii0		at mainbus0		# onboard scsi
 # the scsi busses
diff --git a/sys/arch/pmax/conf/GENERIC.rz0 b/sys/arch/pmax/conf/GENERIC.rz0
index 30d2f5a917f..0a4e0ab549f 100644
--- a/sys/arch/pmax/conf/GENERIC.rz0
+++ b/sys/arch/pmax/conf/GENERIC.rz0
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC.rz0,v 1.5 1999/10/01 21:59:33 maja Exp $
+#	$OpenBSD: GENERIC.rz0,v 1.6 2000/05/01 22:25:46 maja Exp $
 #
 # GENERIC kernel for the distribition simpleroot with root + swap hardcoded
 # to rz0 - required for use with zip drives for instance
@@ -98,15 +98,15 @@ xcfb0		at tc?			# tc framebuffer "option"
 dtop0		at ioasic0 offset?	# destop bus,  lk501 kbd,  mouse
 # 5000/200-only (aka 3MAX aka KN02) baseboard devices (tc but no ioasic)
 clock0		at mainbus0		# rtc
-dc0		at mainbus0
+dz0		at mainbus0
 le0		at tc?			# tc ether "option" on baseboard
 asc0		at tc?			# tc scsi  "option" on baseboard
 # for now, pretend this machine has an ioasic
-dc0		at ioasic? offset?	# dc7083 four-port dz device
+dz0		at ioasic? offset?	# dc7083 four-port dz device
 # 2100/3100-only (aka PMAX aka KN01) baseboard devices.
 clock0		at mainbus0		# rtc
 pm0		at mainbus0		# 3100 onboard fb
-dc0		at mainbus0		# dc7083 four-port dz device
+dz0		at mainbus0		# dc7083 four-port dz device
 le*		at mainbus0		# 3100 onboard lance
 sii0		at mainbus0		# onboard scsi
 # the scsi busses
diff --git a/sys/arch/pmax/conf/PLUTO b/sys/arch/pmax/conf/PLUTO
index a10c2ca520a..5cb86f6734a 100644
--- a/sys/arch/pmax/conf/PLUTO
+++ b/sys/arch/pmax/conf/PLUTO
@@ -1,4 +1,4 @@
-#	$OpenBSD: PLUTO,v 1.8 1999/10/01 21:59:33 maja Exp $
+#	$OpenBSD: PLUTO,v 1.9 2000/05/01 22:25:46 maja Exp $
 #
 #	PLUTO - specific config(8) file for pluto
 #
@@ -34,7 +34,7 @@ mainbus0	at root
 cpu*		at mainbus0
 clock0		at mainbus0
 pm0		at mainbus0
-dc0		at mainbus0
+dz0		at mainbus0
 le0		at mainbus0
 sii0		at mainbus0
 oldscsibus*	at sii?
diff --git a/sys/arch/pmax/conf/RAMDISK b/sys/arch/pmax/conf/RAMDISK
index 1286418929b..497eecaff06 100644
--- a/sys/arch/pmax/conf/RAMDISK
+++ b/sys/arch/pmax/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK,v 1.2 1999/10/01 21:59:33 maja Exp $
+#	$OpenBSD: RAMDISK,v 1.3 2000/05/01 22:25:46 maja Exp $
 #
 # RAMDISK kernel for the distribition ramdisk
 #
@@ -61,15 +61,15 @@ xcfb0		at tc?			# tc framebuffer "option"
 dtop0		at ioasic0 offset?	# destop bus,  lk501 kbd,  mouse
 # 5000/200-only (aka 3MAX aka KN02) baseboard devices (tc but no ioasic)
 clock0		at mainbus0		# rtc
-dc0		at mainbus0
+dz0		at mainbus0
 le0		at tc?			# tc ether "option" on baseboard
 asc0		at tc?			# tc scsi  "option" on baseboard
 # for now, pretend this machine has an ioasic
-dc0		at ioasic? offset? 	# dc7083 four-port dz device
+dz0		at ioasic? offset? 	# dc7083 four-port dz device
 # 2100/3100-only (aka PMAX aka KN01) baseboard devices.
 clock0		at mainbus0		# rtc
 pm0		at mainbus0		# 3100 onboard fb
-dc0		at mainbus0		# dc7083 four-port dz device
+dz0		at mainbus0		# dc7083 four-port dz device
 le*		at mainbus0		# 3100 onboard lance
 sii0		at mainbus0		# onboard scsi
 # the scsi busses
diff --git a/sys/arch/pmax/conf/SUMMER b/sys/arch/pmax/conf/SUMMER
index 9e8e26aa2c6..0672130635a 100644
--- a/sys/arch/pmax/conf/SUMMER
+++ b/sys/arch/pmax/conf/SUMMER
@@ -48,7 +48,7 @@ mfb0		at tc?
 cfb0		at tc?
 sfb0		at tc?
 ioasic0		at tc?
-dc0		at ioasic? offset?
+dz0		at ioasic? offset?
 clock0		at ioasic? offset?
 asc0		at tc?
 oldscsibus*	at asc?
diff --git a/sys/arch/pmax/conf/files.pmax b/sys/arch/pmax/conf/files.pmax
index 219bbe47d6b..bc0d81a96e9 100644
--- a/sys/arch/pmax/conf/files.pmax
+++ b/sys/arch/pmax/conf/files.pmax
@@ -44,7 +44,7 @@ file	dev/tc/tc.c			tc		needs-flag
 #
 device ioasic { offset = -1 } 		# not really optional
 attach ioasic at tc
-file	arch/pmax/tc/asic.c		ioasic | dc_ds # TTTTT dc_ds is ugly
+file	arch/pmax/tc/asic.c		ioasic | dz_ds # TTTTT dz_ds is ugly
 
 
 # Real-time clock (not optional)
@@ -112,12 +112,12 @@ file	arch/pmax/dev/led.c		led needs-count
 
 # DC7085 (DZ-like four-port serial device) on mainbus on non-IOASIC machines.
 # For the 3MAX (aka kn02 aka 5k/200) pretend that it's on an  ASIC.
-device dc
-file	arch/pmax/dev/dc.c		dc
-attach dc at ioasic with dc_ioasic
-file	arch/pmax/dev/dc_ioasic.c	dc_ioasic | dc_ds needs-flag # TTTTT ugly
-attach dc at mainbus with dc_ds
-file	arch/pmax/dev/dc_ds.c		dc_ds	needs-flag
+device dz
+file	arch/pmax/dev/dc.c		dz
+attach dz at ioasic with dz_ioasic
+file	arch/pmax/dev/dc_ioasic.c	dz_ioasic | dz_ds needs-flag # TTTTT ugly
+attach dz at mainbus with dz_ds
+file	arch/pmax/dev/dc_ds.c		dz_ds	needs-flag
 
 
 # The "desktop bus" on the MAXINE (5k/25). What is it, anyway? ADB?
diff --git a/sys/arch/pmax/dev/dc.c b/sys/arch/pmax/dev/dc.c
index da0346fc622..8c90dc27bd3 100644
--- a/sys/arch/pmax/dev/dc.c
+++ b/sys/arch/pmax/dev/dc.c
@@ -115,9 +115,9 @@ int	old_dcmatch  __P((struct device * parent, void *cfdata, void *aux));
 void	old_dcattach __P((struct device *parent, struct device *self, void *aux));
 
 
-extern struct cfdriver dc_cd;
-struct  cfdriver dc_cd = {
-	NULL, "dc", DV_TTY
+extern struct cfdriver dz_cd;
+struct  cfdriver dz_cd = {
+	NULL, "dz", DV_TTY
 };
 
 
@@ -382,10 +382,10 @@ dcopen(dev, flag, mode, p)
 
 	unit = DCUNIT(dev);
 	line = DCLINE(dev);
-	if (unit >= dc_cd.cd_ndevs || line > 4)
+	if (unit >= dz_cd.cd_ndevs || line > 4)
 		return (ENXIO);
 
-	sc = dc_cd.cd_devs[unit];
+	sc = dz_cd.cd_devs[unit];
 	if (sc->dc_pdma[line].p_addr == (void *)0)
 		return (ENXIO);	  
 
@@ -451,7 +451,7 @@ dcclose(dev, flag, mode, p)
 	register int line, bit;
 	int s;
 
-	sc = dc_cd.cd_devs[DCUNIT(dev)];
+	sc = dz_cd.cd_devs[DCUNIT(dev)];
 	line = DCLINE(dev);
 	tp = sc->dc_tty[line];
 	bit = 1 << (line + 8);
@@ -477,7 +477,7 @@ dcread(dev, uio, flag)
 	register struct dc_softc *sc;
 	register struct tty *tp;
 
-	sc = dc_cd.cd_devs[DCUNIT(dev)];
+	sc = dz_cd.cd_devs[DCUNIT(dev)];
 	tp = sc->dc_tty[DCLINE(dev)];
 
 #ifdef HW_FLOW_CONTROL
@@ -499,7 +499,7 @@ dcwrite(dev, uio, flag)
 	register struct dc_softc *sc;
 	register struct tty *tp;
 
-	sc = dc_cd.cd_devs[DCUNIT(dev)];
+	sc = dz_cd.cd_devs[DCUNIT(dev)];
 	tp = sc->dc_tty[DCLINE(dev)];
 	return ((*linesw[tp->t_line].l_write)(tp, uio, flag));
 }
@@ -511,7 +511,7 @@ dctty(dev)
 	register struct dc_softc *sc;
 	register struct tty *tp;
 
-	sc = dc_cd.cd_devs[DCUNIT(dev)];
+	sc = dz_cd.cd_devs[DCUNIT(dev)];
 	tp = sc->dc_tty[DCLINE(dev)];
         return (tp);
 }
@@ -534,7 +534,7 @@ dcioctl(dev, cmd, data, flag, p)
 
 	unit = DCUNIT(dev);
 	line = DCLINE(dev);
-	sc = dc_cd.cd_devs[unit];
+	sc = dz_cd.cd_devs[unit];
 	tp = sc->dc_tty[line];
 
 	error = (*linesw[tp->t_line].l_ioctl)(tp, cmd, data, flag, p);
@@ -603,7 +603,7 @@ dcparam(tp, t)
 	 * Extract softc data, and pass entire request onto
 	 * cold_dcparam() for argument checking and execution.
 	 */
-	sc = dc_cd.cd_devs[DCUNIT(tp->t_dev)];
+	sc = dz_cd.cd_devs[DCUNIT(tp->t_dev)];
 	dcaddr = (dcregs *)sc->dc_pdma[0].p_addr;
 	return (cold_dcparam(tp, t, dcaddr, sc->dc_19200));
 
@@ -709,7 +709,7 @@ dcrint(sc)
 	int overrun = 0;
 	register struct tty **dc_tty;
 
-	dc_tty = ((struct dc_softc*)dc_cd.cd_devs[0])->dc_tty;	/* XXX */
+	dc_tty = ((struct dc_softc*)dz_cd.cd_devs[0])->dc_tty;	/* XXX */
 
 	dcaddr = (dcregs *)sc->dc_pdma[0].p_addr;	/*XXX*/
 	while ((c = dcaddr->dc_rbuf) < 0) {	/* char present */
@@ -776,7 +776,7 @@ dcxint(tp)
 	register dcregs *dcaddr;
 	int line, linemask;
 
-	sc = dc_cd.cd_devs[DCUNIT(tp->t_dev)];	/* XXX */
+	sc = dz_cd.cd_devs[DCUNIT(tp->t_dev)];	/* XXX */
 
 	line = DCLINE(tp->t_dev);
 	linemask = 1 << line;
@@ -846,7 +846,7 @@ dcstart(tp)
 	register int cc;
 	int line, s;
 
-	sc = dc_cd.cd_devs[DCUNIT(tp->t_dev)];
+	sc = dz_cd.cd_devs[DCUNIT(tp->t_dev)];
 	line = DCLINE(tp->t_dev);
 	dp = &sc->dc_pdma[line];
 	dcaddr = (dcregs *)dp->p_addr;
@@ -905,7 +905,7 @@ dcstop(tp, flag)
 	register struct pdma *dp;
 	register int s;
 
-	sc = dc_cd.cd_devs[DCUNIT(tp->t_dev)];
+	sc = dz_cd.cd_devs[DCUNIT(tp->t_dev)];
 	dp = &sc->dc_pdma[DCLINE(tp->t_dev)];
 	s = spltty();
 	if (tp->t_state & TS_BUSY) {
@@ -928,7 +928,7 @@ dcmctl(dev, bits, how)
 	register int tcr, msr;
 
 	line = DCLINE(dev);
-	sc = dc_cd.cd_devs[DCUNIT(dev)];
+	sc = dz_cd.cd_devs[DCUNIT(dev)];
 	b = 1 << line;
 	dcaddr = (dcregs *)sc->dc_pdma[line].p_addr;
 	s = spltty();
@@ -1049,7 +1049,7 @@ void
 dcscan(arg)
 	void *arg;
 {
-	register struct dc_softc *sc = dc_cd.cd_devs[0]; /* XXX */
+	register struct dc_softc *sc = dz_cd.cd_devs[0]; /* XXX */
 	register dcregs *dcaddr;
 	register struct tty *tp;
 	register int unit, limit, dtr, dsr;
@@ -1132,7 +1132,7 @@ dcGetc(dev)
 		dcaddr = dc_cons_addr;
 	} else {
 		struct dc_softc *sc;
-		sc = dc_cd.cd_devs[DCUNIT(dev)];
+		sc = dz_cd.cd_devs[DCUNIT(dev)];
 		dcaddr = (dcregs *)sc->dc_pdma[line].p_addr;
 	}
 	if (!dcaddr)
@@ -1172,7 +1172,7 @@ dcPutc(dev, c)
 	} else {
 		struct dc_softc *sc;
 
-		sc = dc_cd.cd_devs[DCUNIT(dev)];
+		sc = dz_cd.cd_devs[DCUNIT(dev)];
 		dcaddr = (dcregs *)sc->dc_pdma[out_line].p_addr;
 		brk = sc->dc_brk;
 	}
diff --git a/sys/arch/pmax/dev/dc_ds.c b/sys/arch/pmax/dev/dc_ds.c
index 0e29bde4b1a..c99d9c8a8a8 100644
--- a/sys/arch/pmax/dev/dc_ds.c
+++ b/sys/arch/pmax/dev/dc_ds.c
@@ -34,7 +34,7 @@ extern struct cfdriver mainbus_cd;	/* XXX */
 int	dc_ds_match  __P((struct device * parent, void *cfdata, void *aux));
 void	dc_ds_attach __P((struct device *parent, struct device *self, void *aux));
 
-struct cfattach dc_ds_ca = {
+struct cfattach dz_ds_ca = {
 	sizeof(struct dc_softc), dc_ds_match, dc_ds_attach
 };
 
diff --git a/sys/arch/pmax/dev/dc_ioasic.c b/sys/arch/pmax/dev/dc_ioasic.c
index 583131ee7cd..55d1f14acc8 100644
--- a/sys/arch/pmax/dev/dc_ioasic.c
+++ b/sys/arch/pmax/dev/dc_ioasic.c
@@ -33,7 +33,7 @@
 int	dc_ioasic_match  __P((struct device * parent, void *cfdata, void *aux));
 void	dc_ioasic_attach __P((struct device *parent, struct device *self, void *aux));
 
-struct cfattach dc_ioasic_ca = {
+struct cfattach dz_ioasic_ca = {
 	sizeof(struct dc_softc), dc_ioasic_match, dc_ioasic_attach
 };
 
diff --git a/sys/arch/pmax/dev/fb.c b/sys/arch/pmax/dev/fb.c
index 97f401e2139..22e20487f1a 100644
--- a/sys/arch/pmax/dev/fb.c
+++ b/sys/arch/pmax/dev/fb.c
@@ -100,8 +100,8 @@
 
 #include "rasterconsole.h"
 
-#include "dc_ioasic.h"
-#include "dc_ds.h"
+#include "dz_ioasic.h"
+#include "dz_ds.h"
 #include "scc.h"
 #include "dtop.h"
 
@@ -123,7 +123,7 @@ extern int pmax_boardtype;
 extern void fbScreenInit __P (( struct fbinfo *fi));
 
 
-#if (NDC_DS > 0) || (NDC_IOASIC > 0)
+#if (NDZ_DS > 0) || (NDZ_IOASIC > 0)
 #include <machine/dc7085cons.h>
 #include <pmax/dev/dcvar.h>
 #endif
@@ -272,13 +272,13 @@ tb_kbdmouseconfig(fi)
 
 	switch (pmax_boardtype) {
 
-#if (NDC_DS > 0) || (NDC_IOASIC > 0)
+#if (NDZ_DS > 0) || (NDZ_IOASIC > 0)
 	case DS_PMAX:
 	case DS_3MAX:
 		fi->fi_glasstty->KBDPutc = dcPutc;
 		fi->fi_glasstty->kbddev = makedev(DCDEV, DCKBD_PORT);
 		break;
-#endif	/* NDC_DS || NDC_IOASIC */
+#endif	/* NDZ_DS || NDZ_IOASIC */
 
 #if NSCC > 0
 	case DS_3MIN:
diff --git a/sys/arch/pmax/dev/pm_ds.c b/sys/arch/pmax/dev/pm_ds.c
index 64144ed32d8..fe2883bcdcb 100644
--- a/sys/arch/pmax/dev/pm_ds.c
+++ b/sys/arch/pmax/dev/pm_ds.c
@@ -36,10 +36,10 @@
 
 #include "fb.h"
 #include "pm.h"
-#include "dc_ds.h"
+#include "dz_ds.h"
 
 #if 0
-#if NDC_DS == 0
+#if NDZ_DS == 0
 pm needs dc device
 #endif
 #endif
diff --git a/sys/arch/pmax/dev/qvss_compat.c b/sys/arch/pmax/dev/qvss_compat.c
index 6692e6370bb..b2bf41b5147 100644
--- a/sys/arch/pmax/dev/qvss_compat.c
+++ b/sys/arch/pmax/dev/qvss_compat.c
@@ -89,8 +89,8 @@
 #include <pmax/pmax/cons.h>
 #include <pmax/pmax/pmaxtype.h>
 
-#include "dc_ds.h"
-#include "dc_ioasic.h"
+#include "dz_ds.h"
+#include "dz_ioasic.h"
 #include "scc.h"
 #include "dtop.h"
 
@@ -547,21 +547,21 @@ genConfigMouse()
 
 	s = spltty();
 	switch (pmax_boardtype) {
-#if NDC_IOASIC > 0
+#if NDZ_IOASIC > 0
 	case DS_3MAX:
 		dcDivertXInput = genKbdEvent;
 		dcMouseEvent = (void (*) __P((int)))genMouseEvent;
 		dcMouseButtons = (void (*) __P((int)))genMouseButtons;
 		break;
-#endif /* NDC_IOASIC */
+#endif /* NDZ_IOASIC */
 
-#if NDC_DS > 0
+#if NDZ_DS > 0
 	case DS_PMAX:
 		dcDivertXInput = genKbdEvent;
 		dcMouseEvent = (void (*) __P((int)))genMouseEvent;
 		dcMouseButtons = (void (*) __P((int)))genMouseButtons;
 		break;
-#endif /* NDC_DS */
+#endif /* NDZ_DS */
 
 #if NSCC > 0
 	case DS_3MIN:
@@ -594,22 +594,22 @@ genDeconfigMouse()
 
 	s = spltty();
 	switch (pmax_boardtype) {
-#if NDC_IOASIC > 0
+#if NDZ_IOASIC > 0
 	case DS_3MAX:
 
 		dcDivertXInput = (void (*) __P((int)) )0;
 		dcMouseEvent = (void (*) __P((int)) )0;
 		dcMouseButtons = (void (*) __P((int)) )0;
 		break;
-#endif  /* NDC_IOASIC */
+#endif  /* NDZ_IOASIC */
 
-#if NDC_DS > 0
+#if NDZ_DS > 0
 	case DS_PMAX:
 		dcDivertXInput = (void (*) __P((int)) )0;
 		dcMouseEvent = (void (*) __P((int)) )0;
 		dcMouseButtons =  (void (*) __P((int)) )0;
 		break;
-#endif /* NDC_DS */
+#endif /* NDZ_DS */
 
 #if NSCC > 0
 	case DS_3MIN:
diff --git a/sys/arch/pmax/pmax/conf.c b/sys/arch/pmax/pmax/conf.c
index afe4143a7b5..a185dc2adef 100644
--- a/sys/arch/pmax/pmax/conf.c
+++ b/sys/arch/pmax/pmax/conf.c
@@ -111,8 +111,8 @@ cdev_decl(mm);
 #include "bpfilter.h"
 #include "dtop.h"
 cdev_decl(dtop);
-#include "dc_ioasic.h"
-#include "dc_ds.h"
+#include "dz_ioasic.h"
+#include "dz_ds.h"
 cdev_decl(dc);
 #include "scc.h"
 cdev_decl(scc);
@@ -144,10 +144,10 @@ cdev_decl(xfs_dev);
 #define NIPF 0
 #endif
 
-#if (NDC_DS > 0) || (NDC_IOASIC > 0)
-# define NDC 1
+#if (NDZ_DS > 0) || (NDZ_IOASIC > 0)
+# define NDZ 1
 #else
-# define NDC 0
+# define NDZ 0
 #endif
 
 /* a framebuffer with an attached mouse: */
@@ -181,7 +181,7 @@ struct cdevsw	cdevsw[] =
 	cdev_notdef(),			/* 13: color frame buffer */
 	cdev_notdef(),			/* 14: maxine color frame buffer */
 	cdev_tty_init(NDTOP,dtop),	/* 15: desktop bus interface */
-	cdev_tty_init(NDC,dc),		/* 16: dc7085 serial interface */
+	cdev_tty_init(NDZ,dc),		/* 16: dc7085 serial interface */
 	cdev_tty_init(NSCC,scc),	/* 17: scc 82530 serial interface */
 	cdev_notdef(),			/* 18: mono frame buffer */
         cdev_notdef(),		        /* 19: mt */
diff --git a/sys/arch/pmax/pmax/cpu_cons.c b/sys/arch/pmax/pmax/cpu_cons.c
index b7c0c8953b4..f00c4a4ed90 100644
--- a/sys/arch/pmax/pmax/cpu_cons.c
+++ b/sys/arch/pmax/pmax/cpu_cons.c
@@ -80,15 +80,15 @@
 #include "mfb.h"
 #include "xcfb.h"
 #include "sfb.h"
-#include "dc_ds.h"
-#include "dc_ioasic.h"
+#include "dz_ds.h"
+#include "dz_ioasic.h"
 #include "dtop.h"
 #include "scc.h"
 #include "asc.h"
 #include "tc.h"
 #include  "rasterconsole.h"
 
-#if (NDC_DS > 0) || (NDC_IOASIC > 0)
+#if (NDZ_DS > 0) || (NDZ_IOASIC > 0)
 #include <machine/dc7085cons.h>
 #include <pmax/dev/dc_cons.h>
 #include <pmax/dev/dc_ds_cons.h>
@@ -232,7 +232,7 @@ consinit()
 	if (screen) {
 	    switch (pmax_boardtype) {
 	    case DS_PMAX:
-#if NDC_DS > 0 && NPM > 0
+#if NDZ_DS > 0 && NPM > 0
 		if (pminit(0, 0, 1)) {
 			cd.cn_pri = CN_INTERNAL;
 			cd.cn_dev = makedev(DCDEV, DCKBD_PORT);
@@ -241,7 +241,7 @@ consinit()
 			cd.cn_putc = rcons_vputc;	/*XXX*/
 			return;
 		}
-#endif /* NDC_DS and NPM */
+#endif /* NDZ_DS and NPM */
 		goto remcons;
 
 	    case DS_MAXINE:
@@ -262,13 +262,13 @@ consinit()
 		break;
 
 	    case DS_3MAX:
-#if NDC_IOASIC > 0
+#if NDZ_IOASIC > 0
 		if (kbd == 7) {
 			cd.cn_dev = makedev(DCDEV, DCKBD_PORT);
 			cd.cn_getc = LKgetc;
 			lk_divert(dcGetc, makedev(DCDEV, DCKBD_PORT));
 		} else
-#endif /* NDC_IOASIC */
+#endif /* NDZ_IOASIC */
 			goto remcons;
 		break;
 
@@ -317,22 +317,22 @@ remcons:
 	 */
 	switch (pmax_boardtype) {
 	case DS_PMAX:
-#if NDC_DS > 0
+#if NDZ_DS > 0
 		if (kbd == 4)
 			cd.cn_dev = makedev(DCDEV, DCCOMM_PORT);
 		else
 			cd.cn_dev = makedev(DCDEV, DCPRINTER_PORT);
 		dc_ds_consinit(cd.cn_dev);
 		return;
-#endif /* NDC_DS */
+#endif /* NDZ_DS */
 		break;
 
 	case DS_3MAX:
-#if (NDC_IOASIC > 0)
+#if (NDZ_IOASIC > 0)
 		cd.cn_dev = makedev(DCDEV, DCPRINTER_PORT);
 		dc_ioasic_consinit(cd.cn_dev);
 		return;
-#endif /* NDC */
+#endif /* NDZ */
 		break;
 
 	}
diff --git a/sys/arch/pmax/pmax/pmax_trap.c b/sys/arch/pmax/pmax/pmax_trap.c
index 087763b6f7c..df3fd077d5f 100644
--- a/sys/arch/pmax/pmax/pmax_trap.c
+++ b/sys/arch/pmax/pmax/pmax_trap.c
@@ -91,7 +91,7 @@ struct ifnet; struct ethercom;
 #include "asc.h"
 #include "sii.h"
 #include "le_pmax.h"
-#include "dc_ds.h"
+#include "dz_ds.h"
 #include "led.h"
 
 #include <sys/cdefs.h>
@@ -180,7 +180,7 @@ int leintr __P((void *));
 #if NSII > 0
 int siiintr __P((void *));
 #endif
-#if NDC_DS > 0
+#if NDZ_DS > 0
 int dcintr __P((void *));
 #endif
 
@@ -199,7 +199,7 @@ kn01_intr(mask, pc, statusReg, causeReg)
 	int temp;
 	extern struct cfdriver sii_cd;
 	extern struct cfdriver le_cd;
-	extern struct cfdriver dc_cd;
+	extern struct cfdriver dz_cd;
 
 	/* handle clock interrupts ASAP */
 	if (mask & MIPS_INT_MASK_3) {
@@ -236,12 +236,12 @@ kn01_intr(mask, pc, statusReg, causeReg)
 	}
 #endif /* NLE_PMAX */
 
-#if NDC_DS > 0
+#if NDZ_DS > 0
 	if (mask & MIPS_INT_MASK_2) {
-		dcintr(dc_cd.cd_devs[0]);
+		dcintr(dz_cd.cd_devs[0]);
 		intrcnt[SERIAL0_INTR]++;
 	}
-#endif /* NDC_DS */
+#endif /* NDZ_DS */
 
 	if (mask & MIPS_INT_MASK_4) {
 		pmax_errintr();