Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 180847
b: refs/heads/master
c: 580363d
h: refs/heads/master
i:
  180845: 59e25c5
  180843: 42260fe
  180839: f31f854
  180831: e1afedf
v: v3
  • Loading branch information
Stephane Chatty authored and Jiri Kosina committed Feb 10, 2010
1 parent 5381967 commit 41bd4b7
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b32758c7216f337044ceb6dcaa754b8eda95a59f
refs/heads/master: 580363db92572cccbe6226bf83321e50a9ea50ea
9 changes: 5 additions & 4 deletions trunk/drivers/hid/hid-stantum.c
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ static int stantum_input_mapping(struct hid_device *hdev, struct hid_input *hi,
case HID_DG_DEVICEINDEX:
case HID_DG_CONTACTCOUNT:
case HID_DG_CONTACTMAX:
case HID_DG_TIPPRESSURE:
return -1;

case HID_DG_TIPSWITCH:
Expand All @@ -84,6 +83,11 @@ static int stantum_input_mapping(struct hid_device *hdev, struct hid_input *hi,
input_set_abs_params(hi->input, ABS_MT_ORIENTATION,
1, 1, 0, 0);
return 1;
case HID_DG_TIPPRESSURE:
hid_map_usage(hi, usage, bit, max,
EV_ABS, ABS_MT_PRESSURE);
return 1;

case HID_DG_CONTACTID:
hid_map_usage(hi, usage, bit, max,
EV_ABS, ABS_MT_TRACKING_ID);
Expand Down Expand Up @@ -140,10 +144,7 @@ static void stantum_filter_event(struct stantum_data *sd,
input_event(input, EV_ABS, ABS_MT_TOUCH_MAJOR, wide ? sd->w : sd->h);
input_event(input, EV_ABS, ABS_MT_TOUCH_MINOR, wide ? sd->h : sd->w);

#if 0
/* MT_PRESSURE does not exist yet */
input_event(input, EV_ABS, ABS_MT_PRESSURE, sd->z);
#endif

input_mt_sync(input);
sd->valid = false;
Expand Down

0 comments on commit 41bd4b7

Please sign in to comment.