Module Name: xsrc
Committed By: jdc
Date: Wed Jul 25 22:11:09 UTC 2012
Modified Files:
xsrc/external/mit/xf86-input-keyboard/dist/src [netbsd-6]: bsd_kbd.c
Log Message:
Pull up revision 1.16 (requested by tsutsui in ticket #445).
Don't return FALSE in OpenKeyboard() even if wskbd type is unknown
so that we can still setup keyboard map manually by xmodmap(1) etc.
on poor Tier II machines.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.14.2.1 \
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.14 xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c:1.14.2.1
--- xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c:1.14 Sun Jul 24 00:45:04 2011
+++ xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c Wed Jul 25 22:11:09 2012
@@ -427,10 +427,10 @@ OpenKeyboard(InputInfoPtr pInfo)
break;
#endif
default:
- xf86Msg(X_ERROR, "%s: Unsupported wskbd type \"%d\"",
- pInfo->name, pKbd->wsKbdType);
- close(pInfo->fd);
- return FALSE;
+ xf86Msg(X_WARNING, "%s: Unsupported wskbd type \"%d\"\n",
+ pInfo->name, pKbd->wsKbdType);
+ printWsType("Unknown wskbd", pInfo->name);
+ break;
}
}
#endif
