diff options
| author | Thomas Klausner <wiz@NetBSD.org> | 2013-07-29 23:23:41 +0200 |
|---|---|---|
| committer | Gaetan Nadon <memsize@videotron.ca> | 2013-10-18 16:41:13 -0400 |
| commit | e5ecacb20ad3685d6f422c5ed21632fb8b1f7fa0 (patch) | |
| tree | 1ccc6a084cf918fcf1b2afac375974bfa8f2fa6d | |
| parent | 8879a7682ef94471e907bb660d2b96cc95ed7b81 (diff) | |
| download | xorg-driver-xf86-input-keyboard-e5ecacb20ad3685d6f422c5ed21632fb8b1f7fa0.tar.gz | |
Add default device for Protocol "wskbd".
Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
| -rw-r--r-- | src/bsd_kbd.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/src/bsd_kbd.c b/src/bsd_kbd.c index b6235d7..d3c3748 100644 --- a/src/bsd_kbd.c +++ b/src/bsd_kbd.c @@ -359,20 +359,18 @@ OpenKeyboard(InputInfoPtr pInfo) } free(s); - s = xf86SetStrOption(pInfo->options, "Device", NULL); + if (prot == PROT_WSCONS) + s = xf86SetStrOption(pInfo->options, "Device", "/dev/wskbd"); + else + s = xf86SetStrOption(pInfo->options, "Device", NULL); + if (s == NULL) { - if (prot == PROT_WSCONS) { - xf86Msg(X_ERROR,"A \"device\" option is required with" - " the \"wskbd\" keyboard protocol\n"); - return FALSE; - } else { - pInfo->fd = xf86Info.consoleFd; - pKbd->isConsole = TRUE; - pKbd->consType = xf86Info.consType; - } + pInfo->fd = xf86Info.consoleFd; + pKbd->isConsole = TRUE; + pKbd->consType = xf86Info.consType; } else { pInfo->fd = open(s, O_RDONLY | O_NONBLOCK | O_EXCL); - if (pInfo->fd == -1) { + if (pInfo->fd == -1) { xf86Msg(X_ERROR, "%s: cannot open \"%s\"\n", pInfo->name, s); free(s); return FALSE; |