ajax deleted the evdev driver in the removal of fbdev and the linux backend.
Signed-off-by: Eric Anholt <e...@anholt.net> --- hw/kdrive/ephyr/ephyrinit.c | 10 ---------- hw/kdrive/src/kinput.c | 25 ------------------------- include/kdrive-config.h.in | 3 --- 3 files changed, 38 deletions(-) diff --git a/hw/kdrive/ephyr/ephyrinit.c b/hw/kdrive/ephyr/ephyrinit.c index 7632c2643210..9794cecc96dd 100644 --- a/hw/kdrive/ephyr/ephyrinit.c +++ b/hw/kdrive/ephyr/ephyrinit.c @@ -40,11 +40,6 @@ extern Bool ephyr_glamor, ephyr_glamor_gles2, ephyr_glamor_skip_present; 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 processOutputArg(const char *output, char *parent_id); void processScreenArg(const char *screen_size, char *parent_id); @@ -91,11 +86,6 @@ InitInput(int argc, char **argv) KdKeyboardInfo *ki; KdPointerInfo *pi; -#ifdef KDRIVE_EVDEV - KdAddKeyboardDriver(&LinuxEvdevKeyboardDriver); - KdAddPointerDriver(&LinuxEvdevMouseDriver); -#endif - if (!SeatId) { KdAddKeyboardDriver(&EphyrKeyboardDriver); KdAddPointerDriver(&EphyrMouseDriver); diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c index 8b08747a6077..b15375137af4 100644 --- a/hw/kdrive/src/kinput.c +++ b/hw/kdrive/src/kinput.c @@ -54,11 +54,6 @@ #include <hotplug.h> #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) struct KdConfigDevice { @@ -1091,16 +1086,6 @@ KdParseKbdOptions(KdKeyboardInfo * ki) ErrorF("Kbd option key (%s) of value (%s) not assigned!\n", 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 * @@ -1209,16 +1194,6 @@ KdParsePointerOptions(KdPointerInfo * pi) ErrorF("Pointer option key (%s) of value (%s) not assigned!\n", 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 * diff --git a/include/kdrive-config.h.in b/include/kdrive-config.h.in index f59262c417f1..2d3aedf856fc 100644 --- a/include/kdrive-config.h.in +++ b/include/kdrive-config.h.in @@ -16,9 +16,6 @@ /* Support tslib touchscreen abstraction library */ #undef TSLIB -/* Support KDrive evdev driver */ -#undef KDRIVE_EVDEV - /* Verbose debugging output hilarity */ #undef DEBUG -- 2.11.0 _______________________________________________ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: https://lists.x.org/mailman/listinfo/xorg-devel