[src/trunk]: src/sys/dev/wscons Change type `kbd_t' from `u_int_16_t' to `u_i...

[hannken <hannken%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ab443a889643
branches:  trunk
changeset: 494454:ab443a889643
user:      hannken <hannken%NetBSD.org@localhost>
date:      Thu Jul 06 16:29:49 2000 +0000

description:
Change type `kbd_t' from `u_int_16_t' to `u_int32_t'.
This eliminates bogus casts from `int *' to `u_int_16_t*'.

diffstat:

 sys/dev/wscons/wsconsio.h  |  6 +++---
 sys/dev/wscons/wsksymdef.h |  8 ++++----
 sys/dev/wscons/wsksymvar.h |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diffs (62 lines):

diff -r 4719cde2d03b -r ab443a889643 sys/dev/wscons/wsconsio.h
--- a/sys/dev/wscons/wsconsio.h Thu Jul 06 16:19:15 2000 +0000
+++ b/sys/dev/wscons/wsconsio.h Thu Jul 06 16:29:49 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: wsconsio.h,v 1.31 2000/06/09 16:07:55 drochner Exp $ */
+/* $NetBSD: wsconsio.h,v 1.32 2000/07/06 16:29:49 hannken Exp $ */
 
 /*
  * Copyright (c) 1996, 1997 Christopher G. Demetriou.  All rights reserved.
@@ -139,8 +139,8 @@
 };
 #define WSKBDIO_GETMAP         _IOWR('W', 13, struct wskbd_map_data)
 #define WSKBDIO_SETMAP         _IOW('W', 14, struct wskbd_map_data)
-#define WSKBDIO_GETENCODING    _IOR('W', 15, int)
-#define WSKBDIO_SETENCODING    _IOW('W', 16, int)
+#define WSKBDIO_GETENCODING    _IOR('W', 15, kbd_t)
+#define WSKBDIO_SETENCODING    _IOW('W', 16, kbd_t)
 
 /* internal use only */
 #define WSKBDIO_SETMODE                _IOW('W', 19, int)
diff -r 4719cde2d03b -r ab443a889643 sys/dev/wscons/wsksymdef.h
--- a/sys/dev/wscons/wsksymdef.h        Thu Jul 06 16:19:15 2000 +0000
+++ b/sys/dev/wscons/wsksymdef.h        Thu Jul 06 16:29:49 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: wsksymdef.h,v 1.34 2000/05/19 16:39:15 drochner Exp $ */
+/*     $NetBSD: wsksymdef.h,v 1.35 2000/07/06 16:29:49 hannken Exp $ */
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -454,11 +454,11 @@
                            (((k) & 0xf800) == 0xf000 ? ((k) & 0x00ff) : (k)))
 
 /*
- * Keyboard types: 8bit encoding, 8bit variant
+ * Keyboard types: 8bit encoding, 24bit variant
  */
 
-#define KB_ENCODING(e)         ((e) & 0xff00)
-#define KB_VARIANT(e)          ((e) & 0x00ff)
+#define KB_ENCODING(e)         ((e) & 0x0000ff00)
+#define KB_VARIANT(e)          ((e) & 0xffff00ff)
 
 #define KB_USER                        0x0100
 #define KB_US                  0x0200
diff -r 4719cde2d03b -r ab443a889643 sys/dev/wscons/wsksymvar.h
--- a/sys/dev/wscons/wsksymvar.h        Thu Jul 06 16:19:15 2000 +0000
+++ b/sys/dev/wscons/wsksymvar.h        Thu Jul 06 16:29:49 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: wsksymvar.h,v 1.8 1999/12/21 11:59:13 drochner Exp $ */
+/*     $NetBSD: wsksymvar.h,v 1.9 2000/07/06 16:29:49 hannken Exp $ */
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -44,7 +44,7 @@
 #endif
 
 typedef u_int16_t keysym_t;
-typedef u_int16_t kbd_t;
+typedef u_int32_t kbd_t;
 
 struct wscons_keymap {
        keysym_t command;