kdrive: remove KdSignalWrapper etc.
This no longer does anything useful. Signed-off-by: Adam Jackson <ajax@redhat.com> Reviewed-by: Olivier Fourdan <ofourdan@redhat.com> Reviewed-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
parent
4353d83f60
commit
bed2830099
|
@ -86,8 +86,6 @@ const char *kdGlobalXkbLayout = NULL;
|
||||||
const char *kdGlobalXkbVariant = NULL;
|
const char *kdGlobalXkbVariant = NULL;
|
||||||
const char *kdGlobalXkbOptions = NULL;
|
const char *kdGlobalXkbOptions = NULL;
|
||||||
|
|
||||||
static Bool kdCaughtSignal = FALSE;
|
|
||||||
|
|
||||||
void
|
void
|
||||||
KdDisableScreen(ScreenPtr pScreen)
|
KdDisableScreen(ScreenPtr pScreen)
|
||||||
{
|
{
|
||||||
|
@ -168,9 +166,6 @@ void
|
||||||
AbortDDX(enum ExitCode error)
|
AbortDDX(enum ExitCode error)
|
||||||
{
|
{
|
||||||
KdDisableScreens();
|
KdDisableScreens();
|
||||||
|
|
||||||
if (kdCaughtSignal)
|
|
||||||
OsAbort();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
@ -937,13 +932,6 @@ KdAddScreen(ScreenInfo * pScreenInfo,
|
||||||
AddScreen(KdScreenInit, argc, argv);
|
AddScreen(KdScreenInit, argc, argv);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
|
||||||
KdSignalWrapper(int signum)
|
|
||||||
{
|
|
||||||
kdCaughtSignal = TRUE;
|
|
||||||
return 1; /* use generic OS layer cleanup & abort */
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
void
|
||||||
KdInitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
|
KdInitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
|
||||||
{
|
{
|
||||||
|
@ -985,8 +973,6 @@ KdInitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
|
||||||
for (screen = card->screenList; screen; screen = screen->next)
|
for (screen = card->screenList; screen; screen = screen->next)
|
||||||
KdAddScreen(pScreenInfo, screen, argc, argv);
|
KdAddScreen(pScreenInfo, screen, argc, argv);
|
||||||
|
|
||||||
OsRegisterSigWrapper(KdSignalWrapper);
|
|
||||||
|
|
||||||
#if defined(CONFIG_UDEV) || defined(CONFIG_HAL)
|
#if defined(CONFIG_UDEV) || defined(CONFIG_HAL)
|
||||||
if (SeatId) /* Enable input hot-plugging */
|
if (SeatId) /* Enable input hot-plugging */
|
||||||
config_pre_init();
|
config_pre_init();
|
||||||
|
|
Loading…
Reference in New Issue