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

Commit 55dfce87 authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Input: factor out and export input_device_id matching code 



Factor out and export input_match_device_id() so that modules may use it.
It will be needed by joydev to blacklist accelerometers in composite
devices.

Tested-by: default avatarRoderick Colenbrander <roderick.colenbrander@sony.com>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 9b5db7aa

drivers/input/input.c

+38 −45
Original line number Diff line number Diff line
@@ -933,59 +933,52 @@ int input_set_keycode(struct input_dev *dev, 
}

EXPORT_SYMBOL(input_set_keycode);



static const struct input_device_id *input_match_device(struct input_handler *handler,

							struct input_dev *dev)

bool input_match_device_id(const struct input_dev *dev,

			   const struct input_device_id *id)

{

	const struct input_device_id *id;



	for (id = handler->id_table; id->flags || id->driver_info; id++) {



	if (id->flags & INPUT_DEVICE_ID_MATCH_BUS)

		if (id->bustype != dev->id.bustype)

				continue;

			return false;



	if (id->flags & INPUT_DEVICE_ID_MATCH_VENDOR)

		if (id->vendor != dev->id.vendor)

				continue;

			return false;



	if (id->flags & INPUT_DEVICE_ID_MATCH_PRODUCT)

		if (id->product != dev->id.product)

				continue;

			return false;



	if (id->flags & INPUT_DEVICE_ID_MATCH_VERSION)

		if (id->version != dev->id.version)

				continue;



		if (!bitmap_subset(id->evbit, dev->evbit, EV_MAX))

			continue;



		if (!bitmap_subset(id->keybit, dev->keybit, KEY_MAX))

			continue;



		if (!bitmap_subset(id->relbit, dev->relbit, REL_MAX))

			continue;

			return false;



		if (!bitmap_subset(id->absbit, dev->absbit, ABS_MAX))

			continue;



		if (!bitmap_subset(id->mscbit, dev->mscbit, MSC_MAX))

			continue;



		if (!bitmap_subset(id->ledbit, dev->ledbit, LED_MAX))

			continue;



		if (!bitmap_subset(id->sndbit, dev->sndbit, SND_MAX))

			continue;

	if (!bitmap_subset(id->evbit, dev->evbit, EV_MAX) ||

	    !bitmap_subset(id->keybit, dev->keybit, KEY_MAX) ||

	    !bitmap_subset(id->relbit, dev->relbit, REL_MAX) ||

	    !bitmap_subset(id->absbit, dev->absbit, ABS_MAX) ||

	    !bitmap_subset(id->mscbit, dev->mscbit, MSC_MAX) ||

	    !bitmap_subset(id->ledbit, dev->ledbit, LED_MAX) ||

	    !bitmap_subset(id->sndbit, dev->sndbit, SND_MAX) ||

	    !bitmap_subset(id->ffbit, dev->ffbit, FF_MAX) ||

	    !bitmap_subset(id->swbit, dev->swbit, SW_MAX)) {

		return false;

	}



		if (!bitmap_subset(id->ffbit, dev->ffbit, FF_MAX))

			continue;

	return true;

}

EXPORT_SYMBOL(input_match_device_id);



		if (!bitmap_subset(id->swbit, dev->swbit, SW_MAX))

			continue;

static const struct input_device_id *input_match_device(struct input_handler *handler,

							struct input_dev *dev)

{

	const struct input_device_id *id;



		if (!handler->match || handler->match(handler, dev))

	for (id = handler->id_table; id->flags || id->driver_info; id++) {

		if (input_match_device_id(dev, id) &&

		    (!handler->match || handler->match(handler, dev))) {

			return id;

		}

	}



	return NULL;

}

include/linux/input.h

+3 −0
Original line number Diff line number Diff line
@@ -469,6 +469,9 @@ int input_get_keycode(struct input_dev *dev, struct input_keymap_entry *ke); 
int input_set_keycode(struct input_dev *dev,

		      const struct input_keymap_entry *ke);



bool input_match_device_id(const struct input_dev *dev,

			   const struct input_device_id *id);



void input_enable_softrepeat(struct input_dev *dev, int delay, int period);



extern struct class input_class;