Attachment #214372 for bug #298579




	}

	/* vendor is wacom */
	if (WACOM_VENDOR_ID(sID.vendor))
	{
		common->tablet_id = sID.product;


		else
			channel = 0;
	}
	else
	{
		/* dual input is supported */
		if ( strstr(common->wcmModel->name, "Intuos1") ||


	if ((event->type == EV_MSC) && (event->code == MSC_SERIAL))
	{
		/* we don't report serial numbers for some tools
		 * but we never report a serial number with a value of 0 */
		if (event->value == 0)
		{
			xf86Msg(X_ERROR, "%s: usbParse: Ignoring event from invalid serial 0\n",
				local->name);
			goto skipEvent;
		}

		/* save the serial number so we can look up the channel number later */
		common->wcmLastToolSerial = event->value;


Lines 904-910 Link Here

(-)xf86-input-wacom-0.10.3/src/xf86Wacom.c (-1 / +1 lines)
904		904
905	SYSCALL(close(fd));	905	SYSCALL(close(fd));
906		906
907	if (id.vendor == WACOM_VENDOR_ID)	907	if (WACOM_VENDOR_ID(id.vendor))
908	return TRUE;	908	return TRUE;
909	else	909	else
910	return FALSE;	910	return FALSE;

Lines 26-33 Link Here

(-)xf86-input-wacom-0.10.3/src/xf86WacomDefs.h (-2 / +3 lines)
26	#include <asm/types.h>	26	#include <asm/types.h>
27	#include <linux/input.h>	27	#include <linux/input.h>
28	#define MAX_USB_EVENTS 32	28	#define MAX_USB_EVENTS 32
29	#define WACOM_VENDOR_ID 0x056a /* vendor ID on the kernel device */	29	#define WACOM_VENDOR_ID(id) /vendor ID on the kernel device/ \
30		30	id == 0x056a \|\| /* Wacom */ \
		31	id == 0x172f /* Waltop */
31	#define DEFAULT_SUPPRESS 2 /* default suppress */	32	#define DEFAULT_SUPPRESS 2 /* default suppress */
32	#define MAX_SUPPRESS 100 /* max value of suppress */	33	#define MAX_SUPPRESS 100 /* max value of suppress */
33	#define BUFFER_SIZE 256 /* size of reception buffer */	34	#define BUFFER_SIZE 256 /* size of reception buffer */

Return to bug 298579

Lines 523-529 Link Here

(-)xf86-input-wacom-0.10.3/src/wcmUSB.c (-11 / +2 lines)
523	}	523	}
524		524
525	/* vendor is wacom */	525	/* vendor is wacom */
526	if (sID.vendor == WACOM_VENDOR_ID)	526	if (WACOM_VENDOR_ID(sID.vendor))
527	{	527	{
528	common->tablet_id = sID.product;	528	common->tablet_id = sID.product;
529		529
Lines 756-762 Link Here
756	else	756	else
757	channel = 0;	757	channel = 0;
758	}	758	}
759	else if (serial) /* serial number should never be 0 for V5 devices */	759	else
760	{	760	{
761	/* dual input is supported */	761	/* dual input is supported */
762	if ( strstr(common->wcmModel->name, "Intuos1") \|\|	762	if ( strstr(common->wcmModel->name, "Intuos1") \|\|
Lines 849-863 Link Here
849		849
850	if ((event->type == EV_MSC) && (event->code == MSC_SERIAL))	850	if ((event->type == EV_MSC) && (event->code == MSC_SERIAL))
851	{	851	{
852	/* we don't report serial numbers for some tools
853	* but we never report a serial number with a value of 0 */
854	if (event->value == 0)
855	{
856	xf86Msg(X_ERROR, "%s: usbParse: Ignoring event from invalid serial 0\n",
857	local->name);
858	goto skipEvent;
859	}
860
861	/* save the serial number so we can look up the channel number later */	852	/* save the serial number so we can look up the channel number later */
862	common->wcmLastToolSerial = event->value;	853	common->wcmLastToolSerial = event->value;
863		854