From 62db838128fc76454466e28149c94362195322a4 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 9 Aug 2013 13:47:00 +1000 Subject: [PATCH] Rename libevdev_kernel_set_abs_value to libevdev_kernel_set_abs_info Keep it in line with the non-kernel setter Signed-off-by: Peter Hutterer Reviewed-by: Benjamin Tissoires --- libevdev/libevdev.c | 7 +++++++ libevdev/libevdev.h | 6 +++++- test/test-libevdev-has-event.c | 4 ++-- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/libevdev/libevdev.c b/libevdev/libevdev.c index 0641b97..4603651 100644 --- a/libevdev/libevdev.c +++ b/libevdev/libevdev.c @@ -961,9 +961,16 @@ libevdev_disable_event_code(struct libevdev *dev, unsigned int type, unsigned in return 0; } +/* DEPRECATED */ int libevdev_kernel_set_abs_value(struct libevdev *dev, unsigned int code, const struct input_absinfo *abs) { + return libevdev_kernel_set_abs_info(dev, code, abs); +} + +int +libevdev_kernel_set_abs_info(struct libevdev *dev, unsigned int code, const struct input_absinfo *abs) +{ int rc; if (code > ABS_MAX) diff --git a/libevdev/libevdev.h b/libevdev/libevdev.h index bd65175..ccb2cc7 100644 --- a/libevdev/libevdev.h +++ b/libevdev/libevdev.h @@ -1092,7 +1092,7 @@ int libevdev_disable_event_code(struct libevdev *dev, unsigned int type, unsigne * * @see libevdev_enable_event_code */ -int libevdev_kernel_set_abs_value(struct libevdev *dev, unsigned int code, const struct input_absinfo *abs); +int libevdev_kernel_set_abs_info(struct libevdev *dev, unsigned int code, const struct input_absinfo *abs); /** * @ingroup misc @@ -1227,5 +1227,9 @@ int libevdev_get_vendor_id(const struct libevdev *dev) LIBEVDEV_DEPRECATED; int libevdev_get_bustype(const struct libevdev *dev) LIBEVDEV_DEPRECATED; int libevdev_get_version(const struct libevdev *dev) LIBEVDEV_DEPRECATED; +/* replacement: libevdev_kernel_set_abs_info */ +int libevdev_kernel_set_abs_value(struct libevdev *dev, unsigned int code, const struct input_absinfo *abs) LIBEVDEV_DEPRECATED; + + /**************************************/ #endif /* LIBEVDEV_H */ diff --git a/test/test-libevdev-has-event.c b/test/test-libevdev-has-event.c index 7ce616f..307ea58 100644 --- a/test/test-libevdev-has-event.c +++ b/test/test-libevdev-has-event.c @@ -866,7 +866,7 @@ START_TEST(test_device_kernel_change_axis) abs.fuzz = 10; abs.flat = 20; abs.resolution = 30; - rc = libevdev_kernel_set_abs_value(dev, ABS_X, &abs); + rc = libevdev_kernel_set_abs_info(dev, ABS_X, &abs); ck_assert_int_eq(rc, 0); ck_assert_int_eq(libevdev_get_abs_minimum(dev, ABS_X), 500); @@ -915,7 +915,7 @@ START_TEST(test_device_kernel_change_axis_invalid) rc = libevdev_new_from_fd(uinput_device_get_fd(uidev), &dev); ck_assert_msg(rc == 0, "Failed to init device: %s", strerror(-rc));; - rc = libevdev_kernel_set_abs_value(dev, ABS_MAX + 1, &abs); + rc = libevdev_kernel_set_abs_info(dev, ABS_MAX + 1, &abs); ck_assert_int_eq(rc, -EINVAL); libevdev_free(dev); -- 2.7.4