Hello @tech
Recently found a pile of old Logitech webcams to test with uvideo(4).
s/QUICKCAM/QKCAM.
shorten device strings.
Add many new Logitech device ids.
dev/usb/usbdevs
dev/usb/uaudio.c
dev/usb/uvideo.c
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 22 Jan 2017 22:35:43 -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_QKCAMNBDX_1 },
UAUDIO_FLAG_BAD_AUDIO },
- { { USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAMPRONB },
+ { { USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QKCAMNBPRO_4 },
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 22 Jan 2017 22:35:47 -0000
@@ -2553,37 +2553,85 @@ 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 WEBCAMC200 0x0802 Webcam C200
-product LOGITECH WEBCAMC500 0x0807 Webcam C500
-product LOGITECH QUICKCAMPRO 0x0810 QuickCam Pro
-product LOGITECH WEBCAMC310 0x081b Webcam C310
+product LOGITECH QKCAMWEB_1 0x0801 QuickCam Web
+product LOGITECH WEBCAM200 0x0802 Webcam 200
+product LOGITECH WEBCAM250 0x0804 Webcam 250
+product LOGITECH WEBCAM300 0x0805 Webcam 300
+product LOGITECH WEBCAM500 0x0807 Webcam 500
+product LOGITECH WEBCAM600 0x0808 Webcam 600
+product LOGITECH WEBCAMPRO9K 0x0809 Webcam Pro 9000
+product LOGITECH WEBCAM905 0x080a Webcam 905
+product LOGITECH WEBCAM120 0x080f Webcam 120
+product LOGITECH QKCAMPRO_1 0x0810 QuickCam Pro
+product LOGITECH WEBCAMC100 0x0817 Webcam C100
+product LOGITECH WEBCAMC210 0x0819 Webcam C210
+product LOGITECH WEBCAMC260 0x081a Webcam C260
+product LOGITECH HDCAMC310 0x081b HD Webcam C310
+product LOGITECH HDCAMC510 0x081d HD Webcam C510
+product LOGITECH QKCAMVC 0x0820 QuickCam VC
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 HDCAMB910 0x0823 HD Webcam B910
+product LOGITECH WEBCAMC160 0x0824 Webcam C160
+product LOGITECH WEBCAMC270 0x0825 Webcam C270
+product LOGITECH HDCAMC525 0x0826 HD Webcam C525
+product LOGITECH HDCAMC990 0x0828 HD Webcam C990
+product LOGITECH WEBCAMC170 0x082b Webcam C170
+product LOGITECH HDCAMC615 0x082c HD Webcam C615
+product LOGITECH HDPROC920_1 0x082d HD Pro Webcam C920
+product LOGITECH HDPROC920_2 0x0834 HD Pro Webcam C920
+product LOGITECH HDCAMB525 0x0836 HD Webcam B525
+product LOGITECH QKCAMEXP_1 0x0840 QuickCam Express
+product LOGITECH WEBCAMC930E 0x0843 QuickCam C930e
+product LOGITECH QKCAMWEB_2 0x0850 QuickCam Web
+product LOGITECH QKCAMEXP_2 0x0870 QuickCam Express
+product LOGITECH QKCAMTRAV 0x0890 QuickCam Traveler
+product LOGITECH ORBICAM_1 0x0892 OrbiCam
+product LOGITECH QKCAMOEM_1 0x0895 QuickCam OEM
+product LOGITECH ORBICAM_2 0x0896 OrbiCam
+product LOGITECH QKCAMOEM_2 0x0897 QuickCam OEM
+product LOGITECH QKCAMOEM_3 0x0899 QuickCam OEM
+product LOGITECH QKCAME2500 0x089d QuickCam E2500
+product LOGITECH QKCAMIM_1 0x08a0 QuickCam IM
+product LOGITECH QKCAMIM_2 0x08a1 QuickCam IM
+product LOGITECH LTWEBCAMP 0x08a2 Labtec Webcam Pro
+product LOGITECH QKCAMCHAT 0x08a3 QuickCam Chat
+product LOGITECH QKCAMIM_3 0x08a6 QuickCam IM
+product LOGITECH QKCAMIM_4 0x08a7 QuickCam Image
+product LOGITECH QKCAMNBDX_1 0x08a9 QuickCam Notebook Deluxe
+product LOGITECH LTWEBCAM 0x08aa Labtec Webcam
+product LOGITECH QKCAMCOOL_1 0x08ac QuickCam Cool
+product LOGITECH QKCAMCOMM_1 0x08ad QuickCam Communicate
+product LOGITECH QKCAMNB_1 0x08ae QuickCam for Notebooks
+product LOGITECH QKCAMCOOL_2 0x08af QuickCam Cool
+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_2 0x08c3 QuickCam Notebook Pro
+product LOGITECH QKCAMPRO5K_1 0x08c5 QuickCam Pro 5000
+product LOGITECH QKCAMOEM_4 0x08c6 QuickCam OEM
+product LOGITECH QKCAMOEM_5 0x08c7 QuickCam OEM
+product LOGITECH QKCAMULTVIS 0x08c9 QuickCam Ultra Vision
+product LOGITECH QKCAMFUSION_2 0x08ca QuickCam Fusion
+product LOGITECH QKCAMNBPRO_3 0x08cb QuickCam Notebook Pro
+product LOGITECH QKCAMORBMP_2 0x08cc QuickCam Orbit MP
+product LOGITECH QKCAMPRO5K_2 0x08ce QuickCam Pro 5000
+product LOGITECH QKCAMEXP_3 0x08d0 QuickCam Express
+product LOGITECH QKCAMCOMM_2 0x08d7 QuickCam Communicate
+product LOGITECH QKCAMNBDX_2 0x08d8 QuickCam Notebook Deluxe
+product LOGITECH QKCAMIM_5 0x08d9 QuickCam IM
+product LOGITECH QKCAMMSGR 0x08da QuickCam Messenger
+product LOGITECH QKCAMNB_2 0x08dd QuickCam for Notebooks
+product LOGITECH QKCAMPRO9K 0x0990 QuickCam Pro 9000
+product LOGITECH QKCAMNBPRO_4 0x0991 QuickCam Pro Notebook
+product LOGITECH QKCAMCODX_1 0x0992 QuickCam Communicate Deluxe
+product LOGITECH QKCAMORBAF 0x0994 QuickCam Orbit AF
+product LOGITECH QKCAMCOMP_1 0x09a1 QuickCam Communicate MP
+product LOGITECH QKCAME3500P 0x09a4 QuickCam E 3500 Plus
+product LOGITECH QKCAM3K 0x09a5 QuickCam 3000
+product LOGITECH QKCAMNBDX_3 0x09c1 QuickCam Notebook Deluxe
product LOGITECH N43 0xc000 N43
product LOGITECH N48 0xc001 N48 mouse
product LOGITECH MBA47 0xc002 M-BA47 mouse
@@ -2600,7 +2648,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 QKCAMPRO_2 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 22 Jan 2017 22:35:50 -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,85 @@
#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_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_QKCAMWEB_1 0x0801 /* QuickCam Web
*/
+#define USB_PRODUCT_LOGITECH_WEBCAM200 0x0802 /* Webcam 200 */
+#define USB_PRODUCT_LOGITECH_WEBCAM250 0x0804 /* Webcam 250 */
+#define USB_PRODUCT_LOGITECH_WEBCAM300 0x0805 /* Webcam 300 */
+#define USB_PRODUCT_LOGITECH_WEBCAM500 0x0807 /* Webcam 500 */
+#define USB_PRODUCT_LOGITECH_WEBCAM600 0x0808 /* Webcam 600 */
+#define USB_PRODUCT_LOGITECH_WEBCAMPRO9K 0x0809 /*
Webcam Pro 9000 */
+#define USB_PRODUCT_LOGITECH_WEBCAM905 0x080a /* Webcam 905 */
+#define USB_PRODUCT_LOGITECH_WEBCAM120 0x080f /* Webcam 120 */
+#define USB_PRODUCT_LOGITECH_QKCAMPRO_1 0x0810 /* QuickCam Pro
*/
+#define USB_PRODUCT_LOGITECH_WEBCAMC100 0x0817 /* Webcam C100
*/
+#define USB_PRODUCT_LOGITECH_WEBCAMC210 0x0819 /* Webcam C210
*/
+#define USB_PRODUCT_LOGITECH_WEBCAMC260 0x081a /* Webcam C260
*/
+#define USB_PRODUCT_LOGITECH_HDCAMC310 0x081b /* HD Webcam
C310 */
+#define USB_PRODUCT_LOGITECH_HDCAMC510 0x081d /* HD Webcam
C510 */
+#define USB_PRODUCT_LOGITECH_QKCAMVC 0x0820 /* QuickCam VC
*/
#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_HDCAMB910 0x0823 /* HD Webcam
B910 */
+#define USB_PRODUCT_LOGITECH_WEBCAMC160 0x0824 /* Webcam C160
*/
+#define USB_PRODUCT_LOGITECH_WEBCAMC270 0x0825 /* Webcam C270
*/
+#define USB_PRODUCT_LOGITECH_HDCAMC525 0x0826 /* HD Webcam
C525 */
+#define USB_PRODUCT_LOGITECH_HDCAMC990 0x0828 /* HD Webcam
C990 */
+#define USB_PRODUCT_LOGITECH_WEBCAMC170 0x082b /* Webcam C170
*/
+#define USB_PRODUCT_LOGITECH_HDCAMC615 0x082c /* HD Webcam
C615 */
+#define USB_PRODUCT_LOGITECH_HDPROC920_1 0x082d /* HD
Pro Webcam C920 */
+#define USB_PRODUCT_LOGITECH_HDPROC920_2 0x0834 /* HD
Pro Webcam C920 */
+#define USB_PRODUCT_LOGITECH_HDCAMB525 0x0836 /* HD Webcam
B525 */
+#define USB_PRODUCT_LOGITECH_QKCAMEXP_1 0x0840 /* QuickCam
Express */
+#define USB_PRODUCT_LOGITECH_WEBCAMC930E 0x0843 /*
QuickCam C930e */
+#define USB_PRODUCT_LOGITECH_QKCAMWEB_2 0x0850 /* QuickCam Web
*/
+#define USB_PRODUCT_LOGITECH_QKCAMEXP_2 0x0870 /* QuickCam
Express */
+#define USB_PRODUCT_LOGITECH_QKCAMTRAV 0x0890 /* QuickCam
Traveler */
+#define USB_PRODUCT_LOGITECH_ORBICAM_1 0x0892 /* OrbiCam */
+#define USB_PRODUCT_LOGITECH_QKCAMOEM_1 0x0895 /* QuickCam OEM
*/
+#define USB_PRODUCT_LOGITECH_ORBICAM_2 0x0896 /* OrbiCam */
+#define USB_PRODUCT_LOGITECH_QKCAMOEM_2 0x0897 /* QuickCam OEM
*/
+#define USB_PRODUCT_LOGITECH_QKCAMOEM_3 0x0899 /* QuickCam OEM
*/
+#define USB_PRODUCT_LOGITECH_QKCAME2500 0x089d /* QuickCam
E2500 */
+#define USB_PRODUCT_LOGITECH_QKCAMIM_1 0x08a0 /* QuickCam IM
*/
+#define USB_PRODUCT_LOGITECH_QKCAMIM_2 0x08a1 /* QuickCam IM
*/
+#define USB_PRODUCT_LOGITECH_LTWEBCAMP 0x08a2 /* Labtec
Webcam Pro */
+#define USB_PRODUCT_LOGITECH_QKCAMCHAT 0x08a3 /* QuickCam
Chat */
+#define USB_PRODUCT_LOGITECH_QKCAMIM_3 0x08a6 /* QuickCam IM
*/
+#define USB_PRODUCT_LOGITECH_QKCAMIM_4 0x08a7 /* QuickCam
Image */
+#define USB_PRODUCT_LOGITECH_QKCAMNBDX_1 0x08a9 /*
QuickCam Notebook Deluxe */
+#define USB_PRODUCT_LOGITECH_LTWEBCAM 0x08aa /* Labtec
Webcam */
+#define USB_PRODUCT_LOGITECH_QKCAMCOOL_1 0x08ac /*
QuickCam Cool */
+#define USB_PRODUCT_LOGITECH_QKCAMCOMM_1 0x08ad /*
QuickCam Communicate */
+#define USB_PRODUCT_LOGITECH_QKCAMNB_1 0x08ae /* QuickCam for
Notebooks */
+#define USB_PRODUCT_LOGITECH_QKCAMCOOL_2 0x08af /*
QuickCam Cool */
+#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_2 0x08c3 /*
QuickCam Notebook Pro */
+#define USB_PRODUCT_LOGITECH_QKCAMPRO5K_1 0x08c5 /*
QuickCam Pro 5000 */
+#define USB_PRODUCT_LOGITECH_QKCAMOEM_4 0x08c6 /* QuickCam OEM
*/
+#define USB_PRODUCT_LOGITECH_QKCAMOEM_5 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_3 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_QKCAMEXP_3 0x08d0 /* QuickCam
Express */
+#define USB_PRODUCT_LOGITECH_QKCAMCOMM_2 0x08d7 /*
QuickCam Communicate */
+#define USB_PRODUCT_LOGITECH_QKCAMNBDX_2 0x08d8 /*
QuickCam Notebook Deluxe */
+#define USB_PRODUCT_LOGITECH_QKCAMIM_5 0x08d9 /* QuickCam IM
*/
+#define USB_PRODUCT_LOGITECH_QKCAMMSGR 0x08da /* QuickCam
Messenger */
+#define USB_PRODUCT_LOGITECH_QKCAMNB_2 0x08dd /* QuickCam for
Notebooks */
+#define USB_PRODUCT_LOGITECH_QKCAMPRO9K 0x0990 /* QuickCam Pro
9000 */
+#define USB_PRODUCT_LOGITECH_QKCAMNBPRO_4 0x0991 /*
QuickCam Pro Notebook */
+#define USB_PRODUCT_LOGITECH_QKCAMCODX_1 0x0992 /*
QuickCam
Communicate Deluxe */
+#define USB_PRODUCT_LOGITECH_QKCAMORBAF 0x0994 /* QuickCam
Orbit AF */
+#define USB_PRODUCT_LOGITECH_QKCAMCOMP_1 0x09a1 /*
QuickCam Communicate MP */
+#define USB_PRODUCT_LOGITECH_QKCAME3500P 0x09a4 /*
QuickCam E 3500 Plus */
+#define USB_PRODUCT_LOGITECH_QKCAM3K 0x09a5 /* QuickCam
3000 */
+#define USB_PRODUCT_LOGITECH_QKCAMNBDX_3 0x09c1 /*
QuickCam Notebook Deluxe */
#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 +2655,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_QKCAMPRO_2 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 22 Jan 2017 22:35:55 -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,128 +5630,320 @@ const struct usb_known_product usb_known
"PageScan",
},
{
- USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAMWEB,
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QKCAMWEB_1,
"QuickCam Web",
},
{
- USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_WEBCAMC200,
- "Webcam C200",
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_WEBCAM200,
+ "Webcam 200",
},
{
- USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_WEBCAMC500,
- "Webcam C500",
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_WEBCAM250,
+ "Webcam 250",
},
{
- USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAMPRO,
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_WEBCAM300,
+ "Webcam 300",
+ },
+ {
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_WEBCAM500,
+ "Webcam 500",
+ },
+ {
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_WEBCAM600,
+ "Webcam 600",
+ },
+ {
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_WEBCAMPRO9K,
+ "Webcam Pro 9000",
+ },
+ {
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_WEBCAM905,
+ "Webcam 905",
+ },
+ {
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_WEBCAM120,
+ "Webcam 120",
+ },
+ {
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QKCAMPRO_1,
"QuickCam Pro",
},
{
- USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_WEBCAMC310,
- "Webcam C310",
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_WEBCAMC100,
+ "Webcam C100",
+ },
+ {
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_WEBCAMC210,
+ "Webcam C210",
+ },
+ {
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_WEBCAMC260,
+ "Webcam C260",
+ },
+ {
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_HDCAMC310,
+ "HD Webcam C310",
+ },
+ {
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_HDCAMC510,
+ "HD Webcam C510",
+ },
+ {
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QKCAMVC,
+ "QuickCam VC",
},
{
USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_HDPROC910,
"HD Pro Webcam C910",
},
{
- USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAMEXP,
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_HDCAMB910,
+ "HD Webcam B910",
+ },
+ {
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_WEBCAMC160,
+ "Webcam C160",
+ },
+ {
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_WEBCAMC270,
+ "Webcam C270",
+ },
+ {
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_HDCAMC525,
+ "HD Webcam C525",
+ },
+ {
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_HDCAMC990,
+ "HD Webcam C990",
+ },
+ {
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_WEBCAMC170,
+ "Webcam C170",
+ },
+ {
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_HDCAMC615,
+ "HD Webcam C615",
+ },
+ {
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_HDPROC920_1,
+ "HD Pro Webcam C920",
+ },
+ {
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_HDPROC920_2,
+ "HD Pro Webcam C920",
+ },
+ {
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_HDCAMB525,
+ "HD Webcam B525",
+ },
+ {
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QKCAMEXP_1,
"QuickCam Express",
},
{
- USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAM,
- "QuickCam",
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_WEBCAMC930E,
+ "QuickCam C930e",
+ },
+ {
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QKCAMWEB_2,
+ "QuickCam Web",
+ },
+ {
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QKCAMEXP_2,
+ "QuickCam Express",
+ },
+ {
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QKCAMTRAV,
+ "QuickCam Traveler",
+ },
+ {
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_ORBICAM_1,
+ "OrbiCam",
},
{
- USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAMNBDLX,
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QKCAMOEM_1,
+ "QuickCam OEM",
+ },
+ {
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_ORBICAM_2,
+ "OrbiCam",
+ },
+ {
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QKCAMOEM_2,
+ "QuickCam OEM",
+ },
+ {
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QKCAMOEM_3,
+ "QuickCam OEM",
+ },
+ {
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QKCAME2500,
+ "QuickCam E2500",
+ },
+ {
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QKCAMIM_1,
+ "QuickCam IM",
+ },
+ {
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QKCAMIM_2,
+ "QuickCam IM",
+ },
+ {
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_LTWEBCAMP,
+ "Labtec Webcam Pro",
+ },
+ {
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QKCAMCHAT,
+ "QuickCam Chat",
+ },
+ {
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QKCAMIM_3,
+ "QuickCam IM",
+ },
+ {
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QKCAMIM_4,
+ "QuickCam Image",
+ },
+ {
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QKCAMNBDX_1,
"QuickCam Notebook Deluxe",
},
{
- USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAMPRO3K,
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_LTWEBCAM,
+ "Labtec Webcam",
+ },
+ {
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QKCAMCOOL_1,
+ "QuickCam Cool",
+ },
+ {
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QKCAMCOMM_1,
+ "QuickCam Communicate",
+ },
+ {
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QKCAMNB_1,
+ "QuickCam for Notebooks",
+ },
+ {
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QKCAMCOOL_2,
+ "QuickCam Cool",
+ },
+ {
+ 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_2,
"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_4,
"QuickCam OEM",
},
{
- USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAMOEM_2,
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QKCAMOEM_5,
"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_3,
"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_QKCAMEXP_3,
+ "QuickCam Express",
+ },
+ {
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QKCAMCOMM_2,
+ "QuickCam Communicate",
+ },
+ {
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QKCAMNBDX_2,
+ "QuickCam Notebook Deluxe",
+ },
+ {
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QKCAMIM_5,
+ "QuickCam IM",
+ },
+ {
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QKCAMMSGR,
+ "QuickCam Messenger",
+ },
+ {
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QKCAMNB_2,
+ "QuickCam for Notebooks",
+ },
+ {
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QKCAMPRO9K,
"QuickCam Pro 9000",
},
{
- USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAMPRONB,
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QKCAMNBPRO_4,
"QuickCam Pro Notebook",
},
{
- USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAMCOMMDLX,
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QKCAMCODX_1,
"QuickCam Communicate Deluxe",
},
{
- USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAMORBITAF,
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QKCAMORBAF,
"QuickCam Orbit AF",
},
{
- USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAMCOMMMP,
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QKCAMCOMP_1,
"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,
- "QuickCam Deluxe Notebook",
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QKCAM3K,
+ "QuickCam 3000",
+ },
+ {
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QKCAMNBDX_3,
+ "QuickCam Notebook Deluxe",
},
{
USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_N43,
@@ -5818,7 +6010,7 @@ const struct usb_known_product usb_known
"Cordless Desktop Optical",
},
{
- USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAMPRO2,
+ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QKCAMPRO_2,
"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 22 Jan 2017 22:35:57 -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
