From fc6f2bb9d67fbaa4ee0018bab1f08cb51b50713a Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 26 Aug 2014 10:33:39 +1000 Subject: [PATCH] udev: use evdev_device_calibrate() instead of manually writing the matrix We have a wrapper, use it. Signed-off-by: Peter Hutterer Reviewed-by: Hans de Goede --- src/udev-seat.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/src/udev-seat.c b/src/udev-seat.c index 8d198947..2947e712 100644 --- a/src/udev-seat.c +++ b/src/udev-seat.c @@ -49,6 +49,7 @@ device_added(struct udev_device *udev_device, struct udev_input *input) const char *sysname; const char *device_seat, *seat_name, *output_name; const char *calibration_values; + float calibration[6]; struct udev_seat *seat; device_seat = udev_device_get_property_value(udev_device, "ID_SEAT"); @@ -93,21 +94,21 @@ device_added(struct udev_device *udev_device, struct udev_input *input) if (calibration_values && sscanf(calibration_values, "%f %f %f %f %f %f", - &device->abs.calibration[0], - &device->abs.calibration[1], - &device->abs.calibration[2], - &device->abs.calibration[3], - &device->abs.calibration[4], - &device->abs.calibration[5]) == 6) { - device->abs.apply_calibration = 1; + &calibration[0], + &calibration[1], + &calibration[2], + &calibration[3], + &calibration[4], + &calibration[5]) == 6) { + evdev_device_calibrate(device, calibration); log_info(&input->base, "Applying calibration: %f %f %f %f %f %f\n", - device->abs.calibration[0], - device->abs.calibration[1], - device->abs.calibration[2], - device->abs.calibration[3], - device->abs.calibration[4], - device->abs.calibration[5]); + calibration[0], + calibration[1], + calibration[2], + calibration[3], + calibration[4], + calibration[5]); } output_name = udev_device_get_property_value(udev_device, "WL_OUTPUT"); -- 2.34.1