kbdmux(4) keyboard multiplexer integration

o Slightly change KBADDKBD and KBRELKBD ioctl() interface. Instead of passing
  keyboard index pass keyboard_info_t structure with populated 'kb_unit' and
  'kb_name' fields. Keyboard index is not very user-friendly and is not very
  easy to obtain. Keyboard driver name and unit, on the other hand, is much
  more user friendly and known almost all the time;

o Move definition of keyboard_info_t structure up;

o Teach kbdcontrol(1) how to attach/detach keyboards to/from the keyboard
  multiplexor;

o Update kbdcontrol(1) man page and document new functionality.

To attach/detach keyboard to/from keyboard multiplexor one needs to use
keyboard device name (i.e. ukbd0).

MFC after:	1 week

1 files changed, 11 insertions, 10 deletions

diff --git a/sys/sys/kbio.h b/sys/sys/kbio.h
index e357582..a4b1f04 100644
--- a/sys/sys/kbio.h
+++ b/sys/sys/kbio.h
@@ -60,16 +60,6 @@
 /* set keyboard repeat rate (obsolete, use KDSETREPEAT below) */
 #define KDSETRAD	_IO('K', 67 /*, int */)
 
-/* add/remove keyboard to/from mux */
-#define KBADDKBD	_IOW('K', 68, int)	/* add keyboard */
-#define KBRELKBD	_IOW('K', 69, int)	/* release keyboard */
-
-/* see console.h for the definition of the following ioctl */
-#if notdef
-#define KDRASTER	_IOW('K', 100, scr_size_t)
-#endif
-
-/* get keyboard information */
 struct keyboard_info {
 	int		kb_index;	/* kbdio index#			*/
 	char		kb_name[16];	/* driver name			*/
@@ -79,6 +69,17 @@ struct keyboard_info {
 	int		kb_flags;	/* internal flags		*/
 };
 typedef struct keyboard_info keyboard_info_t;
+
+/* add/remove keyboard to/from mux */
+#define KBADDKBD	_IOW('K', 68, keyboard_info_t)	/* add keyboard */
+#define KBRELKBD	_IOW('K', 69, keyboard_info_t)	/* release keyboard */
+
+/* see console.h for the definition of the following ioctl */
+#if notdef
+#define KDRASTER	_IOW('K', 100, scr_size_t)
+#endif
+
+/* get keyboard information */
 #define KDGKBINFO	_IOR('K', 101, keyboard_info_t)
 
 /* set/get keyboard repeat rate (new interface) */