From 58e23447c13ed1fc01c0e41cbe66bb52602c2e74 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Pawe=C5=82=20Sikora?= Date: Mon, 16 Feb 2004 18:03:40 +0000 Subject: [PATCH] - fixed conflict beetwen xfree86 and kernel. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 XFree86-lnx_kbd.patch diff --git a/XFree86-lnx_kbd.patch b/XFree86-lnx_kbd.patch new file mode 100644 index 0000000..0496c0c --- /dev/null +++ b/XFree86-lnx_kbd.patch @@ -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 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? */ -- 2.44.0