From b7501655c086fd470663c51f13d478ad1a7d6ec9 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 23 Aug 2013 10:48:46 +1000 Subject: [PATCH] Drop deprecated API Signed-off-by: Peter Hutterer Acked-by: Benjamin Tissoires --- libevdev/libevdev.c | 14 -------------- libevdev/libevdev.h | 14 -------------- 2 files changed, 28 deletions(-) diff --git a/libevdev/libevdev.c b/libevdev/libevdev.c index 5356e58..0c8cb2f 100644 --- a/libevdev/libevdev.c +++ b/libevdev/libevdev.c @@ -791,11 +791,6 @@ int libevdev_get_##name(const struct libevdev *dev) \ return dev->ids.field; \ } -PRODUCT_GETTER(product_id, product); /* DEPRECATED */ -PRODUCT_GETTER(vendor_id, vendor); /* DEPRECATED */ -PRODUCT_GETTER(bustype, bustype); /* DEPRECATED */ -PRODUCT_GETTER(version, version); /* DEPRECATED */ - PRODUCT_GETTER(id_product, product); PRODUCT_GETTER(id_vendor, vendor); PRODUCT_GETTER(id_bustype, bustype); @@ -997,8 +992,6 @@ int libevdev_get_abs_##name(const struct libevdev *dev, unsigned int code) \ return absinfo ? absinfo->field : 0; \ } -ABS_GETTER(max, maximum); /* DEPRECATED */ -ABS_GETTER(min, minimum); /* DEPRECATED */ ABS_GETTER(maximum, maximum); ABS_GETTER(minimum, minimum); ABS_GETTER(fuzz, fuzz) @@ -1202,13 +1195,6 @@ libevdev_get_event_code_name(unsigned int type, unsigned int code) return event_type_map[type][code]; } -/* DEPRECATED */ -const char* -libevdev_get_input_prop_name(unsigned int prop) -{ - return libevdev_get_property_name(prop); -} - const char* libevdev_get_property_name(unsigned int prop) { diff --git a/libevdev/libevdev.h b/libevdev/libevdev.h index 24fa9eb..e2c5823 100644 --- a/libevdev/libevdev.h +++ b/libevdev/libevdev.h @@ -1326,22 +1326,8 @@ int libevdev_get_repeat(struct libevdev *dev, int *delay, int *period); #define LIBEVDEV_DEPRECATED #endif -/* replacement: libevdev_get_abs_minimum */ -int libevdev_get_abs_min(const struct libevdev *dev, unsigned int code) LIBEVDEV_DEPRECATED; -/* replacement: libevdev_get_abs_maximum */ -int libevdev_get_abs_max(const struct libevdev *dev, unsigned int code) LIBEVDEV_DEPRECATED; - -/* replacement: libevdev_get_property_name */ -const char* libevdev_get_input_prop_name(unsigned int prop) LIBEVDEV_DEPRECATED; - -int libevdev_get_product_id(const struct libevdev *dev) LIBEVDEV_DEPRECATED; -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 */ -- 2.7.4