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

3 files changed, 20 insertions, 17 deletions

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 */