From owner-p4-projects@FreeBSD.ORG Tue Nov 4 18:51:03 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6B1721065674; Tue, 4 Nov 2008 18:51:03 +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 2F3201065675 for ; Tue, 4 Nov 2008 18:51:03 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1C7048FC20 for ; Tue, 4 Nov 2008 18:51:03 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mA4Ip3TQ040849 for ; Tue, 4 Nov 2008 18:51:03 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mA4Ip2cP040847 for perforce@freebsd.org; Tue, 4 Nov 2008 18:51:02 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 4 Nov 2008 18:51:02 GMT Message-Id: <200811041851.mA4Ip2cP040847@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 152478 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: Tue, 04 Nov 2008 18:51:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=152478 Change 152478 by hselasky@hselasky_laptop001 on 2008/11/04 18:50:56 Patch to support a common "usbdevs" file. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usbdevs#25 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usbdevs#11 delete .. //depot/projects/usb/src/sys/dev/usb2/include/Makefile#4 edit .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devid.h#10 edit .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devtable.h#10 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usbdevs#25 (text+ko) ==== @@ -795,7 +795,7 @@ /* AIPTEK products */ product AIPTEK POCKETCAM3M 0x2011 PocketCAM 3Mega -product AIPTEK2 PENCAM_MEGA_1_3 0x504a PenCam Mega 1.3 +product SUNPLUS PENCAM_MEGA_1_3 0x504a PenCam Mega 1.3 /* AirPrime products */ product AIRPRIME PC5220 0x0112 CDMA Wireless PC Card @@ -1006,7 +1006,7 @@ /* Chicony products */ product CHICONY KB8933 0x0001 KB-8933 keyboard -product CHICONY2 TWINKLECAM 0x600d TwinkleCam USB camera +product MICRODIA TWINKLECAM 0x600d TwinkleCam USB camera /* CH Products */ product CHPRODUCTS PROTHROTTLE 0x00f1 Pro Throttle ==== //depot/projects/usb/src/sys/dev/usb2/include/Makefile#4 (text+ko) ==== @@ -6,8 +6,8 @@ S=${.CURDIR}/../../.. all: - awk -f $S/tools/usbdevs2h.awk $S/dev/usb2/core/usbdevs -d ; mv usbdevs_data.h usb2_devtable.h - awk -f $S/tools/usbdevs2h.awk $S/dev/usb2/core/usbdevs -h ; mv usbdevs.h usb2_devid.h + awk -f $S/tools/usbdevs2h.awk $S/dev/usb/usbdevs -d ; mv usbdevs_data.h usb2_devtable.h + awk -f $S/tools/usbdevs2h.awk $S/dev/usb/usbdevs -h ; mv usbdevs.h usb2_devid.h clean: rm -f usb2_devtable.h usb2_devid.h ==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_devid.h#10 (text+ko) ==== @@ -4,7 +4,7 @@ * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * FreeBSD: src/sys/dev/usb/usbdevs,v 1.372 2008/09/19 09:04:06 kevlo Exp + * FreeBSD: src/sys/dev/usb/usbdevs,v 1.381 2008/11/02 03:00:36 imp Exp */ /* $NetBSD: usbdevs,v 1.392 2004/12/29 08:38:44 imp Exp $ */ @@ -951,6 +951,7 @@ #define USB_PRODUCT_BELKIN_F5D7050 0x7050 /* F5D7050 Wireless Adapter */ #define USB_PRODUCT_BELKIN_F5D7051 0x7051 /* F5D7051 54g USB Network Adapter */ #define USB_PRODUCT_BELKIN_F5D7050A 0x705a /* F5D7050A Wireless Adapter */ +/* Also sold as 'Ativa 802.11g wireless card' */ #define USB_PRODUCT_BELKIN_F5D7050_V4000 0x705c /* F5D7050 v4000 Wireless Adapter */ #define USB_PRODUCT_BELKIN_F5D9050V3 0x905b /* F5D9050 ver 3 Wireless Adapter */ #define USB_PRODUCT_BELKIN2_F5U002 0x0002 /* F5U002 Parallel printer */ @@ -1431,6 +1432,7 @@ #define USB_PRODUCT_HP_640C 0x2004 /* DeskJet 640c */ #define USB_PRODUCT_HP_4670V 0x3005 /* ScanJet 4670v */ #define USB_PRODUCT_HP_P1100 0x3102 /* Photosmart P1100 */ +#define USB_PRODUCT_HP_OJ4215 0x3d11 /* OfficeJet 4215 */ #define USB_PRODUCT_HP_HN210E 0x811c /* Ethernet HN210E */ #define USB_PRODUCT_HP2_C500 0x6002 /* PhotoSmart C500 */ @@ -1441,7 +1443,7 @@ /* HUAWEI products */ #define USB_PRODUCT_HUAWEI_MOBILE 0x1001 /* Huawei Mobile */ -#define USB_PRODUCT_HUAWEI_E270 0x1003 /* Huawei HSPA modem */ +#define USB_PRODUCT_HUAWEI_E220 0x1003 /* Huawei HSDPA modem */ /* HUAWEI 3com products */ #define USB_PRODUCT_HUAWEI3COM_WUB320G 0x0009 /* Aolynk WUB320g */ @@ -1846,7 +1848,7 @@ #define USB_PRODUCT_NOVATEL_ES620 0x2100 /* ES620 CDMA */ #define USB_PRODUCT_NOVATEL_U720 0x2110 /* Merlin U720 */ #define USB_PRODUCT_NOVATEL_U727 0x4100 /* Merlin U727 CDMA */ -#define USB_PRODUCT_NOVATEL_U950D 0x4400 /* Novatel MC950D HSUPA */ +#define USB_PRODUCT_NOVATEL_MC950D 0x4400 /* Novatel MC950D HSUPA */ #define USB_PRODUCT_NOVATEL_ZEROCD 0x5010 /* Novatel ZeroCD */ #define USB_PRODUCT_NOVATEL2_FLEXPACKGPS 0x0100 /* NovAtel FlexPack GPS receiver */ @@ -1879,6 +1881,7 @@ #define USB_PRODUCT_OPTION_GT3GQUAD 0x6300 /* GlobeTrotter 3G QUAD datacard */ #define USB_PRODUCT_OPTION_GT3GPLUS 0x6600 /* GlobeTrotter 3G+ datacard */ #define USB_PRODUCT_OPTION_GTMAX36 0x6701 /* GlobeTrotter Max 3.6 Modem */ +#define USB_PRODUCT_OPTION_GTMAXHSUPA 0x7001 /* GlobeTrotter HSUPA */ /* OQO */ #define USB_PRODUCT_OQO_WIFI01 0x0002 /* model 01 WiFi interface */ @@ -2002,6 +2005,7 @@ #define USB_PRODUCT_QUALCOMM2_RWT_FCT 0x3100 /* RWT FCT-CDMA 2000 1xRTT modem */ #define USB_PRODUCT_QUALCOMM2_CDMA_MSM 0x3196 /* CDMA Technologies MSM modem */ #define USB_PRODUCT_QUALCOMMINC_CDMA_MSM 0x0001 /* CDMA Technologies MSM modem */ +#define USB_PRODUCT_QUALCOMMINC_ZTE_STOR 0x2000 /* USB ZTE Storage */ /* Qtronix products */ #define USB_PRODUCT_QTRONIX_980N 0x2011 /* Scorpion-980N keyboard */ @@ -2238,6 +2242,7 @@ #define USB_PRODUCT_SONY_CLIE_NX60 0x00da /* Sony Clie nx60 */ #define USB_PRODUCT_SONY_CLIE_TH55 0x0144 /* Sony Clie th55 */ #define USB_PRODUCT_SONY_CLIE_TJ37 0x0169 /* Sony Clie tj37 */ +#define USB_PRODUCT_SONY_RF_RECEIVER 0x01db /* Sony RF mouse/kbd Receiver VGP-WRC1 */ /* Sony Ericsson products */ #define USB_PRODUCT_SONYERICSSON_DCU10 0x0528 /* USB Cable */ ==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_devtable.h#10 (text+ko) ==== @@ -4,7 +4,7 @@ * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * FreeBSD: src/sys/dev/usb/usbdevs,v 1.372 2008/09/19 09:04:06 kevlo Exp + * FreeBSD: src/sys/dev/usb/usbdevs,v 1.381 2008/11/02 03:00:36 imp Exp */ /* $NetBSD: usbdevs,v 1.392 2004/12/29 08:38:44 imp Exp $ */ @@ -3101,6 +3101,12 @@ "Photosmart P1100", }, { + USB_VENDOR_HP, USB_PRODUCT_HP_OJ4215, + 0, + "Hewlett Packard", + "OfficeJet 4215", + }, + { USB_VENDOR_HP, USB_PRODUCT_HP_HN210E, 0, "Hewlett Packard", @@ -3137,10 +3143,10 @@ "Huawei Mobile", }, { - USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_E270, + USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_E220, 0, "Huawei Technologies", - "Huawei HSPA modem", + "Huawei HSDPA modem", }, { USB_VENDOR_HUAWEI3COM, USB_PRODUCT_HUAWEI3COM_WUB320G, @@ -4775,7 +4781,7 @@ "Merlin U727 CDMA", }, { - USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_U950D, + USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_MC950D, 0, "Novatel Wireless", "Novatel MC950D HSUPA", @@ -4913,6 +4919,12 @@ "GlobeTrotter Max 3.6 Modem", }, { + USB_VENDOR_OPTION, USB_PRODUCT_OPTION_GTMAXHSUPA, + 0, + "Option N.V:", + "GlobeTrotter HSUPA", + }, + { USB_VENDOR_OQO, USB_PRODUCT_OQO_WIFI01, 0, "OQO", @@ -5435,6 +5447,12 @@ "CDMA Technologies MSM modem", }, { + USB_VENDOR_QUALCOMMINC, USB_PRODUCT_QUALCOMMINC_ZTE_STOR, + 0, + "Qualcomm, Incorporated", + "USB ZTE Storage", + }, + { USB_VENDOR_QTRONIX, USB_PRODUCT_QTRONIX_980N, 0, "Qtronix", @@ -6395,6 +6413,12 @@ "Sony Clie tj37", }, { + USB_VENDOR_SONY, USB_PRODUCT_SONY_RF_RECEIVER, + 0, + "Sony", + "Sony RF mouse/kbd Receiver VGP-WRC1", + }, + { USB_VENDOR_SONYERICSSON, USB_PRODUCT_SONYERICSSON_DCU10, 0, "Sony Ericsson",