Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 987a6c02 authored by Daniel Mack's avatar Daniel Mack Committed by Dmitry Torokhov
Browse files

Input: switch to input_abs_*() access functions 



Change all call sites in drivers/input to not access the ABS axis
information directly anymore. Make them use the access helpers instead.

Also use input_set_abs_params() when possible.
Did some code refactoring as I was on it.

Signed-off-by: default avatarDaniel Mack <daniel@caiaq.de>
Cc: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent 7957e9c4

drivers/hid/hid-wacom.c

+24 −25
Original line number Diff line number Diff line
@@ -230,7 +230,7 @@ static int wacom_raw_event(struct hid_device *hdev, struct hid_report *report, 
				input_report_key(input, BTN_RIGHT, 0);

				input_report_key(input, BTN_MIDDLE, 0);

				input_report_abs(input, ABS_DISTANCE,

						input->absmax[ABS_DISTANCE]);

					input_abs_get_max(input, ABS_DISTANCE));

			} else {

				input_report_key(input, BTN_TOUCH, 0);

				input_report_key(input, BTN_STYLUS, 0);
@@ -383,38 +383,37 @@ move_on: 


	/* Basics */

	input->evbit[0] |= BIT(EV_KEY) | BIT(EV_ABS) | BIT(EV_REL);

	input->absbit[0] |= BIT(ABS_X) | BIT(ABS_Y) |

		BIT(ABS_PRESSURE) | BIT(ABS_DISTANCE);

	input->relbit[0] |= BIT(REL_WHEEL);

	set_bit(BTN_TOOL_PEN, input->keybit);

	set_bit(BTN_TOUCH, input->keybit);

	set_bit(BTN_STYLUS, input->keybit);

	set_bit(BTN_STYLUS2, input->keybit);

	set_bit(BTN_LEFT, input->keybit);

	set_bit(BTN_RIGHT, input->keybit);

	set_bit(BTN_MIDDLE, input->keybit);



	__set_bit(REL_WHEEL, input->relbit);



	__set_bit(BTN_TOOL_PEN, input->keybit);

	__set_bit(BTN_TOUCH, input->keybit);

	__set_bit(BTN_STYLUS, input->keybit);

	__set_bit(BTN_STYLUS2, input->keybit);

	__set_bit(BTN_LEFT, input->keybit);

	__set_bit(BTN_RIGHT, input->keybit);

	__set_bit(BTN_MIDDLE, input->keybit);



	/* Pad */

	input->evbit[0] |= BIT(EV_MSC);

	input->mscbit[0] |= BIT(MSC_SERIAL);

	set_bit(BTN_0, input->keybit);

	set_bit(BTN_1, input->keybit);

	set_bit(BTN_TOOL_FINGER, input->keybit);



	/* Distance, rubber and mouse */

	input->absbit[0] |= BIT(ABS_DISTANCE);

	set_bit(BTN_TOOL_RUBBER, input->keybit);

	set_bit(BTN_TOOL_MOUSE, input->keybit);

	__set_bit(MSC_SERIAL, input->mscbit);



	input->absmax[ABS_PRESSURE] = 511;

	input->absmax[ABS_DISTANCE] = 32;

	__set_bit(BTN_0, input->keybit);

	__set_bit(BTN_1, input->keybit);

	__set_bit(BTN_TOOL_FINGER, input->keybit);



	input->absmax[ABS_X] = 16704;

	input->absmax[ABS_Y] = 12064;

	input->absfuzz[ABS_X] = 4;

	input->absfuzz[ABS_Y] = 4;

	/* Distance, rubber and mouse */

	__set_bit(BTN_TOOL_RUBBER, input->keybit);

	__set_bit(BTN_TOOL_MOUSE, input->keybit);



	input_set_abs_params(input, ABS_X, 0, 16704, 4, 0);

	input_set_abs_params(input, ABS_Y, 0, 12064, 4, 0);

	input_set_abs_params(input, ABS_PRESSURE, 0, 511, 0, 0);

	input_set_abs_params(input, ABS_DISTANCE, 0, 32, 0, 0);



	return 0;



err_free:

	kfree(wdata);

	return ret;

drivers/input/evdev.c

+13 −13
Original line number Diff line number Diff line
@@ -650,12 +650,12 @@ static long evdev_do_ioctl(struct file *file, unsigned int cmd, 


				t = _IOC_NR(cmd) & ABS_MAX;



				abs.value = dev->abs[t];

				abs.minimum = dev->absmin[t];

				abs.maximum = dev->absmax[t];

				abs.fuzz = dev->absfuzz[t];

				abs.flat = dev->absflat[t];

				abs.resolution = dev->absres[t];

				abs.value = input_abs_get_val(dev, t);

				abs.minimum = input_abs_get_min(dev, t);

				abs.maximum = input_abs_get_max(dev, t);

				abs.fuzz = input_abs_get_fuzz(dev, t);

				abs.flat = input_abs_get_flat(dev, t);

				abs.resolution = input_abs_get_res(dev, t);



				if (copy_to_user(p, &abs, min_t(size_t,

								_IOC_SIZE(cmd),
@@ -702,13 +702,13 @@ static long evdev_do_ioctl(struct file *file, unsigned int cmd, 
				 */

				spin_lock_irq(&dev->event_lock);



				dev->abs[t] = abs.value;

				dev->absmin[t] = abs.minimum;

				dev->absmax[t] = abs.maximum;

				dev->absfuzz[t] = abs.fuzz;

				dev->absflat[t] = abs.flat;

				dev->absres[t] = _IOC_SIZE(cmd) < sizeof(struct input_absinfo) ?

							0 : abs.resolution;

				input_abs_set_val(dev, t, abs.value);

				input_abs_set_min(dev, t, abs.minimum);

				input_abs_set_max(dev, t, abs.maximum);

				input_abs_set_fuzz(dev, t, abs.fuzz);

				input_abs_set_flat(dev, t, abs.flat);

				input_abs_set_res(dev, t, _IOC_SIZE(cmd) < sizeof(struct input_absinfo) ?

								0 : abs.resolution);



				spin_unlock_irq(&dev->event_lock);

drivers/input/input.c

+2 −2
Original line number Diff line number Diff line
@@ -204,8 +204,8 @@ static int input_handle_abs_event(struct input_dev *dev, 
	}



	/* Flush pending "slot" event */

	if (is_mt_event && dev->slot != dev->abs[ABS_MT_SLOT]) {

		dev->abs[ABS_MT_SLOT] = dev->slot;

	if (is_mt_event && dev->slot != input_abs_get_val(dev, ABS_MT_SLOT)) {

		input_abs_set_val(dev, ABS_MT_SLOT, dev->slot);

		input_pass_event(dev, EV_ABS, ABS_MT_SLOT, dev->slot);

	}

drivers/input/joydev.c

+16 −15
Original line number Diff line number Diff line
@@ -530,7 +530,7 @@ static int joydev_ioctl_common(struct joydev *joydev, 
{

	struct input_dev *dev = joydev->handle.dev;

	size_t len;

	int i, j;

	int i;

	const char *name;



	/* Process fixed-sized commands. */
@@ -565,9 +565,8 @@ static int joydev_ioctl_common(struct joydev *joydev, 
			return -EFAULT;



		for (i = 0; i < joydev->nabs; i++) {

			j = joydev->abspam[i];

			joydev->abs[i] = joydev_correct(dev->abs[j],

							&joydev->corr[i]);

			int val = input_abs_get_val(dev, joydev->abspam[i]);

			joydev->abs[i] = joydev_correct(val, &joydev->corr[i]);

		}

		return 0;
@@ -848,24 +847,26 @@ static int joydev_connect(struct input_handler *handler, struct input_dev *dev, 


	for (i = 0; i < joydev->nabs; i++) {

		j = joydev->abspam[i];

		if (dev->absmax[j] == dev->absmin[j]) {

		if (input_abs_get_max(dev, j) == input_abs_get_min(dev, j)) {

			joydev->corr[i].type = JS_CORR_NONE;

			joydev->abs[i] = dev->abs[j];

			joydev->abs[i] = input_abs_get_val(dev, j);

			continue;

		}

		joydev->corr[i].type = JS_CORR_BROKEN;

		joydev->corr[i].prec = dev->absfuzz[j];

		joydev->corr[i].coef[0] =

			(dev->absmax[j] + dev->absmin[j]) / 2 - dev->absflat[j];

		joydev->corr[i].coef[1] =

			(dev->absmax[j] + dev->absmin[j]) / 2 + dev->absflat[j];

		joydev->corr[i].prec = input_abs_get_fuzz(dev, j);



		t = (input_abs_get_max(dev, j) + input_abs_get_min(dev, j)) / 2;

		joydev->corr[i].coef[0] = t - input_abs_get_flat(dev, j);

		joydev->corr[i].coef[1] = t + input_abs_get_flat(dev, j);



		t = (dev->absmax[j] - dev->absmin[j]) / 2 - 2 * dev->absflat[j];

		t = (input_abs_get_max(dev, j) - input_abs_get_min(dev, j)) / 2

			- 2 * input_abs_get_flat(dev, j);

		if (t) {

			joydev->corr[i].coef[2] = (1 << 29) / t;

			joydev->corr[i].coef[3] = (1 << 29) / t;



			joydev->abs[i] = joydev_correct(dev->abs[j],

			joydev->abs[i] =

				joydev_correct(input_abs_get_val(dev, j),

					       joydev->corr + i);

		}

	}

drivers/input/joystick/a3d.c

+2 −1
Original line number Diff line number Diff line
@@ -342,7 +342,8 @@ static int a3d_connect(struct gameport *gameport, struct gameport_driver *drv) 


		for (i = 0; i < 4; i++) {

			if (i < 2)

				input_set_abs_params(input_dev, axes[i], 48, input_dev->abs[axes[i]] * 2 - 48, 0, 8);

				input_set_abs_params(input_dev, axes[i],

					48, input_abs_get_val(input_dev, axes[i]) * 2 - 48, 0, 8);

			else

				input_set_abs_params(input_dev, axes[i], 2, 253, 0, 0);

			input_set_abs_params(input_dev, ABS_HAT0X + i, -1, 1, 0, 0);