From 844d87b600e04fa65d307de09a4be7bac23234c6 Mon Sep 17 00:00:00 2001 From: Chris Bagwell Date: Wed, 17 Mar 2010 22:21:51 -0500 Subject: [PATCH 2/2] Enable multi-touch support for 2.6.30 kernels. Signed-off-by: Chris Bagwell --- src/2.6.27/wacom_sys.c | 4 ---- src/2.6.27/wacom_wac.c | 8 -------- 2 files changed, 0 insertions(+), 12 deletions(-) diff --git a/src/2.6.27/wacom_sys.c b/src/2.6.27/wacom_sys.c index 87b9b2a..07f1e9e 100755 --- a/src/2.6.27/wacom_sys.c +++ b/src/2.6.27/wacom_sys.c @@ -196,7 +196,6 @@ void input_dev_bpt(struct input_dev *input_dev, struct wacom_wac *wacom_wac) input_set_abs_params(input_dev, ABS_RY, 0, wacom_wac->features.y_phy, 0, 0); -#if 0 /* finger position */ input_set_abs_params(input_dev, ABS_MT_POSITION_X, 0, wacom_wac->features.x_max, 0, 0); @@ -204,7 +203,6 @@ void input_dev_bpt(struct input_dev *input_dev, struct wacom_wac *wacom_wac) wacom_wac->features.y_max, 0, 0); input_set_abs_params(input_dev, ABS_MT_TOUCH_MAJOR, 0, wacom_wac->features.pressure_max, 0, 0); -#endif input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOOL_DOUBLETAP); input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOOL_TRIPLETAP); @@ -330,7 +328,6 @@ void input_dev_tpc(struct input_dev *input_dev, struct wacom_wac *wacom_wac) void input_dev_tpc2fg(struct input_dev *input_dev, struct wacom_wac *wacom_wac) { if (wacom_wac->features.device_type == BTN_TOOL_TRIPLETAP) { -#if 0 /* finger position */ input_set_abs_params(input_dev, ABS_MT_POSITION_X, 0, wacom_wac->features.x_max, 0, 0); @@ -339,7 +336,6 @@ void input_dev_tpc2fg(struct input_dev *input_dev, struct wacom_wac *wacom_wac) input_set_abs_params(input_dev, ABS_MT_TOUCH_MAJOR, 0, wacom_wac->features.pressure_max, 0, 0); -#endif input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOOL_TRIPLETAP); diff --git a/src/2.6.27/wacom_wac.c b/src/2.6.27/wacom_wac.c index 5eb24a9..f876a10 100755 --- a/src/2.6.27/wacom_wac.c +++ b/src/2.6.27/wacom_wac.c @@ -178,7 +178,6 @@ static void wacom_bpt_touch(struct wacom_wac *wacom, void *wcombo, } } -#if 0 wacom_report_abs(wcombo, ABS_MT_TOUCH_MAJOR, prox1 != 0); wacom_report_abs(wcombo, ABS_MT_POSITION_X, x1); wacom_report_abs(wcombo, ABS_MT_POSITION_Y, y1); @@ -190,7 +189,6 @@ static void wacom_bpt_touch(struct wacom_wac *wacom, void *wcombo, wacom_report_abs(wcombo, ABS_MT_POSITION_Y, y2); wacom_input_mt_sync(wcombo); -#endif /* Normally, we send both fingers data on any finger change. * Since input layer thinks its the same finger, its @@ -252,7 +250,6 @@ static void wacom_bpt_touch(struct wacom_wac *wacom, void *wcombo, wacom_input_event(wcombo, EV_MSC, MSC_SERIAL, 1); wacom_input_sync(wcombo); } -#if 0 else { /* MT docs require always sending a sync */ @@ -260,7 +257,6 @@ static void wacom_bpt_touch(struct wacom_wac *wacom, void *wcombo, wacom_input_event(wcombo, EV_MSC, MSC_SERIAL, 1); wacom_input_sync(wcombo); } -#endif old_prox1 = prox1; if (prox2 || old_prox2 != prox2) @@ -857,7 +853,6 @@ static void wacom_tpc_touch(struct wacom_wac *wacom, void *wcombo, } } -#if 0 if (send_multi) { wacom_report_abs(wcombo, ABS_MT_TOUCH_MAJOR, prox1 != 0); @@ -872,7 +867,6 @@ static void wacom_tpc_touch(struct wacom_wac *wacom, void *wcombo, wacom_input_mt_sync(wcombo); } -#endif /* See Bamboo P&T comments on why this is needed */ if (prox1 || old_prox1 != prox1) @@ -888,7 +882,6 @@ static void wacom_tpc_touch(struct wacom_wac *wacom, void *wcombo, wacom_input_event(wcombo, EV_MSC, MSC_SERIAL, 1); wacom_input_sync(wcombo); } -#if 0 else { /* MT docs require always sending a sync */ @@ -896,7 +889,6 @@ static void wacom_tpc_touch(struct wacom_wac *wacom, void *wcombo, wacom_input_event(wcombo, EV_MSC, MSC_SERIAL, 1); wacom_input_sync(wcombo); } -#endif old_prox1 = prox1; if (prox2 || old_prox2 != prox2) -- 1.6.6.1