diff options
| author |   shadchin <shadchin@openbsd.org> | 2011-09-20 17:00:24 +0000 |
|---|---|---|
| committer | shadchin <shadchin@openbsd.org> | 2011-09-20 17:00:24 +0000 |
| commit | 5f1e1ce72f91300b21d9acf6fcca325965dab48e (patch) | |
| tree | 5831fd3530ec4bc79011d6686d7a9d963c2026fb | |
| parent | When restarting a system call we need to go back four instructions, not (diff) | |
| download | wireguard-openbsd-5f1e1ce72f91300b21d9acf6fcca325965dab48e.tar.xz wireguard-openbsd-5f1e1ce72f91300b21d9acf6fcca325965dab48e.zip | |
Prepare to add support ALPS touchpads
no objections mpi@ and matthieu@
| -rw-r--r-- | sbin/wsconsctl/util.c | 5 | ||||
| -rw-r--r-- | sys/dev/wscons/wsconsio.h | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/sbin/wsconsctl/util.c b/sbin/wsconsctl/util.c index b5ec29fed37..38e5f1582cf 100644 --- a/sbin/wsconsctl/util.c +++ b/sbin/wsconsctl/util.c @@ -1,4 +1,4 @@ -/* $OpenBSD: util.c,v 1.54 2011/09/15 04:59:16 shadchin Exp $ */ +/* $OpenBSD: util.c,v 1.55 2011/09/20 17:00:24 shadchin Exp $ */ /* $NetBSD: util.c,v 1.8 2000/03/14 08:11:53 sato Exp $ */ /*- @@ -88,7 +88,8 @@ static const struct nameint mstype_tab[] = { { WSMOUSE_TYPE_DOMAIN, "domain" }, { WSMOUSE_TYPE_BLUETOOTH, "bluetooth" }, { WSMOUSE_TYPE_SUN, "sun" }, - { WSMOUSE_TYPE_SYNAPTICS, "synaptics"} + { WSMOUSE_TYPE_SYNAPTICS, "synaptics" }, + { WSMOUSE_TYPE_ALPS, "alps" } }; static const struct nameint dpytype_tab[] = { diff --git a/sys/dev/wscons/wsconsio.h b/sys/dev/wscons/wsconsio.h index 1c101845d03..2026effbe3e 100644 --- a/sys/dev/wscons/wsconsio.h +++ b/sys/dev/wscons/wsconsio.h @@ -1,4 +1,4 @@ -/* $OpenBSD: wsconsio.h,v 1.63 2011/05/05 15:30:31 shadchin Exp $ */ +/* $OpenBSD: wsconsio.h,v 1.64 2011/09/20 17:00:24 shadchin Exp $ */ /* $NetBSD: wsconsio.h,v 1.74 2005/04/28 07:15:44 martin Exp $ */ /* @@ -209,6 +209,7 @@ struct wskbd_map_data { #define WSMOUSE_TYPE_BLUETOOTH 13 /* Bluetooth mouse */ #define WSMOUSE_TYPE_SUN 14 /* SUN serial mouse */ #define WSMOUSE_TYPE_SYNAPTICS 15 /* Synaptics touchpad */ +#define WSMOUSE_TYPE_ALPS 16 /* ALPS touchpad */ /* Set resolution. Not applicable to all mouse types. */ #define WSMOUSEIO_SRES _IOW('W', 33, u_int) |