]> git.pld-linux.org Git - packages/XFree86.git/commitdiff
- fixed conflict beetwen xfree86 and kernel.
authorPaweł Sikora <pluto@pld-linux.org>
Mon, 16 Feb 2004 18:03:40 +0000 (18:03 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
  eg. kernel log:
  atkbd.c: Unknown key released (translated set 2, code 0x7a on isa0060/serio0).
  atkbd.c: This is an XFree86 bug. It shouldn't access hardware directly.

Changed files:
    XFree86-lnx_kbd.patch -> 1.1

XFree86-lnx_kbd.patch [new file with mode: 0644]

diff --git a/XFree86-lnx_kbd.patch b/XFree86-lnx_kbd.patch
new file mode 100644 (file)
index 0000000..0496c0c
--- /dev/null
@@ -0,0 +1,38 @@
+--- xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c.orig     2004-02-16 18:25:42.000000000 +0100
++++ xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c  2004-02-16 18:29:53.875110184 +0100
+@@ -108,7 +108,7 @@
+ #endif
+ static int
+-KDKBDREP_ioctl_ok(int rate, int delay) {
++KDKBDREP_ioctl_ok(int fd, int rate, int delay) {
+ #if defined(KDKBDREP) && !defined(__sparc__)
+      /* This ioctl is defined in <linux/kd.h> but is not
+       implemented anywhere - must be in some m68k patches. */
+@@ -117,7 +117,7 @@
+    /* don't change, just test */
+    kbdrep_s.rate = -1;
+    kbdrep_s.delay = -1;
+-   if (ioctl( 0, KDKBDREP, &kbdrep_s )) {
++   if (ioctl( fd, KDKBDREP, &kbdrep_s )) {
+        return 0;
+    }
+@@ -132,7 +132,7 @@
+    if (kbdrep_s.delay < 1)
+      kbdrep_s.delay = 1;
+    
+-   if (ioctl( 0, KDKBDREP, &kbdrep_s )) {
++   if (ioctl( fd, KDKBDREP, &kbdrep_s )) {
+      return 0;
+    }
+@@ -200,7 +200,7 @@
+   if (pKbd->delay >= 0)
+     delay = pKbd->delay;
+-  if(KDKBDREP_ioctl_ok(rate, delay))  /* m68k? */
++  if(KDKBDREP_ioctl_ok(pInfo->fd, rate, delay))       /* m68k? */
+     return;
+   if(KIOCSRATE_ioctl_ok(rate, delay)) /* sparc? */
This page took 0.035378 seconds and 4 git commands to generate.