Merging w/ NetBSD 021796.

speaker upgraded to the current.
some changes to the VM stuff (ie kern_thread.c added and so).

6 files changed, 35 insertions, 77 deletions

diff --git a/sys/arch/i386/isa/pcvt/Util/vgaio/vgaio.h b/sys/arch/i386/isa/pcvt/Util/vgaio/vgaio.h
index b2d09999282..ee8c5c22935 100644
--- a/sys/arch/i386/isa/pcvt/Util/vgaio/vgaio.h
+++ b/sys/arch/i386/isa/pcvt/Util/vgaio/vgaio.h
@@ -37,8 +37,13 @@
  * The author may be reached unter <joerg_wunsch@uriah.sax.de>
  *
  * $Log: vgaio.h,v $
- * Revision 1.1  1995/10/18 08:50:49  deraadt
- * Initial revision
+ * Revision 1.2  1996/03/19 21:09:52  mickey
+ * Merging w/ NetBSD 021796.
+ * speaker upgraded to the current.
+ * some changes to the VM stuff (ie kern_thread.c added and so).
+ *
+ * Revision 1.1.1.1  1996/02/16 18:59:24  niklas
+ * Checkin of the NetBSD src/, supped 960203
  *
  * Revision 1.3  1995/10/07 21:46:02  jtc
  * Overlay our pcvt with pcvt 3.32 sources.  All of our fixes have been
diff --git a/sys/arch/i386/isa/pcvt/pcvt_conf.h b/sys/arch/i386/isa/pcvt/pcvt_conf.h
index 379475bf49f..7a21fb3c8e3 100644
--- a/sys/arch/i386/isa/pcvt/pcvt_conf.h
+++ b/sys/arch/i386/isa/pcvt/pcvt_conf.h
@@ -179,7 +179,7 @@
 #endif
 
 #if !defined PCVT_PRETTYSCRNS	/* ---------- DEFAULT: OFF ------------ */
-# define PCVT_PRETTYSCRNS 0	/* for the cost of some microseconds of	*/
+# define PCVT_PRETTYSCRNS 1	/* for the cost of some microseconds of	*/
 #elif PCVT_PRETTYSCRNS != 0	/* cpu time this adds a more "pretty"	*/
 # undef PCVT_PRETTYSCRNS	/* version to the screensaver, an "*"	*/
 # define PCVT_PRETTYSCRNS 1	/* in random locations of the display.	*/
@@ -462,7 +462,7 @@
 #define COLOR_KERNEL_FG	FG_LIGHTGREY	/* kernel messages, foreground	*/
 #endif
 #if !defined COLOR_KERNEL_BG
-#define COLOR_KERNEL_BG	BG_RED		/* kernel messages, background	*/
+#define COLOR_KERNEL_BG	BG_BLUE		/* kernel messages, background	*/
 #endif
 
 #if !defined MONO_KERNEL_FG		/* monochrome displays		*/
diff --git a/sys/arch/i386/isa/pcvt/pcvt_drv.c b/sys/arch/i386/isa/pcvt/pcvt_drv.c
index 0f71a01d6fd..220b4465b3a 100644
--- a/sys/arch/i386/isa/pcvt/pcvt_drv.c
+++ b/sys/arch/i386/isa/pcvt/pcvt_drv.c
@@ -336,7 +336,7 @@ pcattach(struct isa_device *dev)
 
 #if PCVT_NETBSD > 101
 	sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_TTY, pcintr,
-	    (void *)0, sc->sc_dev.dv_xname);
+	    (void *)0);
 #else /* PCVT_NETBSD > 100 */
 	vthand.ih_fun = pcrint;
 	vthand.ih_arg = 0;
diff --git a/sys/arch/i386/isa/pcvt/pcvt_hdr.h b/sys/arch/i386/isa/pcvt/pcvt_hdr.h
index 615e19abeb3..b41ea8e2d3a 100644
--- a/sys/arch/i386/isa/pcvt/pcvt_hdr.h
+++ b/sys/arch/i386/isa/pcvt/pcvt_hdr.h
@@ -72,8 +72,6 @@
 #define	PCVT_REL "3.32"		/* driver attach announcement	*/
 				/* see also: pcvt_ioctl.h	*/
 
-#if PCVT_FREEBSD >= 200
-
 #include <sys/param.h>
 #include <sys/conf.h>
 #include <sys/ioctl.h>
@@ -88,110 +86,65 @@
 #include <sys/malloc.h>
 #include <sys/time.h>
 
-#else /* ! PCVT_FREEBSD >= 200 */
-
-#include "param.h"
-#include "conf.h"
-#include "ioctl.h"
-#include "proc.h"
-#include "user.h"
-#include "tty.h"
-#include "uio.h"
-#include "callout.h"
-#include "systm.h"
-#include "kernel.h"
-#include "syslog.h"
-#include "malloc.h"
-#include "time.h"
-
-#endif /* PCVT_FREEBSD >= 200 */
-
 #include "pcvt_conf.h"
 
 #if PCVT_NETBSD > 9
-#include "device.h"
+#include <sys/device.h>
 #endif
 
 #if PCVT_NETBSD > 9
 #if PCVT_NETBSD > 101
-#include "i386/isa/isa_machdep.h"
-#include "dev/isa/isavar.h"
+#include <i386/isa/isa_machdep.h>
+#include <dev/isa/isavar.h>
 #else
-#include "i386/isa/isavar.h"
+#include <i386/isa/isavar.h>
 #endif
-
-#include "i386/cpufunc.h"
-#elif PCVT_FREEBSD >= 200
-#include <i386/isa/isa_device.h>
+#include <machine/cpufunc.h>
 #else
-#include "i386/isa/isa_device.h"
+#include <i386/isa/isa_device.h>
 #endif
 
-#if PCVT_FREEBSD >= 200
 #include <i386/isa/icu.h>
-#else
-#include "i386/isa/icu.h"
-#endif
 
 #if PCVT_NETBSD > 100
 #if PCVT_NETBSD > 101
-#include "dev/isa/isareg.h"
+#include <dev/isa/isareg.h>
 #else
-#include "i386/isa/isareg.h"
+#include <i386/isa/isareg.h>
 #endif
-#elif PCVT_FREEBSD >= 200
-#include <i386/isa/isa.h>
 #else
-#include "i386/isa/isa.h"
+#include <i386/isa/isa.h>
 #endif
 
 #if PCVT_NETBSD > 9
-#include "dev/cons.h"
+#include <dev/cons.h>
 #if PCVT_NETBSD > 100
-#include "dev/ic/mc146818reg.h"
-#include "i386/isa/nvram.h"
+#include <dev/ic/mc146818reg.h>
+#include <i386/isa/nvram.h>
 #endif
-#elif PCVT_FREEBSD >= 200
-#include <i386/i386/cons.h>
 #else
-#include "i386/i386/cons.h"
+#include <i386/i386/cons.h>
 #endif
 
 #if PCVT_NETBSD <= 9
-#if PCVT_FREEBSD >= 200
 #include <machine/psl.h>
 #include <machine/frame.h>
-#else /* ! PCVT_FREEBSD >= 200 */
-#include "machine/psl.h"
-#include "machine/frame.h"
-#endif /* PCVT_FREEBSD >= 200 */
 #endif /* PCVT_NETBSD <= 9 */
 
-#if PCVT_FREEBSD >= 200
 #include <machine/stdarg.h>
-#else
-#include "machine/stdarg.h"
-#endif
 
 #if PCVT_NETBSD > 9
 #include "pcvt_ioctl.h"
-#elif PCVT_FREEBSD >= 200
-#include <machine/pcvt_ioctl.h>
 #else
-#include "machine/pcvt_ioctl.h"
+#include <machine/pcvt_ioctl.h>
 #endif
 
-#if PCVT_FREEBSD >= 200
 #include <machine/pc/display.h>
 #if PCVT_FREEBSD > 200
 #include <machine/clock.h>
 #include <machine/md_var.h>
 #endif
 #include <vm/vm_kern.h>
-#else /* PCVT_FREEBSD >= 200 */
-#include "machine/pc/display.h"
-#include "vm/vm_kern.h"
-#endif /* PCVT_FREEBSD >= 200 */
 
 #if PCVT_FREEBSD > 205
 #include <sys/devconf.h>
@@ -252,9 +205,9 @@ in the config file"
 
 #if PCVT_NETBSD
 #if PCVT_NETBSD == 9
-#include "machine/cpufunc.h"	/* NetBSD 0.9 [...and earlier -currents] */
+#include <machine/cpufunc.h>	/* NetBSD 0.9 [...and earlier -currents] */
 #else
-#include "machine/pio.h"	/* recent NetBSD -currents */
+#include <machine/pio.h>	/* recent NetBSD -currents */
 #define NEW_AVERUNNABLE		/* averunnable changes for younger currents */
 #endif /* PCVT_NETBSD == 9 */
 #endif /* PCVT_NETBSD */
@@ -763,9 +716,7 @@ EXTERN	u_short	user_attr;		/* character attributes */
 
 #if !PCVT_EMU_MOUSE
 
-#if PCVT_NETBSD > 100
-/* nothing */
-#elif PCVT_NETBSD
+#if PCVT_NETBSD
 EXTERN struct tty *pc_tty[PCVT_NSCREENS];
 #elif !(PCVT_FREEBSD > 110 && PCVT_FREEBSD < 200)
 EXTERN struct tty pccons[PCVT_NSCREENS];
@@ -775,9 +726,7 @@ EXTERN struct tty *pccons[PCVT_NSCREENS];
 
 #else /* PCVT_EMU_MOUSE */
 
-#if PCVT_NETBSD > 100
-/* nothing */
-#elif PCVT_NETBSD
+#if PCVT_NETBSD
 EXTERN struct tty *pc_tty[PCVT_NSCREENS + 1];
 #elif !(PCVT_FREEBSD > 110 && PCVT_FREEBSD < 200)
 EXTERN struct tty pccons[PCVT_NSCREENS + 1];
diff --git a/sys/arch/i386/isa/pcvt/pcvt_ioctl.h b/sys/arch/i386/isa/pcvt/pcvt_ioctl.h
index bcef870bed9..a3e7d413406 100644
--- a/sys/arch/i386/isa/pcvt/pcvt_ioctl.h
+++ b/sys/arch/i386/isa/pcvt/pcvt_ioctl.h
@@ -75,10 +75,8 @@
 #define PCVTIDMAJOR   3			/* driver id - major release	*/
 #define PCVTIDMINOR   32		/* driver id - minor release	*/
 
-#if defined(KERNEL) || defined(_KERNEL)
-#include "ioctl.h"
-#else
 #include <sys/ioctl.h>
+#if !defined(KERNEL) && !defined(_KERNEL)
 #include <sys/types.h>
 #endif
 
diff --git a/sys/arch/i386/isa/pcvt/pcvt_kbd.c b/sys/arch/i386/isa/pcvt/pcvt_kbd.c
index c7925fd407e..d13008c230b 100644
--- a/sys/arch/i386/isa/pcvt/pcvt_kbd.c
+++ b/sys/arch/i386/isa/pcvt/pcvt_kbd.c
@@ -1215,7 +1215,13 @@ loop:
 					 * less than half a second
 					 */
 					now = time;
+
+#if PCVT_NETBSD > 100
+					timersub(&now,&mouse.lastmove,&now);
+#else
 					timevalsub(&now, &mouse.lastmove);
+#endif
+
 					mouse.lastmove = time;
 					accel = (now.tv_sec == 0
 						 && now.tv_usec