Date: Sun, 14 Dec 2008 21:34:31 GMT From: Hans Petter Selasky <hselasky@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 154662 for review Message-ID: <200812142134.mBELYVWl029399@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=154662 Change 154662 by hselasky@hselasky_laptop001 on 2008/12/14 21:34:01 Some nits M. Warner Losh pointed out. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usbdevs#29 edit .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devid.h#15 edit .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devtable.h#15 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usbdevs#29 (text+ko) ==== @@ -806,12 +806,12 @@ /* 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 product ALCOR SM_KBD 0x9410 MicroConnectors/StrongMan Keyboard product ALCOR NEC_KBD_HUB 0x9472 NEC Kbd Hub -product ALCOR TRANSCEND 0x6387 Transcend JetFlash Drive /* Altec Lansing products */ product ALTEC ADA70 0x0070 ADA70 Speakers @@ -1424,13 +1424,13 @@ 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 product HP OJ4215 0x3d11 OfficeJet 4215 product HP HN210E 0x811c Ethernet HN210E product HP2 C500 0x6002 PhotoSmart C500 -product HP HS2300 0x1e1d MC8775 /* HTC products */ product HTC WINMOBILE 0x00ce HTC USB Sync ==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_devid.h#15 (text+ko) ==== @@ -813,12 +813,12 @@ /* 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 */ #define USB_PRODUCT_ALCOR_SM_KBD 0x9410 /* MicroConnectors/StrongMan Keyboard */ #define USB_PRODUCT_ALCOR_NEC_KBD_HUB 0x9472 /* NEC Kbd Hub */ -#define USB_PRODUCT_ALCOR_TRANSCEND 0x6387 /* Transcend JetFlash Drive */ /* Altec Lansing products */ #define USB_PRODUCT_ALTEC_ADA70 0x0070 /* ADA70 Speakers */ @@ -1431,13 +1431,13 @@ #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 */ #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#15 (text+ko) ==== @@ -623,6 +623,12 @@ "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", @@ -653,12 +659,6 @@ "NEC Kbd Hub", }, { - USB_VENDOR_ALCOR, USB_PRODUCT_ALCOR_TRANSCEND, - 0, - "Alcor Micro", - "Transcend JetFlash Drive", - }, - { USB_VENDOR_ALTEC, USB_PRODUCT_ALTEC_ADA70, 0, "Altec Lansing", @@ -3095,6 +3095,12 @@ "Inkjet P-2000U", }, { + USB_VENDOR_HP, USB_PRODUCT_HP_HS2300, + 0, + "Hewlett Packard", + "MC8775", + }, + { USB_VENDOR_HP, USB_PRODUCT_HP_640C, 0, "Hewlett Packard", @@ -3131,12 +3137,6 @@ "PhotoSmart C500", }, { - USB_VENDOR_HP, USB_PRODUCT_HP_HS2300, - 0, - "Hewlett Packard", - "MC8775", - }, - { USB_VENDOR_HTC, USB_PRODUCT_HTC_WINMOBILE, 0, "HTC",
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200812142134.mBELYVWl029399>