Commit 2e28f3e0 authored by Nikolai Kondrashov's avatar Nikolai Kondrashov Committed by Jiri Kosina
Browse files

HID: uclogic: Use "frame" instead of "buttonpad" 



Use the term "frame" instead of "buttonpad" for consistency, in UC-Logic
driver.

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 2f290b39

drivers/hid/hid-uclogic-params.c

+22 −24
Original line number Diff line number Diff line
@@ -431,8 +431,8 @@ static int uclogic_params_frame_init_with_desc( 
}



/**

 * uclogic_params_frame_init_v1_buttonpad() - initialize abstract buttonpad

 * on a v1 tablet interface.

 * uclogic_params_frame_init_v1() - initialize v1 tablet interface frame

 * controls.

 *

 * @frame:	Pointer to the frame parameters to initialize (to be cleaned

 *		up with uclogic_params_frame_cleanup()). Not modified in case
@@ -446,8 +446,7 @@ static int uclogic_params_frame_init_with_desc( 
 * Returns:

 *	Zero, if successful. A negative errno code on error.

 */

static int uclogic_params_frame_init_v1_buttonpad(

					struct uclogic_params_frame *frame,

static int uclogic_params_frame_init_v1(struct uclogic_params_frame *frame,

					bool *pfound,

					struct hid_device *hdev)

{
@@ -488,9 +487,9 @@ static int uclogic_params_frame_init_v1_buttonpad( 
		hid_dbg(hdev, "generic buttons enabled\n");

		rc = uclogic_params_frame_init_with_desc(

				frame,

				uclogic_rdesc_buttonpad_v1_arr,

				uclogic_rdesc_buttonpad_v1_size,

				UCLOGIC_RDESC_BUTTONPAD_V1_ID);

				uclogic_rdesc_frame_v1_arr,

				uclogic_rdesc_frame_v1_size,

				UCLOGIC_RDESC_FRAME_V1_ID);

		if (rc != 0)

			goto cleanup;

		found = true;
@@ -750,22 +749,22 @@ static int uclogic_params_huion_init(struct uclogic_params *params, 
			goto cleanup;

		} else if (found) {

			hid_dbg(hdev, "pen v2 parameters found\n");

			/* Create v2 buttonpad parameters */

			/* Create v2 frame parameters */

			rc = uclogic_params_frame_init_with_desc(

					&p.frame,

					uclogic_rdesc_buttonpad_v2_arr,

					uclogic_rdesc_buttonpad_v2_size,

					UCLOGIC_RDESC_BUTTONPAD_V2_ID);

					uclogic_rdesc_frame_v2_arr,

					uclogic_rdesc_frame_v2_size,

					UCLOGIC_RDESC_FRAME_V2_ID);

			if (rc != 0) {

				hid_err(hdev,

					"failed creating v2 buttonpad parameters: %d\n",

					"failed creating v2 frame parameters: %d\n",

					rc);

				goto cleanup;

			}

			/* Link frame button subreports from pen reports */

			p.pen.subreport_list[0].value = 0xe0;

			p.pen.subreport_list[0].id =

				UCLOGIC_RDESC_BUTTONPAD_V2_ID;

				UCLOGIC_RDESC_FRAME_V2_ID;

			goto output;

		}

		hid_dbg(hdev, "pen v2 parameters not found\n");
@@ -779,21 +778,20 @@ static int uclogic_params_huion_init(struct uclogic_params *params, 
		goto cleanup;

	} else if (found) {

		hid_dbg(hdev, "pen v1 parameters found\n");

		/* Try to probe v1 buttonpad */

		rc = uclogic_params_frame_init_v1_buttonpad(

						&p.frame,

		/* Try to probe v1 frame */

		rc = uclogic_params_frame_init_v1(&p.frame,

						  &found, hdev);

		if (rc != 0) {

			hid_err(hdev, "v1 buttonpad probing failed: %d\n", rc);

			hid_err(hdev, "v1 frame probing failed: %d\n", rc);

			goto cleanup;

		}

		hid_dbg(hdev, "buttonpad v1 parameters%s found\n",

		hid_dbg(hdev, "frame v1 parameters%s found\n",

			(found ? "" : " not"));

		if (found) {

			/* Link frame button subreports from pen reports */

			p.pen.subreport_list[0].value = 0xe0;

			p.pen.subreport_list[0].id =

				UCLOGIC_RDESC_BUTTONPAD_V1_ID;

				UCLOGIC_RDESC_FRAME_V1_ID;

		}

		goto output;

	}
@@ -1067,7 +1065,7 @@ int uclogic_params_init(struct uclogic_params *params, 
				UCLOGIC_RDESC_UGEE_G5_FRAME_ID);

			if (rc != 0) {

				hid_err(hdev,

					"failed creating buttonpad parameters: %d\n",

					"failed creating frame parameters: %d\n",

					rc);

				goto cleanup;

			}
@@ -1096,12 +1094,12 @@ int uclogic_params_init(struct uclogic_params *params, 
		} else if (found) {

			rc = uclogic_params_frame_init_with_desc(

				&p.frame,

				uclogic_rdesc_ugee_ex07_buttonpad_arr,

				uclogic_rdesc_ugee_ex07_buttonpad_size,

				uclogic_rdesc_ugee_ex07_frame_arr,

				uclogic_rdesc_ugee_ex07_frame_size,

				0);

			if (rc != 0) {

				hid_err(hdev,

					"failed creating buttonpad parameters: %d\n",

					"failed creating frame parameters: %d\n",

					rc);

				goto cleanup;

			}

drivers/hid/hid-uclogic-rdesc.c

+16 −16
Original line number Diff line number Diff line
@@ -652,12 +652,12 @@ const size_t uclogic_rdesc_pen_v2_template_size = 
			sizeof(uclogic_rdesc_pen_v2_template_arr);



/*

 * Expand to the contents of a generic buttonpad report descriptor.

 * Expand to the contents of a generic frame report descriptor.

 *

 * @_id:	The report ID to use.

 * @_size:	Size of the report to pad to, including report ID, bytes.

 */

#define UCLOGIC_RDESC_BUTTONPAD_BYTES(_id, _size) \

#define UCLOGIC_RDESC_FRAME_BYTES(_id, _size) \

	0x05, 0x01,     /*  Usage Page (Desktop),               */ \

	0x09, 0x07,     /*  Usage (Keypad),                     */ \

	0xA1, 0x01,     /*  Collection (Application),           */ \
@@ -698,22 +698,22 @@ const size_t uclogic_rdesc_pen_v2_template_size = 
	0xC0,           /*      End Collection,                 */ \

	0xC0            /*  End Collection                      */



/* Fixed report descriptor for (tweaked) v1 buttonpad reports */

const __u8 uclogic_rdesc_buttonpad_v1_arr[] = {

	UCLOGIC_RDESC_BUTTONPAD_BYTES(UCLOGIC_RDESC_BUTTONPAD_V1_ID, 8)

/* Fixed report descriptor for (tweaked) v1 frame reports */

const __u8 uclogic_rdesc_frame_v1_arr[] = {

	UCLOGIC_RDESC_FRAME_BYTES(UCLOGIC_RDESC_FRAME_V1_ID, 8)

};

const size_t uclogic_rdesc_buttonpad_v1_size =

			sizeof(uclogic_rdesc_buttonpad_v1_arr);

const size_t uclogic_rdesc_frame_v1_size =

			sizeof(uclogic_rdesc_frame_v1_arr);



/* Fixed report descriptor for (tweaked) v2 buttonpad reports */

const __u8 uclogic_rdesc_buttonpad_v2_arr[] = {

	UCLOGIC_RDESC_BUTTONPAD_BYTES(UCLOGIC_RDESC_BUTTONPAD_V2_ID, 12)

/* Fixed report descriptor for (tweaked) v2 frame reports */

const __u8 uclogic_rdesc_frame_v2_arr[] = {

	UCLOGIC_RDESC_FRAME_BYTES(UCLOGIC_RDESC_FRAME_V2_ID, 12)

};

const size_t uclogic_rdesc_buttonpad_v2_size =

			sizeof(uclogic_rdesc_buttonpad_v2_arr);

const size_t uclogic_rdesc_frame_v2_size =

			sizeof(uclogic_rdesc_frame_v2_arr);



/* Fixed report descriptor for Ugee EX07 buttonpad */

const __u8 uclogic_rdesc_ugee_ex07_buttonpad_arr[] = {

/* Fixed report descriptor for Ugee EX07 frame */

const __u8 uclogic_rdesc_ugee_ex07_frame_arr[] = {

	0x05, 0x01,             /*  Usage Page (Desktop),                   */

	0x09, 0x07,             /*  Usage (Keypad),                         */

	0xA1, 0x01,             /*  Collection (Application),               */
@@ -736,8 +736,8 @@ const __u8 uclogic_rdesc_ugee_ex07_buttonpad_arr[] = { 
	0xC0,                   /*      End Collection,                     */

	0xC0                    /*  End Collection                          */

};

const size_t uclogic_rdesc_ugee_ex07_buttonpad_size =

			sizeof(uclogic_rdesc_ugee_ex07_buttonpad_arr);

const size_t uclogic_rdesc_ugee_ex07_frame_size =

			sizeof(uclogic_rdesc_ugee_ex07_frame_arr);



/* Fixed report descriptor for Ugee G5 frame controls */

const __u8 uclogic_rdesc_ugee_g5_frame_arr[] = {

drivers/hid/hid-uclogic-rdesc.h

+13 −13
Original line number Diff line number Diff line
@@ -117,23 +117,23 @@ extern const size_t uclogic_rdesc_pen_v1_template_size; 
extern const __u8 uclogic_rdesc_pen_v2_template_arr[];

extern const size_t uclogic_rdesc_pen_v2_template_size;



/* Fixed report descriptor for (tweaked) v1 buttonpad reports */

extern const __u8 uclogic_rdesc_buttonpad_v1_arr[];

extern const size_t uclogic_rdesc_buttonpad_v1_size;

/* Fixed report descriptor for (tweaked) v1 frame reports */

extern const __u8 uclogic_rdesc_frame_v1_arr[];

extern const size_t uclogic_rdesc_frame_v1_size;



/* Report ID for tweaked v1 buttonpad reports */

#define UCLOGIC_RDESC_BUTTONPAD_V1_ID 0xf7

/* Report ID for tweaked v1 frame reports */

#define UCLOGIC_RDESC_FRAME_V1_ID 0xf7



/* Fixed report descriptor for (tweaked) v2 buttonpad reports */

extern const __u8 uclogic_rdesc_buttonpad_v2_arr[];

extern const size_t uclogic_rdesc_buttonpad_v2_size;

/* Fixed report descriptor for (tweaked) v2 frame reports */

extern const __u8 uclogic_rdesc_frame_v2_arr[];

extern const size_t uclogic_rdesc_frame_v2_size;



/* Report ID for tweaked v2 buttonpad reports */

#define UCLOGIC_RDESC_BUTTONPAD_V2_ID 0xf7

/* Report ID for tweaked v2 frame reports */

#define UCLOGIC_RDESC_FRAME_V2_ID 0xf7



/* Fixed report descriptor for Ugee EX07 buttonpad */

extern const __u8 uclogic_rdesc_ugee_ex07_buttonpad_arr[];

extern const size_t uclogic_rdesc_ugee_ex07_buttonpad_size;

/* Fixed report descriptor for Ugee EX07 frame */

extern const __u8 uclogic_rdesc_ugee_ex07_frame_arr[];

extern const size_t uclogic_rdesc_ugee_ex07_frame_size;



/* Fixed report descriptor for XP-Pen Deco 01 frame controls */

extern const __u8 uclogic_rdesc_xppen_deco01_frame_arr[];