← Back to branch summary

~ubuntu-branches/ubuntu/lucid/wacom-tools/lucid

« back to all changes in this revision

Viewing changes to linuxwacom/src/util/wacusb.c

  • Committer: Bazaar Package Importer
  • Author(s): Timo Aaltonen
  • Date: 2008-06-04 19:24:32 UTC
  • mfrom: (2.1.4 sid)
  • Revision ID: james.westby@ubuntu.com-20080604192432-uism8om4ffoex0gv
Tags: 1:0.8.0.2-2ubuntu1
* Merge with Debian unstable, remaining changes:
  - Bump the epoch because of old Ubuntu packaging.
  - debian/control:
    Change the Maintainer address.
    Bump the epoch on Replaces/Conflicts.
    Don't build wacom-kernel-source anymore (#71944).
  - debian/wacom.postinst:
    Remove old files.
  - debian/xserver-xorg-input-wacom.init.d, debian/rules:
    Initscript for serial devices.
  - debian/rules: Disable the scaling quirk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
linuxwacom/src/util/wacusb.c
133
133
        BTN_TL, BTN_TR, BTN_TL2, BTN_TR2, BTN_SELECT
134
134
};
135
135
 
136
 
int gPadKeys [WACOMBUTTON_MAX];
137
 
int gNumPadKeys;
 
136
#define NUM_PADKEY_CODES (sizeof(padkey_codes) / sizeof(unsigned short))
 
137
 
 
138
static int gPadKeys [NUM_PADKEY_CODES];
 
139
static int gNumPadKeys;
138
140
 
139
141
/*****************************************************************************
140
142
** Static Prototypes
272
274
        static USBSUBTYPE xCintiqV5[] =
273
275
        {
274
276
                { "DTZ-21ux",  "Wacom Cintiq 21UX",  1, 0x3F },
275
 
                { "DTZ-20wsx", "Wacom Cintiq 20WSX", 2, 0x65 },
276
 
                { "DTZ-12wx",  "Wacom Cintiq 12WX",  3, 0x6C },
 
277
                { "DTZ-20wsx", "Wacom Cintiq 20WSX", 2, 0xC5 },
 
278
                { "DTZ-12wx",  "Wacom Cintiq 12WX",  3, 0xC6 },
277
279
                { NULL }
278
280
        };
279
281
 
632
634
                                        BIT(WACOMFIELD_TOOLTYPE);
633
635
 
634
636
                /* Detect button codes */
635
 
                for (nCnt = 0; nCnt < WACOMBUTTON_MAX; nCnt++)
 
637
                for (nCnt = 0; nCnt < NUM_PADKEY_CODES; nCnt++)
636
638
                        if (ISBITSET (keybits, padkey_codes [nCnt]))
637
639
                                gPadKeys [gNumPadKeys++] = padkey_codes [nCnt];
638
640
        }