Generify the xppen pro init function for general use.

Author: Mel

hid-uclogic-core.c

@@ -475,7 +475,7 @@ static int uclogic_raw_event(struct hid_device *hdev,
 						223, 231, 239, 247, 257, 266, 277
 					};
 					// sqrt(8) / 4 = 0.7071067811865476
-					const s32 discriminant = 7071068;
+					const s32 discriminant = 707106781;
 					s8 tx = data[8];
 					s8 ty = data[9];
 					s8 abs_tilt;

hid-uclogic-params.c

@@ -1007,17 +1007,22 @@ static int uclogic_params_huion_init(struct uclogic_params *params,
  * @params:	Parameters to fill in (to be cleaned with
  *		uclogic_params_cleanup()). Not modified in case of error.
  *		Cannot be NULL.
+ * @init_packet: Magic packet to send on usb to activate device.
+ * @packet_size: Size of the init packet.
+ * @rdesc_pen_arr: Pen report descriptor array.
+ * @rdesc_pen_size: Size of the pen array.
+ * @rdesc_frame_arr: Frame report descriptor array.
+ * @rdesc_frame_size: Size of the frame array.
  *
  * Returns:
  *	Zero, if successful. A negative errno code on error.
  */
 static int uclogic_params_init_ugee_xppen_pro(struct hid_device *hdev,
-	struct uclogic_params *p)
+	struct uclogic_params *p,
+	const u8 init_packet[], const size_t packet_size,
+	const u8 rdesc_pen_arr[], const size_t rdesc_pen_size,
+	const u8 rdesc_frame_arr[], const size_t rdesc_frame_size)
 {
-	static const u8 init_packet[] = {
-		0x02, 0xb0, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-	};
-	const size_t packet_size = sizeof(init_packet);
 	const size_t str_desc_len = 12;
 	struct usb_device *udev = hid_to_usb_dev(hdev);
 	u8 *buf = kmemdup(init_packet, packet_size, GFP_KERNEL);
@@ -1096,18 +1101,18 @@ static int uclogic_params_init_ugee_xppen_pro(struct hid_device *hdev,
 	);
 
 	p->pen.desc_ptr = uclogic_rdesc_template_apply(
-		uclogic_rdesc_xppen_a156p_pen_arr,
-		uclogic_rdesc_xppen_a156p_pen_size,
+		rdesc_pen_arr,
+		rdesc_pen_size,
 		desc_params,
 		ARRAY_SIZE(desc_params)
 	);
-	p->pen.desc_size = uclogic_rdesc_xppen_a156p_pen_size;
+	p->pen.desc_size = rdesc_pen_size;
 	p->pen.id = 0x02;
 
 	rc = uclogic_params_frame_init_with_desc(
 		&p->frame_list[0],
-		uclogic_rdesc_xppen_a156p_frame_arr,
-		uclogic_rdesc_xppen_a156p_frame_size,
+		rdesc_frame_arr,
+		rdesc_frame_size,
 		UCLOGIC_RDESC_V1_FRAME_ID
 	);
 	if (rc < 0) {
@@ -1419,13 +1424,22 @@ int uclogic_params_init(struct uclogic_params *params,
 		break;
 	case VID_PID(USB_VENDOR_ID_UGEE,
 			USB_DEVICE_ID_UGEE_XPPEN_TABLET_A156P):
+        static const u8 init_packet[] = {
+            0x02, 0xb0, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+        };
+		const size_t packet_size = sizeof(init_packet);
+
 		/* Only use the uniform interface */
 		if (bInterfaceNumber != 2) {
 			uclogic_params_init_invalid(&p);
 			break;
 		}
 
-		rc = uclogic_params_init_ugee_xppen_pro(hdev, &p);
+		rc = uclogic_params_init_ugee_xppen_pro(hdev, &p, init_packet, packet_size,
+												uclogic_rdesc_xppen_a156p_pen_arr,
+												uclogic_rdesc_xppen_a156p_pen_size,
+												uclogic_rdesc_xppen_a156p_frame_arr,
+												uclogic_rdesc_xppen_a156p_frame_size);
 		if (rc != 0) {
 			hid_err(hdev, "a156p init failed: %d\n", rc);
 			goto cleanup;