[src/trunk]: src/sys Add and return WSKBD_TYPE_LUNA and WSDISPLAY_TYPE_LUNA o...

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

details:   https://anonhg.NetBSD.org/src/rev/1fc6310497a8
branches:  trunk
changeset: 767538:1fc6310497a8
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Thu Jul 21 10:33:17 2011 +0000

description:
Add and return WSKBD_TYPE_LUNA and WSDISPLAY_TYPE_LUNA on WS*_GTYPE ioctls.

XXX: should we still sync <sys/dev/wsconsio.h> and src/sbin/wsconsctl/util.c?

diffstat:

 sys/arch/luna68k/dev/lunafb.c |  6 +++---
 sys/arch/luna68k/dev/lunaws.c |  6 +++---
 sys/dev/wscons/wsconsio.h     |  4 +++-
 3 files changed, 9 insertions(+), 7 deletions(-)

diffs (79 lines):

diff -r e437209a50f2 -r 1fc6310497a8 sys/arch/luna68k/dev/lunafb.c
--- a/sys/arch/luna68k/dev/lunafb.c     Thu Jul 21 10:20:25 2011 +0000
+++ b/sys/arch/luna68k/dev/lunafb.c     Thu Jul 21 10:33:17 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: lunafb.c,v 1.22 2011/07/21 10:06:59 tsutsui Exp $ */
+/* $NetBSD: lunafb.c,v 1.23 2011/07/21 10:33:17 tsutsui Exp $ */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: lunafb.c,v 1.22 2011/07/21 10:06:59 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lunafb.c,v 1.23 2011/07/21 10:33:17 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -225,7 +225,7 @@
 
        switch (cmd) {
        case WSDISPLAYIO_GTYPE:
-               *(u_int *)data = 0x19990927;
+               *(u_int *)data = WSDISPLAY_TYPE_LUNA;
                return (0);
 
        case WSDISPLAYIO_GINFO:
diff -r e437209a50f2 -r 1fc6310497a8 sys/arch/luna68k/dev/lunaws.c
--- a/sys/arch/luna68k/dev/lunaws.c     Thu Jul 21 10:20:25 2011 +0000
+++ b/sys/arch/luna68k/dev/lunaws.c     Thu Jul 21 10:33:17 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: lunaws.c,v 1.20 2009/10/26 19:16:56 cegger Exp $ */
+/* $NetBSD: lunaws.c,v 1.21 2011/07/21 10:33:17 tsutsui Exp $ */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: lunaws.c,v 1.20 2009/10/26 19:16:56 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lunaws.c,v 1.21 2011/07/21 10:33:17 tsutsui Exp $");
 
 #include "wsmouse.h"
 
@@ -416,7 +416,7 @@
 {
        switch (cmd) {
            case WSKBDIO_GTYPE:
-               *(int *)data = 0x19991005 /* XXX */;
+               *(int *)data = WSKBD_TYPE_LUNA;
                return 0;
            case WSKBDIO_SETLEDS:
            case WSKBDIO_GETLEDS:
diff -r e437209a50f2 -r 1fc6310497a8 sys/dev/wscons/wsconsio.h
--- a/sys/dev/wscons/wsconsio.h Thu Jul 21 10:20:25 2011 +0000
+++ b/sys/dev/wscons/wsconsio.h Thu Jul 21 10:33:17 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: wsconsio.h,v 1.99 2011/06/29 05:00:06 macallan Exp $ */
+/* $NetBSD: wsconsio.h,v 1.100 2011/07/21 10:33:17 tsutsui Exp $ */
 
 /*
  * Copyright (c) 1996, 1997 Christopher G. Demetriou.  All rights reserved.
@@ -105,6 +105,7 @@
 #define        WSKBD_TYPE_EWS4800      20      /* NEC EWS4800 */
 #define        WSKBD_TYPE_BLUETOOTH    21      /* Bluetooth keyboard */
 #define        WSKBD_TYPE_ZAURUS       22      /* Sharp Zaurus keyboard */
+#define        WSKBD_TYPE_LUNA         23      /* OMRON SX-9100 LUNA */
 
 /* Manipulate the keyboard bell. */
 struct wskbd_bell_data {
@@ -322,6 +323,7 @@
 #define WSDISPLAY_TYPE_AG10    48      /* Fujitsu AG-10e */
 #define WSDISPLAY_TYPE_DL      49      /* DisplayLink DL-1x0/DL-1x5 */
 #define WSDISPLAY_TYPE_XVR1000 50      /* Sun XVR-1000 */
+#define WSDISPLAY_TYPE_LUNA    51      /* OMRON SX-9100 LUNA */
 
 /* Basic display information.  Not applicable to all display types. */
 struct wsdisplay_fbinfo {