Sat Feb 14 17:03:33 2009 UTC ()
regen.


(jakllsch)
diff -r1.517 -r1.518 src/sys/dev/usb/usbdevs.h
diff -r1.518 -r1.519 src/sys/dev/usb/usbdevs_data.h
cvs diff -r1.517 -r1.518 src/sys/dev/usb/usbdevs.h (expand / switch to unified diff)

--- src/sys/dev/usb/usbdevs.h 2009/01/16 13:31:41 1.517
+++ src/sys/dev/usb/usbdevs.h 2009/02/14 17:03:33 1.518
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1/* $NetBSD: usbdevs.h,v 1.517 2009/01/16 13:31:41 jmcneill Exp $ */ 1/* $NetBSD: usbdevs.h,v 1.518 2009/02/14 17:03:33 jakllsch Exp $ */
2 2
3/* 3/*
4 * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. 4 * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
5 * 5 *
6 * generated from: 6 * generated from:
7 * NetBSD: usbdevs,v 1.521 2009/01/16 13:31:01 jmcneill Exp 7 * NetBSD: usbdevs,v 1.523 2009/02/14 17:01:23 jakllsch Exp
8 */ 8 */
9 9
10/* 10/*
11 * Copyright (c) 1998-2004 The NetBSD Foundation, Inc. 11 * Copyright (c) 1998-2004 The NetBSD Foundation, Inc.
12 * All rights reserved. 12 * All rights reserved.
13 * 13 *
14 * This code is derived from software contributed to The NetBSD Foundation 14 * This code is derived from software contributed to The NetBSD Foundation
15 * by Lennart Augustsson (lennart@augustsson.net) at 15 * by Lennart Augustsson (lennart@augustsson.net) at
16 * Carlstedt Research & Technology. 16 * Carlstedt Research & Technology.
17 * 17 *
18 * Redistribution and use in source and binary forms, with or without 18 * Redistribution and use in source and binary forms, with or without
19 * modification, are permitted provided that the following conditions 19 * modification, are permitted provided that the following conditions
20 * are met: 20 * are met:
@@ -28,26 +28,30 @@ @@ -28,26 +28,30 @@
28 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED 28 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
29 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 29 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
30 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS 30 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
31 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 31 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
32 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 32 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
33 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 33 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
34 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 34 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
35 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 35 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
36 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 36 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
37 * POSSIBILITY OF SUCH DAMAGE. 37 * POSSIBILITY OF SUCH DAMAGE.
38 */ 38 */
39 39
40/* 40/*
 41 * Use "make -f Makefile.usbdevs" to regenerate usbdevs.h and usbdevs_data.h
 42 */
 43
 44/*
41 * List of known USB vendors 45 * List of known USB vendors
42 * 46 *
43 * USB.org publishes a VID list of USB-IF member companies at 47 * USB.org publishes a VID list of USB-IF member companies at
44 * http://www.usb.org/developers/tools 48 * http://www.usb.org/developers/tools
45 * Note that it does not show companies that have obtained a Vendor ID 49 * Note that it does not show companies that have obtained a Vendor ID
46 * without becoming full members. 50 * without becoming full members.
47 * 51 *
48 * Please note that these IDs do not do anything. Adding an ID here and 52 * Please note that these IDs do not do anything. Adding an ID here and
49 * regenerating the usbdevs.h and usbdevs_data.h only makes a symbolic name 53 * regenerating the usbdevs.h and usbdevs_data.h only makes a symbolic name
50 * available to the source code and does not change any functionality, nor 54 * available to the source code and does not change any functionality, nor
51 * does it make your device available to a specific driver. 55 * does it make your device available to a specific driver.
52 * It will however make the descriptive string available if a device does not 56 * It will however make the descriptive string available if a device does not
53 * provide the string itself. 57 * provide the string itself.
@@ -257,26 +261,27 @@ @@ -257,26 +261,27 @@
257#define USB_VENDOR_ALCATELM 0x06e4 /* Alcatel Microelectronics */ 261#define USB_VENDOR_ALCATELM 0x06e4 /* Alcatel Microelectronics */
258#define USB_VENDOR_SIRIUS 0x06ea /* Sirius Technologies */ 262#define USB_VENDOR_SIRIUS 0x06ea /* Sirius Technologies */
259#define USB_VENDOR_GUILLEMOT 0x06f8 /* Guillemot */ 263#define USB_VENDOR_GUILLEMOT 0x06f8 /* Guillemot */
260#define USB_VENDOR_BOSTON 0x06fd /* Boston Acoustics */ 264#define USB_VENDOR_BOSTON 0x06fd /* Boston Acoustics */
261#define USB_VENDOR_SMC 0x0707 /* Standard Microsystems */ 265#define USB_VENDOR_SMC 0x0707 /* Standard Microsystems */
262#define USB_VENDOR_PUTERCOM 0x0708 /* Putercom */ 266#define USB_VENDOR_PUTERCOM 0x0708 /* Putercom */
263#define USB_VENDOR_MCT 0x0711 /* MCT */ 267#define USB_VENDOR_MCT 0x0711 /* MCT */
264#define USB_VENDOR_IMATION 0x0718 /* Imation */ 268#define USB_VENDOR_IMATION 0x0718 /* Imation */
265#define USB_VENDOR_SUSTEEN 0x0731 /* Susteen */ 269#define USB_VENDOR_SUSTEEN 0x0731 /* Susteen */
266#define USB_VENDOR_EICON 0x0734 /* Eicon Networks */ 270#define USB_VENDOR_EICON 0x0734 /* Eicon Networks */
267#define USB_VENDOR_DIGITALSTREAM 0x074e /* Digital Stream */ 271#define USB_VENDOR_DIGITALSTREAM 0x074e /* Digital Stream */
268#define USB_VENDOR_AUREAL 0x0755 /* Aureal Semiconductor */ 272#define USB_VENDOR_AUREAL 0x0755 /* Aureal Semiconductor */
269#define USB_VENDOR_MIDIMAN 0x0763 /* Midiman */ 273#define USB_VENDOR_MIDIMAN 0x0763 /* Midiman */
 274#define USB_VENDOR_CYBERPOWER 0x0764 /* CyberPower Systems, Inc. */
270#define USB_VENDOR_SURECOM 0x0769 /* Surecom Technology */ 275#define USB_VENDOR_SURECOM 0x0769 /* Surecom Technology */
271#define USB_VENDOR_LINKSYS2 0x077b /* Linksys */ 276#define USB_VENDOR_LINKSYS2 0x077b /* Linksys */
272#define USB_VENDOR_GRIFFIN 0x077d /* Griffin Technology */ 277#define USB_VENDOR_GRIFFIN 0x077d /* Griffin Technology */
273#define USB_VENDOR_SANDISK 0x0781 /* SanDisk */ 278#define USB_VENDOR_SANDISK 0x0781 /* SanDisk */
274#define USB_VENDOR_JENOPTIK 0x0784 /* Jenoptik */ 279#define USB_VENDOR_JENOPTIK 0x0784 /* Jenoptik */
275#define USB_VENDOR_LOGITEC 0x0789 /* Logitec */ 280#define USB_VENDOR_LOGITEC 0x0789 /* Logitec */
276#define USB_VENDOR_BRIMAX 0x078e /* Brimax */ 281#define USB_VENDOR_BRIMAX 0x078e /* Brimax */
277#define USB_VENDOR_AXIS 0x0792 /* Axis Communications */ 282#define USB_VENDOR_AXIS 0x0792 /* Axis Communications */
278#define USB_VENDOR_ABL 0x0794 /* ABL Electronics */ 283#define USB_VENDOR_ABL 0x0794 /* ABL Electronics */
279#define USB_VENDOR_SAGEM 0x079b /* Sagem */ 284#define USB_VENDOR_SAGEM 0x079b /* Sagem */
280#define USB_VENDOR_SUNCOMM 0x079c /* Sun Communications, Inc. */ 285#define USB_VENDOR_SUNCOMM 0x079c /* Sun Communications, Inc. */
281#define USB_VENDOR_ALFADATA 0x079d /* Alfadata Computer */ 286#define USB_VENDOR_ALFADATA 0x079d /* Alfadata Computer */
282#define USB_VENDOR_NATIONALTECH 0x07a2 /* National Technical Systems */ 287#define USB_VENDOR_NATIONALTECH 0x07a2 /* National Technical Systems */
@@ -890,26 +895,29 @@ @@ -890,26 +895,29 @@
890#define USB_PRODUCT_CREATIVE_NOMAD 0x4106 /* Nomad */ 895#define USB_PRODUCT_CREATIVE_NOMAD 0x4106 /* Nomad */
891 896
892#define USB_PRODUCT_CREATIVE2_VOIP_BLASTER 0x0258 /* Voip Blaster */ 897#define USB_PRODUCT_CREATIVE2_VOIP_BLASTER 0x0258 /* Voip Blaster */
893 898
894#define USB_PRODUCT_CREATIVE3_OPTICAL_MOUSE 0x0001 /* Notebook Optical Mouse */ 899#define USB_PRODUCT_CREATIVE3_OPTICAL_MOUSE 0x0001 /* Notebook Optical Mouse */
895 900
896/* Cambridge Silicon Radio products */ 901/* Cambridge Silicon Radio products */
897#define USB_PRODUCT_CSR_BLUETOOTH 0x0001 /* Bluetooth USB Adapter */ 902#define USB_PRODUCT_CSR_BLUETOOTH 0x0001 /* Bluetooth USB Adapter */
898#define USB_PRODUCT_CSR_BLUETOOTH_NF 0xffff /* Bluetooth USB Adapter */ 903#define USB_PRODUCT_CSR_BLUETOOTH_NF 0xffff /* Bluetooth USB Adapter */
899 904
900/* CTX products */ 905/* CTX products */
901#define USB_PRODUCT_CTX_EX1300 0x9999 /* Ex1300 hub */ 906#define USB_PRODUCT_CTX_EX1300 0x9999 /* Ex1300 hub */
902 907
 908/* CyberPower Systems, Inc. products */
 909#define USB_PRODUCT_CYBERPOWER_UPS 0x0501 /* Uninterruptible Power Supply */
 910
903/* CyberTAN Technology products */ 911/* CyberTAN Technology products */
904#define USB_PRODUCT_CYBERTAN_TG54USB 0x1666 /* TG54USB */ 912#define USB_PRODUCT_CYBERTAN_TG54USB 0x1666 /* TG54USB */
905 913
906/* Cypress Semiconductor products */ 914/* Cypress Semiconductor products */
907#define USB_PRODUCT_CYPRESS_MOUSE 0x0001 /* mouse */ 915#define USB_PRODUCT_CYPRESS_MOUSE 0x0001 /* mouse */
908#define USB_PRODUCT_CYPRESS_THERMO 0x0002 /* thermometer */ 916#define USB_PRODUCT_CYPRESS_THERMO 0x0002 /* thermometer */
909#define USB_PRODUCT_CYPRESS_KBDHUB 0x0101 /* Keyboard/Hub */ 917#define USB_PRODUCT_CYPRESS_KBDHUB 0x0101 /* Keyboard/Hub */
910#define USB_PRODUCT_CYPRESS_FMRADIO 0x1002 /* FM Radio */ 918#define USB_PRODUCT_CYPRESS_FMRADIO 0x1002 /* FM Radio */
911#define USB_PRODUCT_CYPRESS_USBRS232 0x5500 /* USB-RS232 Interface */ 919#define USB_PRODUCT_CYPRESS_USBRS232 0x5500 /* USB-RS232 Interface */
912#define USB_PRODUCT_CYPRESS_HUB2 0x6560 /* USB2 Hub */ 920#define USB_PRODUCT_CYPRESS_HUB2 0x6560 /* USB2 Hub */
913 921
914/* Daisy Technology products */ 922/* Daisy Technology products */
915#define USB_PRODUCT_DAISY_DMC 0x6901 /* PhotoClip USBMediaReader */ 923#define USB_PRODUCT_DAISY_DMC 0x6901 /* PhotoClip USBMediaReader */
cvs diff -r1.518 -r1.519 src/sys/dev/usb/usbdevs_data.h (expand / switch to unified diff)

--- src/sys/dev/usb/usbdevs_data.h 2009/01/16 13:31:41 1.518
+++ src/sys/dev/usb/usbdevs_data.h 2009/02/14 17:03:33 1.519
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1/* $NetBSD: usbdevs_data.h,v 1.518 2009/01/16 13:31:41 jmcneill Exp $ */ 1/* $NetBSD: usbdevs_data.h,v 1.519 2009/02/14 17:03:33 jakllsch Exp $ */
2 2
3/* 3/*
4 * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. 4 * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
5 * 5 *
6 * generated from: 6 * generated from:
7 * NetBSD: usbdevs,v 1.521 2009/01/16 13:31:01 jmcneill Exp 7 * NetBSD: usbdevs,v 1.523 2009/02/14 17:01:23 jakllsch Exp
8 */ 8 */
9 9
10/* 10/*
11 * Copyright (c) 1998-2004 The NetBSD Foundation, Inc. 11 * Copyright (c) 1998-2004 The NetBSD Foundation, Inc.
12 * All rights reserved. 12 * All rights reserved.
13 * 13 *
14 * This code is derived from software contributed to The NetBSD Foundation 14 * This code is derived from software contributed to The NetBSD Foundation
15 * by Lennart Augustsson (lennart@augustsson.net) at 15 * by Lennart Augustsson (lennart@augustsson.net) at
16 * Carlstedt Research & Technology. 16 * Carlstedt Research & Technology.
17 * 17 *
18 * Redistribution and use in source and binary forms, with or without 18 * Redistribution and use in source and binary forms, with or without
19 * modification, are permitted provided that the following conditions 19 * modification, are permitted provided that the following conditions
20 * are met: 20 * are met:
@@ -853,26 +853,30 @@ const struct usb_vendor usb_vendors[] =  @@ -853,26 +853,30 @@ const struct usb_vendor usb_vendors[] =
853 { 853 {
854 USB_VENDOR_DIGITALSTREAM, 854 USB_VENDOR_DIGITALSTREAM,
855 "Digital Stream", 855 "Digital Stream",
856 }, 856 },
857 { 857 {
858 USB_VENDOR_AUREAL, 858 USB_VENDOR_AUREAL,
859 "Aureal Semiconductor", 859 "Aureal Semiconductor",
860 }, 860 },
861 { 861 {
862 USB_VENDOR_MIDIMAN, 862 USB_VENDOR_MIDIMAN,
863 "Midiman", 863 "Midiman",
864 }, 864 },
865 { 865 {
 866 USB_VENDOR_CYBERPOWER,
 867 "CyberPower Systems, Inc.",
 868 },
 869 {
866 USB_VENDOR_SURECOM, 870 USB_VENDOR_SURECOM,
867 "Surecom Technology", 871 "Surecom Technology",
868 }, 872 },
869 { 873 {
870 USB_VENDOR_LINKSYS2, 874 USB_VENDOR_LINKSYS2,
871 "Linksys", 875 "Linksys",
872 }, 876 },
873 { 877 {
874 USB_VENDOR_GRIFFIN, 878 USB_VENDOR_GRIFFIN,
875 "Griffin Technology", 879 "Griffin Technology",
876 }, 880 },
877 { 881 {
878 USB_VENDOR_SANDISK, 882 USB_VENDOR_SANDISK,
@@ -1845,27 +1849,27 @@ const struct usb_vendor usb_vendors[] =  @@ -1845,27 +1849,27 @@ const struct usb_vendor usb_vendors[] =
1845 { 1849 {
1846 USB_VENDOR_EMPIA, 1850 USB_VENDOR_EMPIA,
1847 "eMPIA Technology", 1851 "eMPIA Technology",
1848 }, 1852 },
1849 { 1853 {
1850 USB_VENDOR_HP2, 1854 USB_VENDOR_HP2,
1851 "Hewlett Packard", 1855 "Hewlett Packard",
1852 }, 1856 },
1853 { 1857 {
1854 USB_VENDOR_USRP, 1858 USB_VENDOR_USRP,
1855 "GNU Radio USRP", 1859 "GNU Radio USRP",
1856 }, 1860 },
1857}; 1861};
1858const int usb_nvendors = 454; 1862const int usb_nvendors = 455;
1859 1863
1860const struct usb_product usb_products[] = { 1864const struct usb_product usb_products[] = {
1861 { 1865 {
1862 USB_VENDOR_3COM, USB_PRODUCT_3COM_HOMECONN, 1866 USB_VENDOR_3COM, USB_PRODUCT_3COM_HOMECONN,
1863 "HomeConnect USB Camera", 1867 "HomeConnect USB Camera",
1864 }, 1868 },
1865 { 1869 {
1866 USB_VENDOR_3COM, USB_PRODUCT_3COM_3CREB96, 1870 USB_VENDOR_3COM, USB_PRODUCT_3COM_3CREB96,
1867 "Bluetooth USB Adapter", 1871 "Bluetooth USB Adapter",
1868 }, 1872 },
1869 { 1873 {
1870 USB_VENDOR_3COM, USB_PRODUCT_3COM_3C19250, 1874 USB_VENDOR_3COM, USB_PRODUCT_3COM_3C19250,
1871 "3C19250 Ethernet adapter", 1875 "3C19250 Ethernet adapter",
@@ -2797,26 +2801,30 @@ const struct usb_product usb_products[]  @@ -2797,26 +2801,30 @@ const struct usb_product usb_products[]
2797 { 2801 {
2798 USB_VENDOR_CSR, USB_PRODUCT_CSR_BLUETOOTH, 2802 USB_VENDOR_CSR, USB_PRODUCT_CSR_BLUETOOTH,
2799 "Bluetooth USB Adapter", 2803 "Bluetooth USB Adapter",
2800 }, 2804 },
2801 { 2805 {
2802 USB_VENDOR_CSR, USB_PRODUCT_CSR_BLUETOOTH_NF, 2806 USB_VENDOR_CSR, USB_PRODUCT_CSR_BLUETOOTH_NF,
2803 "Bluetooth USB Adapter", 2807 "Bluetooth USB Adapter",
2804 }, 2808 },
2805 { 2809 {
2806 USB_VENDOR_CTX, USB_PRODUCT_CTX_EX1300, 2810 USB_VENDOR_CTX, USB_PRODUCT_CTX_EX1300,
2807 "Ex1300 hub", 2811 "Ex1300 hub",
2808 }, 2812 },
2809 { 2813 {
 2814 USB_VENDOR_CYBERPOWER, USB_PRODUCT_CYBERPOWER_UPS,
 2815 "Uninterruptible Power Supply",
 2816 },
 2817 {
2810 USB_VENDOR_CYBERTAN, USB_PRODUCT_CYBERTAN_TG54USB, 2818 USB_VENDOR_CYBERTAN, USB_PRODUCT_CYBERTAN_TG54USB,
2811 "TG54USB", 2819 "TG54USB",
2812 }, 2820 },
2813 { 2821 {
2814 USB_VENDOR_CYPRESS, USB_PRODUCT_CYPRESS_MOUSE, 2822 USB_VENDOR_CYPRESS, USB_PRODUCT_CYPRESS_MOUSE,
2815 "mouse", 2823 "mouse",
2816 }, 2824 },
2817 { 2825 {
2818 USB_VENDOR_CYPRESS, USB_PRODUCT_CYPRESS_THERMO, 2826 USB_VENDOR_CYPRESS, USB_PRODUCT_CYPRESS_THERMO,
2819 "thermometer", 2827 "thermometer",
2820 }, 2828 },
2821 { 2829 {
2822 USB_VENDOR_CYPRESS, USB_PRODUCT_CYPRESS_KBDHUB, 2830 USB_VENDOR_CYPRESS, USB_PRODUCT_CYPRESS_KBDHUB,
@@ -6817,14 +6825,14 @@ const struct usb_product usb_products[]  @@ -6817,14 +6825,14 @@ const struct usb_product usb_products[]
6817 { 6825 {
6818 USB_VENDOR_ZYXEL, USB_PRODUCT_ZYXEL_M202, 6826 USB_VENDOR_ZYXEL, USB_PRODUCT_ZYXEL_M202,
6819 "M-202", 6827 "M-202",
6820 }, 6828 },
6821 { 6829 {
6822 USB_VENDOR_ZYXEL, USB_PRODUCT_ZYXEL_G220V2, 6830 USB_VENDOR_ZYXEL, USB_PRODUCT_ZYXEL_G220V2,
6823 "G-220 v2", 6831 "G-220 v2",
6824 }, 6832 },
6825 { 6833 {
6826 USB_VENDOR_ZYXEL, USB_PRODUCT_ZYXEL_PRESTIGE, 6834 USB_VENDOR_ZYXEL, USB_PRODUCT_ZYXEL_PRESTIGE,
6827 "Prestige", 6835 "Prestige",
6828 }, 6836 },
6829}; 6837};
6830const int usb_nproducts = 1242; 6838const int usb_nproducts = 1243;