Commit 7e418667 authored by Nikolai Kondrashov's avatar Nikolai Kondrashov Committed by Jiri Kosina
Browse files

HID: uclogic: Split pen and frame raw event handling 



In order to avoid ending up with  a big uclogic_raw_event function,
split it in two smaller functions: uclogic_raw_event_pen for the pen
events and uclogic_raw_event_frame for the pad events.

Signed-off-by: default avatarNikolai Kondrashov <spbnick@gmail.com>
Signed-off-by: default avatarJosé Expósito <jose.exposito89@gmail.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 5591403c

drivers/hid/hid-uclogic-core.c

+120 −75
Original line number Diff line number Diff line
@@ -246,25 +246,24 @@ static int uclogic_resume(struct hid_device *hdev) 
}

#endif



static int uclogic_raw_event(struct hid_device *hdev,

				struct hid_report *report,

/**

 * uclogic_raw_event_pen - handle raw pen events (pen HID reports).

 *

 * @drvdata:	Driver data.

 * @data:	Report data buffer, can be modified.

 * @size:	Report data size, bytes.

 *

 * Returns:

 *	Negative value on error (stops event delivery), zero for success.

 */

static int uclogic_raw_event_pen(struct uclogic_drvdata *drvdata,

					u8 *data, int size)

{

	struct uclogic_drvdata *drvdata = hid_get_drvdata(hdev);

	struct uclogic_params *params = &drvdata->params;



	/* Tweak pen reports, if necessary */

	if (!params->pen_unused &&

	    (report->type == HID_INPUT_REPORT) &&

	    (report->id == params->pen.id) &&

	    (size >= 2)) {

		/* If it's the "virtual" frame controls report */

		if (params->frame.id != 0 &&

		    data[1] & params->pen_frame_flag) {

			/* Change to virtual frame controls report ID */

			data[0] = params->frame.id;

			return 0;

		}

	WARN_ON(drvdata == NULL);

	WARN_ON(data == NULL && size != 0);



	/* If in-range reports are inverted */

	if (params->pen.inrange ==

		UCLOGIC_PARAMS_PEN_INRANGE_INVERTED) {
@@ -307,11 +306,28 @@ static int uclogic_raw_event(struct hid_device *hdev, 
	/* If we report tilt and Y direction is flipped */

	if (size >= 12 && params->pen.tilt_y_flipped)

		data[11] = -data[11];



	return 0;

}



	/* Tweak frame control reports, if necessary */

	if ((report->type == HID_INPUT_REPORT) &&

	    (report->id == params->frame.id)) {

/**

 * uclogic_raw_event_frame - handle raw frame events (frame HID reports).

 *

 * @drvdata:	Driver data.

 * @data:	Report data buffer, can be modified.

 * @size:	Report data size, bytes.

 *

 * Returns:

 *	Negative value on error (stops event delivery), zero for success.

 */

static int uclogic_raw_event_frame(struct uclogic_drvdata *drvdata,

					u8 *data, int size)

{

	struct uclogic_params *params = &drvdata->params;



	WARN_ON(drvdata == NULL);

	WARN_ON(data == NULL && size != 0);



	/* If need to, and can, set pad device ID for Wacom drivers */

	if (params->frame.dev_id_byte > 0 &&

	    params->frame.dev_id_byte < size) {
@@ -343,8 +359,37 @@ static int uclogic_raw_event(struct hid_device *hdev, 
		/* Remember state */

		drvdata->re_state = state;

	}



	return 0;

}



static int uclogic_raw_event(struct hid_device *hdev,

				struct hid_report *report,

				u8 *data, int size)

{

	struct uclogic_drvdata *drvdata = hid_get_drvdata(hdev);

	struct uclogic_params *params = &drvdata->params;



	/* Tweak pen reports, if necessary */

	if (!params->pen_unused &&

	    (report->type == HID_INPUT_REPORT) &&

	    (report->id == params->pen.id) &&

	    (size >= 2)) {

		/* If it's the "virtual" frame controls report */

		if (params->frame.id != 0 &&

		    data[1] & params->pen_frame_flag) {

			/* Change to virtual frame controls report ID */

			data[0] = params->frame.id;

			return 0;

		}

		return uclogic_raw_event_pen(drvdata, data, size);

	}



	/* Tweak frame control reports, if necessary */

	if ((report->type == HID_INPUT_REPORT) &&

	    (report->id == params->frame.id))

		return uclogic_raw_event_frame(drvdata, data, size);



	return 0;

}