Late in the release of OpenBSD/pmax 2.7 a conflict between the pmax

dc driver and the generic if_dc driver was found. The fix was to
change the pmax drivers name to dz instead. But this was only done
in a miminal way.

This commit will switch over and use the new dz driver.

-moj

7 files changed, 38 insertions, 31 deletions

diff --git a/sys/arch/pmax/conf/files.pmax b/sys/arch/pmax/conf/files.pmax
index bc0d81a96e9..b69f1affc9a 100644
--- a/sys/arch/pmax/conf/files.pmax
+++ b/sys/arch/pmax/conf/files.pmax
@@ -1,3 +1,4 @@
+#	$OpenBSD: files.pmax,v 1.13 2000/08/19 18:43:30 maja Exp $
 #	$NetBSD: files.pmax,v 1.36 1996/10/13 05:28:48 jonathan Exp $
 # DECstation-specific configuration info
 
@@ -113,11 +114,11 @@ 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 dz
-file	arch/pmax/dev/dc.c		dz
+file	arch/pmax/dev/dz.c		dz
 attach dz at ioasic with dz_ioasic
-file	arch/pmax/dev/dc_ioasic.c	dz_ioasic | dz_ds needs-flag # TTTTT ugly
+file	arch/pmax/dev/dz_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
+file	arch/pmax/dev/dz_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/fb.c b/sys/arch/pmax/dev/fb.c
index 22e20487f1a..88af95f6852 100644
--- a/sys/arch/pmax/dev/fb.c
+++ b/sys/arch/pmax/dev/fb.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: fb.c,v 1.7 2000/08/19 18:43:30 maja Exp $	*/
 /*	$NetBSD: fb.c,v 1.19 1997/05/24 08:19:50 jonathan Exp $	*/
 
 /*-
@@ -125,7 +126,7 @@ extern void fbScreenInit __P (( struct fbinfo *fi));
 
 #if (NDZ_DS > 0) || (NDZ_IOASIC > 0)
 #include <machine/dc7085cons.h>
-#include <pmax/dev/dcvar.h>
+#include <pmax/dev/dzvar.h>
 #endif
 
 #if NDTOP > 0
@@ -275,7 +276,7 @@ tb_kbdmouseconfig(fi)
 #if (NDZ_DS > 0) || (NDZ_IOASIC > 0)
 	case DS_PMAX:
 	case DS_3MAX:
-		fi->fi_glasstty->KBDPutc = dcPutc;
+		fi->fi_glasstty->KBDPutc = dzPutc;
 		fi->fi_glasstty->kbddev = makedev(DCDEV, DCKBD_PORT);
 		break;
 #endif	/* NDZ_DS || NDZ_IOASIC */
diff --git a/sys/arch/pmax/dev/pm_ds.c b/sys/arch/pmax/dev/pm_ds.c
index fe2883bcdcb..bb7d49bb64a 100644
--- a/sys/arch/pmax/dev/pm_ds.c
+++ b/sys/arch/pmax/dev/pm_ds.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: pm_ds.c,v 1.5 2000/08/19 18:43:30 maja Exp $	*/
 /*	$NetBSD: pm_ds.c,v 1.4 1997/05/24 08:19:52 jonathan Exp $	*/
 
 /*
@@ -83,7 +84,7 @@ extern struct pmax_fbtty pmfb;
  * we hardcode an entry point.
  * XXX
  */
-void dcPutc	__P((dev_t, int));		/* XXX */
+void dzPutc	__P((dev_t, int));		/* XXX */
 
 
 /*
@@ -197,7 +198,7 @@ pminit(fi, unit, cold_console_flag)
 	/*
 	 * set putc/getc entry point
 	 */
-	fi->fi_glasstty->KBDPutc = dcPutc;	/* XXX */
+	fi->fi_glasstty->KBDPutc = dzPutc;	/* XXX */
 	fi->fi_glasstty->kbddev = makedev(DCDEV, DCKBD_PORT);
 
 	/* call back-end to initialize hardware and attach to rcons */
diff --git a/sys/arch/pmax/dev/qvss_compat.c b/sys/arch/pmax/dev/qvss_compat.c
index b2bf41b5147..e2b28904d99 100644
--- a/sys/arch/pmax/dev/qvss_compat.c
+++ b/sys/arch/pmax/dev/qvss_compat.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: qvss_compat.c,v 1.9 2000/08/19 18:43:30 maja Exp $	*/
 /*	$NetBSD: qvss_compat.c,v 1.8 1997/05/25 10:53:33 jonathan Exp $	*/
 
 /*-
@@ -104,7 +105,7 @@
 struct termios; struct dcregs;
 #include <pmax/dev/dtopvar.h>			/* dtop console I/O decls */
 #include <pmax/tc/sccvar.h>			/* ioasic z8530 I/O decls */
-#include <pmax/dev/dcvar.h>			/* DZ-11 chip console I/O */
+#include <pmax/dev/dzvar.h>			/* DZ-11 chip console I/O */
 
 extern int pmax_boardtype;
 
@@ -549,17 +550,17 @@ genConfigMouse()
 	switch (pmax_boardtype) {
 #if NDZ_IOASIC > 0
 	case DS_3MAX:
-		dcDivertXInput = genKbdEvent;
-		dcMouseEvent = (void (*) __P((int)))genMouseEvent;
-		dcMouseButtons = (void (*) __P((int)))genMouseButtons;
+		dzDivertXInput = genKbdEvent;
+		dzMouseEvent = (void (*) __P((int)))genMouseEvent;
+		dzMouseButtons = (void (*) __P((int)))genMouseButtons;
 		break;
 #endif /* NDZ_IOASIC */
 
 #if NDZ_DS > 0
 	case DS_PMAX:
-		dcDivertXInput = genKbdEvent;
-		dcMouseEvent = (void (*) __P((int)))genMouseEvent;
-		dcMouseButtons = (void (*) __P((int)))genMouseButtons;
+		dzDivertXInput = genKbdEvent;
+		dzMouseEvent = (void (*) __P((int)))genMouseEvent;
+		dzMouseButtons = (void (*) __P((int)))genMouseButtons;
 		break;
 #endif /* NDZ_DS */
 
@@ -597,17 +598,17 @@ genDeconfigMouse()
 #if NDZ_IOASIC > 0
 	case DS_3MAX:
 
-		dcDivertXInput = (void (*) __P((int)) )0;
-		dcMouseEvent = (void (*) __P((int)) )0;
-		dcMouseButtons = (void (*) __P((int)) )0;
+		dzDivertXInput = (void (*) __P((int)) )0;
+		dzMouseEvent = (void (*) __P((int)) )0;
+		dzMouseButtons = (void (*) __P((int)) )0;
 		break;
 #endif  /* NDZ_IOASIC */
 
 #if NDZ_DS > 0
 	case DS_PMAX:
-		dcDivertXInput = (void (*) __P((int)) )0;
-		dcMouseEvent = (void (*) __P((int)) )0;
-		dcMouseButtons =  (void (*) __P((int)) )0;
+		dzDivertXInput = (void (*) __P((int)) )0;
+		dzMouseEvent = (void (*) __P((int)) )0;
+		dzMouseButtons =  (void (*) __P((int)) )0;
 		break;
 #endif /* NDZ_DS */
 
diff --git a/sys/arch/pmax/pmax/conf.c b/sys/arch/pmax/pmax/conf.c
index a185dc2adef..cbf64d13f3b 100644
--- a/sys/arch/pmax/pmax/conf.c
+++ b/sys/arch/pmax/pmax/conf.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: conf.c,v 1.18 2000/08/19 18:43:30 maja Exp $	*/
 /*	$NetBSD: conf.c,v 1.23 1996/09/07 12:40:38 mycroft Exp $	*/
 
 /*
@@ -113,7 +114,7 @@ cdev_decl(mm);
 cdev_decl(dtop);
 #include "dz_ioasic.h"
 #include "dz_ds.h"
-cdev_decl(dc);
+cdev_decl(dz);
 #include "scc.h"
 cdev_decl(scc);
 cdev_decl(rz);
@@ -181,7 +182,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(NDZ,dc),		/* 16: dc7085 serial interface */
+	cdev_tty_init(NDZ,dz),		/* 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 f00c4a4ed90..b2d305e5708 100644
--- a/sys/arch/pmax/pmax/cpu_cons.c
+++ b/sys/arch/pmax/pmax/cpu_cons.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: cpu_cons.c,v 1.7 2000/08/19 18:43:31 maja Exp $	*/
 /*	$NetBSD: cpu_cons.c,v 1.17 1997/05/24 08:19:48 jonathan Exp $	*/
 
 /*
@@ -90,9 +91,9 @@
 
 #if (NDZ_DS > 0) || (NDZ_IOASIC > 0)
 #include <machine/dc7085cons.h>
-#include <pmax/dev/dc_cons.h>
-#include <pmax/dev/dc_ds_cons.h>
-#include <pmax/dev/dc_ioasic_cons.h>
+#include <pmax/dev/dz_cons.h>
+#include <pmax/dev/dz_ds_cons.h>
+#include <pmax/dev/dz_ioasic_cons.h>
 #endif
 
 #if NDTOP > 0
@@ -237,7 +238,7 @@ consinit()
 			cd.cn_pri = CN_INTERNAL;
 			cd.cn_dev = makedev(DCDEV, DCKBD_PORT);
 			cd.cn_getc = LKgetc;
-			lk_divert(dcGetc, makedev(DCDEV, DCKBD_PORT));
+			lk_divert(dzGetc, makedev(DCDEV, DCKBD_PORT));
 			cd.cn_putc = rcons_vputc;	/*XXX*/
 			return;
 		}
@@ -266,7 +267,7 @@ consinit()
 		if (kbd == 7) {
 			cd.cn_dev = makedev(DCDEV, DCKBD_PORT);
 			cd.cn_getc = LKgetc;
-			lk_divert(dcGetc, makedev(DCDEV, DCKBD_PORT));
+			lk_divert(dzGetc, makedev(DCDEV, DCKBD_PORT));
 		} else
 #endif /* NDZ_IOASIC */
 			goto remcons;
@@ -322,7 +323,7 @@ remcons:
 			cd.cn_dev = makedev(DCDEV, DCCOMM_PORT);
 		else
 			cd.cn_dev = makedev(DCDEV, DCPRINTER_PORT);
-		dc_ds_consinit(cd.cn_dev);
+		dz_ds_consinit(cd.cn_dev);
 		return;
 #endif /* NDZ_DS */
 		break;
@@ -330,7 +331,7 @@ remcons:
 	case DS_3MAX:
 #if (NDZ_IOASIC > 0)
 		cd.cn_dev = makedev(DCDEV, DCPRINTER_PORT);
-		dc_ioasic_consinit(cd.cn_dev);
+		dz_ioasic_consinit(cd.cn_dev);
 		return;
 #endif /* NDZ */
 		break;
diff --git a/sys/arch/pmax/pmax/pmax_trap.c b/sys/arch/pmax/pmax/pmax_trap.c
index df3fd077d5f..d407232dc6c 100644
--- a/sys/arch/pmax/pmax/pmax_trap.c
+++ b/sys/arch/pmax/pmax/pmax_trap.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: pmax_trap.c,v 1.8 2000/08/19 18:43:31 maja Exp $	*/
 /*	$NetBSD: pmax_trap.c,v 1.44 1997/05/31 20:33:35 mhitch Exp $	*/
 
 /*
@@ -181,7 +182,7 @@ int leintr __P((void *));
 int siiintr __P((void *));
 #endif
 #if NDZ_DS > 0
-int dcintr __P((void *));
+int dzintr __P((void *));
 #endif
 
 /*
@@ -238,7 +239,7 @@ kn01_intr(mask, pc, statusReg, causeReg)
 
 #if NDZ_DS > 0
 	if (mask & MIPS_INT_MASK_2) {
-		dcintr(dz_cd.cd_devs[0]);
+		dzintr(dz_cd.cd_devs[0]);
 		intrcnt[SERIAL0_INTR]++;
 	}
 #endif /* NDZ_DS */