summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorRobert Nagy <robert@cvs.openbsd.org>2005-12-24 12:45:55 +0000
committerRobert Nagy <robert@cvs.openbsd.org>2005-12-24 12:45:55 +0000
commit9e1f9ee91056f170c9cdb077c7dd065fa594c8fe (patch)
treef3967057c63cc14b6b442aa398c439ed5e539004 /sys/dev
parent1d756a49df11741b7fe6dd62495c3a0a5f6ee729 (diff)
Add Logitech QuickCam Zoom support.
A quirk is needed to prevent attaching to uaudio(4) instead of ugen(4), because of the internal microphone. ok jsg@
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/usb/usb_quirks.c4
-rw-r--r--sys/dev/usb/usbdevs3
2 files changed, 5 insertions, 2 deletions
diff --git a/sys/dev/usb/usb_quirks.c b/sys/dev/usb/usb_quirks.c
index 50a590d016f..9e041a1d5f7 100644
--- a/sys/dev/usb/usb_quirks.c
+++ b/sys/dev/usb/usb_quirks.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: usb_quirks.c,v 1.18 2004/10/31 14:06:40 jsg Exp $ */
+/* $OpenBSD: usb_quirks.c,v 1.19 2005/12/24 12:45:54 robert Exp $ */
/* $NetBSD: usb_quirks.c,v 1.45 2003/05/10 17:47:14 hamajima Exp $ */
/* $FreeBSD: src/sys/dev/usb/usb_quirks.c,v 1.30 2003/01/02 04:15:55 imp Exp $ */
@@ -70,6 +70,8 @@ Static const struct usbd_quirk_entry {
0x000, { UQ_BAD_AUDIO }},
{ USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAMPRO4K,
0x000, { UQ_BAD_AUDIO }},
+ { USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAMZOOM,
+ 0x000, { UQ_BAD_AUDIO }},
{ USB_VENDOR_QTRONIX, USB_PRODUCT_QTRONIX_980N, 0x110, { UQ_SPUR_BUT_UP }},
{ USB_VENDOR_ALCOR2, USB_PRODUCT_ALCOR2_KBD_HUB, 0x001, { UQ_SPUR_BUT_UP }},
{ USB_VENDOR_MCT, USB_PRODUCT_MCT_HUB0100, 0x102, { UQ_BUS_POWERED }},
diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs
index bfb5e0cc6e3..17a14f048a3 100644
--- a/sys/dev/usb/usbdevs
+++ b/sys/dev/usb/usbdevs
@@ -1,4 +1,4 @@
-$OpenBSD: usbdevs,v 1.177 2005/12/23 08:01:43 jsg Exp $
+$OpenBSD: usbdevs,v 1.178 2005/12/24 12:45:54 robert Exp $
/* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
/*
@@ -1264,6 +1264,7 @@ 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 QUICKCAMZOOM 0x08b3 QuickCam Zoom
/* Longshine products */
product ABOCOM LCS8138TX 0x401a LCS-8138TX