From 7a38f4abc3ed1df368d5bad32a1d72559acdc234 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 22 Nov 2013 10:23:55 +1000 Subject: [PATCH] Drop deprecated functions Signed-off-by: Peter Hutterer Reviewed-by: David Herrmann --- libevdev/libevdev.c | 49 ------------------------------------------------- libevdev/libevdev.h | 30 ------------------------------ 2 files changed, 79 deletions(-) diff --git a/libevdev/libevdev.c b/libevdev/libevdev.c index ca57e26..bc041e2 100644 --- a/libevdev/libevdev.c +++ b/libevdev/libevdev.c @@ -168,14 +168,6 @@ libevdev_free(struct libevdev *dev) free(dev); } -/* DEPRECATED */ -LIBEVDEV_EXPORT void -libevdev_set_log_handler(struct libevdev *dev, libevdev_log_func_t logfunc) -{ - /* Can't be backwards compatible to this yet, so don't even try */ - fprintf(stderr, "libevdev: ABI change. Log function will not be honored.\n"); -} - LIBEVDEV_EXPORT void libevdev_set_log_function(libevdev_log_func_t logfunc, void *data) { @@ -1240,12 +1232,6 @@ libevdev_disable_event_code(struct libevdev *dev, unsigned int type, unsigned in } LIBEVDEV_EXPORT 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); -} - -LIBEVDEV_EXPORT int libevdev_kernel_set_abs_info(struct libevdev *dev, unsigned int code, const struct input_absinfo *abs) { int rc; @@ -1298,22 +1284,12 @@ libevdev_grab(struct libevdev *dev, enum libevdev_grab_mode grab) return rc < 0 ? -errno : 0; } -/* DEPRECATED */ -LIBEVDEV_EXPORT int -libevdev_is_event_type(const struct input_event *ev, unsigned int type) -ALIAS(libevdev_event_is_type); - LIBEVDEV_EXPORT int libevdev_event_is_type(const struct input_event *ev, unsigned int type) { return type < EV_CNT && ev->type == type; } -/* DEPRECATED */ -LIBEVDEV_EXPORT int -libevdev_is_event_code(const struct input_event *ev, unsigned int type, unsigned int code) -ALIAS(libevdev_event_is_code); - LIBEVDEV_EXPORT int libevdev_event_is_code(const struct input_event *ev, unsigned int type, unsigned int code) { @@ -1326,11 +1302,6 @@ libevdev_event_is_code(const struct input_event *ev, unsigned int type, unsigned return (max > -1 && code <= (unsigned int)max && ev->code == code); } -/* DEPRECATED */ -LIBEVDEV_EXPORT const char* -libevdev_get_event_type_name(unsigned int type) -ALIAS(libevdev_event_type_get_name); - LIBEVDEV_EXPORT const char* libevdev_event_type_get_name(unsigned int type) { @@ -1340,11 +1311,6 @@ libevdev_event_type_get_name(unsigned int type) return ev_map[type]; } -/* DEPRECATED */ -LIBEVDEV_EXPORT const char* -libevdev_get_event_code_name(unsigned int type, unsigned int code) -ALIAS(libevdev_event_code_get_name); - LIBEVDEV_EXPORT const char* libevdev_event_code_get_name(unsigned int type, unsigned int code) { @@ -1356,16 +1322,6 @@ libevdev_event_code_get_name(unsigned int type, unsigned int code) return event_type_map[type][code]; } -/* DEPRECATED */ -LIBEVDEV_EXPORT const char* -libevdev_get_input_prop_name(unsigned int prop) -ALIAS(libevdev_property_get_name); - -/* DEPRECATED */ -LIBEVDEV_EXPORT const char* -libevdev_get_property_name(unsigned int prop) -ALIAS(libevdev_property_get_name); - LIBEVDEV_EXPORT const char* libevdev_property_get_name(unsigned int prop) { @@ -1375,11 +1331,6 @@ libevdev_property_get_name(unsigned int prop) return input_prop_map[prop]; } -/* DEPRECATED */ -LIBEVDEV_EXPORT int -libevdev_get_event_type_max(unsigned int type) -ALIAS(libevdev_event_type_get_max); - LIBEVDEV_EXPORT int libevdev_event_type_get_max(unsigned int type) { diff --git a/libevdev/libevdev.h b/libevdev/libevdev.h index 1ee74b9..121fb3e 100644 --- a/libevdev/libevdev.h +++ b/libevdev/libevdev.h @@ -1561,36 +1561,6 @@ int libevdev_get_repeat(struct libevdev *dev, int *delay, int *period); #define LIBEVDEV_DEPRECATED #endif -LIBEVDEV_DEPRECATED extern const enum libevdev_read_flag LIBEVDEV_READ_SYNC; -LIBEVDEV_DEPRECATED extern const enum libevdev_read_flag LIBEVDEV_READ_NORMAL; -LIBEVDEV_DEPRECATED extern const enum libevdev_read_flag LIBEVDEV_FORCE_SYNC; -LIBEVDEV_DEPRECATED extern const enum libevdev_read_flag LIBEVDEV_READ_BLOCKING; - -/* 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; - - -/* replacement: libevdev_set_log_function */ -void libevdev_set_log_handler(struct libevdev *dev, libevdev_log_func_t logfunc) LIBEVDEV_DEPRECATED; - -/** replacement: libevdev_event_type_get_max */ -int libevdev_get_event_type_max(unsigned int type) LIBEVDEV_DEPRECATED; - -/** replacement: libevdev_property_get_name */ -const char* libevdev_get_property_name(unsigned int prop) LIBEVDEV_DEPRECATED; - -/** replacement: libevdev_event_type_get_name */ -const char * libevdev_get_event_type_name(unsigned int type) LIBEVDEV_DEPRECATED; -/** replacement: libevdev_event_code_get_name */ -const char * libevdev_get_event_code_name(unsigned int type, unsigned int code) LIBEVDEV_DEPRECATED; - -/** replacement: libevdev_event_is_type */ -int libevdev_is_event_type(const struct input_event *ev, unsigned int type) LIBEVDEV_DEPRECATED; - -/** replacement: libevdev_event_is_code */ -int libevdev_is_event_code(const struct input_event *ev, unsigned int type, unsigned int code) LIBEVDEV_DEPRECATED; -/**************************************/ - #ifdef __cplusplus } #endif -- 2.7.4