diff options
| author | Adam Jackson <ajax@redhat.com> | 2009-04-01 09:42:06 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2009-04-01 09:42:06 -0400 |
| commit | 7d94414cf4b16501ce4c4291846498f393f150a4 (patch) | |
| tree | f7486d47f28e697c9673688a3966599d1e570f16 /hw/xfree86 | |
| parent | 3311ef6ec93df4325d198715e0fce73af19f0781 (diff) | |
input: Remove xf86ReloadInputDevs hack
We have input hotplug now, no need to fake it.
Diffstat (limited to 'hw/xfree86')
| -rw-r--r-- | hw/xfree86/common/xf86Events.c | 17 | ||||
| -rw-r--r-- | hw/xfree86/os-support/linux/lnx_init.c | 1 | ||||
| -rw-r--r-- | hw/xfree86/os-support/xf86_OSproc.h | 1 |
3 files changed, 0 insertions, 19 deletions
diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c index 9ed28840d..4f84a4c55 100644 --- a/hw/xfree86/common/xf86Events.c +++ b/hw/xfree86/common/xf86Events.c @@ -771,23 +771,6 @@ xf86EnableVTSwitch(Bool new) } void -xf86ReloadInputDevs(int sig) -{ - InputInfoPtr pInfo; - - signal(sig, (void(*)(int))xf86ReloadInputDevs); - - pInfo = xf86InputDevs; - while (pInfo) { - DisableDevice(pInfo->dev); - EnableDevice(pInfo->dev); - pInfo = pInfo->next; - } - - return; -} - -void DDXRingBell(int volume, int pitch, int duration) { xf86OSRingBell(volume, pitch, duration); } diff --git a/hw/xfree86/os-support/linux/lnx_init.c b/hw/xfree86/os-support/linux/lnx_init.c index 152fae114..a49086b37 100644 --- a/hw/xfree86/os-support/linux/lnx_init.c +++ b/hw/xfree86/os-support/linux/lnx_init.c @@ -286,7 +286,6 @@ xf86OpenConsole(void) } else { /* ShareVTs */ close(xf86Info.consoleFd); } - signal(SIGUSR2, xf86ReloadInputDevs); } else { /* serverGeneration != 1 */ if (!ShareVTs && VTSwitch) { diff --git a/hw/xfree86/os-support/xf86_OSproc.h b/hw/xfree86/os-support/xf86_OSproc.h index 576088800..507db1862 100644 --- a/hw/xfree86/os-support/xf86_OSproc.h +++ b/hw/xfree86/os-support/xf86_OSproc.h @@ -212,7 +212,6 @@ extern _X_EXPORT Bool xf86VTSwitchTo(void); extern _X_EXPORT void xf86VTRequest(int sig); extern _X_EXPORT int xf86ProcessArgument(int, char **, int); extern _X_EXPORT void xf86UseMsg(void); -extern _X_EXPORT void xf86ReloadInputDevs(int sig); extern _X_EXPORT PMClose xf86OSPMOpen(void); #ifdef NEED_OS_RAC_PROTOS |