From owner-freebsd-usb@FreeBSD.ORG Sun Jul 22 12:40:02 2007 Return-Path: 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 A8EB616A417 for ; Sun, 22 Jul 2007 12:40:02 +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 8AEB713C468 for ; Sun, 22 Jul 2007 12:40:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.1/8.14.1) with ESMTP id l6MCe2pM052952 for ; Sun, 22 Jul 2007 12:40:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.1/8.14.1/Submit) id l6MCe2QB052946; Sun, 22 Jul 2007 12:40:02 GMT (envelope-from gnats) Resent-Date: Sun, 22 Jul 2007 12:40:02 GMT Resent-Message-Id: <200707221240.l6MCe2QB052946@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-usb@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Henrik Brix Andersen Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9711E16A419 for ; Sun, 22 Jul 2007 12:30:41 +0000 (UTC) (envelope-from brix@lothlorien.brixandersen.dk) Received: from solow.pil.dk (relay.pil.dk [195.41.47.164]) by mx1.freebsd.org (Postfix) with ESMTP id 2B13313C468 for ; Sun, 22 Jul 2007 12:30:40 +0000 (UTC) (envelope-from brix@lothlorien.brixandersen.dk) Received: from lothlorien.brixandersen.dk (osgiliath.brixandersen.dk [87.53.223.189]) by solow.pil.dk (Postfix) with ESMTP id 5B6CE1CC0F3; Sun, 22 Jul 2007 14:30:39 +0200 (CEST) Received: by lothlorien.brixandersen.dk (Postfix, from userid 1001) id 9505711439; Sun, 22 Jul 2007 14:30:38 +0200 (CEST) Message-Id: <20070722123038.9505711439@lothlorien.brixandersen.dk> Date: Sun, 22 Jul 2007 14:30:38 +0200 (CEST) From: Henrik Brix Andersen To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Warner Losh Subject: usb/114807: [patch] Make MetaGeek Wi-Spy 2.4x appear as such (and fix build error) X-BeenThere: freebsd-usb@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Henrik Brix Andersen List-Id: FreeBSD support for USB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Jul 2007 12:40:02 -0000 >Number: 114807 >Category: usb >Synopsis: [patch] Make MetaGeek Wi-Spy 2.4x appear as such (and fix build error) >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-usb >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Jul 22 12:40:01 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Henrik Brix Andersen >Release: FreeBSD 7.0-CURRENT i386 >Organization: pil.dk >Environment: System: FreeBSD lothlorien.brixandersen.dk 7.0-CURRENT FreeBSD 7.0-CURRENT #55: Fri Jul 20 01:36:09 CEST 2007 root@lothlorien.brixandersen.dk:/usr/obj/usr/src/sys/LOTHLORIEN i386 >Description: The latest commit to sys/dev/usb/usbdevs (r1.324) breaks compilation of sys/dev/usb/usb_quirks.c. I take it the addition of an 'X' to the Wi-Spy PID was to make it clear that this is the Wi-Spy 2.4x product (as suggested by me). However, usb_quirks.c was not updated to match this, and neither was the descriptive text in usbdevs. >How-To-Repeat: >Fix: Below is my proposed patch for identifying the MetaGeek Wi-Spy 2.4x correctly (and solving the current build issue). --- wispy24x.diff begins here --- --- sys/dev/usb/usbdevs.orig 2007-07-22 13:40:12.000000000 +0200 +++ sys/dev/usb/usbdevs 2007-07-22 13:40:45.000000000 +0200 @@ -1562,7 +1562,7 @@ product MELCO SG54HP 0x00d8 WLI-U2-SG54 product MELCO G54HP 0x00d9 WLI-U2-G54HP /* MetaGeek products */ -product METAGEEK WISPYX 0x083e MetaGeek Wi-Spy +product METAGEEK WISPY24X 0x083e MetaGeek Wi-Spy 2.4x /* Metricom products */ product METRICOM RICOCHET_GS 0x0001 Ricochet GS --- sys/dev/usb/usb_quirks.c.orig 2007-07-22 13:41:40.000000000 +0200 +++ sys/dev/usb/usb_quirks.c 2007-07-22 13:41:59.000000000 +0200 @@ -108,7 +108,7 @@ static const struct usbd_quirk_entry { /* Devices which should be ignored by both ukbd and uhid */ { USB_VENDOR_CYPRESS, USB_PRODUCT_CYPRESS_WISPY, ANY, { UQ_KBD_IGNORE }}, - { USB_VENDOR_METAGEEK, USB_PRODUCT_METAGEEK_WISPY, + { USB_VENDOR_METAGEEK, USB_PRODUCT_METAGEEK_WISPY24X, ANY, { UQ_KBD_IGNORE }}, { 0, 0, 0, { 0 } } }; --- wispy24x.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: