diff options
| -rw-r--r-- | sbin/wsconsctl/util.c | 10 | ||||
| -rw-r--r-- | sys/dev/wscons/wsconsio.h | 4 |
2 files changed, 10 insertions, 4 deletions
diff --git a/sbin/wsconsctl/util.c b/sbin/wsconsctl/util.c index ce0f981dd51..a7c055c98b0 100644 --- a/sbin/wsconsctl/util.c +++ b/sbin/wsconsctl/util.c @@ -1,4 +1,4 @@ -/* $OpenBSD: util.c,v 1.45 2009/07/03 17:37:02 kettenis Exp $ */ +/* $OpenBSD: util.c,v 1.46 2009/12/25 22:02:46 miod Exp $ */ /* $NetBSD: util.c,v 1.8 2000/03/14 08:11:53 sato Exp $ */ /*- @@ -67,7 +67,9 @@ static const struct nameint kbtype_tab[] = { { WSKBD_TYPE_GSC, "hp-ps2" }, { WSKBD_TYPE_LUNA, "luna" }, { WSKBD_TYPE_ZAURUS, "zaurus" }, - { WSKBD_TYPE_DOMAIN, "domain" } + { WSKBD_TYPE_DOMAIN, "domain" }, + { WSKBD_TYPE_BLUETOOTH, "bluetooth" }, + { WSKBD_TYPE_KPC, "kpc" }, }; static const struct nameint mstype_tab[] = { @@ -83,6 +85,7 @@ static const struct nameint mstype_tab[] = { { WSMOUSE_TYPE_HIL, "hil" }, { WSMOUSE_TYPE_LUNA, "luna" }, { WSMOUSE_TYPE_DOMAIN, "domain" }, + { WSMOUSE_TYPE_BLUETOOTH, "bluetooth" }, { WSMOUSE_TYPE_SUN, "sun" } }; @@ -148,7 +151,8 @@ static const struct nameint dpytype_tab[] = { { WSDISPLAY_TYPE_DL, "displaylink" }, { WSDISPLAY_TYPE_MACHFB, "mach64" }, { WSDISPLAY_TYPE_GFXP, "gfxp" }, - { WSDISPLAY_TYPE_RADEONFB, "radeon" } + { WSDISPLAY_TYPE_RADEONFB, "radeon" }, + { WSDISPLAY_TYPE_SMFB, "smfb" } }; static const struct nameint kbdenc_tab[] = { diff --git a/sys/dev/wscons/wsconsio.h b/sys/dev/wscons/wsconsio.h index b74f4bc7219..1057f0e7b96 100644 --- a/sys/dev/wscons/wsconsio.h +++ b/sys/dev/wscons/wsconsio.h @@ -1,4 +1,4 @@ -/* $OpenBSD: wsconsio.h,v 1.56 2009/09/21 07:41:18 mglocker Exp $ */ +/* $OpenBSD: wsconsio.h,v 1.57 2009/12/25 22:02:47 miod Exp $ */ /* $NetBSD: wsconsio.h,v 1.74 2005/04/28 07:15:44 martin Exp $ */ /* @@ -124,6 +124,7 @@ struct wscons_event { #define WSKBD_TYPE_ZAURUS 16 /* Sharp Zaurus */ #define WSKBD_TYPE_DOMAIN 17 /* Apollo Domain */ #define WSKBD_TYPE_BLUETOOTH 18 /* Bluetooth keyboard */ +#define WSKBD_TYPE_KPC 19 /* Palm keypad */ /* Manipulate the keyboard bell. */ struct wskbd_bell_data { @@ -309,6 +310,7 @@ struct wsmouse_calibcoords { #define WSDISPLAY_TYPE_MACHFB 59 /* Sun PGX/PGX64 */ #define WSDISPLAY_TYPE_GFXP 60 /* Sun PGX32 */ #define WSDISPLAY_TYPE_RADEONFB 61 /* Sun XVR-100 */ +#define WSDISPLAY_TYPE_SMFB 62 /* SiliconMotion SM712 */ /* Basic display information. Not applicable to all display types. */ struct wsdisplay_fbinfo { |