projects / packages / XFree86.git / blame
| Commit | Line | Data |
|---|---|---|
| 0fe12615 AM |
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 | |
| 5 | @@ -81,7 +81,7 @@ | |
| 6 | #endif | |
| 7 | ||
| 8 | static int | |
| 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. */ | |
| 14 | @@ -90,7 +90,7 @@ | |
| 15 | /* don't change, just test */ | |
| 16 | kbdrep_s.rate = -1; | |
| 17 | kbdrep_s.delay = -1; | |
| 18 | - if (ioctl( 0, KDKBDREP, &kbdrep_s )) { | |
| 19 | + if (ioctl( fd, KDKBDREP, &kbdrep_s )) { | |
| 20 | return 0; | |
| 21 | } | |
| 22 | ||
| 23 | @@ -105,7 +105,7 @@ | |
| 24 | if (kbdrep_s.delay < 1) | |
| 25 | kbdrep_s.delay = 1; | |
| 26 | ||
| 27 | - if (ioctl( 0, KDKBDREP, &kbdrep_s )) { | |
| 28 | + if (ioctl( fd, KDKBDREP, &kbdrep_s )) { | |
| 29 | return 0; | |
| 30 | } | |
| 31 | ||
| 32 | @@ -174,7 +174,7 @@ | |
| 33 | delay = xf86Info.kbdDelay; | |
| 34 | ||
| 35 | ||
| 36 | - if(KDKBDREP_ioctl_ok(rate, delay)) /* m68k? */ | |
| 37 | + if(KDKBDREP_ioctl_ok(xf86Info.consoleFd, rate, delay)) /* m68k? */ | |
| 38 | return; | |
| 39 | ||
| 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 | |
| 58e23447 PS |
45 | @@ -108,7 +108,7 @@ |
| 46 | #endif | |
| 47 | ||
| 48 | static int | |
| 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. */ | |
| 54 | @@ -117,7 +117,7 @@ | |
| 55 | /* don't change, just test */ | |
| 56 | kbdrep_s.rate = -1; | |
| 57 | kbdrep_s.delay = -1; | |
| 58 | - if (ioctl( 0, KDKBDREP, &kbdrep_s )) { | |
| 59 | + if (ioctl( fd, KDKBDREP, &kbdrep_s )) { | |
| 60 | return 0; | |
| 61 | } | |
| 62 | ||
| 63 | @@ -132,7 +132,7 @@ | |
| 64 | if (kbdrep_s.delay < 1) | |
| 65 | kbdrep_s.delay = 1; | |
| 66 | ||
| 67 | - if (ioctl( 0, KDKBDREP, &kbdrep_s )) { | |
| 68 | + if (ioctl( fd, KDKBDREP, &kbdrep_s )) { | |
| 69 | return 0; | |
| 70 | } | |
| 71 | ||
| 72 | @@ -200,7 +200,7 @@ | |
| 73 | if (pKbd->delay >= 0) | |
| 74 | delay = pKbd->delay; | |
| 75 | ||
| 76 | - if(KDKBDREP_ioctl_ok(rate, delay)) /* m68k? */ | |
| 77 | + if(KDKBDREP_ioctl_ok(pInfo->fd, rate, delay)) /* m68k? */ | |
| 78 | return; | |
| 79 | ||
| 80 | if(KIOCSRATE_ioctl_ok(rate, delay)) /* sparc? */ |