diff options
| author | Ping Cheng <pingc@wacom.com> | 2010-03-19 22:18:15 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-04-13 23:24:06 -0700 |
| commit | 4492efffffeb88d87e7aa74765f3c53b3a7dd40f (patch) | |
| tree | 258b17da4faf0934efb8bc63a5163d77e047dbc8 /drivers/input/tablet/wacom_wac.h | |
| parent | 3b57ca0f80c5c8994b5b1e3d3f904cfe727951f2 (diff) | |
Input: wacom - share pen info with touch of the same ID
Touch enbaled devices share the same product ID with pen. However,
we do not want to post touch events while pen is in prox. To do so,
we used to keep a local static variable to keep track of if pen is
in prox or not. This works fine for Tablet PC devices since there
is only one device attached. With the newer touch enabled regular
tablets, we can not make this assumption any more, i.e, one system
may have more than one identical tablet plugged in.
This patch adds an new entry, shared, into the struct wacom_wac so
touch data can access pen data to locally. This solution assumes
the two tools (touch and pen) of the same ID will be probed one
after the other without interruption in between by another Wacom
device of the same ID.
Diffstat (limited to 'drivers/input/tablet/wacom_wac.h')
| -rw-r--r-- | drivers/input/tablet/wacom_wac.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/input/tablet/wacom_wac.h b/drivers/input/tablet/wacom_wac.h index b50cf04e61a8..4b55fc7ad8ae 100644 --- a/drivers/input/tablet/wacom_wac.h +++ b/drivers/input/tablet/wacom_wac.h @@ -71,6 +71,10 @@ struct wacom_features { unsigned char unitExpo; }; +struct wacom_shared { + bool stylus_in_proximity; +}; + struct wacom_wac { char name[64]; unsigned char *data; @@ -78,6 +82,7 @@ struct wacom_wac { int id[2]; __u32 serial[2]; struct wacom_features features; + struct wacom_shared *shared; }; #endif |