From owner-p4-projects@FreeBSD.ORG Sun Dec 14 21:24:29 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DF43D1065686; Sun, 14 Dec 2008 21:24:28 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A22CD1065744; Sun, 14 Dec 2008 21:24:28 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from harmony.bsdimp.com (bsdimp.com [199.45.160.85]) by mx1.freebsd.org (Postfix) with ESMTP id 872D88FC13; Sun, 14 Dec 2008 21:24:27 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from localhost (localhost [127.0.0.1]) by harmony.bsdimp.com (8.14.2/8.14.1) with ESMTP id mBELMlvJ021857; Sun, 14 Dec 2008 14:22:47 -0700 (MST) (envelope-from imp@bsdimp.com) Date: Sun, 14 Dec 2008 14:22:47 -0700 (MST) Message-Id: <20081214.142247.-1540392820.imp@bsdimp.com> To: hselasky@freebsd.org From: "M. Warner Losh" In-Reply-To: <200812061016.mB6AGpgA053888@repoman.freebsd.org> References: <200812061016.mB6AGpgA053888@repoman.freebsd.org> X-Mailer: Mew version 5.2 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: perforce@freebsd.org Subject: Re: PERFORCE change 154173 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Dec 2008 21:24:29 -0000 In message: <200812061016.mB6AGpgA053888@repoman.freebsd.org> Hans Petter Selasky writes: : http://perforce.freebsd.org/chv.cgi?CH=154173 : : Change 154173 by hselasky@hselasky_laptop001 on 2008/12/06 10:15:56 : : : Add USB device ID's from Michael. : : Affected files ... : : .. //depot/projects/usb/src/sys/dev/usb/usbdevs#28 edit : .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_msctest.c#13 edit : .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devid.h#14 edit : .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devtable.h#14 edit : : Differences ... : : ==== //depot/projects/usb/src/sys/dev/usb/usbdevs#28 (text+ko) ==== : : @@ -1430,6 +1430,7 @@ : product HP OJ4215 0x3d11 OfficeJet 4215 : product HP HN210E 0x811c Ethernet HN210E : product HP2 C500 0x6002 PhotoSmart C500 : +product HP HS2300 0x1e1d MC8775 This is out of order. It should be sorted in numeric order with the other HP products (with the single HP2 coming last). Warner : /* HTC products */ : product HTC WINMOBILE 0x00ce HTC USB Sync : : ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_msctest.c#13 (text+ko) ==== : : @@ -649,6 +649,7 @@ : {USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC8775_2, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, /* XXX */ : {USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC8780, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, /* XXX */ : {USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC8781, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, /* XXX */ : + {USB_VPI(USB_VENDOR_HP, USB_PRODUCT_HP_HS2300, U3GINFO(U3GSP_HSPA, U3GFL_NONE))}, /* XXX */ : /* Sierra TruInstaller device ID */ : {USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_TRUINSTALL, U3GINFO(U3GSP_UMTS, U3GFL_SIERRA_INIT))}, : }; : : ==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_devid.h#14 (text+ko) ==== : : @@ -1437,6 +1437,7 @@ : #define USB_PRODUCT_HP_OJ4215 0x3d11 /* OfficeJet 4215 */ : #define USB_PRODUCT_HP_HN210E 0x811c /* Ethernet HN210E */ : #define USB_PRODUCT_HP2_C500 0x6002 /* PhotoSmart C500 */ : +#define USB_PRODUCT_HP_HS2300 0x1e1d /* MC8775 */ : : /* HTC products */ : #define USB_PRODUCT_HTC_WINMOBILE 0x00ce /* HTC USB Sync */ : : ==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_devtable.h#14 (text+ko) ==== : : @@ -3131,6 +3131,12 @@ : "PhotoSmart C500", : }, : { : + USB_VENDOR_HP, USB_PRODUCT_HP_HS2300, : + 0, : + "Hewlett Packard", : + "MC8775", : + }, : + { : USB_VENDOR_HTC, USB_PRODUCT_HTC_WINMOBILE, : 0, : "HTC", :