diff options
| author | Eric Anholt <eric@anholt.net> | 2017-03-22 15:11:30 -0700 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2017-03-23 13:14:13 -0400 |
| commit | 1b1a8c481773e15142202a7b761d614b33f12577 (patch) | |
| tree | b6349d5c759bfa4f291ffb582d95a30d5a926623 /hw/kdrive | |
| parent | ad6689b7db0a4b0d22716acedae98462a68ea1ae (diff) | |
kdrive: Unifdef KDRIVE_EVDEV.
ajax deleted the evdev driver in the removal of fbdev and the linux
backend.
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'hw/kdrive')
| -rw-r--r-- | hw/kdrive/ephyr/ephyrinit.c | 10 | ||||
| -rw-r--r-- | hw/kdrive/src/kinput.c | 25 |
2 files changed, 0 insertions, 35 deletions
diff --git a/hw/kdrive/ephyr/ephyrinit.c b/hw/kdrive/ephyr/ephyrinit.c index 7632c2643..9794cecc9 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 8b08747a6..b15375137 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 * |