|
Line
Link Here
|
| 0 |
-- programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c |
0 |
++ programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c |
|
Lines 67-72
xf86GetKbdLeds()
Link Here
|
| 67 |
* from util-linux-2.9t package */ |
67 |
* from util-linux-2.9t package */ |
| 68 |
|
68 |
|
| 69 |
#include <linux/kd.h> |
69 |
#include <linux/kd.h> |
|
|
70 |
#include <linux/version.h> |
| 70 |
#ifdef __sparc__ |
71 |
#ifdef __sparc__ |
| 71 |
#include <asm/param.h> |
72 |
#include <asm/param.h> |
| 72 |
#include <asm/kbio.h> |
73 |
#include <asm/kbio.h> |
| 73 |
-- programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c |
74 |
++ programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c |
|
Lines 94-104
GetKbdLeds(InputInfoPtr pInfo)
Link Here
|
| 94 |
* from util-linux-2.9t package */ |
94 |
* from util-linux-2.9t package */ |
| 95 |
|
95 |
|
| 96 |
|
96 |
|
|
|
97 |
#include <linux/version.h> |
| 97 |
#ifdef __sparc__ |
98 |
#ifdef __sparc__ |
| 98 |
#include <asm/param.h> |
99 |
#include <asm/param.h> |
| 99 |
#include <asm/kbio.h> |
100 |
#include <asm/kbio.h> |
| 100 |
#endif |
101 |
#endif |
| 101 |
|
102 |
|
|
|
103 |
/* Deal with spurious kernel header change */ |
| 104 |
#if defined(LINUX_VERSION_CODE) && defined(KERNEL_VERSION) |
| 105 |
# if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,42) |
| 106 |
# define rate period |
| 107 |
# endif |
| 108 |
#endif |
| 109 |
|
| 102 |
static int |
110 |
static int |
| 103 |
KDKBDREP_ioctl_ok(int rate, int delay) { |
111 |
KDKBDREP_ioctl_ok(int rate, int delay) { |
| 104 |
#if defined(KDKBDREP) && !defined(__sparc__) |
112 |
#if defined(KDKBDREP) && !defined(__sparc__) |
|
Lines 160-165
KIOCSRATE_ioctl_ok(int rate, int delay)
Link Here
|
| 160 |
#endif /* KIOCSRATE */ |
168 |
#endif /* KIOCSRATE */ |
| 161 |
} |
169 |
} |
| 162 |
|
170 |
|
|
|
171 |
#undef rate |
| 172 |
|
| 163 |
static void |
173 |
static void |
| 164 |
SetKbdRepeat(InputInfoPtr pInfo, char rad) |
174 |
SetKbdRepeat(InputInfoPtr pInfo, char rad) |
| 165 |
{ |
175 |
{ |
