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

Commit ecd618dc authored by Ping Cheng's avatar Ping Cheng Committed by Jiri Kosina
Browse files

HID: wacom: Update maximum X/Y accounding to outbound offset 



Defined outbound offset for DTU and Cintiq. But didn't update
the relevant maximum values. Oops...

Signed-off-by: default avatarPing Cheng <pingc@wacom.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent fff00bf8

drivers/hid/wacom_wac.c

+9 −9
Original line number Original line Diff line number Diff line
@@ -2685,11 +2685,11 @@ static const struct wacom_features wacom_features_0x317 = 
	  INTUOSPL, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, .touch_max = 16,

	  INTUOSPL, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, .touch_max = 16,

	  .check_for_hid_type = true, .hid_type = HID_TYPE_USBNONE };

	  .check_for_hid_type = true, .hid_type = HID_TYPE_USBNONE };

static const struct wacom_features wacom_features_0xF4 =

static const struct wacom_features wacom_features_0xF4 =

	{ "Wacom Cintiq 24HD", 104280, 65400, 2047, 63,

	{ "Wacom Cintiq 24HD", 104080, 65200, 2047, 63,

	  WACOM_24HD, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES,

	  WACOM_24HD, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES,

	  WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET };

	  WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET };

static const struct wacom_features wacom_features_0xF8 =

static const struct wacom_features wacom_features_0xF8 =

	{ "Wacom Cintiq 24HD touch", 104280, 65400, 2047, 63, /* Pen */

	{ "Wacom Cintiq 24HD touch", 104080, 65200, 2047, 63, /* Pen */

	  WACOM_24HD, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES,

	  WACOM_24HD, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES,

	  WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET,

	  WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET,

	  .oVid = USB_VENDOR_ID_WACOM, .oPid = 0xf6 };

	  .oVid = USB_VENDOR_ID_WACOM, .oPid = 0xf6 };
@@ -2707,7 +2707,7 @@ static const struct wacom_features wacom_features_0xC6 = 
	{ "Wacom Cintiq 12WX", 53020, 33440, 1023, 63,

	{ "Wacom Cintiq 12WX", 53020, 33440, 1023, 63,

	  WACOM_BEE, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES };

	  WACOM_BEE, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES };

static const struct wacom_features wacom_features_0x304 =

static const struct wacom_features wacom_features_0x304 =

	{ "Wacom Cintiq 13HD", 59352, 33648, 1023, 63,

	{ "Wacom Cintiq 13HD", 59152, 33448, 1023, 63,

	  WACOM_13HD, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES,

	  WACOM_13HD, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES,

	  WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET };

	  WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET };

static const struct wacom_features wacom_features_0xC7 =

static const struct wacom_features wacom_features_0xC7 =
@@ -2721,7 +2721,7 @@ static const struct wacom_features wacom_features_0xF0 = 
	{ "Wacom DTU1631", 34623, 19553, 511, 0,

	{ "Wacom DTU1631", 34623, 19553, 511, 0,

	  DTU, WACOM_INTUOS_RES, WACOM_INTUOS_RES };

	  DTU, WACOM_INTUOS_RES, WACOM_INTUOS_RES };

static const struct wacom_features wacom_features_0xFB =

static const struct wacom_features wacom_features_0xFB =

	{ "Wacom DTU1031", 22096, 13960, 511, 0,

	{ "Wacom DTU1031", 21896, 13760, 511, 0,

	  DTUS, WACOM_INTUOS_RES, WACOM_INTUOS_RES,

	  DTUS, WACOM_INTUOS_RES, WACOM_INTUOS_RES,

	  WACOM_DTU_OFFSET, WACOM_DTU_OFFSET };

	  WACOM_DTU_OFFSET, WACOM_DTU_OFFSET };

static const struct wacom_features wacom_features_0x32F =

static const struct wacom_features wacom_features_0x32F =
@@ -2742,15 +2742,15 @@ static const struct wacom_features wacom_features_0x5D = /* Touch */ 
	  .oVid = USB_VENDOR_ID_WACOM, .oPid = 0x59, .touch_max = 10,

	  .oVid = USB_VENDOR_ID_WACOM, .oPid = 0x59, .touch_max = 10,

	  .check_for_hid_type = true, .hid_type = HID_TYPE_USBNONE };

	  .check_for_hid_type = true, .hid_type = HID_TYPE_USBNONE };

static const struct wacom_features wacom_features_0xCC =

static const struct wacom_features wacom_features_0xCC =

	{ "Wacom Cintiq 21UX2", 87000, 65400, 2047, 63,

	{ "Wacom Cintiq 21UX2", 86800, 65200, 2047, 63,

	  WACOM_21UX2, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES,

	  WACOM_21UX2, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES,

	  WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET };

	  WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET };

static const struct wacom_features wacom_features_0xFA =

static const struct wacom_features wacom_features_0xFA =

	{ "Wacom Cintiq 22HD", 95640, 54060, 2047, 63,

	{ "Wacom Cintiq 22HD", 95440, 53860, 2047, 63,

	  WACOM_22HD, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES,

	  WACOM_22HD, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES,

	  WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET };

	  WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET };

static const struct wacom_features wacom_features_0x5B =

static const struct wacom_features wacom_features_0x5B =

	{ "Wacom Cintiq 22HDT", 95640, 54060, 2047, 63,

	{ "Wacom Cintiq 22HDT", 95440, 53860, 2047, 63,

	  WACOM_22HD, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES,

	  WACOM_22HD, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES,

	  WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET,

	  WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET,

	  .oVid = USB_VENDOR_ID_WACOM, .oPid = 0x5e };

	  .oVid = USB_VENDOR_ID_WACOM, .oPid = 0x5e };
@@ -2897,7 +2897,7 @@ static const struct wacom_features wacom_features_0x6004 = 
	{ "ISD-V4", 12800, 8000, 255, 0,

	{ "ISD-V4", 12800, 8000, 255, 0,

	  TABLETPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };

	  TABLETPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };

static const struct wacom_features wacom_features_0x307 =

static const struct wacom_features wacom_features_0x307 =

	{ "Wacom ISDv5 307", 59352, 33648, 2047, 63,

	{ "Wacom ISDv5 307", 59152, 33448, 2047, 63,

	  CINTIQ_HYBRID, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES,

	  CINTIQ_HYBRID, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES,

	  WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET,

	  WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET,

	  .oVid = USB_VENDOR_ID_WACOM, .oPid = 0x309 };

	  .oVid = USB_VENDOR_ID_WACOM, .oPid = 0x309 };
@@ -2906,7 +2906,7 @@ static const struct wacom_features wacom_features_0x309 = 
	  .oVid = USB_VENDOR_ID_WACOM, .oPid = 0x0307, .touch_max = 10,

	  .oVid = USB_VENDOR_ID_WACOM, .oPid = 0x0307, .touch_max = 10,

	  .check_for_hid_type = true, .hid_type = HID_TYPE_USBNONE };

	  .check_for_hid_type = true, .hid_type = HID_TYPE_USBNONE };

static const struct wacom_features wacom_features_0x30A =

static const struct wacom_features wacom_features_0x30A =

	{ "Wacom ISDv5 30A", 59352, 33648, 2047, 63,

	{ "Wacom ISDv5 30A", 59152, 33448, 2047, 63,

	  CINTIQ_HYBRID, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES,

	  CINTIQ_HYBRID, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES,

	  WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET,

	  WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET,

	  .oVid = USB_VENDOR_ID_WACOM, .oPid = 0x30C };

	  .oVid = USB_VENDOR_ID_WACOM, .oPid = 0x30C };