]>
Commit | Line | Data |
---|---|---|
58e23447 PS |
1 | --- xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c.orig 2004-02-16 18:25:42.000000000 +0100 |
2 | +++ xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c 2004-02-16 18:29:53.875110184 +0100 | |
3 | @@ -108,7 +108,7 @@ | |
4 | #endif | |
5 | ||
6 | static int | |
7 | -KDKBDREP_ioctl_ok(int rate, int delay) { | |
8 | +KDKBDREP_ioctl_ok(int fd, int rate, int delay) { | |
9 | #if defined(KDKBDREP) && !defined(__sparc__) | |
10 | /* This ioctl is defined in <linux/kd.h> but is not | |
11 | implemented anywhere - must be in some m68k patches. */ | |
12 | @@ -117,7 +117,7 @@ | |
13 | /* don't change, just test */ | |
14 | kbdrep_s.rate = -1; | |
15 | kbdrep_s.delay = -1; | |
16 | - if (ioctl( 0, KDKBDREP, &kbdrep_s )) { | |
17 | + if (ioctl( fd, KDKBDREP, &kbdrep_s )) { | |
18 | return 0; | |
19 | } | |
20 | ||
21 | @@ -132,7 +132,7 @@ | |
22 | if (kbdrep_s.delay < 1) | |
23 | kbdrep_s.delay = 1; | |
24 | ||
25 | - if (ioctl( 0, KDKBDREP, &kbdrep_s )) { | |
26 | + if (ioctl( fd, KDKBDREP, &kbdrep_s )) { | |
27 | return 0; | |
28 | } | |
29 | ||
30 | @@ -200,7 +200,7 @@ | |
31 | if (pKbd->delay >= 0) | |
32 | delay = pKbd->delay; | |
33 | ||
34 | - if(KDKBDREP_ioctl_ok(rate, delay)) /* m68k? */ | |
35 | + if(KDKBDREP_ioctl_ok(pInfo->fd, rate, delay)) /* m68k? */ | |
36 | return; | |
37 | ||
38 | if(KIOCSRATE_ioctl_ok(rate, delay)) /* sparc? */ |