Regen.

diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index 3343ccb..0588bc3 100644 (file)
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: usbdevs.h,v 1.10 1999/12/26 14:57:46 fgsch Exp $      */
+/*     $OpenBSD: usbdevs.h,v 1.11 2000/03/26 08:34:31 aaron Exp $      */
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
@@ -49,6 +49,7 @@
  * List of known USB vendors
  */
 
+#define        USB_VENDOR_AOX  0x03e8          /* Aox Inc. */
 #define        USB_VENDOR_HP   0x03f0          /* Hewlett Packard */
 #define        USB_VENDOR_NEC  0x0409          /* NEC */
 #define        USB_VENDOR_KODAK        0x040a          /* Eastman Kodak Corp. */
@@ -76,7 +77,6 @@
 #define        USB_VENDOR_3COM 0x04c1          /* U.S. Robotics */
 #define        USB_VENDOR_KONICA       0x04c8          /* Konica Corp. */
 #define        USB_VENDOR_ALTEC        0x04d2          /* Altec Lansing */
-#define        USB_VENDOR_SHUTTLE      0x04e6          /* Shuttle Technology */
 #define        USB_VENDOR_CHICONY      0x04f2          /* Chicony Electronics Co., Ltd. */
 #define        USB_VENDOR_BROTHER      0x04f9          /* Brother Industries Corp. */
 #define        USB_VENDOR_DALLAS       0x04fa          /* Dallas Semiconductor */
@@ -103,28 +103,36 @@
 #define        USB_VENDOR_QTRONIX      0x05c7          /* Qtronix Corp */
 #define        USB_VENDOR_ELSA 0x05cc          /* ELSA Gmbh */
 #define        USB_VENDOR_EIZONANAO    0x05e7          /* EIZO Nanao */
+#define        USB_VENDOR_KLSI 0x05e9          /* Kawasaki LSI */
 #define        USB_VENDOR_PIENGINEERING        0x05f3          /* P.I. Engineering */
 #define        USB_VENDOR_CHIC 0x05fe          /* Chic Technology */
 #define        USB_VENDOR_MACALLY      0x0618          /* Macally */
+#define        USB_VENDOR_LINKSYS      0x066b          /* Linksys Inc. */
 #define        USB_VENDOR_MULTITECH    0x06e0          /* MultiTech */
 #define        USB_VENDOR_ADS  0x06e1          /* ADS Technologies */
+#define        USB_VENDOR_SMC  0x0707          /* Standard Microsystems Corp */
 #define        USB_VENDOR_MIDIMAN      0x0763          /* Midiman */
 #define        USB_VENDOR_SANDISK      0x0781          /* SanDisk Corp */
 #define        USB_VENDOR_COREGA       0x07aa          /* Corega */
 #define        USB_VENDOR_SIIG 0x07cc          /* SIIG */
 #define        USB_VENDOR_HANDSPRING   0x082d          /* Handspring Inc. */
+#define        USB_VENDOR_NETGEAR      0x0846          /* BayNETGEAR Inc. */
 #define        USB_VENDOR_ACTIVEWIRE   0x0854          /* ActiveWire Inc. */
 #define        USB_VENDOR_BILLIONTON   0x08dd          /* Billionton Systems Inc. */
 #define        USB_VENDOR_MOTOROLA     0x1063          /* Motorola */
 #define        USB_VENDOR_PLX  0x10b5          /* PLX */
 #define        USB_VENDOR_INSIDEOUT    0x1608          /* Inside Out Networks */
 #define        USB_VENDOR_ENTREGA      0x1645          /* Entrega */
+#define        USB_VENDOR_DLINK        0x2001          /* D-Link Corp */
 #define        USB_VENDOR_INTEL        0x8086          /* Intel */
 
 /*
  * List of known products.  Grouped by vendor.
  */
 
+/* AOX products */
+#define        USB_PRODUCT_AOX_USB101  0x0008          /* USB ethernet controller engine */
+
 /* HP products */
 #define        USB_PRODUCT_HP_4100C    0x0101          /* Scanjet 4100C */
 #define        USB_PRODUCT_HP_6300C    0x0601          /* Scanjet 6300C */
@@ -207,12 +215,14 @@
 
 /* 3Com products */
 #define        USB_PRODUCT_3COM_HOMECONN       0x009d          /* HomeConnect USB Camera */
+#define        USB_PRODUCT_3COM_3C19250        0x03e8          /* 3C19250 Ethernet adapter */
 #define        USB_PRODUCT_3COM_USR56K 0x3021          /* U.S.Robotics 56000 Voice Faxmodem Pro */
 
 /* Konica Corp. Products */
 #define        USB_PRODUCT_KONICA_CAMERA       0x0720          /* Digital Color Camera */
 
 /* Altec Lansing products */
+#define        USB_PRODUCT_ALTEC_ADA70 0x0070          /* ADA70 Speakers */
 #define        USB_PRODUCT_ALTEC_ASC495        0xff05          /* ASC495 Speakers */
 
 /* Shuttle Technology products */
@@ -257,6 +267,8 @@
 
 /* Peracom products */
 #define        USB_PRODUCT_PERACOM_SERIAL1     0x0001          /* Serial Converter */
+#define        USB_PRODUCT_PERACOM_ENET        0x0002          /* Ethernet adapter */
+#define        USB_PRODUCT_PERACOM_ENET2       0x0005          /* Ethernet adapter */
 
 /* Wacom products */
 #define        USB_PRODUCT_WACOM_CT0405U       0x0000          /* CT-0405-U Tablet */
@@ -298,6 +310,9 @@
 #define        USB_PRODUCT_LOGITECH_N48        0xc001          /* N48 mouse */
 #define        USB_PRODUCT_LOGITECH_MBA47      0xc002          /* M-BA47 mouse */
 
+/* Kawasaki products */
+#define        USB_PRODUCT_KLSI_USB101 0x0008          /* USB ethernet controller engine */
+
 /* P.I. Engineering products */
 #define        USB_PRODUCT_PIENGINEERING_PS2USB        0x020b          /* PS2 to Mac USB Adapter */
 
@@ -307,23 +322,35 @@
 /* Macally products */
 #define        USB_PRODUCT_MACALLY_MOUSE1      0x0101          /* mouse */
 
+/* Linksys products */
+#define        USB_PRODUCT_LINKSYS_USB10T      0x2202          /* USB10T Ethernet */
+#define        USB_PRODUCT_LINKSYS_USB100TX    0x2203          /* USB100TX Ethernet */
+
 /* MultiTech products */
 #define        USB_PRODUCT_MULTITECH_ATLAS     0xf101          /* MT5634ZBA-USB modem */
 
 /* ADS products */
-#define        USB_PRODUCT_ADS_ENET    0x0008          /* Ethernet adapter */
+#define        USB_PRODUCT_ADS_UBS10BT 0x0008          /* Ethernet adapter */
+
+/* SMC products */
+#define        USB_PRODUCT_SMC_2102USB 0x0100          /* 10Mbps ethernet adapter */
+#define        USB_PRODUCT_SMC_2202USB 0x0200          /* 10/100 ethernet adapter */
 
 /* Entrega products */
 #define        USB_PRODUCT_ENTREGA_1S  0x0001          /* 1S serial connector */
 #define        USB_PRODUCT_ENTREGA_2S  0x0002          /* 2S serial connector */
 #define        USB_PRODUCT_ENTREGA_1S25        0x0003          /* 1S25 serial connector */
 #define        USB_PRODUCT_ENTREGA_4S  0x0004          /* 4S serial connector */
+#define        USB_PRODUCT_ENTREGA_E45 0x0005          /* E45 Ethernet adapter */
 #define        USB_PRODUCT_ENTREGA_CENTRONICS  0x0006          /* Centronics connector */
 #define        USB_PRODUCT_ENTREGA_1S9 0x0093          /* 1S9 serial connector */
 #define        USB_PRODUCT_ENTREGA_EZUSB       0x8000          /* EZ-USB */
 /*product ENTREGA SERIAL       0x8001  DB25 Serial connector*/
 /*product ENTREGA SERIAL_DB9   0x8093  DB9 Serial connector*/
 
+/* D-Link products */
+#define        USB_PRODUCT_DLINK_DSB650C       0x4000          /* 10Mbps ethernet adapter */
+
 /* Midiman products */
 #define        USB_PRODUCT_MIDIMAN_MIDISPORT2X2        0x1001          /* Midisport 2x2 */
 
@@ -339,6 +366,9 @@
 /* Handspring Inc. */
 #define        USB_PRODUCT_HANDSPRING_VISOR    0x0100          /* Handspring Visor */
 
+/* Netgear products */
+#define        USB_PRODUCT_NETGEAR_EA101       0x1001          /* Ethernet adapter */
+
 /* ActiveWire Inc. products */
 #define        USB_PRODUCT_ACTIVEWIRE_IOBOARD  0x0100          /* I/O Board */
 #define        USB_PRODUCT_ACTIVEWIRE_IOBOARD_FW1      0x0101          /* I/O Board, rev. 1 firmware */

diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index 8f442c4..2fdb6cc 100644 (file)
--- a/sys/dev/usb/usbdevs_data.h
+++ b/sys/dev/usb/usbdevs_data.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: usbdevs_data.h,v 1.10 1999/12/26 14:57:46 fgsch Exp $ */
+/*     $OpenBSD: usbdevs_data.h,v 1.11 2000/03/26 08:34:31 aaron Exp $ */
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
@@ -46,6 +46,12 @@
  */
 
 struct usb_knowndev usb_knowndevs[] = {
+       {
+           USB_VENDOR_AOX, USB_PRODUCT_AOX_USB101,
+           0,
+           "Aox Inc.",
+           "USB ethernet controller engine",
+       },
        {
            USB_VENDOR_HP, USB_PRODUCT_HP_4100C,
            0,
@@ -268,6 +274,12 @@ struct usb_knowndev usb_knowndevs[] = {
            "U.S. Robotics",
            "HomeConnect USB Camera",
        },
+       {
+           USB_VENDOR_3COM, USB_PRODUCT_3COM_3C19250,
+           0,
+           "U.S. Robotics",
+           "3C19250 Ethernet adapter",
+       },
        {
            USB_VENDOR_3COM, USB_PRODUCT_3COM_USR56K,
            0,
@@ -280,6 +292,12 @@ struct usb_knowndev usb_knowndevs[] = {
            "Konica Corp.",
            "Digital Color Camera",
        },
+       {
+           USB_VENDOR_ALTEC, USB_PRODUCT_ALTEC_ADA70,
+           0,
+           "Altec Lansing",
+           "ADA70 Speakers",
+       },
        {
            USB_VENDOR_ALTEC, USB_PRODUCT_ALTEC_ASC495,
            0,
@@ -289,7 +307,7 @@ struct usb_knowndev usb_knowndevs[] = {
        {
            USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_EUSB,
            0,
-           "Shuttle Technology",
+           "",
            "E-USB Bridge",
        },
        {
@@ -376,6 +394,18 @@ struct usb_knowndev usb_knowndevs[] = {
            "Peracom Networks Inc.",
            "Serial Converter",
        },
+       {
+           USB_VENDOR_PERACOM, USB_PRODUCT_PERACOM_ENET,
+           0,
+           "Peracom Networks Inc.",
+           "Ethernet adapter",
+       },
+       {
+           USB_VENDOR_PERACOM, USB_PRODUCT_PERACOM_ENET2,
+           0,
+           "Peracom Networks Inc.",
+           "Ethernet adapter",
+       },
        {
            USB_VENDOR_WACOM, USB_PRODUCT_WACOM_CT0405U,
            0,
@@ -484,6 +514,12 @@ struct usb_knowndev usb_knowndevs[] = {
            "Logitech Inc.",
            "M-BA47 mouse",
        },
+       {
+           USB_VENDOR_KLSI, USB_PRODUCT_KLSI_USB101,
+           0,
+           "Kawasaki LSI",
+           "USB ethernet controller engine",
+       },
        {
            USB_VENDOR_PIENGINEERING, USB_PRODUCT_PIENGINEERING_PS2USB,
            0,
@@ -502,6 +538,18 @@ struct usb_knowndev usb_knowndevs[] = {
            "Macally",
            "mouse",
        },
+       {
+           USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB10T,
+           0,
+           "Linksys Inc.",
+           "USB10T Ethernet",
+       },
+       {
+           USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB100TX,
+           0,
+           "Linksys Inc.",
+           "USB100TX Ethernet",
+       },
        {
            USB_VENDOR_MULTITECH, USB_PRODUCT_MULTITECH_ATLAS,
            0,
@@ -509,11 +557,23 @@ struct usb_knowndev usb_knowndevs[] = {
            "MT5634ZBA-USB modem",
        },
        {
-           USB_VENDOR_ADS, USB_PRODUCT_ADS_ENET,
+           USB_VENDOR_ADS, USB_PRODUCT_ADS_UBS10BT,
            0,
            "ADS Technologies",
            "Ethernet adapter",
        },
+       {
+           USB_VENDOR_SMC, USB_PRODUCT_SMC_2102USB,
+           0,
+           "Standard Microsystems Corp",
+           "10Mbps ethernet adapter",
+       },
+       {
+           USB_VENDOR_SMC, USB_PRODUCT_SMC_2202USB,
+           0,
+           "Standard Microsystems Corp",
+           "10/100 ethernet adapter",
+       },
        {
            USB_VENDOR_ENTREGA, USB_PRODUCT_ENTREGA_1S,
            0,
@@ -538,6 +598,12 @@ struct usb_knowndev usb_knowndevs[] = {
            "Entrega",
            "4S serial connector",
        },
+       {
+           USB_VENDOR_ENTREGA, USB_PRODUCT_ENTREGA_E45,
+           0,
+           "Entrega",
+           "E45 Ethernet adapter",
+       },
        {
            USB_VENDOR_ENTREGA, USB_PRODUCT_ENTREGA_CENTRONICS,
            0,
@@ -556,6 +622,12 @@ struct usb_knowndev usb_knowndevs[] = {
            "Entrega",
            "EZ-USB",
        },
+       {
+           USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650C,
+           0,
+           "D-Link Corp",
+           "10Mbps ethernet adapter",
+       },
        {
            USB_VENDOR_MIDIMAN, USB_PRODUCT_MIDIMAN_MIDISPORT2X2,
            0,
@@ -586,6 +658,12 @@ struct usb_knowndev usb_knowndevs[] = {
            "Handspring Inc.",
            "Handspring Visor",
        },
+       {
+           USB_VENDOR_NETGEAR, USB_PRODUCT_NETGEAR_EA101,
+           0,
+           "BayNETGEAR Inc.",
+           "Ethernet adapter",
+       },
        {
            USB_VENDOR_ACTIVEWIRE, USB_PRODUCT_ACTIVEWIRE_IOBOARD,
            0,
@@ -628,6 +706,12 @@ struct usb_knowndev usb_knowndevs[] = {
            "Intel",
            "82930 test board",
        },
+       {
+           USB_VENDOR_AOX, 0,
+           USB_KNOWNDEV_NOPROD,
+           "Aox Inc.",
+           NULL,
+       },
        {
            USB_VENDOR_HP, 0,
            USB_KNOWNDEV_NOPROD,
@@ -790,12 +874,6 @@ struct usb_knowndev usb_knowndevs[] = {
            "Altec Lansing",
            NULL,
        },
-       {
-           USB_VENDOR_SHUTTLE, 0,
-           USB_KNOWNDEV_NOPROD,
-           "Shuttle Technology",
-           NULL,
-       },
        {
            USB_VENDOR_CHICONY, 0,
            USB_KNOWNDEV_NOPROD,
@@ -952,6 +1030,12 @@ struct usb_knowndev usb_knowndevs[] = {
            "EIZO Nanao",
            NULL,
        },
+       {
+           USB_VENDOR_KLSI, 0,
+           USB_KNOWNDEV_NOPROD,
+           "Kawasaki LSI",
+           NULL,
+       },
        {
            USB_VENDOR_PIENGINEERING, 0,
            USB_KNOWNDEV_NOPROD,
@@ -970,6 +1054,12 @@ struct usb_knowndev usb_knowndevs[] = {
            "Macally",
            NULL,
        },
+       {
+           USB_VENDOR_LINKSYS, 0,
+           USB_KNOWNDEV_NOPROD,
+           "Linksys Inc.",
+           NULL,
+       },
        {
            USB_VENDOR_MULTITECH, 0,
            USB_KNOWNDEV_NOPROD,
@@ -982,6 +1072,12 @@ struct usb_knowndev usb_knowndevs[] = {
            "ADS Technologies",
            NULL,
        },
+       {
+           USB_VENDOR_SMC, 0,
+           USB_KNOWNDEV_NOPROD,
+           "Standard Microsystems Corp",
+           NULL,
+       },
        {
            USB_VENDOR_MIDIMAN, 0,
            USB_KNOWNDEV_NOPROD,
@@ -1012,6 +1108,12 @@ struct usb_knowndev usb_knowndevs[] = {
            "Handspring Inc.",
            NULL,
        },
+       {
+           USB_VENDOR_NETGEAR, 0,
+           USB_KNOWNDEV_NOPROD,
+           "BayNETGEAR Inc.",
+           NULL,
+       },
        {
            USB_VENDOR_ACTIVEWIRE, 0,
            USB_KNOWNDEV_NOPROD,
@@ -1048,6 +1150,12 @@ struct usb_knowndev usb_knowndevs[] = {
            "Entrega",
            NULL,
        },
+       {
+           USB_VENDOR_DLINK, 0,
+           USB_KNOWNDEV_NOPROD,
+           "D-Link Corp",
+           NULL,
+       },
        {
            USB_VENDOR_INTEL, 0,
            USB_KNOWNDEV_NOPROD,