Module Name: xsrc
Committed By: jmcneill
Date: Mon Mar 18 11:50:08 UTC 2013
Modified Files:
xsrc/external/mit/xf86-input-keyboard/dist/src: bsd_kbd.c
Log Message:
If WSKBDIO_GTYPE succeeds and returns type=0, it is a mux with no keyboard
attached. In this case, assume USB.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 \
xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c
diff -u xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c:1.17 xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c:1.18
--- xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c:1.17 Thu Feb 14 20:53:26 2013
+++ xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c Mon Mar 18 11:50:08 2013
@@ -429,6 +429,12 @@ OpenKeyboard(InputInfoPtr pInfo)
close(pInfo->fd);
return FALSE;
}
+ /* If wsKbdType==0, no keyboard attached to the mux. Assume USB. */
+ if (pKbd->wsKbdType == 0) {
+ xf86Msg(X_WARNING, "%s: No keyboard attached, assuming USB\n",
+ pInfo->name);
+ pKbd->wsKbdType = WSKBD_TYPE_USB;
+ }
switch (pKbd->wsKbdType) {
case WSKBD_TYPE_PC_XT:
printWsType("XT", pInfo->name);
