1 Index: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c
2 diff -u xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c:3.26 xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c:3.27
3 --- xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c:3.26 Mon Nov 17 22:20:41 2003
4 +++ xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c Wed Mar 3 18:53:41 2004
9 -KDKBDREP_ioctl_ok(int rate, int delay) {
10 +KDKBDREP_ioctl_ok(int fd, int rate, int delay) {
11 #if defined(KDKBDREP) && !defined(__sparc__)
12 /* This ioctl is defined in <linux/kd.h> but is not
13 implemented anywhere - must be in some m68k patches. */
15 /* don't change, just test */
18 - if (ioctl( 0, KDKBDREP, &kbdrep_s )) {
19 + if (ioctl( fd, KDKBDREP, &kbdrep_s )) {
24 if (kbdrep_s.delay < 1)
27 - if (ioctl( 0, KDKBDREP, &kbdrep_s )) {
28 + if (ioctl( fd, KDKBDREP, &kbdrep_s )) {
33 delay = xf86Info.kbdDelay;
36 - if(KDKBDREP_ioctl_ok(rate, delay)) /* m68k? */
37 + if(KDKBDREP_ioctl_ok(xf86Info.consoleFd, rate, delay)) /* m68k? */
40 if(KIOCSRATE_ioctl_ok(rate, delay)) /* sparc? */
41 Index: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c
42 diff -u xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c:1.5 xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c:1.6
43 --- xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c:1.5 Tue Nov 4 03:14:39 2003
44 +++ xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c Wed Mar 3 18:53:41 2004
49 -KDKBDREP_ioctl_ok(int rate, int delay) {
50 +KDKBDREP_ioctl_ok(int fd, int rate, int delay) {
51 #if defined(KDKBDREP) && !defined(__sparc__)
52 /* This ioctl is defined in <linux/kd.h> but is not
53 implemented anywhere - must be in some m68k patches. */
55 /* don't change, just test */
58 - if (ioctl( 0, KDKBDREP, &kbdrep_s )) {
59 + if (ioctl( fd, KDKBDREP, &kbdrep_s )) {
64 if (kbdrep_s.delay < 1)
67 - if (ioctl( 0, KDKBDREP, &kbdrep_s )) {
68 + if (ioctl( fd, KDKBDREP, &kbdrep_s )) {
76 - if(KDKBDREP_ioctl_ok(rate, delay)) /* m68k? */
77 + if(KDKBDREP_ioctl_ok(pInfo->fd, rate, delay)) /* m68k? */
80 if(KIOCSRATE_ioctl_ok(rate, delay)) /* sparc? */