Chris,
Thanks for the feedback, I've got two more from tonight as well plus a
fix to patch 0011. In patch 0011 I messed up the logic on resetting
firstFinger to zero in the kernel code. The 0019 makes sure horizontal
scroll will work on TPC2FG's, and 0020 fixes a problem pointed out by
Favux with my change to wacomcpl-exec.
More responses inline...
On Tue, 2010-01-19 at 21:23 -0600, Chris Bagwell wrote:
>
>
> On Mon, Jan 18, 2010 at 10:48 AM, Jason Childs
> <obliv...@users.sourceforge.net> wrote:
> Hi Ping,
>
> I'm attaching a tar.bz2 of 17 patches that capture the changes
> I've done
> over the last three days. I started a git repository with the
> base
> 0.8.5-9 source from sourceforge, so some of the patches will
> look
> useless as I changed stuff along the way.
>
>
> Since there is quite a bit there, I suggest breaking the submits to
> CVS into batches. I suggest doing the earlier kernel patches first
> just because they can be verified on both versions of X drivers right
> now. Probably we should save the patch that disables buttons (0011)
> until its discussed a little more.
>
Agreed, I will need feedback on adding serial numbers and channels for
touch devices. I've got a mocked up patch that seems to work really
well (i.e. I've got buttons working again and gestures). It will
obviously need review to make sure I don't break existing functionality.
I want to sleep on them tonight and take a fresh look at them tomorrow
before I send them out. Also, in wcmTouchFilter.c there are hard coded
values for the gesture min/max activation distances, obviously 300 and
350 are a bit big for the 4x5 tablets, I'd like to get feedback on
making these configurable items via the common structure?
> Here is my feedback on your kernel driver patches; all tested with
> current git of xf86-input-wacom (you can add Tested-By: me if you
> like). The comments are more geared towards Ping or whom ever will
> submit the patches as a feel good measure then to Jason.
>
> 0006-Kernel-Module-Fix-shared-features-buffer-corruption.patch
>
> Seems an important fix. I saw no issues in review or testing. I
> really like appending Touch/Pen to name. Makes output of dmesg that
> much more useful.
It may also add a way of having more than one of the same model tablet
connected since we can dynamically change the name in the kernel driver
now. Still thinking of what we can append that makes them unique
though. They would then show up as distinct devices to wacomcpl and X.
>
> 0002-Kernel-Module-Fixes-for-Bamboo-P-T-issues.patch
> 0005-Kernel-Module-Change-Bamboo-P-T-features-length.patch
>
> Code definitely reads better using correct packet size everywhere. My
> tablet worked before and after patch though. I know Jason said it
> helps certain USB hubs and maybe more. Can't see a place it would
> hurt other tablets (wrapped in if()'s for Bamboo P&T specific
> functions).
>
Yep, definitely required the correct size on my ATI OCHI chipset to get
the pen packets working.
> Patch 0002 contains some obvious fixes in x/y values that look good.
>
> 0001-Input-wacom-Debian-patch-for-device-ids.patch
>
> No real comment on this one. It worked for me and I saw no issues.
> I'm not sure I understand background of why patch was written. I
> think the reason may be in mailing list archive but I didn't look.
This came from the devel list a few weeks ago. It was supposed to help
with the crashes I was seeing initially. I was fighting for spin locks
around all static shared memory access in the kernel driver. But I
promised Ping I'd back off on that since I haven't had any further
crashes with the changes from the 0001 patch :).
>
> 0003-X-Driver-Default-Bamboo-P-T-Touch-to-Relative.patch
>
> OK, the only xdrv patch I'll commit on for now. :-) Its already in
> xf86-input-wacom so might as well get it in linuxwacom as well.
>
> Chris
>
0007, 0008, 0009 and 0013 are important for getting hotplug of a tablet
to work in X. They makes sure that the correct tablet initialization
values are being used when a tablet is plugged in after X is already up
and running. There is some other stuff mixed in (like gesture changes).
Jason
>From 45ec88e4e11d8a5fdb63917d04ff6cee1f8e1b44 Mon Sep 17 00:00:00 2001
From: Jason Childs <obliv...@users.sourceforge.net>
Date: Tue, 19 Jan 2010 18:26:32 -0500
Subject: [PATCH 19/20] Kernel Module: tpc2fg horizontal scroll support
Add BTN_EXTRA to BTN_MISC word for tpc2fg to make sure buttons 6 and 7
are supported for horizontal scroll event. Without this the X Driver
won't send the button presses for the left/right gestures.
Signed-off-by: Jason Childs <obliv...@users.sourceforge.net>
---
src/2.6.27/wacom_sys.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/src/2.6.27/wacom_sys.c b/src/2.6.27/wacom_sys.c
index 76d1583..7bc7180 100755
--- a/src/2.6.27/wacom_sys.c
+++ b/src/2.6.27/wacom_sys.c
@@ -322,6 +322,7 @@ void input_dev_tpc2fg(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
{
if (wacom_wac->features->device_type == BTN_TOOL_TRIPLETAP) {
input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOOL_TRIPLETAP);
+ input_dev->keybit[BIT_WORD(BTN_MISC)] |= BIT_MASK(BTN_EXTRA);
input_dev->evbit[0] |= BIT_MASK(EV_MSC);
input_dev->mscbit[0] |= BIT_MASK(MSC_SERIAL);
}
--
1.6.3.3
>From 82f2b69667d8f65c48d88951d2ce3a5b82e810b8 Mon Sep 17 00:00:00 2001
From: Jason Childs <obliv...@users.sourceforge.net>
Date: Tue, 19 Jan 2010 18:29:51 -0500
Subject: [PATCH 20/20] wacomxi: Remove Bamboo Pen only pad variables
The Bamboo Pen (unit 0xd4) does not have the pad interface.
This modifies a previous change that made this tablet separate
from the other Bamboo P&T units in updateModelInfo.
Signed-off-by: Jason Childs <obliv...@users.sourceforge.net>
---
src/wacomxi/wacomcpl-exec | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/src/wacomxi/wacomcpl-exec b/src/wacomxi/wacomcpl-exec
index 98222c5..4e6b10d 100755
--- a/src/wacomxi/wacomcpl-exec
+++ b/src/wacomxi/wacomcpl-exec
@@ -1945,10 +1945,6 @@ proc updateModelInfo { } {
set hasTouch($i) 1
set hasGesture($i) 1
}
-
- # Bamboo Pen
- set hasPad(212) 1
- set numPadButtons(212) 4
# I3
set numPadButtons(176) 4
--
1.6.3.3
>From 5d1c72eebf56a3f2e96ebd95672de3d88ba7ae5a Mon Sep 17 00:00:00 2001
From: Jason Childs <obliv...@users.sourceforge.net>
Date: Tue, 19 Jan 2010 22:55:29 -0500
Subject: [PATCH 21/21] Kernel Module: Fix logic error for firstFinger
The check of firstFinger state in the touch buffer needed to be a
not value if statement.
Signed-off-by: Jason Childs <obliv...@users.sourceforge.net>
---
src/2.6.27/wacom_wac.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/2.6.27/wacom_wac.c b/src/2.6.27/wacom_wac.c
index 47a8a69..6d8330c 100755
--- a/src/2.6.27/wacom_wac.c
+++ b/src/2.6.27/wacom_wac.c
@@ -219,7 +219,7 @@ static void wacom_bpt_touch_in(struct wacom_wac *wacom, void *wcombo)
secondFinger = 0;
}
- if (data[3] & 0x80) {
+ if (!(data[3] & 0x80)) {
firstFinger = 0;
}
}
--
1.6.3.3
------------------------------------------------------------------------------
Throughout its 18-year history, RSA Conference consistently attracts the
world's best and brightest in the field, creating opportunities for Conference
attendees to learn about information security's most important issues through
interactions with peers, luminaries and emerging and established companies.
http://p.sf.net/sfu/rsaconf-dev2dev
_______________________________________________
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
