Module Name: src
Committed By: hans
Date: Sun May 9 22:24:44 UTC 2010
Modified Files:
src/sys/arch/vax/vsa: dz_vsbus.c
Log Message:
Make console keyboard work on VAXstation 4000/9x. Seems not to break
anything on other VAXstations (tested on 4000 VLC).
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/vax/vsa/dz_vsbus.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/vax/vsa/dz_vsbus.c
diff -u src/sys/arch/vax/vsa/dz_vsbus.c:1.40 src/sys/arch/vax/vsa/dz_vsbus.c:1.41
--- src/sys/arch/vax/vsa/dz_vsbus.c:1.40 Sat Mar 15 00:57:15 2008
+++ src/sys/arch/vax/vsa/dz_vsbus.c Sun May 9 22:24:44 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: dz_vsbus.c,v 1.40 2008/03/15 00:57:15 matt Exp $ */
+/* $NetBSD: dz_vsbus.c,v 1.41 2010/05/09 22:24:44 hans Exp $ */
/*
* Copyright (c) 1998 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dz_vsbus.c,v 1.40 2008/03/15 00:57:15 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dz_vsbus.c,v 1.41 2010/05/09 22:24:44 hans Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -162,7 +162,7 @@
* due to the nature of how bus_space_* works on VAX, this will
* be perfectly good until everything is converted.
*/
- if (dz_regs == 0) /* This isn't console */ {
+ if (cn_tab->cn_dev != makedev(cdevsw_lookup_major(&dz_cdevsw), 0)) {
dz_regs = vax_map_physmem(va->va_paddr, 1);
consline = -1;
} else
@@ -286,6 +286,9 @@
dz_regs = iospace;
dz = (void *)dz_regs;
ioaccess(iospace, ioaddr, 1);
+ dz->csr = 0; /* Disable scanning until initting is done */
+ dz->tcr = (1 << minor(cndev->cn_dev)); /* Turn on xmitter */
+ dz->csr = 0x20; /* Turn scanning back on */
}
void
