summaryrefslogtreecommitdiffstats
path: root/sys/dev/kbd
diff options
context:
space:
mode:
authorphk <phk@FreeBSD.org>2000-10-08 21:34:00 +0000
committerphk <phk@FreeBSD.org>2000-10-08 21:34:00 +0000
commita4f549597e4f1de22e1614caaad56127b519e00e (patch)
tree1860f0608a5e1d1647a4b799848d18efa3cfc199 /sys/dev/kbd
parentf2b5910f009d28be5159b8535af2d8628019a37f (diff)
downloadFreeBSD-src-a4f549597e4f1de22e1614caaad56127b519e00e.zip
FreeBSD-src-a4f549597e4f1de22e1614caaad56127b519e00e.tar.gz
Initiate deorbit burn sequence for <machine/console.h>.
Replace all in-tree uses with necessary subset of <sys/{fb,kb,cons}io.h>. This is also the appropriate fix for exo-tree sources. Put warnings in <machine/console.h> to discourage use. November 15th 2000 the warnings will be converted to errors. January 15th 2001 the <machine/console.h> files will be removed.
Diffstat (limited to 'sys/dev/kbd')
-rw-r--r--sys/dev/kbd/atkbd.c2
-rw-r--r--sys/dev/kbd/kbd.c2
-rw-r--r--sys/dev/kbd/kbdreg.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/kbd/atkbd.c b/sys/dev/kbd/atkbd.c
index 497d267..9b62dd8 100644
--- a/sys/dev/kbd/atkbd.c
+++ b/sys/dev/kbd/atkbd.c
@@ -167,7 +167,7 @@ atkbd_timeout(void *arg)
/* LOW-LEVEL */
#include <machine/limits.h>
-#include <machine/console.h>
+#include <sys/kbio.h>
#include <machine/clock.h>
#define ATKBD_DEFAULT 0
diff --git a/sys/dev/kbd/kbd.c b/sys/dev/kbd/kbd.c
index a9471e8..ec72820 100644
--- a/sys/dev/kbd/kbd.c
+++ b/sys/dev/kbd/kbd.c
@@ -39,7 +39,7 @@
#include <sys/vnode.h>
#include <sys/uio.h>
-#include <machine/console.h>
+#include <sys/kbio.h>
#include <dev/kbd/kbdreg.h>
diff --git a/sys/dev/kbd/kbdreg.h b/sys/dev/kbd/kbdreg.h
index 54b2d6d..de7d941 100644
--- a/sys/dev/kbd/kbdreg.h
+++ b/sys/dev/kbd/kbdreg.h
@@ -232,7 +232,7 @@ int kbd_detach(keyboard_t *kbd);
#define CLKDOWN (1 << 28)
#define ALKDOWN (1 << 29)
#define SHIFTAON (1 << 30)
-/* lock key state (defined in machine/console.h) */
+/* lock key state (defined in sys/kbio.h) */
/*
#define CLKED LED_CAP
#define NLKED LED_NUM
OpenPOWER on IntegriCloud