On Wed, Jun 22, 2011 at 8:01 PM, Peter Hutterer
<peter.hutte...@who-t.net> wrote:
> On Wed, Jun 22, 2011 at 07:18:13PM -0500, ch...@cnpbagwell.com wrote:
>> From: Chris Bagwell <ch...@cnpbagwell.com>
>>
>> This is partially for consistency and partially so we no longer
>> need to be concerned with earlier code setting an initial value
>> and getting lost.
>> ---
>> src/wcmValidateDevice.c | 8 ++++----
>> 1 files changed, 4 insertions(+), 4 deletions(-)
>>
>> diff --git a/src/wcmValidateDevice.c b/src/wcmValidateDevice.c
>> index caa80ec..0ae8cdd 100644
>> --- a/src/wcmValidateDevice.c
>> +++ b/src/wcmValidateDevice.c
>> @@ -184,7 +184,7 @@ int wcmDeviceTypeKeys(InputInfoPtr pInfo)
>> switch (priv->common->tablet_id)
>> {
>> case 0xCC: /* CintiqV5 */
>> - priv->common->tablet_type = WCM_LCD;
>> + priv->common->tablet_type |= WCM_LCD;
>> /* fall through */
>>
>> case 0xB8: /* I4 */
>> @@ -214,7 +214,7 @@ int wcmDeviceTypeKeys(InputInfoPtr pInfo)
>> case 0x44: /* I2 */
>> case 0x45: /* I2 */
>> case 0x47: /* I2 */
>> - priv->common->tablet_type = WCM_DUALINPUT;
>> + priv->common->tablet_type |= WCM_DUALINPUT;
>> break;
>>
>> /* P4 display tablets */
>> @@ -240,7 +240,7 @@ int wcmDeviceTypeKeys(InputInfoPtr pInfo)
>> case 0x3F: /* CintiqV5 */
>> case 0xC5: /* CintiqV5 */
>> case 0xC6: /* CintiqV5 */
>> - priv->common->tablet_type = WCM_LCD;
>> + priv->common->tablet_type |= WCM_LCD;
>> /* fall through */
>> case 0xB0: /* I3 */
>> case 0xB1: /* I3 */
>> @@ -255,7 +255,7 @@ int wcmDeviceTypeKeys(InputInfoPtr pInfo)
>> case 0xE2: /* TPC with 2FGT */
>> case 0xE3: /* TPC with 2FGT */
>> case 0xE6: /* TPC with 2FGT */
>> - priv->common->tablet_type = WCM_TPC;
>> + priv->common->tablet_type |= WCM_TPC;
>> break;
>>
>> case 0x93: /* TPC with 1FGT */
>> --
>> 1.7.5.2
>
> yes, but no :) I'd rather have a macro/function to do this for us.
>
Sure thing. I couldn't bring myself to create a TabletSetFeature()
since I saw perfectly good MaskSet() already defined in
xf86WacomDefs.h. Let me know if you prefer otherwise.
Chris
------------------------------------------------------------------------------
Simplify data backup and recovery for your virtual environment with vRanger.
Installation's a snap, and flexible recovery options mean your data is safe,
secure and there when you need it. Data protection magic?
Nope - It's vRanger. Get your free trial download today.
http://p.sf.net/sfu/quest-sfdev2dev
_______________________________________________
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
