Define wscons device ids for the Luna devices.

4 files changed, 15 insertions, 9 deletions

diff --git a/sbin/wsconsctl/util.c b/sbin/wsconsctl/util.c
index 9704b10c50e..113c1035ef3 100644
--- a/sbin/wsconsctl/util.c
+++ b/sbin/wsconsctl/util.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: util.c,v 1.24 2004/03/04 01:09:23 mickey Exp $ */
+/*	$OpenBSD: util.c,v 1.25 2004/04/24 13:37:41 miod Exp $ */
 /*	$NetBSD: util.c,v 1.8 2000/03/14 08:11:53 sato Exp $ */
 
 /*-
@@ -69,7 +69,8 @@ static const struct nameint kbtype_tab[] = {
 	{ WSKBD_TYPE_SUN,	"sun" },
 	{ WSKBD_TYPE_SUN5,	"sun5" },
 	{ WSKBD_TYPE_HIL,	"hil" },
-	{ WSKBD_TYPE_GSC,	"hp-ps2" }
+	{ WSKBD_TYPE_GSC,	"hp-ps2" },
+	{ WSKBD_TYPE_LUNA,	"luna" }
 };
 
 static const struct nameint mstype_tab[] = {
@@ -82,7 +83,8 @@ static const struct nameint mstype_tab[] = {
 	{ WSMOUSE_TYPE_NEXT,	"NeXT" },
 	{ WSMOUSE_TYPE_ARCHIMEDES, "archimedes" },
 	{ WSMOUSE_TYPE_ADB,	"adb" },
-	{ WSMOUSE_TYPE_HIL,	"hil" }
+	{ WSMOUSE_TYPE_HIL,	"hil" },
+	{ WSMOUSE_TYPE_LUNA,	"luna" }
 };
 
 static const struct nameint dpytype_tab[] = {
@@ -127,7 +129,8 @@ static const struct nameint dpytype_tab[] = {
 	{ WSDISPLAY_TYPE_SUNCG12,	"suncg12" },
 	{ WSDISPLAY_TYPE_MGX,		"mgx" },
 	{ WSDISPLAY_TYPE_SB_P9000,	"p9000" },
-	{ WSDISPLAY_TYPE_RFLEX,		"rasterflex" }
+	{ WSDISPLAY_TYPE_RFLEX,		"rasterflex" },
+	{ WSDISPLAY_TYPE_LUNA,		"luna" }
 };
 
 static const struct nameint kbdenc_tab[] = {
diff --git a/sys/arch/luna88k/dev/lunafb.c b/sys/arch/luna88k/dev/lunafb.c
index 931c5e7a607..959c0ec501e 100644
--- a/sys/arch/luna88k/dev/lunafb.c
+++ b/sys/arch/luna88k/dev/lunafb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lunafb.c,v 1.1 2004/04/21 15:23:52 aoyama Exp $ */
+/* $OpenBSD: lunafb.c,v 1.2 2004/04/24 13:37:44 miod Exp $ */
 /* $NetBSD: lunafb.c,v 1.7.6.1 2002/08/07 01:48:34 lukem Exp $ */
 
 /*-
@@ -245,7 +245,7 @@ omfbioctl(v, cmd, data, flag, p)
 
 	switch (cmd) {
 	case WSDISPLAYIO_GTYPE:
-		*(u_int *)data = WSDISPLAY_TYPE_UNKNOWN; /* XXX for now */
+		*(u_int *)data = WSDISPLAY_TYPE_LUNA;
 		break;
 
 	case WSDISPLAYIO_GINFO:
diff --git a/sys/arch/luna88k/dev/lunaws.c b/sys/arch/luna88k/dev/lunaws.c
index e76ab8df98c..74298475083 100644
--- a/sys/arch/luna88k/dev/lunaws.c
+++ b/sys/arch/luna88k/dev/lunaws.c
@@ -488,7 +488,7 @@ omkbd_ioctl(v, cmd, data, flag, p)
 
 	switch (cmd) {
 	case WSKBDIO_GTYPE:
-		*(int *)data = 0;	/* XXX for now */
+		*(int *)data = WSKBD_TYPE_LUNA;
 		return 0;
 	case WSKBDIO_SETLEDS:
 	case WSKBDIO_GETLEDS:
@@ -526,7 +526,7 @@ omms_ioctl(v, cmd, data, flag, p)
 
 	switch (cmd) {
 	case WSMOUSEIO_GTYPE:
-		*(u_int *)data = 0;	/* XXX for now*/
+		*(u_int *)data = WSMOUSE_TYPE_LUNA;
 		return 0;
 	}
 
diff --git a/sys/dev/wscons/wsconsio.h b/sys/dev/wscons/wsconsio.h
index bcd38000b35..2b4043a40ba 100644
--- a/sys/dev/wscons/wsconsio.h
+++ b/sys/dev/wscons/wsconsio.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsconsio.h,v 1.30 2004/03/01 07:53:01 miod Exp $ */
+/* $OpenBSD: wsconsio.h,v 1.31 2004/04/24 13:37:46 miod Exp $ */
 /* $NetBSD: wsconsio.h,v 1.31.2.1 2000/07/07 09:49:17 hannken Exp $ */
 
 /*
@@ -113,6 +113,7 @@ struct wscons_event {
 #define		WSKBD_TYPE_SUN5		12	/* Sun Type5 */
 #define		WSKBD_TYPE_HIL		13	/* HP HIL */
 #define		WSKBD_TYPE_GSC		14	/* HP PS/2 */
+#define		WSKBD_TYPE_LUNA		15	/* OMRON Luna */
 
 /* Manipulate the keyboard bell. */
 struct wskbd_bell_data {
@@ -192,6 +193,7 @@ struct wskbd_map_data {
 #define		WSMOUSE_TYPE_ARCHIMEDES	8	/* Archimedes mouse */
 #define		WSMOUSE_TYPE_ADB	9	/* ADB */
 #define		WSMOUSE_TYPE_HIL	10	/* HP HIL */
+#define		WSMOUSE_TYPE_LUNA	11	/* OMRON Luna */
 
 /* Set resolution.  Not applicable to all mouse types. */
 #define	WSMOUSEIO_SRES		_IOW('W', 33, u_int)
@@ -272,6 +274,7 @@ struct wsmouse_calibcoords {
 #define		WSDISPLAY_TYPE_MGX	39	/* SMS MGX */
 #define		WSDISPLAY_TYPE_SB_P9000	40	/* Tadpole SPARCbook P9000 */
 #define		WSDISPLAY_TYPE_RFLEX	41	/* RasterFlex series */
+#define		WSDISPLAY_TYPE_LUNA	42	/* OMRON Luna */
 
 /* Basic display information.  Not applicable to all display types. */
 struct wsdisplay_fbinfo {