summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/dev/usb/usbdevs.h7
-rw-r--r--sys/dev/usb/usbdevs_data.h16
2 files changed, 19 insertions, 4 deletions
diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index ea411147aa5..9fcb330fda7 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,10 +1,10 @@
-/* $OpenBSD: usbdevs.h,v 1.493 2010/03/27 10:39:06 otto Exp $ */
+/* $OpenBSD: usbdevs.h,v 1.494 2010/04/03 10:53:34 mpf Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * OpenBSD: usbdevs,v 1.483 2010/03/27 10:37:26 otto Exp
+ * OpenBSD: usbdevs,v 1.484 2010/04/03 10:52:22 mpf Exp
*/
/* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
@@ -75,6 +75,7 @@
#define USB_VENDOR_MELCO 0x0411 /* Melco */
#define USB_VENDOR_LEADTEK 0x0413 /* Leadtek */
#define USB_VENDOR_CREATIVE 0x041e /* Creative Labs */
+#define USB_VENDOR_NOKIA2 0x0421 /* Nokia */
#define USB_VENDOR_ADI 0x0422 /* ADI Systems */
#define USB_VENDOR_CATC 0x0423 /* Computer Access Technology */
#define USB_VENDOR_SMC2 0x0424 /* Standard Microsystems */
@@ -2709,6 +2710,8 @@
/* Nokia products */
#define USB_PRODUCT_NOKIA_CA42 0x1234 /* CA-42 Serial */
+#define USB_PRODUCT_NOKIA2_CS15UMASS 0x0610 /* Internet Stick CS-15 (umass mode) */
+#define USB_PRODUCT_NOKIA2_CS15 0x0612 /* Internet Stick CS-15 */
/* Noritake itron corp products */
#define USB_PRODUCT_NORITAKE_COMEMO 0x11c0 /* Noritake COMEMO */
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index 0277ee6d0ab..6a913b88170 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.487 2010/03/27 10:39:06 otto Exp $ */
+/* $OpenBSD: usbdevs_data.h,v 1.488 2010/04/03 10:53:35 mpf Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * OpenBSD: usbdevs,v 1.483 2010/03/27 10:37:26 otto Exp
+ * OpenBSD: usbdevs,v 1.484 2010/04/03 10:52:22 mpf Exp
*/
/* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
@@ -6338,6 +6338,14 @@ const struct usb_known_product usb_known_products[] = {
"CA-42 Serial",
},
{
+ USB_VENDOR_NOKIA2, USB_PRODUCT_NOKIA2_CS15UMASS,
+ "Internet Stick CS-15 (umass mode)",
+ },
+ {
+ USB_VENDOR_NOKIA2, USB_PRODUCT_NOKIA2_CS15,
+ "Internet Stick CS-15",
+ },
+ {
USB_VENDOR_NORITAKE, USB_PRODUCT_NORITAKE_COMEMO,
"Noritake COMEMO",
},
@@ -9254,6 +9262,10 @@ const struct usb_known_vendor usb_known_vendors[] = {
"Creative Labs",
},
{
+ USB_VENDOR_NOKIA2,
+ "Nokia",
+ },
+ {
USB_VENDOR_ADI,
"ADI Systems",
},