rpms/linuxwacom/devel linuxwacom-0.8.2.2-serial-check.patch, NONE, 1.1 linuxwacom.spec, 1.78, 1.79

[Peter Hutterer]

Author: whot

Update of /cvs/pkgs/rpms/linuxwacom/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2313

Modified Files:
	linuxwacom.spec 
Added Files:
	linuxwacom-0.8.2.2-serial-check.patch 
Log Message:
* Mon Apr 06 2009 Peter Hutterer <peter.hutterer at redhat.com> 0.8.2.2-11
- linuxwacom-0.8.2.2-serial-check.patch: revert serial channel checking, it
  breaks waltop tablets. 



linuxwacom-0.8.2.2-serial-check.patch:

--- NEW FILE linuxwacom-0.8.2.2-serial-check.patch ---
upstream commit points to http://sourceforge.net/tracker/?func=detail&aid=2499414&group_id=69596&atid=525124
as the source for this change. Doesnt make sense to me, but if it that's
really the cause we don't need to worry on server 1.6.

--- ./src/xdrv/wcmUSB.c	2009-01-19 19:58:37.000000000 +0100
+++ /home/social/rpmbuild/SOURCES/linuxwacom-0.8.2-1/src/xdrv/wcmUSB.c	2008-12-30 22:46:01.000000000 +0100
@@ -815,11 +815,6 @@
 	if ((event->type == EV_MSC) && (event->code == MSC_SERIAL))
 	{
 		/* save the serial number so we can look up the channel number later */
-		if (event->value == 0) /* serial number should never be 0 */
-		{
-			ErrorF("usbParse: Ignoring event from invalid serial 0\n");
-			return;
-		}
 		common->wcmLastToolSerial = event->value;
 
 		/* if SYN_REPORT is end of record indicator, we are done */
@@ -852,7 +847,7 @@
 	channel = -1;
 	if (common->wcmProtocolLevel == 4)
 	{
-		/* Protocol 4 doesn't support tool serial numbers */
+		/* Protocol 4 don't support tool serial numbers */
 		if (common->wcmLastToolSerial == 0xf0)
 			channel = 1;
 		else
@@ -864,7 +859,7 @@
 			common->wcmChannel[channel].work.proximity = 1;
 		}
 	}
-	else if (common->wcmLastToolSerial) /* serial number should never be 0 */
+	else
 	{
 		/* find existing channel */
 		for (i=0; i<MAX_CHANNELS; ++i)


Index: linuxwacom.spec
===================================================================
RCS file: /cvs/pkgs/rpms/linuxwacom/devel/linuxwacom.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- linuxwacom.spec	26 Mar 2009 05:25:54 -0000	1.78
+++ linuxwacom.spec	6 Apr 2009 02:29:16 -0000	1.79
@@ -3,7 +3,7 @@
 # Upstream's versioning is goofy.  Note the mapping from tarname to version.
 Name:		linuxwacom
 Version:	0.8.2.2
-Release:	10%{?dist}
+Release:	11%{?dist}
 Summary:	Wacom Drivers from Linux Wacom Project
 
 Group:		User Interface/X Hardware Support
@@ -19,6 +19,7 @@
 Patch5:		linuxwacom-0.8.2.2-export-module.patch
 Patch7:		linuxwacom-0.8.2.2-wcmMaxX.patch
 Patch8:		linuxwacom-0.8.2.2-hal-setup.patch
+Patch9:		linuxwacom-0.8.2.2-serial-check.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}
 BuildRequires:	libX11-devel libXi-devel ncurses-devel
@@ -53,6 +54,7 @@
 %patch5 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 %build
 
@@ -115,6 +117,10 @@
 %{_libdir}/libwacomcfg*.so
 
 %changelog
+* Mon Apr 06 2009 Peter Hutterer <peter.hutterer at redhat.com> 0.8.2.2-11
+- linuxwacom-0.8.2.2-serial-check.patch: revert serial channel checking, it
+  breaks waltop tablets. 
+
 * Thu Mar 26 2009 Peter Hutterer <peter.hutterer at redhat.com> 0.8.2.2-10
 - Add WALTOP and N-Trig Duosense devices to the fdi file.