From 530938a8625e58d7eec9285d108cbfdcfb1c3baf Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 9 Dec 2014 12:55:17 +1000 Subject: [PATCH] Drop deprecated symbols MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Peter Hutterer Reviewed-by: Jonas Ådahl --- src/evdev.c | 7 ------- src/libinput.c | 16 ---------------- src/libinput.h | 27 --------------------------- 3 files changed, 50 deletions(-) diff --git a/src/evdev.c b/src/evdev.c index dce035ac..06dd1df1 100644 --- a/src/evdev.c +++ b/src/evdev.c @@ -1605,13 +1605,6 @@ err: return unhandled_device ? EVDEV_UNHANDLED_DEVICE : NULL; } -int -evdev_device_get_keys(struct evdev_device *device, char *keys, size_t size) -{ - memset(keys, 0, size); - return 0; -} - const char * evdev_device_get_output(struct evdev_device *device) { diff --git a/src/libinput.c b/src/libinput.c index 279cce0f..fbefbb38 100644 --- a/src/libinput.c +++ b/src/libinput.c @@ -1271,22 +1271,6 @@ libinput_device_led_update(struct libinput_device *device, evdev_device_led_update((struct evdev_device *) device, leds); } -LIBINPUT_EXPORT int -libinput_device_get_keys(struct libinput_device *device, - char *keys, size_t size) -{ - return evdev_device_get_keys((struct evdev_device *) device, - keys, - size); -} - -LIBINPUT_EXPORT void -libinput_device_calibrate(struct libinput_device *device, - float calibration[6]) -{ - evdev_device_calibrate((struct evdev_device *) device, calibration); -} - LIBINPUT_EXPORT int libinput_device_has_capability(struct libinput_device *device, enum libinput_device_capability capability) diff --git a/src/libinput.h b/src/libinput.h index 57d9ded7..e2a3eef0 100644 --- a/src/libinput.h +++ b/src/libinput.h @@ -1551,33 +1551,6 @@ void libinput_device_led_update(struct libinput_device *device, enum libinput_led leds); -/** - * @ingroup device - * - * Set the bitmask in keys to the bitmask of the keys present on the device - * (see linux/input.h), up to size characters. - * - * @param device A current input device - * @param keys An array filled with the bitmask for the keys - * @param size Size of the keys array - * - * @return The number of valid bytes in keys, or a negative errno on failure - */ -int -libinput_device_get_keys(struct libinput_device *device, - char *keys, size_t size) - LIBINPUT_ATTRIBUTE_DEPRECATED; - -/** - * @ingroup device - * - * @deprecated Use libinput_device_config_calibration_set_matrix() instead. - */ -void -libinput_device_calibrate(struct libinput_device *device, - float calibration[6]) - LIBINPUT_ATTRIBUTE_DEPRECATED; - /** * @ingroup device *