? build-kernel
? go
? reset-orig-files
? distrib/sets/lists/xdebug/md.pmax
? distrib/sets/lists/xserver/md.pmax
? sys/arch/pmax/compile/GENERIC
? sys/arch/vax/compile/GENERIC
? xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/bsd_ev56.c
Index: external/mit/xorg/server/drivers/Makefile
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/server/drivers/Makefile,v
retrieving revision 1.103
diff -u -r1.103 Makefile
--- external/mit/xorg/server/drivers/Makefile	28 Aug 2021 08:56:10 -0000	1.103
+++ external/mit/xorg/server/drivers/Makefile	5 Dec 2021 17:20:22 -0000
@@ -337,10 +337,11 @@
 .endif	# ${MACHINE} == "sparc"
 .endif	# ${MACHINE} == "sparc" || ${MACHINE} == "sparc64"
 
-.if ${MACHINE} == "vax"
+.if ${MACHINE} == "pmax" || \
+    ${MACHINE} == "vax"
 SUBDIR+= \
 	xf86-video-wsfb
-.endif	# ${MACHINE} == "vax"
+.endif	# ${MACHINE} == "pmax" || ${MACHINE} == "vax"
 
 .if ${MACHINE} == "zaurus"
 SUBDIR+= \
Index: external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile,v
retrieving revision 1.19
diff -u -r1.19 Makefile
--- external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile	3 Jun 2021 07:37:00 -0000	1.19
+++ external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile	5 Dec 2021 17:20:22 -0000
@@ -17,6 +17,7 @@
     ${MACHINE} == "amiga" || \
     ${MACHINE} == "evbarm" || \
     ${MACHINE} == "mac68k" || \
+    ${MACHINE} == "pmax" || \
     ${MACHINE} == "sgimips" || \
     ${MACHINE} == "shark" || \
     ${MACHINE} == "sparc" || \
Index: external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile,v
retrieving revision 1.49
diff -u -r1.49 Makefile
--- external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile	7 Mar 2021 10:42:27 -0000	1.49
+++ external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile	5 Dec 2021 17:20:22 -0000
@@ -48,7 +48,7 @@
 .endif
 
 .if ${MACHINE_ARCH} == "alpha"
-SRCS.bsd+=	alpha_video.c pm_noop.c agp_noop.c
+SRCS.bsd+=	alpha_video.c bsd_ev56.c pm_noop.c agp_noop.c
 .for _FN in ${SRCS.bsd}
 CPPFLAGS.${_FN}=	-DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC -DUSE_ALPHA_PIO
 .endfor
@@ -108,7 +108,8 @@
 .endfor
 .endif
 
-.if ${MACHINE} == "vax"
+.if ${MACHINE} == "pmax" || \
+    ${MACHINE} == "vax"
 SRCS.bsd+=	ppc_video.c pm_noop.c agp_noop.c
 .for _FN in ${SRCS.bsd}
 CPPFLAGS.${_FN}=	-DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC
Index: external/mit/xorg/server/xorg-server.old/hw/xfree86/xorgos/Makefile
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/server/xorg-server.old/hw/xfree86/xorgos/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- external/mit/xorg/server/xorg-server.old/hw/xfree86/xorgos/Makefile	10 Jun 2016 03:42:14 -0000	1.1.1.1
+++ external/mit/xorg/server/xorg-server.old/hw/xfree86/xorgos/Makefile	5 Dec 2021 17:20:22 -0000
@@ -99,7 +99,8 @@
 .endfor
 .endif
 
-.if ${MACHINE} == "vax"
+.if ${MACHINE} == "pmax" || \
+    ${MACHINE} == "vax"
 SRCS.bsd+=	ppc_video.c pm_noop.c agp_noop.c
 .for _FN in ${SRCS.bsd}
 CPPFLAGS.${_FN}=	-DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC
Index: share/mk/bsd.own.mk
===================================================================
RCS file: /cvsroot/src/share/mk/bsd.own.mk,v
retrieving revision 1.1268
diff -u -r1.1268 bsd.own.mk
--- share/mk/bsd.own.mk	13 Nov 2021 10:13:42 -0000	1.1268
+++ share/mk/bsd.own.mk	5 Dec 2021 17:20:23 -0000
@@ -1344,6 +1344,7 @@
     ${MACHINE} == "macppc"	|| \
     ${MACHINE} == "netwinder"	|| \
     ${MACHINE} == "newsmips"	|| \
+    ${MACHINE} == "pmax"	|| \
     ${MACHINE} == "prep"	|| \
     ${MACHINE} == "ofppc"	|| \
     ${MACHINE} == "sgimips"	|| \
@@ -1573,7 +1574,6 @@
 
 # During transition from xorg-server 1.10 to 1.20
 .if \
-    ${MACHINE} == "alpha"	|| \
     ${MACHINE} == "netwinder"	|| \
     ${MACHINE} == "sgimips"	|| \
     ${MACHINE} == "vax"
Index: share/mk/bsd.x11.mk
===================================================================
RCS file: /cvsroot/src/share/mk/bsd.x11.mk,v
retrieving revision 1.141
diff -u -r1.141 bsd.x11.mk
--- share/mk/bsd.x11.mk	24 Aug 2021 06:29:18 -0000	1.141
+++ share/mk/bsd.x11.mk	5 Dec 2021 17:20:23 -0000
@@ -82,7 +82,6 @@
 			-DDDXOSVERRORF -DDDXTIME -DUSB_HID
 
 .if !(${MACHINE} == "acorn32"	|| \
-    ${MACHINE} == "pmax"	|| \
     ${MACHINE} == "sun3"	|| \
     ${MACHINE} == "x68k"	|| \
     ${MACHINE} == "vax")
Index: sys/arch/vax/conf/GENERIC
===================================================================
RCS file: /cvsroot/src/sys/arch/vax/conf/GENERIC,v
retrieving revision 1.214
diff -u -r1.214 GENERIC
--- sys/arch/vax/conf/GENERIC	27 Sep 2020 13:48:54 -0000	1.214
+++ sys/arch/vax/conf/GENERIC	5 Dec 2021 17:20:24 -0000
@@ -232,8 +232,8 @@
 #il*		at uba?	csr 0164000	# NI1010
 mtc*		at uba? csr 0174500	# Tape MSCP ctlr
 ts0		at uba? csr 0172520	# TS11/TSV05 tape.
-#qd0		at uba? csr 0177400	# 4- or 8-bitplans color graphics
-#qv0		at uba? csr 0177400	# Monochrome graphics
+# qd0		at uba? csr 0177400	# 4- or 8-bitplans color graphics
+qv0		at uba? csr 0177400	# Monochrome graphics
 de*		at uba? csr 0174510	# DELUA/DEUNA
 qe*		at uba? csr 0174440	# DEQNA/DELQA
 qe*		at uba? csr 0174460	# DEQNA/DELQA
@@ -273,7 +273,7 @@
 wsdisplay*	at lcg0
 #wsdisplay*	at clr0
 #wsdisplay*	at qd0
-#wsdisplay*	at qv0
+wsdisplay*	at qv0
 lkkbd0		at dz0 line 0
 wskbd*		at lkkbd? console ?
 lkms0		at dz0 line 1
Index: sys/dev/tc/cfb.c
===================================================================
RCS file: /cvsroot/src/sys/dev/tc/cfb.c,v
retrieving revision 1.65
diff -u -r1.65 cfb.c
--- sys/dev/tc/cfb.c	7 Aug 2021 16:19:16 -0000	1.65
+++ sys/dev/tc/cfb.c	5 Dec 2021 17:20:24 -0000
@@ -371,6 +371,11 @@
 		wsd_fbip->cmsize = CMAP_SIZE;
 #undef fbt
 		return (0);
+	
+	case WSDISPLAYIO_GET_FBINFO: {
+		struct wsdisplayio_fbinfo *fbi = data;
+		return wsdisplayio_get_fbinfo(sc->sc_ri, fbi);
+	}
 
 	case WSDISPLAYIO_GETCMAP:
 		return get_cmap(sc, (struct wsdisplay_cmap *)data);
Index: sys/dev/tc/mfb.c
===================================================================
RCS file: /cvsroot/src/sys/dev/tc/mfb.c,v
retrieving revision 1.63
diff -u -r1.63 mfb.c
--- sys/dev/tc/mfb.c	7 Aug 2021 16:19:16 -0000	1.63
+++ sys/dev/tc/mfb.c	5 Dec 2021 17:20:24 -0000
@@ -335,6 +335,11 @@
 		wsd_fbip->cmsize = 0;
 #undef fbt
 		return (0);
+	
+	case WSDISPLAYIO_GET_FBINFO: {
+		struct wsdisplayio_fbinfo *fbi = data;
+		return wsdisplayio_get_fbinfo(sc->sc_ri, fbi);
+	}
 
 	case WSDISPLAYIO_GETCMAP:
 	case WSDISPLAYIO_PUTCMAP:
Index: sys/dev/tc/sfb.c
===================================================================
RCS file: /cvsroot/src/sys/dev/tc/sfb.c,v
retrieving revision 1.88
diff -u -r1.88 sfb.c
--- sys/dev/tc/sfb.c	7 Aug 2021 16:19:16 -0000	1.88
+++ sys/dev/tc/sfb.c	5 Dec 2021 17:20:24 -0000
@@ -405,6 +405,11 @@
 		wsd_fbip->cmsize = CMAP_SIZE;
 #undef fbt
 		return (0);
+	
+	case WSDISPLAYIO_GET_FBINFO: {
+		struct wsdisplayio_fbinfo *fbi = data;
+		return wsdisplayio_get_fbinfo(sc->sc_ri, fbi);
+	}
 
 	case WSDISPLAYIO_GETCMAP:
 		return get_cmap(sc, (struct wsdisplay_cmap *)data);
Index: sys/dev/tc/sfbplus.c
===================================================================
RCS file: /cvsroot/src/sys/dev/tc/sfbplus.c,v
retrieving revision 1.41
diff -u -r1.41 sfbplus.c
--- sys/dev/tc/sfbplus.c	7 Aug 2021 16:19:16 -0000	1.41
+++ sys/dev/tc/sfbplus.c	5 Dec 2021 17:20:24 -0000
@@ -439,6 +439,11 @@
 		wsd_fbip->cmsize = CMAP_SIZE;	/* XXX */
 #undef fbt
 		return (0);
+	
+	case WSDISPLAYIO_GET_FBINFO: {
+		struct wsdisplayio_fbinfo *fbi = data;
+		return wsdisplayio_get_fbinfo(sc->sc_ri, fbi);
+	}
 
 	case WSDISPLAYIO_GETCMAP:
 		return get_cmap(sc, (struct wsdisplay_cmap *)data);
Index: sys/dev/tc/tfb.c
===================================================================
RCS file: /cvsroot/src/sys/dev/tc/tfb.c,v
retrieving revision 1.65
diff -u -r1.65 tfb.c
--- sys/dev/tc/tfb.c	7 Aug 2021 16:19:16 -0000	1.65
+++ sys/dev/tc/tfb.c	5 Dec 2021 17:20:24 -0000
@@ -405,6 +405,11 @@
 		wsd_fbip->cmsize = CMAP_SIZE;
 #undef fbt
 		return (0);
+	
+	case WSDISPLAYIO_GET_FBINFO: {
+		struct wsdisplayio_fbinfo *fbi = data;
+		return wsdisplayio_get_fbinfo(sc->sc_ri, fbi);
+	}
 
 	case WSDISPLAYIO_GETCMAP:
 		return get_cmap(sc, (struct wsdisplay_cmap *)data);
Index: sys/dev/tc/xcfb.c
===================================================================
RCS file: /cvsroot/src/sys/dev/tc/xcfb.c,v
retrieving revision 1.59
diff -u -r1.59 xcfb.c
--- sys/dev/tc/xcfb.c	7 Aug 2021 16:19:16 -0000	1.59
+++ sys/dev/tc/xcfb.c	5 Dec 2021 17:20:24 -0000
@@ -404,6 +404,11 @@
 		wsd_fbip->cmsize = CMAP_SIZE;
 #undef fbt
 		return (0);
+	
+	case WSDISPLAYIO_GET_FBINFO: {
+		struct wsdisplayio_fbinfo *fbi = data;
+		return wsdisplayio_get_fbinfo(sc->sc_ri, fbi);
+	}
 
 	case WSDISPLAYIO_GETCMAP:
 		return get_cmap(sc, (struct wsdisplay_cmap *)data);
Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h
===================================================================
RCS file: /cvsroot/xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h,v
retrieving revision 1.18
diff -u -r1.18 compiler.h
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h	3 Jul 2021 09:43:29 -0000	1.18
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h	5 Dec 2021 17:20:28 -0000
@@ -956,6 +956,9 @@
 #endif
 
 #ifdef __alpha__
+#if defined(__NetBSD__)
+#include <X11/Xmd.h>
+#endif /* __NetBSD__ */
 static inline int
 xf86ReadMmio8(void *Base, unsigned long Offset)
 {
Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/Makefile.am
===================================================================
RCS file: /cvsroot/xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/Makefile.am,v
retrieving revision 1.1.1.5
diff -u -r1.1.1.5 Makefile.am
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/Makefile.am	31 Dec 2018 09:36:11 -0000	1.1.1.5
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/Makefile.am	5 Dec 2021 17:20:28 -0000
@@ -26,7 +26,8 @@
 if ALPHA_VIDEO
 # Cheat here and piggyback other alpha bits on ALPHA_VIDEO.
 ARCH_SOURCES = \
-	alpha_video.c
+	alpha_video.c \
+	bsd_ev56.c \
 endif
 
 if ARM_VIDEO
Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/Makefile.in
===================================================================
RCS file: /cvsroot/xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/Makefile.in,v
retrieving revision 1.1.1.12
diff -u -r1.1.1.12 Makefile.in
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/Makefile.in	11 Jul 2021 00:08:39 -0000	1.1.1.12
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/Makefile.in	5 Dec 2021 17:20:28 -0000
@@ -113,8 +113,8 @@
 libbsd_la_LIBADD =
 am__libbsd_la_SOURCES_DIST = $(srcdir)/../shared/posix_tty.c \
 	$(srcdir)/../shared/sigio.c $(srcdir)/../shared/vidmem.c \
-	bsd_VTsw.c bsd_init.c bsd_bell.c alpha_video.c arm_video.c \
-	i386_video.c ppc_video.c sparc64_video.c \
+	bsd_VTsw.c bsd_init.c bsd_bell.c alpha_video.c bsd_ev56.c \
+	arm_video.c i386_video.c ppc_video.c sparc64_video.c \
 	$(srcdir)/../shared/ioperm_noop.c \
 	$(srcdir)/../shared/agp_noop.c $(srcdir)/../linux/lnx_agp.c \
 	$(srcdir)/../shared/pm_noop.c $(srcdir)/bsd_apm.c \
@@ -125,7 +125,7 @@
 @ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@I386_VIDEO_FALSE@@PPC_VIDEO_TRUE@am__objects_1 = ppc_video.lo
 @ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@I386_VIDEO_TRUE@am__objects_1 = i386_video.lo
 @ALPHA_VIDEO_FALSE@@ARM_VIDEO_TRUE@am__objects_1 = arm_video.lo
-@ALPHA_VIDEO_TRUE@am__objects_1 = alpha_video.lo
+@ALPHA_VIDEO_TRUE@am__objects_1 = alpha_video.lo bsd_ev56.lo
 @AGP_FALSE@am__objects_2 = agp_noop.lo
 @AGP_TRUE@am__objects_2 = lnx_agp.lo
 @BSD_APM_FALSE@@BSD_KQUEUE_APM_FALSE@am__objects_3 = pm_noop.lo
@@ -158,6 +158,7 @@
 am__maybe_remake_depfiles = depfiles
 am__depfiles_remade = ./$(DEPDIR)/agp_noop.Plo \
 	./$(DEPDIR)/alpha_video.Plo ./$(DEPDIR)/arm_video.Plo \
+	./$(DEPDIR)/bsd_ev56.Plo ./$(DEPDIR)/bsd_apm.Plo \
 	./$(DEPDIR)/bsd_VTsw.Plo ./$(DEPDIR)/bsd_apm.Plo \
 	./$(DEPDIR)/bsd_bell.Plo ./$(DEPDIR)/bsd_init.Plo \
 	./$(DEPDIR)/bsd_kmod.Plo ./$(DEPDIR)/bsd_kqueue_apm.Plo \
@@ -585,7 +586,8 @@
 
 # Cheat here and piggyback other alpha bits on ALPHA_VIDEO.
 @ALPHA_VIDEO_TRUE@ARCH_SOURCES = \
-@ALPHA_VIDEO_TRUE@	alpha_video.c
+@ALPHA_VIDEO_TRUE@	alpha_video.c \
+@ALPHA_VIDEO_TRUE@	bsd_ev56.c
 
 @ARM_VIDEO_TRUE@ARCH_SOURCES = arm_video.c
 @I386_VIDEO_TRUE@ARCH_SOURCES = i386_video.c
@@ -680,6 +682,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bsd_VTsw.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bsd_apm.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bsd_bell.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bsd_ev56.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bsd_init.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bsd_kmod.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bsd_kqueue_apm.Plo@am__quote@ # am--include-marker
@@ -924,6 +927,7 @@
 distclean: distclean-am
 		-rm -f ./$(DEPDIR)/agp_noop.Plo
 	-rm -f ./$(DEPDIR)/alpha_video.Plo
+	-rm -f ./$(DEPDIR)/bsd_ev56.Plo
 	-rm -f ./$(DEPDIR)/arm_video.Plo
 	-rm -f ./$(DEPDIR)/bsd_VTsw.Plo
 	-rm -f ./$(DEPDIR)/bsd_apm.Plo
@@ -988,6 +992,7 @@
 maintainer-clean: maintainer-clean-am
 		-rm -f ./$(DEPDIR)/agp_noop.Plo
 	-rm -f ./$(DEPDIR)/alpha_video.Plo
+	-rm -f ./$(DEPDIR)/bsd_ev56.Plo
 	-rm -f ./$(DEPDIR)/arm_video.Plo
 	-rm -f ./$(DEPDIR)/bsd_VTsw.Plo
 	-rm -f ./$(DEPDIR)/bsd_apm.Plo