Commit bd85c131 authored by José Expósito's avatar José Expósito Committed by Jiri Kosina
Browse files

HID: uclogic: Refactor UGEEv2 probe magic data 



A fututure patch will need to use the array of magic data that the
UGEEv2 devices expect on probe and the endpoint number. Move them to a
common place.

Refactor, no functional changes.

Tested-by: default avatarMia Kanashi <chad@redpilled.dev>
Tested-by: default avatarAndreas Grosse <andig.mail@t-online.de>
Signed-off-by: default avatarJosé Expósito <jose.exposito89@gmail.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent f60c377f

drivers/hid/hid-uclogic-params.c

+5 −6
Original line number Diff line number Diff line
@@ -1021,8 +1021,8 @@ static int uclogic_params_huion_init(struct uclogic_params *params, 
 * Returns:

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

 */

static int uclogic_probe_interface(struct hid_device *hdev, u8 *magic_arr,

				   int magic_size, int endpoint)

static int uclogic_probe_interface(struct hid_device *hdev, const u8 *magic_arr,

				   size_t magic_size, int endpoint)

{

	struct usb_device *udev;

	unsigned int pipe = 0;
@@ -1311,9 +1311,6 @@ static int uclogic_params_ugee_v2_init(struct uclogic_params *params, 
	__u8 *rdesc_pen = NULL;

	s32 desc_params[UCLOGIC_RDESC_PH_ID_NUM];

	enum uclogic_params_frame_type frame_type;

	__u8 magic_arr[] = {

		0x02, 0xb0, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00

	};

	/* The resulting parameters (noop) */

	struct uclogic_params p = {0, };
@@ -1344,7 +1341,9 @@ static int uclogic_params_ugee_v2_init(struct uclogic_params *params, 
	 * The specific data was discovered by sniffing the Windows driver

	 * traffic.

	 */

	rc = uclogic_probe_interface(hdev, magic_arr, sizeof(magic_arr), 0x03);

	rc = uclogic_probe_interface(hdev, uclogic_ugee_v2_probe_arr,

				     uclogic_ugee_v2_probe_size,

				     uclogic_ugee_v2_probe_endpoint);

	if (rc) {

		uclogic_params_init_invalid(&p);

		goto output;

drivers/hid/hid-uclogic-rdesc.c

+6 −0
Original line number Diff line number Diff line
@@ -859,6 +859,12 @@ const __u8 uclogic_rdesc_v2_frame_dial_arr[] = { 
const size_t uclogic_rdesc_v2_frame_dial_size =

			sizeof(uclogic_rdesc_v2_frame_dial_arr);



const __u8 uclogic_ugee_v2_probe_arr[] = {

	0x02, 0xb0, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00

};

const size_t uclogic_ugee_v2_probe_size = sizeof(uclogic_ugee_v2_probe_arr);

const int uclogic_ugee_v2_probe_endpoint = 0x03;



/* Fixed report descriptor template for UGEE v2 pen reports */

const __u8 uclogic_rdesc_ugee_v2_pen_template_arr[] = {

	0x05, 0x0d,         /*  Usage Page (Digitizers),                */

drivers/hid/hid-uclogic-rdesc.h

+5 −0
Original line number Diff line number Diff line
@@ -164,6 +164,11 @@ extern const size_t uclogic_rdesc_v2_frame_dial_size; 
/* Report ID for tweaked UGEE v2 battery reports */

#define UCLOGIC_RDESC_UGEE_V2_BATTERY_ID 0xba



/* Magic data expected by UGEEv2 devices on probe */

extern const __u8 uclogic_ugee_v2_probe_arr[];

extern const size_t uclogic_ugee_v2_probe_size;

extern const int uclogic_ugee_v2_probe_endpoint;



/* Fixed report descriptor template for UGEE v2 pen reports */

extern const __u8 uclogic_rdesc_ugee_v2_pen_template_arr[];

extern const size_t uclogic_rdesc_ugee_v2_pen_template_size;