The first stage of console driver reorganization: activate new

keyboard and video card drivers.

Because of the changes, you are required to update your kernel
configuration file now!

The files in sys/dev/syscons are still i386-specific (but less so than
before), and won't compile for alpha and PC98 yet.

syscons still directly accesses the video card registers here and
there; this will be rectified in the later stages.

1 files changed, 21 insertions, 11 deletions

diff --git a/sys/i386/isa/pcvt/pcvt_hdr.h b/sys/i386/isa/pcvt/pcvt_hdr.h
index 11adc9c..2c9aac8 100644
--- a/sys/i386/isa/pcvt/pcvt_hdr.h
+++ b/sys/i386/isa/pcvt/pcvt_hdr.h
@@ -107,7 +107,9 @@
 #endif /* PCVT_FREEBSD >= 200 */
 
 #include <i386/isa/pcvt/pcvt_conf.h>
-#include <i386/isa/kbdio.h>
+
+#include <dev/kbd/kbdreg.h>
+#include <dev/kbd/atkbdcreg.h>
 
 #if PCVT_NETBSD > 9
 #include "device.h"
@@ -168,6 +170,14 @@
 #include <machine/clock.h>
 #include <machine/md_var.h>
 #endif
+/*
+ * The following values are defined in machine/console.h, but the header
+ * file is not included here due to conflicts with pcvt_ioctl.h.
+ */
+#define KDGKBTYPE	_IOR('K', 64, int)
+#define KB_84		1
+#define KB_101		2
+#define KB_OTHER	3
 #else /* PCVT_FREEBSD >= 200 */
 #include "machine/pc/display.h"
 #endif /* PCVT_FREEBSD >= 200 */
@@ -260,7 +270,7 @@ in the config file"
  *	Keyboard and Keyboard Controller
  *---------------------------------------------------------------------------*/
 
-#ifndef _I386_ISA_KBDIO_H_
+#ifndef _DEV_KBD_KBDREG_H_
 
 #define CONTROLLER_CTRL	0x64	/* W - command, R - status	*/
 #define CONTROLLER_DATA	0x60	/* R/W - data			*/
@@ -308,7 +318,7 @@ in the config file"
 #define KEYB_C_ECHO	0xee	/* diagnostic, echo 0xee */
 #define KEYB_C_LEDS	0xed	/* set/reset numlock,capslock & scroll lock */
 
-#endif /* _I386_ISA_KBDIO_H_ */
+#endif /* _DEV_KBD_KBDREG_H_ */
 
 /* responses from the KEYBOARD (via the 8042 controller on mainboard..) */
 
@@ -1000,10 +1010,10 @@ u_char	chargen_access		= 0;		/* synchronize access */
 u_char	keyboard_type		= KB_UNKNOWN;	/* type of keyboard */
 u_char	keyboard_is_initialized = 0;		/* for ddb sanity */
 u_char	kbd_polling		= 0;		/* keyboard is being polled */
-#ifdef _I386_ISA_KBDIO_H_
+#ifdef _DEV_KBD_KBDREG_H_
 u_char	reset_keyboard		= 0;		/* OK to reset keyboard */
-KBDC	kbdc			= NULL;		/* keyboard controller */
-#endif /* _I386_ISA_KBDIO_H_ */
+keyboard_t *kbd			= NULL;
+#endif /* _DEV_KBD_KBDREG_H_ */
 
 #if PCVT_SHOWKEYS
 u_char	keyboard_show		= 0;		/* normal display */
@@ -1141,10 +1151,10 @@ extern u_char		can_do_132col;
 extern u_char		vga_family;
 extern u_char		keyboard_is_initialized;
 extern u_char		kbd_polling;
-#ifdef _I386_ISA_KBDIO_H_
+#ifdef _DEV_KBD_KBDREG_H_
 extern u_char		reset_keyboard;
-extern KBDC		kbdc;
-#endif /* _I386_ISA_KBDIO_H_ */
+extern keyboard_t	*kbd;
+#endif /* _DEV_KBD_KBDREG_H_ */
 
 #if PCVT_SHOWKEYS
 extern u_char		keyboard_show;
@@ -1268,10 +1278,10 @@ void	fkl_on ( struct video_state *svsp );
 struct tty *get_pccons ( Dev_t dev );
 void	init_sfkl ( struct video_state *svsp );
 void	init_ufkl ( struct video_state *svsp );
-#ifndef _I386_ISA_KBDIO_H_
+#ifndef _DEV_KBD_KBDREG_H_
 int	kbd_cmd ( int val );
 int	kbd_response ( void );
-#endif /* _I386_ISA_KBDIO_H_ */
+#endif /* _DEV_KBD_KBDREG_H_ */
 void	kbd_code_init ( void );
 void	kbd_code_init1 ( void );