Module Name: xsrc
Committed By: tsutsui
Date: Sun Oct 10 05:35:34 UTC 2010
Modified Files:
xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha: alphaKbd.c
xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec: decKbd.c
xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips: ews4800mipsKbd.c
xsrc/xfree/xc/programs/Xserver/hw/netbsd/macppc: macppcKbd.c
xsrc/xfree/xc/programs/Xserver/hw/netbsd/newsmips: newsmipsKbd.c
Log Message:
Handle WSKBDIO_SETVERSION. Untested, but better than silently obsolete...
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/alphaKbd.c
cvs rdiff -u -r1.1 -r1.2 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/decKbd.c
cvs rdiff -u -r1.1 -r1.2 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsKbd.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/macppc/macppcKbd.c
cvs rdiff -u -r1.1 -r1.2 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/newsmips/newsmipsKbd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/alphaKbd.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/alphaKbd.c:1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/alphaKbd.c:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/alphaKbd.c:1.1 Sun Jan 18 04:13:22 2004
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/alphaKbd.c Sun Oct 10 05:35:32 2010
@@ -521,6 +521,15 @@
if (alphaChangeKbdTranslation(pPriv->fd,TRUE) == -1)
FatalError("Can't set keyboard translation\n");
#endif /* 0 XXX */
+#ifdef WSKBDIO_SETVERSION
+ {
+ int version = WSKBDIO_EVENT_VERSION;
+ if (ioctl(pPriv->fd, WSKBDIO_SETVERSION, &version) == -1) {
+ Error ("alphaKbdProc ioctl WSKBDIO_SETVERSION");
+ return !Success;
+ }
+ }
+#endif
(void) AddEnabledDevice(pPriv->fd);
pKeyboard->on = TRUE;
break;
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/decKbd.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/decKbd.c:1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/decKbd.c:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/decKbd.c:1.1 Sun Jan 18 05:21:41 2004
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/decKbd.c Sun Oct 10 05:35:33 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: decKbd.c,v 1.1 2004/01/18 05:21:41 rtr Exp $ */
+/* $NetBSD: decKbd.c,v 1.2 2010/10/10 05:35:33 tsutsui Exp $ */
/* XConsortium: sunKbd.c,v 5.47 94/08/16 13:45:30 dpw Exp */
/*-
@@ -519,6 +519,15 @@
* Save the original keyclick volume.
*/
ioctl(pPriv->fd, WSKBDIO_GETKEYCLICK, &pPriv->prevClick);
+#ifdef WSKBDIO_SETVERSION
+ {
+ int version = WSKBDIO_EVENT_VERSION;
+ if (ioctl(pPriv->fd, WSKBDIO_SETVERSION, &version) == -1) {
+ Error ("decKbdProc ioctl WSKBDIO_SETVERSION");
+ return !Success;
+ }
+ }
+#endif
(void) AddEnabledDevice(pPriv->fd);
pKeyboard->on = TRUE;
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsKbd.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsKbd.c:1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsKbd.c:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsKbd.c:1.1 Thu Dec 29 15:43:40 2005
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsKbd.c Sun Oct 10 05:35:33 2010
@@ -154,6 +154,15 @@
case DEVICE_ON:
pPriv = (ews4800mipsKbdPrivPtr)pKeyboard->devicePrivate;
ews4800mipsCleanupFd(pPriv->fd);
+#ifdef WSKBDIO_SETVERSION
+ {
+ int version = WSKBDIO_EVENT_VERSION;
+ if (ioctl(pPriv->fd, WSKBDIO_SETVERSION, &version) == -1) {
+ Error ("ews4800mipsKbdProc ioctl WSKBDIO_SETVERSION");
+ return !Success;
+ }
+ }
+#endif
AddEnabledDevice(pPriv->fd);
pKeyboard->on = TRUE;
break;
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/macppc/macppcKbd.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/macppc/macppcKbd.c:1.1.1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/macppc/macppcKbd.c:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/macppc/macppcKbd.c:1.1.1.1 Sat Dec 27 05:41:21 2003
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/macppc/macppcKbd.c Sun Oct 10 05:35:33 2010
@@ -482,6 +482,15 @@
if (macppcChangeKbdTranslation(pPriv->fd,TRUE) == -1)
FatalError("Can't set keyboard translation\n");
#endif /* 0 XXX */
+#ifdef WSKBDIO_SETVERSION
+ {
+ int version = WSKBDIO_EVENT_VERSION;
+ if (ioctl(pPriv->fd, WSKBDIO_SETVERSION, &version) == -1) {
+ Error ("macppcKbdProc ioctl WSKBDIO_SETVERSION");
+ return !Success;
+ }
+ }
+#endif
(void) AddEnabledDevice(pPriv->fd);
pKeyboard->on = TRUE;
break;
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/newsmips/newsmipsKbd.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/newsmips/newsmipsKbd.c:1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/newsmips/newsmipsKbd.c:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/newsmips/newsmipsKbd.c:1.1 Sun Aug 1 18:46:49 2004
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/newsmips/newsmipsKbd.c Sun Oct 10 05:35:33 2010
@@ -154,6 +154,15 @@
case DEVICE_ON:
pPriv = (newsmipsKbdPrivPtr)pKeyboard->devicePrivate;
newsmipsCleanupFd(pPriv->fd);
+#ifdef WSKBDIO_SETVERSION
+ {
+ int version = WSKBDIO_EVENT_VERSION;
+ if (ioctl(pPriv->fd, WSKBDIO_SETVERSION, &version) == -1) {
+ Error ("newsmipsKbdProc ioctl WSKBDIO_SETVERSION");
+ return !Success;
+ }
+ }
+#endif
AddEnabledDevice(pPriv->fd);
pKeyboard->on = TRUE;
break;
