[patch] the "corrected" upstream patch

1.1.1-sparc64-kbio-fix.patch (text/plain), 5.44 KB, created by Cedric Godin on 2006-10-26 01:45:30 UTC

diff -ruN xorg-server-1.1.1.bak/configure.ac xorg-server-1.1.1/configure.ac
--- xorg-server-1.1.1.bak/configure.ac	2006-10-25 16:22:00.000000000 +0200
+++ xorg-server-1.1.1/configure.ac	2006-10-25 16:58:59.000000000 +0200
@@ -1072,6 +1072,24 @@
 		  *)
 			;;
 		esac
+
+    # check whether struct kbd_repeat has the 'period' field.
+    # on kernels < 2.5.42 it's called 'rate' instead.
+    AC_TRY_COMPILE([
+#include <linux/kd.h>
+#ifdef __sparc__
+#include <asm/param.h>
+#endif
+],[
+int main () { 
+	struct kbd_repeat k;
+	k.period = 0;
+	return 0;
+}],
+		[period_field="period"],
+		[period_field="rate"])
+		AC_DEFINE_UNQUOTED(LNX_KBD_PERIOD_NAME, [$period_field],
+				[Name of the period field in struct kbd_repeat])
 		;;
 	  freebsd*)
 	  	XORG_OS="freebsd"
diff -ruN xorg-server-1.1.1.bak/hw/xfree86/os-support/linux/lnx_io.c xorg-server-1.1.1/hw/xfree86/os-support/linux/lnx_io.c
--- xorg-server-1.1.1.bak/hw/xfree86/os-support/linux/lnx_io.c	2006-07-05 20:31:41.000000000 +0200
+++ xorg-server-1.1.1/hw/xfree86/os-support/linux/lnx_io.c	2006-10-25 16:58:50.000000000 +0200
@@ -67,25 +67,6 @@
 	return(leds);
 }
 
-/* kbd rate stuff based on kbdrate.c from Rik Faith <[e-mail]> et.al.
- * from util-linux-2.9t package */
-
-#include <linux/kd.h>
-#include <linux/version.h>
-#ifdef __sparc__
-#include <asm/param.h>
-#include <asm/kbio.h>
-#endif
-
-/* Deal with spurious kernel header change in struct kbd_repeat.
-   We undo this define after the routine using that struct is over,
-   so as not to interfere with other 'rate' elements.  */
-#if defined(LINUX_VERSION_CODE) && defined(KERNEL_VERSION)
-# if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,42)
-#  define rate period
-# endif
-#endif
-
 static int
 KDKBDREP_ioctl_ok(int rate, int delay) {
 #if defined(KDKBDREP) && !defined(__sparc__)
@@ -94,18 +75,18 @@
    struct kbd_repeat kbdrep_s;
 
    /* don't change, just test */
-   kbdrep_s.rate = -1;
+   kbdrep_s.LNX_KBD_PERIOD_NAME = -1;
    kbdrep_s.delay = -1;
    if (ioctl( xf86Info.consoleFd, KDKBDREP, &kbdrep_s )) {
        return 0;
    }
    /* do the change */
    if (rate == 0)				/* switch repeat off */
-     kbdrep_s.rate = 0;
+     kbdrep_s.LNX_KBD_PERIOD_NAME = 0;
    else
-     kbdrep_s.rate  = 10000 / rate;		/* convert cps to msec */
-   if (kbdrep_s.rate < 1)
-     kbdrep_s.rate = 1;
+     kbdrep_s.LNX_KBD_PERIOD_NAME  = 10000 / rate;		/* convert cps to msec */
+   if (kbdrep_s.LNX_KBD_PERIOD_NAME < 1)
+     kbdrep_s.LNX_KBD_PERIOD_NAME = 1;
    kbdrep_s.delay = delay;
    if (kbdrep_s.delay < 1)
      kbdrep_s.delay = 1;
@@ -120,15 +101,6 @@
 #endif /* KDKBDREP */
 }
 
-#undef rate
-
-/* Undo the earlier define for the struct kbd_repeat problem. */
-#if defined(LINUX_VERSION_CODE) && defined(KERNEL_VERSION)
-# if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,42)
-#  undef rate
-# endif
-#endif
-
 static int
 KIOCSRATE_ioctl_ok(int rate, int delay) {
 #ifdef KIOCSRATE
diff -ruN xorg-server-1.1.1.bak/hw/xfree86/os-support/linux/lnx_kbd.c xorg-server-1.1.1/hw/xfree86/os-support/linux/lnx_kbd.c
--- xorg-server-1.1.1.bak/hw/xfree86/os-support/linux/lnx_kbd.c	2006-07-05 20:31:41.000000000 +0200
+++ xorg-server-1.1.1/hw/xfree86/os-support/linux/lnx_kbd.c	2006-10-25 17:00:35.000000000 +0200
@@ -97,25 +97,6 @@
     return(leds);
 }
 
-/* kbd rate stuff based on kbdrate.c from Rik Faith <[e-mail]> et.al.
- * from util-linux-2.9t package */
-
-#include <linux/kd.h>
-#include <linux/version.h>
-#ifdef __sparc__
-#include <asm/param.h>
-#include <asm/kbio.h>
-#endif
-
-/* Deal with spurious kernel header change in struct kbd_repeat.
-   We undo this define after the routine using that struct is over,
-   so as not to interfere with other 'rate' elements.  */
-#if defined(LINUX_VERSION_CODE) && defined(KERNEL_VERSION)
-# if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,42)
-#  define rate period
-# endif
-#endif
-
 static int
 KDKBDREP_ioctl_ok(int rate, int delay) {
 #if defined(KDKBDREP) && !defined(__sparc__)
@@ -124,7 +105,7 @@
    struct kbd_repeat kbdrep_s;
 
    /* don't change, just test */
-   kbdrep_s.rate = -1;
+   kbdrep_s.LNX_KBD_PERIOD_NAME = -1;
    kbdrep_s.delay = -1;
    if (ioctl( xf86Info.consoleFd, KDKBDREP, &kbdrep_s )) {
        return 0;
@@ -132,11 +113,11 @@
 
    /* do the change */
    if (rate == 0)				/* switch repeat off */
-     kbdrep_s.rate = 0;
+     kbdrep_s.LNX_KBD_PERIOD_NAME = 0;
    else
-     kbdrep_s.rate  = 10000 / rate;		/* convert cps to msec */
-   if (kbdrep_s.rate < 1)
-     kbdrep_s.rate = 1;
+     kbdrep_s.LNX_KBD_PERIOD_NAME  = 10000 / rate;		/* convert cps to msec */
+   if (kbdrep_s.LNX_KBD_PERIOD_NAME < 1)
+     kbdrep_s.LNX_KBD_PERIOD_NAME = 1;
    kbdrep_s.delay = delay;
    if (kbdrep_s.delay < 1)
      kbdrep_s.delay = 1;
@@ -151,15 +132,6 @@
 #endif /* KDKBDREP */
 }
 
-#undef rate
-
-/* Undo the earlier define for the struct kbd_repeat problem. */
-#if defined(LINUX_VERSION_CODE) && defined(KERNEL_VERSION)
-# if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,42)
-#  undef rate
-# endif
-#endif
-
 static int
 KIOCSRATE_ioctl_ok(int rate, int delay) {
 #ifdef KIOCSRATE
diff -ruN xorg-server-1.1.1.bak/include/xorg-config.h.in xorg-server-1.1.1/include/xorg-config.h.in
--- xorg-server-1.1.1.bak/include/xorg-config.h.in	2006-07-05 20:38:48.000000000 +0200
+++ xorg-server-1.1.1/include/xorg-config.h.in	2006-10-25 17:01:32.000000000 +0200
@@ -112,4 +112,7 @@
 /* Has backtrace support */
 #undef HAVE_BACKTRACE
 
+/* Name of the period field in struct kbd_repeat */
+#undef LNX_KBD_PERIOD_NAME
+
 #endif /* _XORG_CONFIG_H_ */