Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/usb Sync with FreeBSD: add two more adapters.



details:   https://anonhg.NetBSD.org/src/rev/b5715d9ad682
branches:  trunk
changeset: 485272:b5715d9ad682
user:      augustss <augustss%NetBSD.org@localhost>
date:      Sun Apr 23 19:03:45 2000 +0000

description:
Sync with FreeBSD: add two more adapters.

diffstat:

 sys/dev/usb/if_aue.c |  11 +++++++----
 sys/dev/usb/if_cue.c |   3 ++-
 sys/dev/usb/usbdevs  |   6 +++++-
 3 files changed, 14 insertions(+), 6 deletions(-)

diffs (90 lines):

diff -r 04eda704caa1 -r b5715d9ad682 sys/dev/usb/if_aue.c
--- a/sys/dev/usb/if_aue.c      Sun Apr 23 18:58:46 2000 +0000
+++ b/sys/dev/usb/if_aue.c      Sun Apr 23 19:03:45 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_aue.c,v 1.38 2000/04/04 20:16:19 augustss Exp $     */
+/*     $NetBSD: if_aue.c,v 1.39 2000/04/23 19:03:45 augustss Exp $     */
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
  *     Bill Paul <wpaul%ee.columbia.edu@localhost>.  All rights reserved.
@@ -182,6 +182,7 @@
        { USB_VENDOR_BILLIONTON, USB_PRODUCT_BILLIONTON_USB100 },
        { USB_VENDOR_MELCO, USB_PRODUCT_MELCO_LUATX },
        { USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB100TX },
+       { USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB10TA },
        { USB_VENDOR_ADMTEK, USB_PRODUCT_ADMTEK_PEGASUS },
        { USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650TX },
        { USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650TX_PNA },
@@ -584,7 +585,8 @@
         * register of the Broadcom PHY.
         */
        if ((sc->aue_vendor == USB_VENDOR_LINKSYS &&
-            sc->aue_product == USB_PRODUCT_LINKSYS_USB100TX) ||
+            (sc->aue_product == USB_PRODUCT_LINKSYS_USB100TX ||
+             sc->aue_product == USB_PRODUCT_LINKSYS_USB10TA)) ||
            (sc->aue_vendor == USB_VENDOR_DLINK &&
             sc->aue_product == USB_PRODUCT_DLINK_DSB650TX)) {
                u_int16_t               auxmode;
@@ -706,7 +708,8 @@
   
        /* Grrr. LinkSys has to be different from everyone else. */
        if ((sc->aue_vendor == USB_VENDOR_LINKSYS &&
-            sc->aue_product == USB_PRODUCT_LINKSYS_USB100TX) ||
+            (sc->aue_product == USB_PRODUCT_LINKSYS_USB100TX ||
+             sc->aue_product == USB_PRODUCT_LINKSYS_USB10TA)) ||
            (sc->aue_vendor == USB_VENDOR_DLINK &&
             sc->aue_product == USB_PRODUCT_DLINK_DSB650TX)) {
                aue_csr_write_1(sc, AUE_GPIO0, 
@@ -1596,7 +1599,7 @@
                    USBDEVNAME(sc->aue_dev), usbd_errstr(err));
                return (EIO);
        }
-       usbd_open_pipe(sc->aue_iface, sc->aue_ed[AUE_ENDPT_TX],
+       err = usbd_open_pipe(sc->aue_iface, sc->aue_ed[AUE_ENDPT_TX],
            USBD_EXCLUSIVE_USE, &sc->aue_ep[AUE_ENDPT_TX]);
        if (err) {
                printf("%s: open tx pipe failed: %s\n",
diff -r 04eda704caa1 -r b5715d9ad682 sys/dev/usb/if_cue.c
--- a/sys/dev/usb/if_cue.c      Sun Apr 23 18:58:46 2000 +0000
+++ b/sys/dev/usb/if_cue.c      Sun Apr 23 19:03:45 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_cue.c,v 1.21 2000/04/02 21:25:41 augustss Exp $     */
+/*     $NetBSD: if_cue.c,v 1.22 2000/04/23 19:03:45 augustss Exp $     */
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
  *     Bill Paul <wpaul%ee.columbia.edu@localhost>.  All rights reserved.
@@ -161,6 +161,7 @@
 Static struct cue_type cue_devs[] = {
        { USB_VENDOR_CATC, USB_PRODUCT_CATC_NETMATE },
        { USB_VENDOR_CATC, USB_PRODUCT_CATC_NETMATE2 },
+       { USB_VENDOR_SMARTBRIDGES, USB_PRODUCT_SMARTBRIDGES_SMARTLINK },
        /* Belkin F5U111 adapter covered by NETMATE entry */
        { 0, 0 }
 };
diff -r 04eda704caa1 -r b5715d9ad682 sys/dev/usb/usbdevs
--- a/sys/dev/usb/usbdevs       Sun Apr 23 18:58:46 2000 +0000
+++ b/sys/dev/usb/usbdevs       Sun Apr 23 19:03:45 2000 +0000
@@ -1,4 +1,4 @@
-$NetBSD: usbdevs,v 1.94 2000/04/21 15:37:50 augustss Exp $
+$NetBSD: usbdevs,v 1.95 2000/04/23 19:03:45 augustss Exp $
 
 /*
  * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -198,6 +198,7 @@
 vendor BURRBROWN       0x08bb  Burr-Brown Japan, Ltd.
 vendor 2WIRE           0x08c8  2Wire, Inc
 vendor AIPTEK          0x08ca  AIPTEK International, Inc.
+vendor SMARTBRIDGES    0x08d1  SmartBridges Pte Ltd.
 vendor BILLIONTON      0x08dd  Billionton Systems, Inc.
 vendor AUTHENTEC       0x08ff  AuthenTec, Inc.
 vendor ALATION         0x0910  Alation Systems, Inc.
@@ -561,6 +562,9 @@
 /* Sirius Technologies products */
 product SIRIUS ROADSTER                0x0001  NetComm Roadster II 56 USB
 
+/* SmartBridges products */
+product SMARTBRIDGES SMARTLINK 0x0001  SmartLink USB ethernet adapter
+
 /* SMC products */
 product SMC 2102USB            0x0100  10Mbps ethernet adapter
 product SMC 2202USB            0x0200  10/100 ethernet adapter



Home | Main Index | Thread Index | Old Index