summaryrefslogtreecommitdiff
path: root/sys/dev/wscons
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev/wscons')
-rw-r--r--sys/dev/wscons/event.c4
-rw-r--r--sys/dev/wscons/kbd.c8
-rw-r--r--sys/dev/wscons/ms.c8
-rw-r--r--sys/dev/wscons/wscons.c8
-rw-r--r--sys/dev/wscons/wscons_emul.c10
-rw-r--r--sys/dev/wscons/wscons_rinit.c9
-rw-r--r--sys/dev/wscons/wscons_rops.c4
7 files changed, 24 insertions, 27 deletions
diff --git a/sys/dev/wscons/event.c b/sys/dev/wscons/event.c
index 57874c90736..23edffb50eb 100644
--- a/sys/dev/wscons/event.c
+++ b/sys/dev/wscons/event.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: event.c,v 1.3 1996/10/30 22:41:36 niklas Exp $ */
+/* $OpenBSD: event.c,v 1.4 1997/11/06 12:26:57 niklas Exp $ */
/* $NetBSD: event.c,v 1.3 1996/09/15 17:15:26 cgd Exp $ */
/*
@@ -61,7 +61,7 @@
#endif
#include <machine/vuid_event.h>
-#include <alpha/wscons/event_var.h>
+#include <dev/wscons/event_var.h>
/*
* Initialize a firm_event queue.
diff --git a/sys/dev/wscons/kbd.c b/sys/dev/wscons/kbd.c
index 05e43d07eea..9595f2d10e7 100644
--- a/sys/dev/wscons/kbd.c
+++ b/sys/dev/wscons/kbd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kbd.c,v 1.4 1997/01/24 19:58:25 niklas Exp $ */
+/* $OpenBSD: kbd.c,v 1.5 1997/11/06 12:26:57 niklas Exp $ */
/* $NetBSD: kbd.c,v 1.3 1996/11/13 21:13:39 cgd Exp $ */
/*
@@ -68,9 +68,9 @@
#include <machine/vuid_event.h>
#include <machine/kbio.h> /* XXX FOR KIOCSDIRECT */
#include <machine/wsconsio.h> /* XXX for bell ioctls */
-#include <alpha/wscons/event_var.h>
-#include <alpha/wscons/wsconsvar.h>
-#include <alpha/wscons/kbd.h>
+#include <dev/wscons/event_var.h>
+#include <dev/wscons/wsconsvar.h>
+#include <dev/wscons/kbd.h>
void kbd_repeat __P((void *));
diff --git a/sys/dev/wscons/ms.c b/sys/dev/wscons/ms.c
index 76a72d67721..8a83c91ac56 100644
--- a/sys/dev/wscons/ms.c
+++ b/sys/dev/wscons/ms.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ms.c,v 1.4 1997/01/24 19:58:27 niklas Exp $ */
+/* $OpenBSD: ms.c,v 1.5 1997/11/06 12:26:58 niklas Exp $ */
/* $NetBSD: ms.c,v 1.3 1996/11/13 21:13:40 cgd Exp $ */
/*
@@ -60,9 +60,9 @@
#include <sys/tty.h>
#include <machine/vuid_event.h>
-#include <alpha/wscons/event_var.h>
-#include <alpha/wscons/wsconsvar.h>
-#include <alpha/wscons/ms.h>
+#include <dev/wscons/event_var.h>
+#include <dev/wscons/wsconsvar.h>
+#include <dev/wscons/ms.h>
struct ms_softc {
struct device *ms_dev;
diff --git a/sys/dev/wscons/wscons.c b/sys/dev/wscons/wscons.c
index 1a2b203c54a..a01d15ff0ff 100644
--- a/sys/dev/wscons/wscons.c
+++ b/sys/dev/wscons/wscons.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wscons.c,v 1.5 1997/08/22 22:25:11 deraadt Exp $ */
+/* $OpenBSD: wscons.c,v 1.6 1997/11/06 12:26:58 niklas Exp $ */
/* $NetBSD: wscons.c,v 1.10 1996/12/05 01:39:47 cgd Exp $ */
/*
@@ -40,9 +40,9 @@
#include <sys/termios.h>
#include <dev/cons.h>
-#include <alpha/wscons/wsconsvar.h>
-#include <alpha/wscons/wscons_emul.h>
-#include <alpha/wscons/kbd.h>
+#include <dev/wscons/wsconsvar.h>
+#include <dev/wscons/wscons_emul.h>
+#include <dev/wscons/kbd.h>
#include <machine/wsconsio.h>
cdev_decl(wscons);
diff --git a/sys/dev/wscons/wscons_emul.c b/sys/dev/wscons/wscons_emul.c
index 3b472714570..55d2cd92cb8 100644
--- a/sys/dev/wscons/wscons_emul.c
+++ b/sys/dev/wscons/wscons_emul.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wscons_emul.c,v 1.11 1997/07/31 13:40:04 kstailey Exp $ */
+/* $OpenBSD: wscons_emul.c,v 1.12 1997/11/06 12:26:59 niklas Exp $ */
/* $NetBSD: wscons_emul.c,v 1.7 1996/11/19 05:23:13 cgd Exp $ */
/*
@@ -35,10 +35,10 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/conf.h>
-#include <alpha/wscons/wsconsvar.h>
-#include <alpha/wscons/wscons_emul.h>
-#include <alpha/wscons/kbd.h>
-#include <alpha/wscons/ascii.h>
+#include <dev/wscons/wsconsvar.h>
+#include <dev/wscons/wscons_emul.h>
+#include <dev/wscons/kbd.h>
+#include <dev/wscons/ascii.h>
static __inline int wscons_emul_input_normal
__P((struct wscons_emul_data *, char));
diff --git a/sys/dev/wscons/wscons_rinit.c b/sys/dev/wscons/wscons_rinit.c
index 50b632f6351..af0c85b46bd 100644
--- a/sys/dev/wscons/wscons_rinit.c
+++ b/sys/dev/wscons/wscons_rinit.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wscons_rinit.c,v 1.5 1997/04/08 00:47:21 michaels Exp $ */
+/* $OpenBSD: wscons_rinit.c,v 1.6 1997/11/06 12:26:59 niklas Exp $ */
/* $NetBSD: wscons_rinit.c,v 1.3 1996/11/13 21:13:42 cgd Exp $ */
/*
@@ -50,11 +50,8 @@
#include <sys/device.h>
#include <dev/rcons/raster.h>
-#include <alpha/wscons/wscons_raster.h>
-
-#include <alpha/wscons/wscons_rfont.h>
-
-void rcons_initfont __P((struct rcons *, struct raster_font *));
+#include <dev/wscons/wscons_raster.h>
+#include <dev/wscons/wscons_rfont.h>
void rcons_initfont __P((struct rcons *, struct raster_font *));
diff --git a/sys/dev/wscons/wscons_rops.c b/sys/dev/wscons/wscons_rops.c
index 821d7b76523..f9c7bbad0d1 100644
--- a/sys/dev/wscons/wscons_rops.c
+++ b/sys/dev/wscons/wscons_rops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wscons_rops.c,v 1.4 1997/07/31 13:40:05 kstailey Exp $ */
+/* $OpenBSD: wscons_rops.c,v 1.5 1997/11/06 12:27:00 niklas Exp $ */
/* $NetBSD: wscons_rops.c,v 1.1 1996/04/12 02:00:55 cgd Exp $ */
/*
@@ -49,7 +49,7 @@
#include <sys/device.h>
#include <dev/rcons/raster.h>
-#include <alpha/wscons/wscons_raster.h>
+#include <dev/wscons/wscons_raster.h>
/*
* Paint (or unpaint) the cursor.