libevdev/libevdev.c | 24 ++++++++++++++++++++++++

 1 file changed, 24 insertions(+)

 

diff --git a/libevdev/libevdev.c b/libevdev/libevdev.c

index b941cfb..7e8d935 100644

--- a/libevdev/libevdev.c

+++ b/libevdev/libevdev.c

@@ -236,10 +236,12 @@ libevdev_new_from_fd(int fd, struct libevdev **dev)

        int rc;

 

        d = libevdev_new();

+       log_error(NULL, "[libevdev] libevdev_new\n");

        if (!d)

                return -ENOMEM;

 

        rc = libevdev_set_fd(d, fd);

+       log_error(NULL, "[libevdev] libevdev_set_fd returned %d\n", rc);

        if (rc < 0)

                libevdev_free(d);

        else

@@ -389,11 +391,13 @@ libevdev_set_fd(struct libevdev* dev, int fd)

        libevdev_reset(dev);

 

        rc = ioctl(fd, EVIOCGBIT(0, sizeof(dev->bits)), dev->bits);

+       log_error(NULL, "[libevdev] ioctl1 returned %d, errno=%d (%s)\n", rc, errno, strerror(errno));

        if (rc < 0)

                goto out;

 

        memset(buf, 0, sizeof(buf));

        rc = ioctl(fd, EVIOCGNAME(sizeof(buf) - 1), buf);

+       log_error(NULL, "[libevdev] ioctl2 returned %d\n", rc);

        if (rc < 0)

                goto out;

 

@@ -408,6 +412,7 @@ libevdev_set_fd(struct libevdev* dev, int fd)

        dev->phys = NULL;

        memset(buf, 0, sizeof(buf));

        rc = ioctl(fd, EVIOCGPHYS(sizeof(buf) - 1), buf);

+       log_error(NULL, "[libevdev] ioctl3 returned %d\n", rc);

        if (rc < 0) {

                /* uinput has no phys */

                if (errno != ENOENT)

@@ -424,6 +429,7 @@ libevdev_set_fd(struct libevdev* dev, int fd)

        dev->uniq = NULL;

        memset(buf, 0, sizeof(buf));

        rc = ioctl(fd, EVIOCGUNIQ(sizeof(buf) - 1), buf);

+       log_error(NULL, "[libevdev] ioctl4 returned %d\n", rc);

        if (rc < 0) {

                if (errno != ENOENT)

                        goto out;

@@ -436,10 +442,12 @@ libevdev_set_fd(struct libevdev* dev, int fd)

        }

 

        rc = ioctl(fd, EVIOCGID, &dev->ids);

+       log_error(NULL, "[libevdev] ioctl5 returned %d\n", rc);

        if (rc < 0)

                goto out;

 

        rc = ioctl(fd, EVIOCGVERSION, &dev->driver_version);

+       log_error(NULL, "[libevdev] ioctl6 returned %d\n", rc);

        if (rc < 0)

                goto out;

 

@@ -448,50 +456,62 @@ libevdev_set_fd(struct libevdev* dev, int fd)

           than that everything is as expected.

         */

        rc = ioctl(fd, EVIOCGPROP(sizeof(dev->props)), dev->props);

+       log_error(NULL, "[libevdev] ioctl7 returned %d\n", rc);

        if (rc < 0 && errno != EINVAL)

                goto out;

 

        rc = ioctl(fd, EVIOCGBIT(EV_REL, sizeof(dev->rel_bits)), dev->rel_bits);

+       log_error(NULL, "[libevdev] ioctl8 returned %d\n", rc);

        if (rc < 0)

                goto out;

 

        rc = ioctl(fd, EVIOCGBIT(EV_ABS, sizeof(dev->abs_bits)), dev->abs_bits);

+       log_error(NULL, "[libevdev] ioctl9 returned %d\n", rc);

        if (rc < 0)

                goto out;

 

        rc = ioctl(fd, EVIOCGBIT(EV_LED, sizeof(dev->led_bits)), dev->led_bits);

+       log_error(NULL, "[libevdev] ioctl10 returned %d\n", rc);

        if (rc < 0)

                goto out;

 

        rc = ioctl(fd, EVIOCGBIT(EV_KEY, sizeof(dev->key_bits)), dev->key_bits);

+       log_error(NULL, "[libevdev] ioctl11 returned %d\n", rc);

        if (rc < 0)

                goto out;

 

        rc = ioctl(fd, EVIOCGBIT(EV_SW, sizeof(dev->sw_bits)), dev->sw_bits);

+       log_error(NULL, "[libevdev] ioctl12 returned %d\n", rc);

        if (rc < 0)

                goto out;

 

        rc = ioctl(fd, EVIOCGBIT(EV_MSC, sizeof(dev->msc_bits)), dev->msc_bits);

+       log_error(NULL, "[libevdev] ioctl13 returned %d\n", rc);

        if (rc < 0)

                goto out;

 

        rc = ioctl(fd, EVIOCGBIT(EV_FF, sizeof(dev->ff_bits)), dev->ff_bits);

+       log_error(NULL, "[libevdev] ioctl14 returned %d\n", rc);

        if (rc < 0)

                goto out;

 

        rc = ioctl(fd, EVIOCGBIT(EV_SND, sizeof(dev->snd_bits)), dev->snd_bits);

+       log_error(NULL, "[libevdev] ioctl15 returned %d\n", rc);

        if (rc < 0)

                goto out;

 

        rc = ioctl(fd, EVIOCGKEY(sizeof(dev->key_values)), dev->key_values);

+       log_error(NULL, "[libevdev] ioctl16 returned %d\n", rc);

        if (rc < 0)

                goto out;

 

        rc = ioctl(fd, EVIOCGLED(sizeof(dev->led_values)), dev->led_values);

+       log_error(NULL, "[libevdev] ioctl17 returned %d\n", rc);

        if (rc < 0)

                goto out;

 

        rc = ioctl(fd, EVIOCGSW(sizeof(dev->sw_values)), dev->sw_values);

+       log_error(NULL, "[libevdev] ioctl18 returned %d\n", rc);

        if (rc < 0)

                goto out;

 

@@ -500,6 +520,7 @@ libevdev_set_fd(struct libevdev* dev, int fd)

                for (i = 0; i < REP_CNT; i++)

                        set_bit(dev->rep_bits, i);

                rc = ioctl(fd, EVIOCGREP, dev->rep_values);

+               log_error(NULL, "[libevdev] ioctl18b returned %d\n", rc);

                if (rc < 0)

                        goto out;

        }

@@ -508,6 +529,7 @@ libevdev_set_fd(struct libevdev* dev, int fd)

                if (bit_is_set(dev->abs_bits, i)) {

                        struct input_absinfo abs_info;

                        rc = ioctl(fd, EVIOCGABS(i), &abs_info);

+                       log_error(NULL, "[libevdev] ioctl18c returned %d\n", rc);

                        if (rc < 0)

                                goto out;

 

@@ -520,6 +542,7 @@ libevdev_set_fd(struct libevdev* dev, int fd)

        dev->fd = fd;

 

        rc = init_slots(dev);

+       log_error(NULL, "[libevdev] init_slots returned %d\n", rc);

        if (rc != 0)

                goto out;

 

@@ -529,6 +552,7 @@ libevdev_set_fd(struct libevdev* dev, int fd)

        }

 

        rc = init_event_queue(dev);

+       log_error(NULL, "[libevdev] init_event_queue returned %d\n", rc);

        if (rc < 0) {

                dev->fd = -1;

                return -rc;