From owner-freebsd-usb@FreeBSD.ORG  Wed Feb 27 22:00:03 2008
Return-Path: <owner-freebsd-usb@FreeBSD.ORG>
Delivered-To: freebsd-usb@hub.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id ED1E7106566B
	for <freebsd-usb@hub.freebsd.org>; Wed, 27 Feb 2008 22:00:03 +0000 (UTC)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org
	[IPv6:2001:4f8:fff6::28])
	by mx1.freebsd.org (Postfix) with ESMTP id DC0878FC1A
	for <freebsd-usb@hub.freebsd.org>; Wed, 27 Feb 2008 22:00:03 +0000 (UTC)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1])
	by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m1RM03Ed058914
	for <freebsd-usb@freefall.freebsd.org>; Wed, 27 Feb 2008 22:00:03 GMT
	(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m1RM03tS058913;
	Wed, 27 Feb 2008 22:00:03 GMT (envelope-from gnats)
Date: Wed, 27 Feb 2008 22:00:03 GMT
Message-Id: <200802272200.m1RM03tS058913@freefall.freebsd.org>
To: freebsd-usb@FreeBSD.org
From: John Baldwin <jhb@FreeBSD.org>
Cc: 
Subject: Re: usb/118670: [ums] [patch] Razer Copperhead Laser Mouse shows up
	as keyboard
X-BeenThere: freebsd-usb@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: John Baldwin <jhb@FreeBSD.org>
List-Id: FreeBSD support for USB <freebsd-usb.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-usb>,
	<mailto:freebsd-usb-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-usb>
List-Post: <mailto:freebsd-usb@freebsd.org>
List-Help: <mailto:freebsd-usb-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-usb>,
	<mailto:freebsd-usb-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 27 Feb 2008 22:00:04 -0000

The following reply was made to PR usb/118670; it has been noted by GNATS.

From: John Baldwin <jhb@freebsd.org>
To: bug-followup@freebsd.org, Uwe@grohnwaldt.eu
Cc: imp@freebsd.org
Subject: Re: usb/118670: [ums] [patch] Razer Copperhead Laser Mouse shows up as keyboard
Date: Wed, 27 Feb 2008 16:41:13 -0500

 According to the USB spec, the protocol field is only defined if the subclass 
 is 1.  So a subclass of 0 is really a violation of the spec.  I think a 
 better fix is to put back the old hid_is_collection() test first and then 
 directly check the descriptor if that fails:
 
 Index: ums.c
 ===================================================================
 RCS file: /usr/cvs/src/sys/dev/usb/ums.c,v
 retrieving revision 1.97
 diff -u -r1.97 ums.c
 --- ums.c	26 Dec 2007 14:31:16 -0000	1.97
 +++ ums.c	27 Feb 2008 21:40:48 -0000
 @@ -198,7 +198,10 @@
  	if (err)
  		return (UMATCH_NONE);
  
 -	if (id->bInterfaceClass == UICLASS_HID &&
 +	if (hid_is_collection(desc, size,
 +			      HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_MOUSE)))
 +		ret = UMATCH_IFACECLASS;
 +	else if (id->bInterfaceClass == UICLASS_HID &&
  	    id->bInterfaceSubClass == UISUBCLASS_BOOT &&
  	    id->bInterfaceProtocol == UIPROTO_MOUSE)
  		ret = UMATCH_IFACECLASS;
 
 -- 
 John Baldwin