Date: Tue, 23 Dec 2008 20:32:00 GMT From: Hans Petter Selasky <hselasky@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 155198 for review Message-ID: <200812232032.mBNKW0kA034038@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=155198 Change 155198 by hselasky@hselasky_laptop001 on 2008/12/23 20:31:04 Get fresh "usbdevs" from FreeBSD vendor branch. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usbdevs#32 integrate .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devid.h#18 edit .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devtable.h#18 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usbdevs#32 (text+ko) ==== @@ -205,7 +205,7 @@ vendor NEWNEX 0x04f7 Newnex vendor BROTHER 0x04f9 Brother Industries vendor DALLAS 0x04fa Dallas Semiconductor -vendor SUNPLUS 0x04fc AIPTEK International +vendor AIPTEK2 0x04fc AIPTEK International vendor PFU 0x04fe PFU vendor FUJIKURA 0x0501 Fujikura/DDK vendor ACER 0x0502 Acer @@ -503,7 +503,7 @@ vendor FSC 0x0bf8 Fujitsu Siemens Computers vendor AGATE 0x0c08 Agate Technologies vendor DMI 0x0c0b DMI -vendor MICRODIA 0x0c45 Chicony +vendor CHICONY2 0x0c45 Chicony vendor SEALEVEL 0x0c52 Sealevel System vendor LUWEN 0x0c76 Luwen vendor KYOCERA2 0x0c88 Kyocera Wireless Corp. @@ -797,7 +797,7 @@ /* AIPTEK products */ product AIPTEK POCKETCAM3M 0x2011 PocketCAM 3Mega -product SUNPLUS PENCAM_MEGA_1_3 0x504a PenCam Mega 1.3 +product AIPTEK2 PENCAM_MEGA_1_3 0x504a PenCam Mega 1.3 /* AirPrime products */ product AIRPRIME PC5220 0x0112 CDMA Wireless PC Card @@ -808,7 +808,6 @@ /* Alcor Micro, Inc. products */ product ALCOR2 KBD_HUB 0x2802 Kbd Hub -product ALCOR TRANSCEND 0x6387 Transcend JetFlash Drive product ALCOR MA_KBD_HUB 0x9213 MacAlly Kbd Hub product ALCOR AU9814 0x9215 AU9814 Hub product ALCOR UMCR_9361 0x9361 USB Multimedia Card Reader @@ -1010,7 +1009,7 @@ /* Chicony products */ product CHICONY KB8933 0x0001 KB-8933 keyboard -product MICRODIA TWINKLECAM 0x600d TwinkleCam USB camera +product CHICONY2 TWINKLECAM 0x600d TwinkleCam USB camera /* CH Products */ product CHPRODUCTS PROTHROTTLE 0x00f1 Pro Throttle @@ -1428,7 +1427,6 @@ product HP 568J 0x1116 Jornada 568 product HP 930C 0x1204 DeskJet 930c product HP P2000U 0x1801 Inkjet P-2000U -product HP HS2300 0x1e1d MC8775 product HP 640C 0x2004 DeskJet 640c product HP 4670V 0x3005 ScanJet 4670v product HP P1100 0x3102 Photosmart P1100 ==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_devid.h#18 (text+ko) ==== @@ -212,7 +212,7 @@ #define USB_VENDOR_NEWNEX 0x04f7 /* Newnex */ #define USB_VENDOR_BROTHER 0x04f9 /* Brother Industries */ #define USB_VENDOR_DALLAS 0x04fa /* Dallas Semiconductor */ -#define USB_VENDOR_SUNPLUS 0x04fc /* AIPTEK International */ +#define USB_VENDOR_AIPTEK2 0x04fc /* AIPTEK International */ #define USB_VENDOR_PFU 0x04fe /* PFU */ #define USB_VENDOR_FUJIKURA 0x0501 /* Fujikura/DDK */ #define USB_VENDOR_ACER 0x0502 /* Acer */ @@ -510,7 +510,7 @@ #define USB_VENDOR_FSC 0x0bf8 /* Fujitsu Siemens Computers */ #define USB_VENDOR_AGATE 0x0c08 /* Agate Technologies */ #define USB_VENDOR_DMI 0x0c0b /* DMI */ -#define USB_VENDOR_MICRODIA 0x0c45 /* Chicony */ +#define USB_VENDOR_CHICONY2 0x0c45 /* Chicony */ #define USB_VENDOR_SEALEVEL 0x0c52 /* Sealevel System */ #define USB_VENDOR_LUWEN 0x0c76 /* Luwen */ #define USB_VENDOR_KYOCERA2 0x0c88 /* Kyocera Wireless Corp. */ @@ -804,7 +804,7 @@ /* AIPTEK products */ #define USB_PRODUCT_AIPTEK_POCKETCAM3M 0x2011 /* PocketCAM 3Mega */ -#define USB_PRODUCT_SUNPLUS_PENCAM_MEGA_1_3 0x504a /* PenCam Mega 1.3 */ +#define USB_PRODUCT_AIPTEK2_PENCAM_MEGA_1_3 0x504a /* PenCam Mega 1.3 */ /* AirPrime products */ #define USB_PRODUCT_AIRPRIME_PC5220 0x0112 /* CDMA Wireless PC Card */ @@ -815,7 +815,6 @@ /* Alcor Micro, Inc. products */ #define USB_PRODUCT_ALCOR2_KBD_HUB 0x2802 /* Kbd Hub */ -#define USB_PRODUCT_ALCOR_TRANSCEND 0x6387 /* Transcend JetFlash Drive */ #define USB_PRODUCT_ALCOR_MA_KBD_HUB 0x9213 /* MacAlly Kbd Hub */ #define USB_PRODUCT_ALCOR_AU9814 0x9215 /* AU9814 Hub */ #define USB_PRODUCT_ALCOR_UMCR_9361 0x9361 /* USB Multimedia Card Reader */ @@ -1017,7 +1016,7 @@ /* Chicony products */ #define USB_PRODUCT_CHICONY_KB8933 0x0001 /* KB-8933 keyboard */ -#define USB_PRODUCT_MICRODIA_TWINKLECAM 0x600d /* TwinkleCam USB camera */ +#define USB_PRODUCT_CHICONY2_TWINKLECAM 0x600d /* TwinkleCam USB camera */ /* CH Products */ #define USB_PRODUCT_CHPRODUCTS_PROTHROTTLE 0x00f1 /* Pro Throttle */ @@ -1435,7 +1434,6 @@ #define USB_PRODUCT_HP_568J 0x1116 /* Jornada 568 */ #define USB_PRODUCT_HP_930C 0x1204 /* DeskJet 930c */ #define USB_PRODUCT_HP_P2000U 0x1801 /* Inkjet P-2000U */ -#define USB_PRODUCT_HP_HS2300 0x1e1d /* MC8775 */ #define USB_PRODUCT_HP_640C 0x2004 /* DeskJet 640c */ #define USB_PRODUCT_HP_4670V 0x3005 /* ScanJet 4670v */ #define USB_PRODUCT_HP_P1100 0x3102 /* Photosmart P1100 */ ==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_devtable.h#18 (text+ko) ==== @@ -599,7 +599,7 @@ "PocketCAM 3Mega", }, { - USB_VENDOR_SUNPLUS, USB_PRODUCT_SUNPLUS_PENCAM_MEGA_1_3, + USB_VENDOR_AIPTEK2, USB_PRODUCT_AIPTEK2_PENCAM_MEGA_1_3, 0, "AIPTEK International", "PenCam Mega 1.3", @@ -623,12 +623,6 @@ "Kbd Hub", }, { - USB_VENDOR_ALCOR, USB_PRODUCT_ALCOR_TRANSCEND, - 0, - "Alcor Micro", - "Transcend JetFlash Drive", - }, - { USB_VENDOR_ALCOR, USB_PRODUCT_ALCOR_MA_KBD_HUB, 0, "Alcor Micro", @@ -1403,7 +1397,7 @@ "KB-8933 keyboard", }, { - USB_VENDOR_MICRODIA, USB_PRODUCT_MICRODIA_TWINKLECAM, + USB_VENDOR_CHICONY2, USB_PRODUCT_CHICONY2_TWINKLECAM, 0, "Chicony", "TwinkleCam USB camera", @@ -3107,12 +3101,6 @@ "Inkjet P-2000U", }, { - USB_VENDOR_HP, USB_PRODUCT_HP_HS2300, - 0, - "Hewlett Packard", - "MC8775", - }, - { USB_VENDOR_HP, USB_PRODUCT_HP_640C, 0, "Hewlett Packard", @@ -8165,7 +8153,7 @@ NULL, }, { - USB_VENDOR_SUNPLUS, 0, + USB_VENDOR_AIPTEK2, 0, USB_KNOWNDEV_NOPROD, "AIPTEK International", NULL, @@ -9953,7 +9941,7 @@ NULL, }, { - USB_VENDOR_MICRODIA, 0, + USB_VENDOR_CHICONY2, 0, USB_KNOWNDEV_NOPROD, "Chicony", NULL,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200812232032.mBNKW0kA034038>