X-Git-Url: https://git.subgeniuskitty.com/unix-history/.git/blobdiff_plain/978f8b9b17209782ff99aa0b2562175228806926..ad7871609881e73855d0b04da49b486cd93efca7:/usr/src/sys/vax/stand/qdcons.c

diff --git a/usr/src/sys/vax/stand/qdcons.c b/usr/src/sys/vax/stand/qdcons.c
index c68660d141..f9afe6c138 100644
--- a/usr/src/sys/vax/stand/qdcons.c
+++ b/usr/src/sys/vax/stand/qdcons.c
@@ -1,10 +1,39 @@
 /*
- * Copyright (c) 1982, 1986 Regents of the University of California.
- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * Copyright (c) 1988 Regents of the University of California.
+ * All rights reserved.
  *
- * 		@(#)qdcons.c	1.3  Berkeley  %G%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
  *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	@(#)qdcons.c	7.5 (Berkeley) 12/16/90
+ */
+
+/*
  *	derived from: @(#)qdcons.c  4.1 (ULTRIX    11/23/87
  */
 
@@ -46,13 +75,13 @@
 *
 ************************************************************************/
 
-#include "../h/types.h"
-#include "../vax/cpu.h"
+#include "sys/types.h"
+#include "../include/cpu.h"
 #define KERNEL
-#include "../vaxuba/qdioctl.h"
-#include "../vaxuba/qevent.h"
-#include "../vaxuba/qduser.h"
-#include "../vaxuba/qdreg.h"
+#include "../uba/qdioctl.h"
+#include "../uba/qevent.h"
+#include "../uba/qduser.h"
+#include "../uba/qdreg.h"
 #undef KERNEL
 
 /*-----------------------------------------------------------------------
@@ -192,6 +221,7 @@ qd_init()
 
 	caddr_t qdaddr;
 	struct dga *dga;
+	extern int cpu;
 
  	qdaddr = (caddr_t) QDSSCSR;
         if (badaddr(qdaddr, sizeof(short)))
@@ -235,21 +265,24 @@ qd_init()
 /*--------------------------------------------------------------------
 * tell the VAX ROM that the cursor is at the bottom of the screen  */
 
-	NVR = (short *) NVR_ADRS;
+	if (cpu == VAX_630) {
+		NVR = (short *) NVR_ADRS;
 
-	i = *NVR++ & 0xFF;
-	i |= (*NVR++ & 0xFF) << 8;
-	i |= (*NVR++ & 0xFF) << 16;
-	i |= (*NVR++ & 0xFF) << 24;
+		i = *NVR++ & 0xFF;
+		i |= (*NVR++ & 0xFF) << 8;
+		i |= (*NVR++ & 0xFF) << 16;
+		i |= (*NVR++ & 0xFF) << 24;
 
-	ROM_console = (char *) i;
+		ROM_console = (char *) i;
 
-	ROM_console[CURRENT_COL] = ROM_console[COL_MIN];
-	ROM_console[CURRENT_ROW] = ROM_console[ROW_MAX];
+		ROM_console[CURRENT_COL] = ROM_console[COL_MIN];
+		ROM_console[CURRENT_ROW] = ROM_console[ROW_MAX];
+	}
 
 /*----------------------------------------------------------
 * smash system virtual console service routine addresses */
 
+	printf("switching console to QDSS display...\n");
 	v_getc = qdgetc;
 	v_putc = qdputc;