Rename ER_SYNC flag to LIBEVDEV_READ_SYNC

ER dated to an earlier version of this library called libevdev_read.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

diff --git a/libevdev/libevdev.c b/libevdev/libevdev.c
index 0523c53450ee64b58d003622749858913e8da1ce..0107e725072d2801dd0dc9e1c914d8e4a85e874d 100644 (file)
--- a/libevdev/libevdev.c
+++ b/libevdev/libevdev.c
@@ -524,7 +524,7 @@ int libevdev_next_event(struct libevdev *dev, unsigned int flags, struct input_e
        if (dev->fd < 0)
                return -ENODEV;
 
-       if (flags & ER_SYNC) {
+       if (flags & LIBEVDEV_READ_SYNC) {
                if (!dev->need_sync && dev->queue_nsync == 0)
                        return -EAGAIN;
                else if (dev->need_sync) {
@@ -552,7 +552,7 @@ int libevdev_next_event(struct libevdev *dev, unsigned int flags, struct input_e
                rc = 1;
        }
 
-       if (flags & ER_SYNC && dev->queue_nsync > 0) {
+       if (flags & LIBEVDEV_READ_SYNC && dev->queue_nsync > 0) {
                dev->queue_nsync--;
                rc = 1;
        }

diff --git a/libevdev/libevdev.h b/libevdev/libevdev.h
index 4a6e183ee9ff98ded1da7df280c5b9a7a93d58b1..5a316eb8977be790e28232b1256e78f124b93459 100644 (file)
--- a/libevdev/libevdev.h
+++ b/libevdev/libevdev.h
@@ -29,9 +29,7 @@
 struct libevdev;
 
 enum EvdevReadFlags {
-    ER_SINGLE          = 1, /**< Read until including the first EV_SYN or EAGAIN */
-    ER_SYNC            = 2, /**< Process data in sync mode */
-    ER_ALL             = 4, /**< Read until EAGAIN */
+    LIBEVDEV_READ_SYNC         = 1, /**< Process data in sync mode */
 };
 
 

diff --git a/test/libevdev-events.c b/test/libevdev-events.c
index 8279229d8ef8ddc601c6c7ac665f57cb03c0554d..2b0f7038ef76a87d9c0624cfc516a986356169d3 100644 (file)
--- a/test/libevdev-events.c
+++ b/test/libevdev-events.c
@@ -103,7 +103,7 @@ main(int argc, char **argv)
                        printf("::::::::::::::::::::: dropped ::::::::::::::::::::::\n");
                        while (rc == 1) {
                                print_sync_event(&ev);
-                               rc = libevdev_next_event(dev, ER_SYNC, &ev);
+                               rc = libevdev_next_event(dev, LIBEVDEV_READ_SYNC, &ev);
                        }
                        printf("::::::::::::::::::::: re-synced ::::::::::::::::::::::\n");
                } else if (rc == 0)