← Back to branch summary

~ubuntu-branches/ubuntu/raring/wacom-tools/raring

« back to all changes in this revision

Viewing changes to linuxwacom/src/2.6.24/wacom_sys.c

  • Committer: Bazaar Package Importer
  • Author(s): Timo Aaltonen
  • Date: 2009-05-22 12:04:32 UTC
  • mfrom: (1.12.2 upstream) (2.2.2 sid)
  • Revision ID: james.westby@ubuntu.com-20090522120432-00suvwukj864ipib
Tags: 1:0.8.3.2-1ubuntu1
* 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/rules: Disable the scaling quirk.
  - Enable patch system (quilt).
    - Import debian/xsfbs/*
    - Add quilt to build-deps.
  - Include wacomcpl so the stylus can be calibrated. (#216347)
    - debian/rules: --enable-libwacomxi
    - debian/control: Add tcl-dev, tk-dev to Build-Depends, and tcl,
      tk to wacom-tools Depends.
  - Modify 10-linuxwacom.fdi to support WALTOP and N-Trig.
  - Add 104_revert-check.diff: Don't check the serial number, it breaks
    some devices. Disabled for now, needs testing because part of it
    is upstream now.

Show diffs side-by-side

added added

removed removed

Lines of Context:
linuxwacom/src/2.6.24/wacom_sys.c
219
219
        input_set_abs_params(input_dev, ABS_RY, 0, 4096, 0, 0);
220
220
}
221
221
 
 
222
void input_dev_i4s(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
 
223
{
 
224
        input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOOL_FINGER);
 
225
        input_dev->keybit[BIT_WORD(BTN_MISC)] |= BIT_MASK(BTN_0) | BIT_MASK(BTN_1) | BIT_MASK(BTN_2) | BIT_MASK(BTN_3);
 
226
        input_dev->keybit[BIT_WORD(BTN_MISC)] |= BIT_MASK(BTN_4) | BIT_MASK(BTN_5) | BIT_MASK(BTN_6);
 
227
        input_set_abs_params(input_dev, ABS_Z, -900, 899, 0, 0);
 
228
}
 
229
 
 
230
void input_dev_i4(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
 
231
{
 
232
        input_dev->keybit[BIT_WORD(BTN_MISC)] |= BIT_MASK(BTN_7) | BIT_MASK(BTN_8);
 
233
}
 
234
 
222
235
void input_dev_bee(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
223
236
{
224
237
        input_dev->keybit[BIT_WORD(BTN_MISC)] |= BIT_MASK(BTN_8) | BIT_MASK(BTN_9);
391
404
 
392
405
        endpoint = &intf->cur_altsetting->endpoint[0].desc;
393
406
 
 
407
        /* Initialize touch_x_max and touch_y_max in case it is not defined */
 
408
        if (wacom_wac->features->type == TABLETPC) {
 
409
                wacom_wac->features->touch_x_max = 1023;
 
410
                wacom_wac->features->touch_y_max = 1023;
 
411
        } else {
 
412
                wacom_wac->features->touch_x_max = 0;
 
413
                wacom_wac->features->touch_y_max = 0;
 
414
        }
 
415
 
394
416
        /* TabletPC need to retrieve the physical and logical maximum from report descriptor */
395
417
        if (wacom_wac->features->type == TABLETPC) {
396
418
                if (usb_get_extra_descriptor(interface, HID_DEVICET_HID, &hid_desc)) {