Re: usbdevs: logitech: cleanup

2017-01-29 Thread James Hastings
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.c3 Jan 2017 06:45:58 -   1.122
+++ dev/usb/uaudio.c29 Jan 2017 22:13:04 -
@@ -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 -  1.673
+++ dev/usb/usbdevs 29 Jan 2017 22:13:07 -
@@ -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 WEBCAMC2000x0802  Webcam C200
 product LOGITECH WEBCAMC5000x0807  Webcam C500
 product LOGITECH QUICKCAMPRO   0x0810  QuickCam Pro
 product LOGITECH WEBCAMC3100x081b  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 0x08b1QuickCam 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 0x08c5QuickCam Pro 5000
-product LOGITECH QUICKCAMOEM_1 0x08c6  QuickCam OEM
-product LOGITECH QUICKCAMOEM_2 0x08c7  QuickCam OEM
-product LOGITECH QUICKCAMULTVIS0x08c9  QuickCam Ultra Vision
-product LOGITECH QUICKCAMFUSION_2 0x08ca QuickCam Fusion
-product LOGITECH QUICKCAMNBPRO_2 0x08cbQuickCam Notebook Pro
-product LOGITECH QUICKCAMORBITMP_2 0x08cc QuickCam Orbit MP
-product LOGITECH QUICKCAMPRO5K_2 0x08ceQuickCam Pro 5000
-product LOGITECH QUICKCAMPRO9K 0x0990  QuickCam Pro 9000
-product LOGITECH QUICKCAMPRONB 0x0991  QuickCam Pro Notebook
-product LOGITECH QUICKCAMCOMMDLX 0x0992QuickCam Communicate Deluxe
-product LOGITECH QUICKCAMORBITAF 0x0994 QuickCam Orbit AF
-product LOGITECH QUICKCAMCOMMMP0x09a1  QuickCam Communicate MP
-product LOGITECH QUICKCAME3500P0x09a4  QuickCam E 3500 Plus
-product LOGITECH QUICKCAMDLXNB 0x09c1  QuickCam Deluxe Notebook
+product LOGITECH QKCAMEXP  0x0840  QuickCam Express
+product LOGITECH QKCAM 0x0850  QuickCam
+product LOGITECH QKCAMNBDLX0x08a9  QuickCam Notebook Deluxe
+product LOGITECH QKCAMPRO3K0x08b0  QuickCam Pro 3000
+product LOGITECH QKCAMNBPRO_1  0x08b1  QuickCam Notebook Pro
+product LOGITECH QKCAMPRO4K0x08b2  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 QKCAMNBPRO0x08c3  QuickCam Notebook Pro
+product LOGITECH QKCAMPRO5K_1  0x08c5  QuickCam Pro 5000
+product LOGITECH QKCAMOEM_10x08c6  QuickCam OEM
+product LOGITECH QKCAMOEM_20x08c7  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 QKCAMPRO9K0x0990  QuickCam Pro 9000
+product LOGITECH QKCAMPRONB0x0991  QuickCam Pro Notebook

Re: usbdevs: logitech: cleanup and new ids

2017-01-22 Thread James Hastings
On 1/23/17, Jonathan Gray  wrote:
> On Mon, Jan 23, 2017 at 01:56:20AM -0500, James Hastings wrote:
>> 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
>
> USB devices normally have their own strings.  usbdevs entries are added
> for non usb-class drivers and if there is a common device without a
> string.  Do any of the devices not have their own strings?
>

One example:

uaudio0 at uhub2 port 1 configuration 1 interface 1 "Logitech product
0x08dd" rev 1.10/1.00 addr 2
uaudio0: audio rev 1.00, 3 mixer controls
audio1 at uaudio0
ugen0 at uhub2 port 1 configuration 1 "Logitech product 0x08dd" rev
1.10/1.00 addr 2

lsusb -v:
Bus 002 Device 002: ID 046d:08dd Logitech, Inc. QuickCam for Notebooks
Device Descriptor:
  bLength18
  bDescriptorType 1
  bcdUSB   1.10
  bDeviceClass0 (Defined at Interface level)
  bDeviceSubClass 0
  bDeviceProtocol 0
  bMaxPacketSize0 8
  idVendor   0x046d Logitech, Inc.
  idProduct  0x08dd QuickCam for Notebooks
  bcdDevice1.00
  iManufacturer   0
  iProduct0
  iSerial 0
  bNumConfigurations  1
  Configuration Descriptor:
bLength 9
bDescriptorType 2
wTotalLength  336
bNumInterfaces  3
bConfigurationValue 1
iConfiguration  0
bmAttributes 0xa0
  (Bus Powered)
  Remote Wakeup
MaxPower  100mA
Interface Descriptor:
  bLength 9
  bDescriptorType 4
  bInterfaceNumber0
  bAlternateSetting   0
  bNumEndpoints   2
  bInterfaceClass   255 Vendor Specific Class
  bInterfaceSubClass255 Vendor Specific Subclass
  bInterfaceProtocol255 Vendor Specific Protocol
  iInterface  0
  Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x81  EP 1 IN
bmAttributes1
  Transfer TypeIsochronous
  Synch Type   None
  Usage Type   Data
wMaxPacketSize 0x  1x 0 bytes
bInterval   1
  Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x82  EP 2 IN
bmAttributes3
  Transfer TypeInterrupt
  Synch Type   None
  Usage Type   Data
wMaxPacketSize 0x0008  1x 8 bytes
bInterval  10
Interface Descriptor:
  bLength 9
  bDescriptorType 4
  bInterfaceNumber0
  bAlternateSetting   1
  bNumEndpoints   2
  bInterfaceClass   255 Vendor Specific Class
  bInterfaceSubClass255 Vendor Specific Subclass
  bInterfaceProtocol255 Vendor Specific Protocol
  iInterface  0
  Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x81  EP 1 IN
bmAttributes1
  Transfer TypeIsochronous
  Synch Type   None
  Usage Type   Data
wMaxPacketSize 0x0080  1x 128 bytes
bInterval   1
  Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x82  EP 2 IN
bmAttributes3
  Transfer TypeInterrupt
  Synch Type   None
  Usage Type   Data
wMaxPacketSize 0x0008  1x 8 bytes
bInterval  10
Interface Descriptor:
  bLength 9
  bDescriptorType 4
  bInterfaceNumber0
  bAlternateSetting   2
  bNumEndpoints   2
  bInterfaceClass   255 Vendor Specific Class
  bInterfaceSubClass255 Vendor Specific Subclass
  bInterfaceProtocol255 Vendor Specific Protocol
  iInterface  0
  Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x81  EP 1 IN
bmAttributes1
  Transfer TypeIsochronous
  Synch Type   None
  Usage Type   Data
wMaxPacketSize 0x00c0  1x 192 bytes
bInterval   1
  Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x82  EP 2 IN
bmAttributes3
  Transfer TypeInterrupt
  Synch Type   

Re: usbdevs: logitech: cleanup and new ids

2017-01-22 Thread Jonathan Gray
On Mon, Jan 23, 2017 at 01:56:20AM -0500, James Hastings wrote:
> 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

USB devices normally have their own strings.  usbdevs entries are added
for non usb-class drivers and if there is a common device without a
string.  Do any of the devices not have their own strings?



usbdevs: logitech: cleanup and new ids

2017-01-22 Thread James Hastings
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.c3 Jan 2017 06:45:58 -   1.122
+++ dev/usb/uaudio.c22 Jan 2017 22:35:43 -
@@ -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 -  1.673
+++ dev/usb/usbdevs 22 Jan 2017 22:35:47 -
@@ -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 WEBCAMC2000x0802  Webcam C200
-product LOGITECH WEBCAMC5000x0807  Webcam C500
-product LOGITECH QUICKCAMPRO   0x0810  QuickCam Pro
-product LOGITECH WEBCAMC3100x081b  Webcam C310
+product LOGITECH QKCAMWEB_10x0801  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_10x0810  QuickCam Pro
+product LOGITECH WEBCAMC1000x0817  Webcam C100
+product LOGITECH WEBCAMC2100x0819  Webcam C210
+product LOGITECH WEBCAMC2600x081a  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 0x08b1QuickCam 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 0x08c5QuickCam Pro 5000
-product LOGITECH QUICKCAMOEM_1 0x08c6  QuickCam OEM
-product LOGITECH QUICKCAMOEM_2 0x08c7  QuickCam OEM
-product LOGITECH QUICKCAMULTVIS0x08c9  QuickCam Ultra Vision
-product LOGITECH QUICKCAMFUSION_2 0x08ca QuickCam Fusion
-product LOGITECH QUICKCAMNBPRO_2 0x08cbQuickCam Notebook Pro
-product LOGITECH QUICKCAMORBITMP_2 0x08cc QuickCam Orbit MP
-product LOGITECH QUICKCAMPRO5K_2 0x08ceQuickCam Pro 5000
-product LOGITECH QUICKCAMPRO9K 0x0990  QuickCam Pro 9000
-product LOGITECH QUICKCAMPRONB 0x0991  QuickCam Pro Notebook
-product LOGITECH QUICKCAMCOMMDLX 0x0992QuickCam Communicate Deluxe
-product LOGITECH QUICKCAMORBITAF 0x0994 QuickCam Orbit AF
-product LOGITECH QUICKCAMCOMMMP0x09a1  QuickCam Communicate MP
-product LOGITECH QUICKCAME3500P0x09a4  QuickCam E 3500 Plus
-product LOGITECH QUICKCAMDLXNB 0x09c1  QuickCam Deluxe Notebook
+product LOGITECH HDCAMB910 0x0823  HD Webcam B910
+product LOGITECH WEBCAMC1600x0824  Webcam C160
+product LOGITECH WEBCAMC2700x0825  Webcam C270
+product LOGITECH HDCAMC525 0x0826  HD Webcam C525
+product LOGITECH