summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorPeter Valchev <pvalchev@cvs.openbsd.org>2004-07-12 05:22:09 +0000
committerPeter Valchev <pvalchev@cvs.openbsd.org>2004-07-12 05:22:09 +0000
commit0b5f181cfa7473f03f71c3915d701f80b1960852 (patch)
tree6bd2afcc9b335bcc1bf8d817d779ebff5df932cf /sys/dev
parent0d74c40c712f7a412796e394204178eba517dc04 (diff)
sync
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/usb/usbdevs.h6
-rw-r--r--sys/dev/usb/usbdevs_data.h16
2 files changed, 18 insertions, 4 deletions
diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index 225c730398c..46cb14552a1 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,10 +1,10 @@
-/* $OpenBSD: usbdevs.h,v 1.100 2004/07/11 12:14:12 deraadt Exp $ */
+/* $OpenBSD: usbdevs.h,v 1.101 2004/07/12 05:22:08 pvalchev Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * OpenBSD: usbdevs,v 1.97 2004/07/11 12:13:58 deraadt Exp
+ * OpenBSD: usbdevs,v 1.98 2004/07/12 05:21:11 pvalchev Exp
*/
/* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
@@ -76,6 +76,7 @@
#define USB_VENDOR_KODAK 0x040a /* Eastman Kodak */
#define USB_VENDOR_MELCO 0x0411 /* Melco */
#define USB_VENDOR_CREATIVE 0x041e /* Creative Labs */
+#define USB_VENDOR_CREATIVE2 0x1292 /* Creative Labs */
#define USB_VENDOR_ADI 0x0422 /* ADI Systems */
#define USB_VENDOR_CATC 0x0423 /* Computer Access Technology */
#define USB_VENDOR_SMC2 0x0424 /* Standard Microsystems */
@@ -623,6 +624,7 @@
/* Creative Labs products */
#define USB_PRODUCT_CREATIVE_NOMAD_II 0x1002 /* Nomad II */
#define USB_PRODUCT_CREATIVE_NOMAD_IIMG 0x4004 /* Nomad II MG */
+#define USB_PRODUCT_CREATIVE2_VOIP_BLASTER 0x0258 /* Voip Blaster */
/* Cambridge Silicon Radio products */
#define USB_PRODUCT_CSR_BLUETOOTH 0x0001 /* Bluetooth */
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index 2da68900dc0..4b90681d29d 100644
--- a/sys/dev/usb/usbdevs_data.h
+++ b/sys/dev/usb/usbdevs_data.h
@@ -1,10 +1,10 @@
-/* $OpenBSD: usbdevs_data.h,v 1.100 2004/07/11 12:14:12 deraadt Exp $ */
+/* $OpenBSD: usbdevs_data.h,v 1.101 2004/07/12 05:22:08 pvalchev Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * OpenBSD: usbdevs,v 1.97 2004/07/11 12:13:58 deraadt Exp
+ * OpenBSD: usbdevs,v 1.98 2004/07/12 05:21:11 pvalchev Exp
*/
/* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
@@ -839,6 +839,12 @@ const struct usb_knowndev usb_knowndevs[] = {
"Nomad II MG",
},
{
+ USB_VENDOR_CREATIVE2, USB_PRODUCT_CREATIVE2_VOIP_BLASTER,
+ 0,
+ "Creative Labs",
+ "Voip Blaster",
+ },
+ {
USB_VENDOR_CSR, USB_PRODUCT_CSR_BLUETOOTH,
0,
"Cambridge Silicon Radio",
@@ -4475,6 +4481,12 @@ const struct usb_knowndev usb_knowndevs[] = {
NULL,
},
{
+ USB_VENDOR_CREATIVE2, 0,
+ USB_KNOWNDEV_NOPROD,
+ "Creative Labs",
+ NULL,
+ },
+ {
USB_VENDOR_ADI, 0,
USB_KNOWNDEV_NOPROD,
"ADI Systems",