diff options
| author | Eric Anholt <anholt@freebsd.org> | 2004-06-16 09:22:17 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@freebsd.org> | 2004-06-16 09:22:17 +0000 |
| commit | 22bad9474b8822f03f84a8a39edce624bfb9befa (patch) | |
| tree | 8b599b118a758a44fe46985b4843fb29d1ae3253 /hw/xfree86/os-support/linux/lnx_kbd.c | |
| parent | 1c133c27ccc1f09b95922fdece3c8d73cc182def (diff) | |
DRI XFree86-4_3_99_12-merge import
Diffstat (limited to 'hw/xfree86/os-support/linux/lnx_kbd.c')
| -rw-r--r-- | hw/xfree86/os-support/linux/lnx_kbd.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/hw/xfree86/os-support/linux/lnx_kbd.c b/hw/xfree86/os-support/linux/lnx_kbd.c index 68f3af38b..1344cecec 100644 --- a/hw/xfree86/os-support/linux/lnx_kbd.c +++ b/hw/xfree86/os-support/linux/lnx_kbd.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c,v 1.4 2003/11/03 05:11:52 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c,v 1.3 2003/08/19 17:32:34 tsi Exp $ */ /* * Copyright (c) 2002 by The XFree86 Project, Inc. @@ -27,7 +27,7 @@ static KbdProtocolRec protocols[] = { {"standard", PROT_STD }, - { NULL, PROT_UNKNOWN_KBD } + { NULL, PROT_UNKNOWN } }; extern Bool VTSwitchEnabled; @@ -117,7 +117,7 @@ KDKBDREP_ioctl_ok(int rate, int delay) { /* don't change, just test */ kbdrep_s.rate = -1; kbdrep_s.delay = -1; - if (ioctl( xf86Info.consoleFd, KDKBDREP, &kbdrep_s )) { + if (ioctl( 0, KDKBDREP, &kbdrep_s )) { return 0; } @@ -132,8 +132,8 @@ KDKBDREP_ioctl_ok(int rate, int delay) { if (kbdrep_s.delay < 1) kbdrep_s.delay = 1; - if (ioctl( xf86Info.consoleFd, KDKBDREP, &kbdrep_s )) { - return 0; + if (ioctl( 0, KDKBDREP, &kbdrep_s )) { + return 0; } return 1; /* success! */ @@ -157,9 +157,8 @@ KIOCSRATE_ioctl_ok(int rate, int delay) { if (kbdrate_s.rate > 50) kbdrate_s.rate = 50; - if (ioctl( fd, KIOCSRATE, &kbdrate_s )) { - return 0; - } + if (ioctl( fd, KIOCSRATE, &kbdrate_s )) + return 0; close( fd ); @@ -447,7 +446,7 @@ OpenKeyboard(InputInfoPtr pInfo) { KbdDevPtr pKbd = (KbdDevPtr) pInfo->private; int i; - KbdProtocolId prot = PROT_UNKNOWN_KBD; + KbdProtocolId prot = PROT_UNKNOWN; char *s; s = xf86SetStrOption(pInfo->options, "Protocol", NULL); |