Module Name: src
Committed By: plunky
Date: Sat Feb 11 05:27:00 UTC 2012
Modified Files:
src/sys/dev/usb: usbdevs.h usbdevs_data.h
Log Message:
regen
To generate a diff of this commit:
cvs rdiff -u -r1.599 -r1.600 src/sys/dev/usb/usbdevs.h
cvs rdiff -u -r1.600 -r1.601 src/sys/dev/usb/usbdevs_data.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/usbdevs.h
diff -u src/sys/dev/usb/usbdevs.h:1.599 src/sys/dev/usb/usbdevs.h:1.600
--- src/sys/dev/usb/usbdevs.h:1.599 Sat Jan 21 12:53:04 2012
+++ src/sys/dev/usb/usbdevs.h Sat Feb 11 05:27:00 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdevs.h,v 1.599 2012/01/21 12:53:04 skrll Exp $ */
+/* $NetBSD: usbdevs.h,v 1.600 2012/02/11 05:27:00 plunky Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
@@ -511,7 +511,7 @@
#define USB_VENDOR_SENAO 0x1740 /* Senao */
#define USB_VENDOR_ASUSTEK2 0x1761 /* ASUSTeK Computer */
#define USB_VENDOR_SWEEX2 0x177f /* Sweex */
-#define USB_VENDOR_METAGEEK 0x1781 /* MetaGeek */
+#define USB_VENDOR_MISC 0x1781 /* Misc Vendors */
#define USB_VENDOR_DISPLAYLINK 0x17e9 /* DisplayLink */
#define USB_VENDOR_E3C 0x18b4 /* E3C Technologies */
#define USB_VENDOR_AMIT 0x18c5 /* AMIT */
@@ -1865,9 +1865,6 @@
/* Merlin products */
#define USB_PRODUCT_MERLIN_V620 0x1110 /* Merlin V620 */
-/* MetaGeek products */
-#define USB_PRODUCT_METAGEEK_WISPY_24X 0x083f /* Wi-Spy 2.4x */
-
/* Metricom products */
#define USB_PRODUCT_METRICOM_RICOCHET_GS 0x0001 /* Ricochet GS */
@@ -1951,6 +1948,11 @@
#define USB_PRODUCT_MINOLTA_DIMAGEA1 0x401a /* Dimage A1 */
#define USB_PRODUCT_MINOLTA_XT 0x4015 /* Dimage Xt */
+/* Misc Vendors (sharing a Vendor ID) */
+#define USB_PRODUCT_MISC_WISPY_24X 0x083f /* MetaGeek Wi-Spy 2.4x */
+#define USB_PRODUCT_MISC_TELLSTICK 0x0c30 /* Telldus Tellstick */
+#define USB_PRODUCT_MISC_TELLSTICK_DUO 0x0c31 /* Telldus Tellstick Duo */
+
/* Mitsumi products */
#define USB_PRODUCT_MITSUMI_CDRRW 0x0000 /* CD-R/RW Drive */
#define USB_PRODUCT_MITSUMI_MOUSE 0x6407 /* Mouse */
@@ -2421,6 +2423,7 @@
#define USB_PRODUCT_ROLAND_UM3 0x009A /* EDIROL UM-3 */
#define USB_PRODUCT_ROLAND_UA4FX 0x00A3 /* EDIROL UA-4FX */
#define USB_PRODUCT_ROLAND_SONICCELL 0x00C2 /* SonicCell */
+#define USB_PRODUCT_ROLAND_UMONE 0x012a /* UM-ONE MIDI I/F */
/* Sagem products */
#define USB_PRODUCT_SAGEM_XG760A 0x004a /* XG-760A */
Index: src/sys/dev/usb/usbdevs_data.h
diff -u src/sys/dev/usb/usbdevs_data.h:1.600 src/sys/dev/usb/usbdevs_data.h:1.601
--- src/sys/dev/usb/usbdevs_data.h:1.600 Sat Jan 21 12:53:04 2012
+++ src/sys/dev/usb/usbdevs_data.h Sat Feb 11 05:27:00 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdevs_data.h,v 1.600 2012/01/21 12:53:04 skrll Exp $ */
+/* $NetBSD: usbdevs_data.h,v 1.601 2012/02/11 05:27:00 plunky Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
@@ -1823,8 +1823,8 @@ const struct usb_vendor usb_vendors[] =
"Sweex",
},
{
- USB_VENDOR_METAGEEK,
- "MetaGeek",
+ USB_VENDOR_MISC,
+ "Misc Vendors",
},
{
USB_VENDOR_DISPLAYLINK,
@@ -5659,10 +5659,6 @@ const struct usb_product usb_products[]
"Merlin V620",
},
{
- USB_VENDOR_METAGEEK, USB_PRODUCT_METAGEEK_WISPY_24X,
- "Wi-Spy 2.4x",
- },
- {
USB_VENDOR_METRICOM, USB_PRODUCT_METRICOM_RICOCHET_GS,
"Ricochet GS",
},
@@ -5899,6 +5895,18 @@ const struct usb_product usb_products[]
"Dimage Xt",
},
{
+ USB_VENDOR_MISC, USB_PRODUCT_MISC_WISPY_24X,
+ "MetaGeek Wi-Spy 2.4x",
+ },
+ {
+ USB_VENDOR_MISC, USB_PRODUCT_MISC_TELLSTICK,
+ "Telldus Tellstick",
+ },
+ {
+ USB_VENDOR_MISC, USB_PRODUCT_MISC_TELLSTICK_DUO,
+ "Telldus Tellstick Duo",
+ },
+ {
USB_VENDOR_MITSUMI, USB_PRODUCT_MITSUMI_CDRRW,
"CD-R/RW Drive",
},
@@ -7275,6 +7283,10 @@ const struct usb_product usb_products[]
"SonicCell",
},
{
+ USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_UMONE,
+ "UM-ONE MIDI I/F",
+ },
+ {
USB_VENDOR_SAGEM, USB_PRODUCT_SAGEM_XG760A,
"XG-760A",
},
@@ -8803,4 +8815,4 @@ const struct usb_product usb_products[]
"Prestige",
},
};
-const int usb_nproducts = 1690;
+const int usb_nproducts = 1693;
