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

Commit 9ebf3d76 authored by Henrik Rydberg's avatar Henrik Rydberg
Browse files

HID: Add an input configured notification callback 



A hid device may create several input devices, and a driver may need
to prepare or finalize the configuration per input device. Currently,
there is no sane way for a driver to know when a device has been
configured. This patch adds a callback providing that information.

Reviewed-and-tested-by: default avatarBenjamin Tissoires <benjamin.tissoires@enac.fr>
Tested-by: default avatarPing Cheng <pingc@wacom.com>
Acked-by: default avatarJiri Kosina <jkosina@suse.cz>
Signed-off-by: default avatarHenrik Rydberg <rydberg@euromail.se>
parent 22739293

drivers/hid/hid-input.c

+9 −2
Original line number Diff line number Diff line
@@ -1154,6 +1154,7 @@ static void report_features(struct hid_device *hid) 


int hidinput_connect(struct hid_device *hid, unsigned int force)

{

	struct hid_driver *drv = hid->driver;

	struct hid_report *report;

	struct hid_input *hidinput = NULL;

	struct input_dev *input_dev;
@@ -1228,6 +1229,8 @@ int hidinput_connect(struct hid_device *hid, unsigned int force) 
				 * UGCI) cram a lot of unrelated inputs into the

				 * same interface. */

				hidinput->report = report;

				if (drv->input_configured)

					drv->input_configured(hid, hidinput);

				if (input_register_device(hidinput->input))

					goto out_cleanup;

				hidinput = NULL;
@@ -1235,8 +1238,12 @@ int hidinput_connect(struct hid_device *hid, unsigned int force) 
		}

	}



	if (hidinput && input_register_device(hidinput->input))

	if (hidinput) {

		if (drv->input_configured)

			drv->input_configured(hid, hidinput);

		if (input_register_device(hidinput->input))

			goto out_cleanup;

	}



	return 0;

include/linux/hid.h

+3 −0
Original line number Diff line number Diff line
@@ -626,6 +626,7 @@ struct hid_usage_id { 
 * @report_fixup: called before report descriptor parsing (NULL means nop)

 * @input_mapping: invoked on input registering before mapping an usage

 * @input_mapped: invoked on input registering after mapping an usage

 * @input_configured: invoked just before the device is registered

 * @feature_mapping: invoked on feature registering

 * @suspend: invoked on suspend (NULL means nop)

 * @resume: invoked on resume if device was not reset (NULL means nop)
@@ -670,6 +671,8 @@ struct hid_driver { 
	int (*input_mapped)(struct hid_device *hdev,

			struct hid_input *hidinput, struct hid_field *field,

			struct hid_usage *usage, unsigned long **bit, int *max);

	void (*input_configured)(struct hid_device *hdev,

				 struct hid_input *hidinput);

	void (*feature_mapping)(struct hid_device *hdev,

			struct hid_field *field,

			struct hid_usage *usage);