Commit 1b1a8c48 authored by Eric Anholt's avatar Eric Anholt Committed by Adam Jackson

kdrive: Unifdef KDRIVE_EVDEV.

ajax deleted the evdev driver in the removal of fbdev and the linux
backend.
Reviewed-by: Peter Hutterer's avatarPeter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone's avatarDaniel Stone <daniels@collabora.com>
Signed-off-by: Eric Anholt's avatarEric Anholt <eric@anholt.net>
parent ad6689b7
...@@ -40,11 +40,6 @@ extern Bool ephyr_glamor, ephyr_glamor_gles2, ephyr_glamor_skip_present; ...@@ -40,11 +40,6 @@ extern Bool ephyr_glamor, ephyr_glamor_gles2, ephyr_glamor_skip_present;
extern Bool ephyrNoXV; extern Bool ephyrNoXV;
#ifdef KDRIVE_EVDEV
extern KdPointerDriver LinuxEvdevMouseDriver;
extern KdKeyboardDriver LinuxEvdevKeyboardDriver;
#endif
void processScreenOrOutputArg(const char *screen_size, const char *output, char *parent_id); void processScreenOrOutputArg(const char *screen_size, const char *output, char *parent_id);
void processOutputArg(const char *output, char *parent_id); void processOutputArg(const char *output, char *parent_id);
void processScreenArg(const char *screen_size, char *parent_id); void processScreenArg(const char *screen_size, char *parent_id);
...@@ -91,11 +86,6 @@ InitInput(int argc, char **argv) ...@@ -91,11 +86,6 @@ InitInput(int argc, char **argv)
KdKeyboardInfo *ki; KdKeyboardInfo *ki;
KdPointerInfo *pi; KdPointerInfo *pi;
#ifdef KDRIVE_EVDEV
KdAddKeyboardDriver(&LinuxEvdevKeyboardDriver);
KdAddPointerDriver(&LinuxEvdevMouseDriver);
#endif
if (!SeatId) { if (!SeatId) {
KdAddKeyboardDriver(&EphyrKeyboardDriver); KdAddKeyboardDriver(&EphyrKeyboardDriver);
KdAddPointerDriver(&EphyrMouseDriver); KdAddPointerDriver(&EphyrMouseDriver);
......
...@@ -54,11 +54,6 @@ ...@@ -54,11 +54,6 @@
#include <hotplug.h> #include <hotplug.h>
#endif #endif
#ifdef KDRIVE_EVDEV
#define DEV_INPUT_EVENT_PREFIX "/dev/input/event"
#define DEV_INPUT_EVENT_PREFIX_LEN (sizeof(DEV_INPUT_EVENT_PREFIX) - 1)
#endif
#define AtomFromName(x) MakeAtom(x, strlen(x), 1) #define AtomFromName(x) MakeAtom(x, strlen(x), 1)
struct KdConfigDevice { struct KdConfigDevice {
...@@ -1091,16 +1086,6 @@ KdParseKbdOptions(KdKeyboardInfo * ki) ...@@ -1091,16 +1086,6 @@ KdParseKbdOptions(KdKeyboardInfo * ki)
ErrorF("Kbd option key (%s) of value (%s) not assigned!\n", ErrorF("Kbd option key (%s) of value (%s) not assigned!\n",
key, value); key, value);
} }
#ifdef KDRIVE_EVDEV
if (!ki->driver && ki->path != NULL &&
strncasecmp(ki->path,
DEV_INPUT_EVENT_PREFIX,
DEV_INPUT_EVENT_PREFIX_LEN) == 0) {
ki->driver = KdFindKeyboardDriver("evdev");
ki->options = input_option_new(ki->options, "driver", "evdev");
}
#endif
} }
KdKeyboardInfo * KdKeyboardInfo *
...@@ -1209,16 +1194,6 @@ KdParsePointerOptions(KdPointerInfo * pi) ...@@ -1209,16 +1194,6 @@ KdParsePointerOptions(KdPointerInfo * pi)
ErrorF("Pointer option key (%s) of value (%s) not assigned!\n", ErrorF("Pointer option key (%s) of value (%s) not assigned!\n",
key, value); key, value);
} }
#ifdef KDRIVE_EVDEV
if (!pi->driver && pi->path != NULL &&
strncasecmp(pi->path,
DEV_INPUT_EVENT_PREFIX,
DEV_INPUT_EVENT_PREFIX_LEN) == 0) {
pi->driver = KdFindPointerDriver("evdev");
pi->options = input_option_new(pi->options, "driver", "evdev");
}
#endif
} }
KdPointerInfo * KdPointerInfo *
......
...@@ -16,9 +16,6 @@ ...@@ -16,9 +16,6 @@
/* Support tslib touchscreen abstraction library */ /* Support tslib touchscreen abstraction library */
#undef TSLIB #undef TSLIB
/* Support KDrive evdev driver */
#undef KDRIVE_EVDEV
/* Verbose debugging output hilarity */ /* Verbose debugging output hilarity */
#undef DEBUG #undef DEBUG
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment