[src/trunk]: src/sys/dev/usb regen

[plunky <plunky%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/cf0b29eda8c8
branches:  trunk
changeset: 773639:cf0b29eda8c8
user:      plunky <plunky%NetBSD.org@localhost>
date:      Sat Feb 11 05:27:00 2012 +0000

description:
regen

diffstat:

 sys/dev/usb/usbdevs.h      |  13 ++++++++-----
 sys/dev/usb/usbdevs_data.h |  28 ++++++++++++++++++++--------
 2 files changed, 28 insertions(+), 13 deletions(-)

diffs (115 lines):

diff -r 00e9b56db7d4 -r cf0b29eda8c8 sys/dev/usb/usbdevs.h
--- a/sys/dev/usb/usbdevs.h     Sat Feb 11 05:26:31 2012 +0000
+++ b/sys/dev/usb/usbdevs.h     Sat Feb 11 05:27:00 2012 +0000
@@ -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 */
diff -r 00e9b56db7d4 -r cf0b29eda8c8 sys/dev/usb/usbdevs_data.h
--- a/sys/dev/usb/usbdevs_data.h        Sat Feb 11 05:26:31 2012 +0000
+++ b/sys/dev/usb/usbdevs_data.h        Sat Feb 11 05:27:00 2012 +0000
@@ -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 @@
            "Sweex",
        },
        {
-           USB_VENDOR_METAGEEK,
-           "MetaGeek",
+           USB_VENDOR_MISC,
+           "Misc Vendors",
        },
        {
            USB_VENDOR_DISPLAYLINK,
@@ -5659,10 +5659,6 @@
            "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 @@
            "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 @@
            "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 @@
            "Prestige",
        },
 };
-const int usb_nproducts = 1690;
+const int usb_nproducts = 1693;