New scaled-back diff. cleanup whitespace, s/QUICKCAM/QKCAM/, no new ids.
Index: dev/usb/uaudio.c
===================================================================
RCS file: /cvs/src/sys/dev/usb/uaudio.c,v
retrieving revision 1.122
diff -u -p -r1.122 uaudio.c
--- dev/usb/uaudio.c 3 Jan 2017 06:45:58 -0000 1.122
+++ dev/usb/uaudio.c 29 Jan 2017 22:13:04 -0000
@@ -214,13 +214,13 @@ struct uaudio_devs {
UAUDIO_FLAG_DEPENDENT },
{ { USB_VENDOR_DALLAS, USB_PRODUCT_DALLAS_J6502 },
UAUDIO_FLAG_NO_XU | UAUDIO_FLAG_BAD_ADC },
- { { USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAMNBDLX },
+ { { USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QKCAMNBDLX },
UAUDIO_FLAG_BAD_AUDIO },
- { { USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAMPRONB },
+ { { USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QKCAMPRONB },
UAUDIO_FLAG_BAD_AUDIO },
- { { USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAMPRO4K },
+ { { USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QKCAMPRO4K },
UAUDIO_FLAG_BAD_AUDIO },
- { { USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAMZOOM },
+ { { USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QKCAMZOOM },
UAUDIO_FLAG_BAD_AUDIO },
{ { USB_VENDOR_TELEX, USB_PRODUCT_TELEX_MIC1 },
UAUDIO_FLAG_NO_FRAC }
Index: dev/usb/usbdevs
===================================================================
RCS file: /cvs/src/sys/dev/usb/usbdevs,v
retrieving revision 1.673
diff -u -p -r1.673 usbdevs
--- dev/usb/usbdevs 15 Dec 2016 15:42:05 -0000 1.673
+++ dev/usb/usbdevs 29 Jan 2017 22:13:07 -0000
@@ -2553,37 +2553,37 @@ product LOGITEC LANW300NU2S 0x0169 LAN-W
product LOGITECH M2452 0x0203 M2452 keyboard
product LOGITECH M4848 0x0301 M4848 mouse
product LOGITECH PAGESCAN 0x040f PageScan
-product LOGITECH QUICKCAMWEB 0x0801 QuickCam Web
+product LOGITECH QKCAMWEB 0x0801 QuickCam Web
product LOGITECH WEBCAMC200 0x0802 Webcam C200
product LOGITECH WEBCAMC500 0x0807 Webcam C500
product LOGITECH QUICKCAMPRO 0x0810 QuickCam Pro
product LOGITECH WEBCAMC310 0x081b Webcam C310
product LOGITECH HDPROC910 0x0821 HD Pro Webcam C910
-product LOGITECH QUICKCAMEXP 0x0840 QuickCam Express
-product LOGITECH QUICKCAM 0x0850 QuickCam
-product LOGITECH QUICKCAMNBDLX 0x08a9 QuickCam Notebook Deluxe
-product LOGITECH QUICKCAMPRO3K 0x08b0 QuickCam Pro 3000
-product LOGITECH QUICKCAMNBPRO_1 0x08b1 QuickCam Notebook Pro
-product LOGITECH QUICKCAMPRO4K 0x08b2 QuickCam Pro 4000
-product LOGITECH QUICKCAMZOOM 0x08b3 QuickCam Zoom
-product LOGITECH QUICKCAMFUSION_1 0x08c1 QuickCam Fusion
-product LOGITECH QUICKCAMORBITMP_1 0x08c2 QuickCam Orbit MP
-product LOGITECH QUICKCAMNBPRO 0x08c3 QuickCam Notebook Pro
-product LOGITECH QUICKCAMPRO5K_1 0x08c5 QuickCam Pro 5000
-product LOGITECH QUICKCAMOEM_1 0x08c6 QuickCam OEM
-product LOGITECH QUICKCAMOEM_2 0x08c7 QuickCam OEM
-product LOGITECH QUICKCAMULTVIS 0x08c9 QuickCam Ultra Vision
-product LOGITECH QUICKCAMFUSION_2 0x08ca QuickCam Fusion
-product LOGITECH QUICKCAMNBPRO_2 0x08cb QuickCam Notebook Pro
-product LOGITECH QUICKCAMORBITMP_2 0x08cc QuickCam Orbit MP
-product LOGITECH QUICKCAMPRO5K_2 0x08ce QuickCam Pro 5000
-product LOGITECH QUICKCAMPRO9K 0x0990 QuickCam Pro 9000
-product LOGITECH QUICKCAMPRONB 0x0991 QuickCam Pro Notebook
-product LOGITECH QUICKCAMCOMMDLX 0x0992 QuickCam Communicate Deluxe
-product LOGITECH QUICKCAMORBITAF 0x0994 QuickCam Orbit AF
-product LOGITECH QUICKCAMCOMMMP 0x09a1 QuickCam Communicate MP
-product LOGITECH QUICKCAME3500P 0x09a4 QuickCam E 3500 Plus
-product LOGITECH QUICKCAMDLXNB 0x09c1 QuickCam Deluxe Notebook
+product LOGITECH QKCAMEXP 0x0840 QuickCam Express
+product LOGITECH QKCAM 0x0850 QuickCam
+product LOGITECH QKCAMNBDLX 0x08a9 QuickCam Notebook Deluxe
+product LOGITECH QKCAMPRO3K 0x08b0 QuickCam Pro 3000
+product LOGITECH QKCAMNBPRO_1 0x08b1 QuickCam Notebook Pro
+product LOGITECH QKCAMPRO4K 0x08b2 QuickCam Pro 4000
+product LOGITECH QKCAMZOOM 0x08b3 QuickCam Zoom
+product LOGITECH QKCAMFUSION_1 0x08c1 QuickCam Fusion
+product LOGITECH QKCAMORBMP_1 0x08c2 QuickCam Orbit MP
+product LOGITECH QKCAMNBPRO 0x08c3 QuickCam Notebook Pro
+product LOGITECH QKCAMPRO5K_1 0x08c5 QuickCam Pro 5000
+product LOGITECH QKCAMOEM_1 0x08c6 QuickCam OEM
+product LOGITECH QKCAMOEM_2 0x08c7 QuickCam OEM
+product LOGITECH QKCAMULTVIS 0x08c9 QuickCam Ultra Vision
+product LOGITECH QKCAMFUSION_2 0x08ca QuickCam Fusion
+product LOGITECH QKCAMNBPRO_2 0x08cb QuickCam Notebook Pro
+product LOGITECH QKCAMORBMP_2 0x08cc QuickCam Orbit MP
+product LOGITECH QKCAMPRO5K_2 0x08ce QuickCam Pro 5000
+product LOGITECH QKCAMPRO9K 0x0990 QuickCam Pro 9000
+product LOGITECH QKCAMPRONB 0x0991 QuickCam Pro Notebook
+product LOGITECH QKCAMCOMMDLX 0x0992 QuickCam Communicate Deluxe
+product LOGITECH QKCAMORBITAF 0x0994 QuickCam Orbit AF
+product LOGITECH QKCAMCOMMMP 0x09a1 QuickCam Communicate MP
+product LOGITECH QKCAME3500P 0x09a4 QuickCam E 3500 Plus
+product LOGITECH QKCAMDLXNB 0x09c1 QuickCam Deluxe Notebook
product LOGITECH N43 0xc000 N43
product LOGITECH N48 0xc001 N48 mouse
product LOGITECH MBA47 0xc002 M-BA47 mouse
@@ -2600,7 +2600,7 @@ product LOGITECH BB18 0xc404 TrackMan W
product LOGITECH RK53 0xc501 Cordless mouse
product LOGITECH RB6 0xc503 Cordless keyboard
product LOGITECH CDO 0xc504 Cordless Desktop Optical
-product LOGITECH QUICKCAMPRO2 0xd001 QuickCam Pro
+product LOGITECH QKCAMPRO2 0xd001 QuickCam Pro
/* Longcheer products */
product LONGCHEER D21LCMASS 0x9401 Emobile D21LC Mass only mode
Index: dev/usb/usbdevs.h
===================================================================
RCS file: /cvs/src/sys/dev/usb/usbdevs.h,v
retrieving revision 1.685
diff -u -p -r1.685 usbdevs.h
--- dev/usb/usbdevs.h 15 Dec 2016 15:44:46 -0000 1.685
+++ dev/usb/usbdevs.h 29 Jan 2017 22:13:11 -0000
@@ -1,4 +1,4 @@
-/* $OpenBSD: usbdevs.h,v 1.685 2016/12/15 15:44:46 pirofti Exp $ */
+/* $OpenBSD$ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
@@ -2560,37 +2560,37 @@
#define USB_PRODUCT_LOGITECH_M2452 0x0203 /* M2452
keyboard */
#define USB_PRODUCT_LOGITECH_M4848 0x0301 /* M4848 mouse
*/
#define USB_PRODUCT_LOGITECH_PAGESCAN 0x040f /* PageScan */
-#define USB_PRODUCT_LOGITECH_QUICKCAMWEB 0x0801 /*
QuickCam Web */
+#define USB_PRODUCT_LOGITECH_QKCAMWEB 0x0801 /* QuickCam Web
*/
#define USB_PRODUCT_LOGITECH_WEBCAMC200 0x0802 /* Webcam C200
*/
#define USB_PRODUCT_LOGITECH_WEBCAMC500 0x0807 /* Webcam C500
*/
#define USB_PRODUCT_LOGITECH_QUICKCAMPRO 0x0810 /*
QuickCam Pro */
#define USB_PRODUCT_LOGITECH_WEBCAMC310 0x081b /* Webcam C310
*/
#define USB_PRODUCT_LOGITECH_HDPROC910 0x0821 /* HD Pro
Webcam C910 */
-#define USB_PRODUCT_LOGITECH_QUICKCAMEXP 0x0840 /*
QuickCam Express */
-#define USB_PRODUCT_LOGITECH_QUICKCAM 0x0850 /* QuickCam */
-#define USB_PRODUCT_LOGITECH_QUICKCAMNBDLX 0x08a9 /*
QuickCam
Notebook Deluxe */
-#define USB_PRODUCT_LOGITECH_QUICKCAMPRO3K 0x08b0 /*
QuickCam Pro 3000 */
-#define USB_PRODUCT_LOGITECH_QUICKCAMNBPRO_1 0x08b1 /*
QuickCam
Notebook Pro */
-#define USB_PRODUCT_LOGITECH_QUICKCAMPRO4K 0x08b2 /*
QuickCam Pro 4000 */
-#define USB_PRODUCT_LOGITECH_QUICKCAMZOOM 0x08b3 /*
QuickCam Zoom */
-#define USB_PRODUCT_LOGITECH_QUICKCAMFUSION_1 0x08c1 /*
QuickCam Fusion */
-#define USB_PRODUCT_LOGITECH_QUICKCAMORBITMP_1 0x08c2 /*
QuickCam Orbit MP */
-#define USB_PRODUCT_LOGITECH_QUICKCAMNBPRO 0x08c3 /*
QuickCam Notebook Pro */
-#define USB_PRODUCT_LOGITECH_QUICKCAMPRO5K_1 0x08c5 /*
QuickCam Pro 5000 */
-#define USB_PRODUCT_LOGITECH_QUICKCAMOEM_1 0x08c6 /*
QuickCam OEM */
-#define USB_PRODUCT_LOGITECH_QUICKCAMOEM_2 0x08c7 /*
QuickCam OEM */
-#define USB_PRODUCT_LOGITECH_QUICKCAMULTVIS 0x08c9 /*
QuickCam Ultra Vision */
-#define USB_PRODUCT_LOGITECH_QUICKCAMFUSION_2 0x08ca /*
QuickCam Fusion */
-#define USB_PRODUCT_LOGITECH_QUICKCAMNBPRO_2 0x08cb /*
QuickCam
Notebook Pro */
-#define USB_PRODUCT_LOGITECH_QUICKCAMORBITMP_2 0x08cc /*
QuickCam Orbit MP */
-#define USB_PRODUCT_LOGITECH_QUICKCAMPRO5K_2 0x08ce /*
QuickCam Pro 5000 */
-#define USB_PRODUCT_LOGITECH_QUICKCAMPRO9K 0x0990 /*
QuickCam Pro 9000 */
-#define USB_PRODUCT_LOGITECH_QUICKCAMPRONB 0x0991 /*
QuickCam Pro Notebook */
-#define USB_PRODUCT_LOGITECH_QUICKCAMCOMMDLX 0x0992 /*
QuickCam
Communicate Deluxe */
-#define USB_PRODUCT_LOGITECH_QUICKCAMORBITAF 0x0994 /*
QuickCam Orbit AF */
-#define USB_PRODUCT_LOGITECH_QUICKCAMCOMMMP 0x09a1 /*
QuickCam
Communicate MP */
-#define USB_PRODUCT_LOGITECH_QUICKCAME3500P 0x09a4 /*
QuickCam E 3500 Plus */
-#define USB_PRODUCT_LOGITECH_QUICKCAMDLXNB 0x09c1 /*
QuickCam Deluxe
Notebook */
+#define USB_PRODUCT_LOGITECH_QKCAMEXP 0x0840 /* QuickCam
Express */
+#define USB_PRODUCT_LOGITECH_QKCAM 0x0850 /* QuickCam */
+#define USB_PRODUCT_LOGITECH_QKCAMNBDLX 0x08a9 /* QuickCam
Notebook Deluxe */
+#define USB_PRODUCT_LOGITECH_QKCAMPRO3K 0x08b0 /* QuickCam Pro
3000 */
+#define USB_PRODUCT_LOGITECH_QKCAMNBPRO_1 0x08b1 /*
QuickCam Notebook Pro */
+#define USB_PRODUCT_LOGITECH_QKCAMPRO4K 0x08b2 /* QuickCam Pro
4000 */
+#define USB_PRODUCT_LOGITECH_QKCAMZOOM 0x08b3 /* QuickCam
Zoom */
+#define USB_PRODUCT_LOGITECH_QKCAMFUSION_1 0x08c1 /*
QuickCam Fusion */
+#define USB_PRODUCT_LOGITECH_QKCAMORBMP_1 0x08c2 /*
QuickCam Orbit MP */
+#define USB_PRODUCT_LOGITECH_QKCAMNBPRO 0x08c3 /* QuickCam
Notebook Pro */
+#define USB_PRODUCT_LOGITECH_QKCAMPRO5K_1 0x08c5 /*
QuickCam Pro 5000 */
+#define USB_PRODUCT_LOGITECH_QKCAMOEM_1 0x08c6 /* QuickCam OEM
*/
+#define USB_PRODUCT_LOGITECH_QKCAMOEM_2 0x08c7 /* QuickCam OEM
*/
+#define USB_PRODUCT_LOGITECH_QKCAMULTVIS 0x08c9 /*
QuickCam Ultra Vision */
+#define USB_PRODUCT_LOGITECH_QKCAMFUSION_2 0x08ca /*
QuickCam Fusion */
+#define USB_PRODUCT_LOGITECH_QKCAMNBPRO_2 0x08cb /*
QuickCam Notebook Pro */
+#define USB_PRODUCT_LOGITECH_QKCAMORBMP_2 0x08cc /*
QuickCam Orbit MP */
+#define USB_PRODUCT_LOGITECH_QKCAMPRO5K_2 0x08ce /*
QuickCam Pro 5000 */
+#define USB_PRODUCT_LOGITECH_QKCAMPRO9K 0x0990 /* QuickCam Pro
9000 */
+#define USB_PRODUCT_LOGITECH_QKCAMPRONB 0x0991 /* QuickCam Pro
Notebook */
+#define USB_PRODUCT_LOGITECH_QKCAMCOMMDLX 0x0992 /*
QuickCam
Communicate Deluxe */
+#define USB_PRODUCT_LOGITECH_QKCAMORBITAF 0x0994 /*
QuickCam Orbit AF */
+#define USB_PRODUCT_LOGITECH_QKCAMCOMMMP 0x09a1 /*
QuickCam Communicate MP */
+#define USB_PRODUCT_LOGITECH_QKCAME3500P 0x09a4 /*
QuickCam E 3500 Plus */
+#define USB_PRODUCT_LOGITECH_QKCAMDLXNB 0x09c1 /* QuickCam
Deluxe Notebook */
#define USB_PRODUCT_LOGITECH_N43 0xc000 /* N43 */
#define USB_PRODUCT_LOGITECH_N48 0xc001 /* N48 mouse */
#define USB_PRODUCT_LOGITECH_MBA47 0xc002 /* M-BA47 mouse
*/
@@ -2607,7 +2607,7 @@
#define USB_PRODUCT_LOGITECH_RK53 0xc501 /* Cordless
mouse */
#define USB_PRODUCT_LOGITECH_RB6 0xc503 /* Cordless
keyboard */
#define USB_PRODUCT_LOGITECH_CDO 0xc504 /* Cordless
Desktop Optical */
-#define USB_PRODUCT_LOGITECH_QUICKCAMPRO2 0xd001 /*
QuickCam Pro */
+#define USB_PRODUCT_LOGITECH_QKCAMPRO2 0xd001 /* QuickCam Pro
*/
/* Longcheer products */
#define USB_PRODUCT_LONGCHEER_D21LCMASS 0x9401 /* Emobile
D21LC Mass
only mode */
Index: dev/usb/usbdevs_data.h
===================================================================
RCS file: /cvs/src/sys/dev/usb/usbdevs_data.h,v
retrieving revision 1.679
diff -u -p -r1.679 usbdevs_data.h
--- dev/usb/usbdevs_data.h 15 Dec 2016 15:44:46 -0000 1.679
+++ dev/usb/usbdevs_data.h 29 Jan 2017 22:13:16 -0000
@@ -1,4 +1,4 @@
-/* $OpenBSD: usbdevs_data.h,v 1.679 2016/12/15 15:44:46 pirofti Exp $
*/
+/* $OpenBSD$ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
@@ -5630,7 +5630,7 @@ const struct usb_known_product usb_known
"PageScan",
},
{
- USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAMWEB,
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QKCAMWEB,
"QuickCam Web",
},
{
@@ -5654,103 +5654,103 @@ const struct usb_known_product usb_known
"HD Pro Webcam C910",
},
{
- USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAMEXP,
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QKCAMEXP,
"QuickCam Express",
},
{
- USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAM,
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QKCAM,
"QuickCam",
},
{
- USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAMNBDLX,
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QKCAMNBDLX,
"QuickCam Notebook Deluxe",
},
{
- USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAMPRO3K,
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QKCAMPRO3K,
"QuickCam Pro 3000",
},
{
- USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAMNBPRO_1,
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QKCAMNBPRO_1,
"QuickCam Notebook Pro",
},
{
- USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAMPRO4K,
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QKCAMPRO4K,
"QuickCam Pro 4000",
},
{
- USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAMZOOM,
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QKCAMZOOM,
"QuickCam Zoom",
},
{
- USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAMFUSION_1,
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QKCAMFUSION_1,
"QuickCam Fusion",
},
{
- USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAMORBITMP_1,
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QKCAMORBMP_1,
"QuickCam Orbit MP",
},
{
- USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAMNBPRO,
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QKCAMNBPRO,
"QuickCam Notebook Pro",
},
{
- USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAMPRO5K_1,
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QKCAMPRO5K_1,
"QuickCam Pro 5000",
},
{
- USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAMOEM_1,
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QKCAMOEM_1,
"QuickCam OEM",
},
{
- USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAMOEM_2,
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QKCAMOEM_2,
"QuickCam OEM",
},
{
- USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAMULTVIS,
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QKCAMULTVIS,
"QuickCam Ultra Vision",
},
{
- USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAMFUSION_2,
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QKCAMFUSION_2,
"QuickCam Fusion",
},
{
- USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAMNBPRO_2,
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QKCAMNBPRO_2,
"QuickCam Notebook Pro",
},
{
- USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAMORBITMP_2,
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QKCAMORBMP_2,
"QuickCam Orbit MP",
},
{
- USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAMPRO5K_2,
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QKCAMPRO5K_2,
"QuickCam Pro 5000",
},
{
- USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAMPRO9K,
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QKCAMPRO9K,
"QuickCam Pro 9000",
},
{
- USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAMPRONB,
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QKCAMPRONB,
"QuickCam Pro Notebook",
},
{
- USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAMCOMMDLX,
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QKCAMCOMMDLX,
"QuickCam Communicate Deluxe",
},
{
- USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAMORBITAF,
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QKCAMORBITAF,
"QuickCam Orbit AF",
},
{
- USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAMCOMMMP,
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QKCAMCOMMMP,
"QuickCam Communicate MP",
},
{
- USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAME3500P,
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QKCAME3500P,
"QuickCam E 3500 Plus",
},
{
- USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAMDLXNB,
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QKCAMDLXNB,
"QuickCam Deluxe Notebook",
},
{
@@ -5818,7 +5818,7 @@ const struct usb_known_product usb_known
"Cordless Desktop Optical",
},
{
- USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAMPRO2,
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QKCAMPRO2,
"QuickCam Pro",
},
{
Index: dev/usb/uvideo.c
===================================================================
RCS file: /cvs/src/sys/dev/usb/uvideo.c,v
retrieving revision 1.192
diff -u -p -r1.192 uvideo.c
--- dev/usb/uvideo.c 17 Jun 2016 07:59:16 -0000 1.192
+++ dev/usb/uvideo.c 29 Jan 2017 22:13:18 -0000
@@ -373,7 +373,7 @@ struct uvideo_devs {
UVIDEO_FLAG_ISIGHT_STREAM_HEADER
},
{ /* Incorrectly reports as bInterfaceClass=UICLASS_VENDOR */
- { USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAMOEM_1 },
+ { USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QKCAMOEM_1 },
NULL,
NULL,
UVIDEO_FLAG_VENDOR_CLASS
