Input: wacom - replace WACOM_PKGLEN_PENABLED
Replacing WACOM_PKGLEN_PENABLED with WACOM_PKGLEN_GRAPHIRE since they both represent the same value, 8. This value will be used for both Tablet PC and Bamboo with touch devices. Signed-off-by: Ping Cheng <pingc@wacom.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
This commit is contained in:
parent
35858adbfc
commit
57e413d95b
|
@ -371,7 +371,7 @@ static int wacom_parse_hid(struct usb_interface *intf, struct hid_descriptor *hi
|
||||||
} else if (pen) {
|
} else if (pen) {
|
||||||
/* penabled only accepts exact bytes of data */
|
/* penabled only accepts exact bytes of data */
|
||||||
if (features->type == TABLETPC2FG)
|
if (features->type == TABLETPC2FG)
|
||||||
features->pktlen = WACOM_PKGLEN_PENABLED;
|
features->pktlen = WACOM_PKGLEN_GRAPHIRE;
|
||||||
features->device_type = BTN_TOOL_PEN;
|
features->device_type = BTN_TOOL_PEN;
|
||||||
features->x_max =
|
features->x_max =
|
||||||
wacom_le16_to_cpu(&report[i + 3]);
|
wacom_le16_to_cpu(&report[i + 3]);
|
||||||
|
@ -410,7 +410,7 @@ static int wacom_parse_hid(struct usb_interface *intf, struct hid_descriptor *hi
|
||||||
} else if (pen) {
|
} else if (pen) {
|
||||||
/* penabled only accepts exact bytes of data */
|
/* penabled only accepts exact bytes of data */
|
||||||
if (features->type == TABLETPC2FG)
|
if (features->type == TABLETPC2FG)
|
||||||
features->pktlen = WACOM_PKGLEN_PENABLED;
|
features->pktlen = WACOM_PKGLEN_GRAPHIRE;
|
||||||
features->device_type = BTN_TOOL_PEN;
|
features->device_type = BTN_TOOL_PEN;
|
||||||
features->y_max =
|
features->y_max =
|
||||||
wacom_le16_to_cpu(&report[i + 3]);
|
wacom_le16_to_cpu(&report[i + 3]);
|
||||||
|
|
|
@ -1028,7 +1028,7 @@ static const struct wacom_features wacom_features_0x93 =
|
||||||
static const struct wacom_features wacom_features_0x9A =
|
static const struct wacom_features wacom_features_0x9A =
|
||||||
{ "Wacom ISDv4 9A", WACOM_PKGLEN_GRAPHIRE, 26202, 16325, 255, 0, TABLETPC };
|
{ "Wacom ISDv4 9A", WACOM_PKGLEN_GRAPHIRE, 26202, 16325, 255, 0, TABLETPC };
|
||||||
static const struct wacom_features wacom_features_0x9F =
|
static const struct wacom_features wacom_features_0x9F =
|
||||||
{ "Wacom ISDv4 9F", WACOM_PKGLEN_PENABLED, 26202, 16325, 255, 0, TABLETPC };
|
{ "Wacom ISDv4 9F", WACOM_PKGLEN_GRAPHIRE, 26202, 16325, 255, 0, TABLETPC };
|
||||||
static const struct wacom_features wacom_features_0xE2 =
|
static const struct wacom_features wacom_features_0xE2 =
|
||||||
{ "Wacom ISDv4 E2", WACOM_PKGLEN_TPC2FG, 26202, 16325, 255, 0, TABLETPC2FG };
|
{ "Wacom ISDv4 E2", WACOM_PKGLEN_TPC2FG, 26202, 16325, 255, 0, TABLETPC2FG };
|
||||||
static const struct wacom_features wacom_features_0xE3 =
|
static const struct wacom_features wacom_features_0xE3 =
|
||||||
|
|
|
@ -17,7 +17,6 @@
|
||||||
#define WACOM_PKGLEN_GRAPHIRE 8
|
#define WACOM_PKGLEN_GRAPHIRE 8
|
||||||
#define WACOM_PKGLEN_BBFUN 9
|
#define WACOM_PKGLEN_BBFUN 9
|
||||||
#define WACOM_PKGLEN_INTUOS 10
|
#define WACOM_PKGLEN_INTUOS 10
|
||||||
#define WACOM_PKGLEN_PENABLED 8
|
|
||||||
#define WACOM_PKGLEN_TPC1FG 5
|
#define WACOM_PKGLEN_TPC1FG 5
|
||||||
#define WACOM_PKGLEN_TPC2FG 14
|
#define WACOM_PKGLEN_TPC2FG 14
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue