diff options
-rw-r--r-- | release/sysinstall/devices.c | 1 | ||||
-rw-r--r-- | release/texts/alpha/HARDWARE.TXT | 13 | ||||
-rw-r--r-- | release/texts/alpha/RELNOTES.TXT | 10 | ||||
-rw-r--r-- | release/texts/i386/HARDWARE.TXT | 6 | ||||
-rw-r--r-- | release/texts/i386/RELNOTES.TXT | 10 | ||||
-rw-r--r-- | share/man/man4/Makefile | 2 | ||||
-rw-r--r-- | share/man/man4/cue.4 | 85 | ||||
-rw-r--r-- | sys/alpha/conf/GENERIC | 1 | ||||
-rw-r--r-- | sys/alpha/conf/NOTES | 1 | ||||
-rw-r--r-- | sys/amd64/conf/GENERIC | 1 | ||||
-rw-r--r-- | sys/boot/forth/loader.conf | 1 | ||||
-rw-r--r-- | sys/conf/NOTES | 8 | ||||
-rw-r--r-- | sys/conf/files | 1 | ||||
-rw-r--r-- | sys/dev/usb/if_cue.c | 1230 | ||||
-rw-r--r-- | sys/dev/usb/if_cuereg.h | 181 | ||||
-rw-r--r-- | sys/i386/conf/GENERIC | 1 | ||||
-rw-r--r-- | sys/i386/conf/LINT | 8 | ||||
-rw-r--r-- | sys/i386/conf/NEWCARD | 1 | ||||
-rw-r--r-- | sys/i386/conf/NOTES | 8 | ||||
-rw-r--r-- | sys/i386/conf/PCCARD | 1 | ||||
-rw-r--r-- | sys/i386/i386/userconfig.c | 1 | ||||
-rw-r--r-- | sys/modules/Makefile | 2 | ||||
-rw-r--r-- | sys/modules/cue/Makefile | 10 | ||||
-rw-r--r-- | usr.sbin/sade/devices.c | 1 | ||||
-rw-r--r-- | usr.sbin/sysinstall/devices.c | 1 |
25 files changed, 1577 insertions, 8 deletions
diff --git a/release/sysinstall/devices.c b/release/sysinstall/devices.c index a7591b9..32b8e7d 100644 --- a/release/sysinstall/devices.c +++ b/release/sysinstall/devices.c @@ -86,6 +86,7 @@ static struct _devname { { DEVICE_TYPE_FLOPPY, "fd%d", "floppy drive unit A", 2, 0, 64, 4, 'b' }, { DEVICE_TYPE_FLOPPY, "worm%d", "SCSI optical disk / CDR", 23, 0, 1, 4, 'b' }, { DEVICE_TYPE_NETWORK, "aue", "ADMtek USB ethernet adapter" }, + { DEVICE_TYPE_NETWORK, "cue", "CATC USB ethernet adapter" }, { DEVICE_TYPE_NETWORK, "fpa", "DEC DEFPA PCI FDDI card" }, { DEVICE_TYPE_NETWORK, "sr", "SDL T1/E1 sync serial PCI card" }, { DEVICE_TYPE_NETWORK, "cc3i", "SDL HSSI sync serial PCI card" }, diff --git a/release/texts/alpha/HARDWARE.TXT b/release/texts/alpha/HARDWARE.TXT index 1786f81..18d2c7a 100644 --- a/release/texts/alpha/HARDWARE.TXT +++ b/release/texts/alpha/HARDWARE.TXT @@ -370,6 +370,13 @@ ADMtek Inc. AN986-based USB ethernet NICs including the following: LinkSys USB100TX Billionton USB100 Melco Inc. LU-ATX + D-Link DSB-650TX + SMC 2202USB + +CATC USB-EL1202A-based USB ethernet NICs including the following: + CATC Netmate + CATC Netmate II + Belkin F5U111 Kawasaki LSI KU5KUSB101B-based USB ethernet NICs including the following: @@ -378,6 +385,12 @@ the following: Peracom USB Ethernet Adapter 3Com 3c19250 ADS Technologies USB-10BT + ATen UC10T + Netgear EA101 + D-Link DSB-650 + SMC 2102USB + SMC 2104USB + Corega USB-T ASIX Electronics AX88140A PCI NICs, including the following: Alfa Inc. GFC2204 diff --git a/release/texts/alpha/RELNOTES.TXT b/release/texts/alpha/RELNOTES.TXT index 28365dc..e59354e 100644 --- a/release/texts/alpha/RELNOTES.TXT +++ b/release/texts/alpha/RELNOTES.TXT @@ -145,6 +145,10 @@ Netgear EA101, the D-Link DSB-650, and the SMC 2102USB and 2104USB. IPfilter version 3.3.6 has been integrated. +Driver support has been added for USB ethernet adapters based on +the CATC USB-EL1201A chip, including the CATC Netmate and Netmate II, +and the Belkin F5U111. + 1.2. SECURITY FIXES ------------------- @@ -373,6 +377,11 @@ ADMtek Inc. AN986-based USB ethernet NICs including the following: D-Link DSB-650TX SMC 2202USB +CATC USB-EL1202A-based USB ethernet NICs including the following: + CATC Netmate + CATC Netmate II + Belkin F5U111 + Kawasaki LSI KU5KUSB101B-based USB ethernet NICs including the following: LinkSys USB10T @@ -385,6 +394,7 @@ the following: D-Link DSB-650 SMC 2102USB SMC 2104USB + Corega USB-T ASIX Electronics AX88140A PCI NICs, including the following: Alfa Inc. GFC2204 diff --git a/release/texts/i386/HARDWARE.TXT b/release/texts/i386/HARDWARE.TXT index ec2318b..aaf8008 100644 --- a/release/texts/i386/HARDWARE.TXT +++ b/release/texts/i386/HARDWARE.TXT @@ -498,6 +498,11 @@ ADMtek Inc. AN986-based USB ethernet NICs including the following: D-Link DSB-650TX SMC 2202USB +CATC USB-EL1202A-based USB ethernet NICs including the following: + CATC Netmate + CATC Netmate II + Belkin F5U111 + Kawasaki LSI KU5KUSB101B-based USB ethernet NICs including the following: LinkSys USB10T @@ -510,6 +515,7 @@ the following: D-Link DSB-650 SMC 2102USB SMC 2104USB + Corega USB-T ASIX Electronics AX88140A PCI NICs, including the following: Alfa Inc. GFC2204 diff --git a/release/texts/i386/RELNOTES.TXT b/release/texts/i386/RELNOTES.TXT index c17c73f..1e1d522 100644 --- a/release/texts/i386/RELNOTES.TXT +++ b/release/texts/i386/RELNOTES.TXT @@ -147,6 +147,10 @@ Netgear EA101, the D-Link DSB-650, and the SMC 2102USB and 2104USB. IPfilter version 3.3.6 has been integrated. +Driver support has been added for USB ethernet adapters based on +the CATC USB-EL1201A chip, including the CATC Netmate and Netmate II, +and the Belkin F5U111. + 1.2. SECURITY FIXES ------------------- @@ -379,6 +383,11 @@ ADMtek Inc. AN986-based USB ethernet NICs including the following: D-Link DSB-650TX SMC 2202USB +CATC USB-EL1202A-based USB ethernet NICs including the following: + CATC Netmate + CATC Netmate II + Belkin F5U111 + Kawasaki LSI KU5KUSB101B-based USB ethernet NICs including the following: LinkSys USB10T @@ -391,6 +400,7 @@ the following: D-Link DSB-650 SMC 2102USB SMC 2104USB + Corega USB-T ASIX Electronics AX88140A PCI NICs, including the following: Alfa Inc. GFC2204 diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index b1eb513..55c0346 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ MAN4= ahc.4 alpm.4 amd.4 atkbd.4 atkbdc.4 aue.4 blackhole.4 bpf.4 \ - bridge.4 ccd.4 cd.4 ch.4 da.4 dc.4 ddb.4 de.4 \ + bridge.4 ccd.4 cd.4 ch.4 cue.4 da.4 dc.4 ddb.4 de.4 \ divert.4 drum.4 dummynet.4 faith.4 fd.4 fdc.4 fpa.4 fxp.4 \ gif.4 \ icmp.4 ifmib.4 iic.4 iicbb.4 iicbus.4 iicsmb.4 \ diff --git a/share/man/man4/cue.4 b/share/man/man4/cue.4 new file mode 100644 index 0000000..41e2b18 --- /dev/null +++ b/share/man/man4/cue.4 @@ -0,0 +1,85 @@ +.\" Copyright (c) 1997, 1998, 1999, 2000 +.\" Bill Paul <wpaul@ee.columbia.edu>. All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" 3. All advertising materials mentioning features or use of this software +.\" must display the following acknowledgement: +.\" This product includes software developed by Bill Paul. +.\" 4. Neither the name of the author nor the names of any co-contributors +.\" may be used to endorse or promote products derived from this software +.\" without specific prior written permission. +.\" +.\" THIS SOFTWARE IS PROVIDED BY Bill Paul AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL Bill Paul OR THE VOICES IN HIS HEAD +.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF +.\" THE POSSIBILITY OF SUCH DAMAGE. +.\" +.\" $FreeBSD$ +.\" +.Dd January 13, 2000 +.Dt CUE 4 i386 +.Os FreeBSD +.Sh NAME +.Nm cue +.Nd +CATC USB-EL1201A USB Ethernet driver +.Sh SYNOPSIS +.Cd "controller uhci0" +.Cd "controller ohci0" +.Cd "controller usb0" +.Cd "device cue0" +.Sh DESCRIPTION +The +.Nm +driver provides support for USB ethernet adapters based on the Computer +Access Technology Corporation's USB-EL1202A chipset, including the +CATC Netmate and Netmate II, and the Belkin F5U111. +.Pp +The USB-EL1202A supports a 512-bit multicast hash filter, single perfect +filter entry for the station address and promiscuous mode. Packets are +received and transmitted over separate USB bulk transfer endpoints. +.Pp +The CATC adapter supports only 10mbps half-duplex mode, hence there +are no +.Xr ifmedia 4 +modes to select. +.Pp +For more information on configuring this device, see +.Xr ifconfig 8 . +.Sh DIAGNOSTICS +.Bl -diag +.It "cue%d: watchdog timeout" +A packet was queued for transmission and a transmit command was +issued, however the device failed to acknowledge the transmission +before a timeout expired. +.It "cue%d: no memory for rx list" +The driver failed to allocate an mbuf for the receiver ring. +.El +.Sh SEE ALSO +.Xr arp 4 , +.Xr netintro 4 , +.Xr ifconfig 8 +.Sh HISTORY +The +.Nm +device driver first appeared in +.Fx 4.0 . +.Sh AUTHORS +The +.Nm +driver was written by +.An Bill Paul Aq wpaul@ee.columbia.edu . diff --git a/sys/alpha/conf/GENERIC b/sys/alpha/conf/GENERIC index 2354b25..e989ecf 100644 --- a/sys/alpha/conf/GENERIC +++ b/sys/alpha/conf/GENERIC @@ -156,4 +156,5 @@ pseudo-device bpf #Berkeley packet filter #device ums0 # Mouse # USB Ethernet #device aue0 # ADMtek USB ethernet +#device cue0 # CATC USB ethernet #device kue0 # Kawasaki LSI USB ethernet diff --git a/sys/alpha/conf/NOTES b/sys/alpha/conf/NOTES index 2354b25..e989ecf 100644 --- a/sys/alpha/conf/NOTES +++ b/sys/alpha/conf/NOTES @@ -156,4 +156,5 @@ pseudo-device bpf #Berkeley packet filter #device ums0 # Mouse # USB Ethernet #device aue0 # ADMtek USB ethernet +#device cue0 # CATC USB ethernet #device kue0 # Kawasaki LSI USB ethernet diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index ee6713e..b66d11e 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -215,4 +215,5 @@ pseudo-device bpf #Berkeley packet filter #device ums0 # Mouse # USB Ethernet #device aue0 # ADMtek USB ethernet +#device cue0 # CATC USB ethernet #device kue0 # Kawasaki LSI USB ethernet diff --git a/sys/boot/forth/loader.conf b/sys/boot/forth/loader.conf index ef31231..085a7b1 100644 --- a/sys/boot/forth/loader.conf +++ b/sys/boot/forth/loader.conf @@ -167,6 +167,7 @@ ulpt_load="NO" # Printer ums_load="NO" # Mouse umass_load="NO" # Mass Storage Devices if_aue_load="NO" # ADMtek USB ethernet +if_cue_load="NO" # CATC USB ethernet if_kue_load="NO" # Kawasaki LSI USB ethernet ############################################################## diff --git a/sys/conf/NOTES b/sys/conf/NOTES index 3a284bd..1c50f92 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -2370,11 +2370,15 @@ device ums0 # eval board. device aue0 # +# CATC USB-EL1201A USB ethernet. Supports the CATC Netmate +# and Netmate II, and the Belkin F5U111. +device cue0 +# # Kawasaki LSI ethernet. Supports the LinkSys USB10T, # Entrega USB-NET-E45, Peracom Ethernet Adapter, the # 3Com 3c19250, the ADS Technologies USB-10BT, the ATen UC10T, -# the Netgear EA101, the D-Link DSB-650, and the SMC 2102USB -# and 2104USB. +# the Netgear EA101, the D-Link DSB-650, the SMC 2102USB +# and 2104USB, and the Corega USB-T. device kue0 # debugging options for the USB subsystem diff --git a/sys/conf/files b/sys/conf/files index 69bfdbd..44e920c 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -909,6 +909,7 @@ dev/usb/ukbd.c optional ukbd dev/usb/umass.c optional umass dev/usb/uhub.c optional usb dev/usb/if_aue.c optional aue +dev/usb/if_cue.c optional cue dev/usb/if_kue.c optional kue isa_if.o optional isa \ dependency "isa_if.c isa_if.h" \ diff --git a/sys/dev/usb/if_cue.c b/sys/dev/usb/if_cue.c new file mode 100644 index 0000000..37aaf8a --- /dev/null +++ b/sys/dev/usb/if_cue.c @@ -0,0 +1,1230 @@ +/* + * Copyright (c) 1997, 1998, 1999, 2000 + * Bill Paul <wpaul@ee.columbia.edu>. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by Bill Paul. + * 4. Neither the name of the author nor the names of any co-contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY Bill Paul AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL Bill Paul OR THE VOICES IN HIS HEAD + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF + * THE POSSIBILITY OF SUCH DAMAGE. + * + * $FreeBSD$ + */ + +/* + * CATC USB-EL1201A USB to ethernet driver. Used in the CATC Netmate + * adapters and others. + * + * Written by Bill Paul <wpaul@ee.columbia.edu> + * Electrical Engineering Department + * Columbia University, New York City + */ + +/* + * The CATC USB-EL1201A provides USB ethernet support at 10Mbps. The + * RX filter uses a 512-bit multicast hash table, single perfect entry + * for the station address, and promiscuous mode. Unlike the ADMtek + * and KLSI chips, the CATC ASIC supports read and write combining + * mode where multiple packets can be transfered using a single bulk + * transaction, which helps performance a great deal. + */ + +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/sockio.h> +#include <sys/mbuf.h> +#include <sys/malloc.h> +#include <sys/kernel.h> +#include <sys/socket.h> + +#include <net/if.h> +#include <net/if_arp.h> +#include <net/ethernet.h> +#include <net/if_dl.h> + +#include <net/bpf.h> + +#include <machine/clock.h> /* for DELAY */ +#include <sys/bus.h> + +#include <dev/usb/usb.h> +#include <dev/usb/usbdi.h> +#include <dev/usb/usbdi_util.h> +#include <dev/usb/usbdivar.h> +#include <dev/usb/usbdevs.h> +#include <dev/usb/usb_quirks.h> +#include <dev/usb/usb_ethersubr.h> + +#include <dev/usb/if_cuereg.h> + +#ifndef lint +static const char rcsid[] = + "$FreeBSD$"; +#endif + +/* + * Various supported device vendors/types and their names. + */ +static struct cue_type cue_devs[] = { + { USB_VENDOR_CATC, USB_PRODUCT_CATC_NETMATE, + "CATC Netmate USB Ethernet" }, + { USB_VENDOR_CATC, USB_PRODUCT_CATC_NETMATE2, + "CATC Netmate USB Ethernet" }, + { 0, 0, NULL } +}; + +static struct usb_qdat cue_qdat; + +static int cue_match __P((device_t)); +static int cue_attach __P((device_t)); +static int cue_detach __P((device_t)); + +static int cue_tx_list_init __P((struct cue_softc *)); +static int cue_rx_list_init __P((struct cue_softc *)); +static int cue_newbuf __P((struct cue_softc *, struct cue_chain *, + struct mbuf *)); +static int cue_encap __P((struct cue_softc *, struct mbuf *, int)); +static void cue_rxeof __P((usbd_xfer_handle, + usbd_private_handle, usbd_status)); +static void cue_txeof __P((usbd_xfer_handle, + usbd_private_handle, usbd_status)); +static void cue_tick __P((void *)); +static void cue_rxstart __P((struct ifnet *)); +static void cue_start __P((struct ifnet *)); +static int cue_ioctl __P((struct ifnet *, u_long, caddr_t)); +static void cue_init __P((void *)); +static void cue_stop __P((struct cue_softc *)); +static void cue_watchdog __P((struct ifnet *)); +static void cue_shutdown __P((device_t)); + +static void cue_setmulti __P((struct cue_softc *)); +static u_int32_t cue_crc __P((caddr_t)); +static void cue_reset __P((struct cue_softc *)); + +static int csr_read_1 __P((struct cue_softc *, int)); +static int csr_write_1 __P((struct cue_softc *, int, int)); +static int csr_read_2 __P((struct cue_softc *, int)); +#ifdef notdef +static int csr_write_2 __P((struct cue_softc *, int, int)); +#endif +static int cue_mem __P((struct cue_softc *, int, + int, void *, int)); +static int cue_getmac __P((struct cue_softc *, void *)); + +static device_method_t cue_methods[] = { + /* Device interface */ + DEVMETHOD(device_probe, cue_match), + DEVMETHOD(device_attach, cue_attach), + DEVMETHOD(device_detach, cue_detach), + DEVMETHOD(device_shutdown, cue_shutdown), + + { 0, 0 } +}; + +static driver_t cue_driver = { + "cue", + cue_methods, + sizeof(struct cue_softc) +}; + +static devclass_t cue_devclass; + +DRIVER_MODULE(if_cue, uhub, cue_driver, cue_devclass, usbd_driver_load, 0); + +#define CUE_SETBIT(sc, reg, x) \ + csr_write_1(sc, reg, csr_read_1(sc, reg) | (x)) + +#define CUE_CLRBIT(sc, reg, x) \ + csr_write_1(sc, reg, csr_read_1(sc, reg) & ~(x)) + +static int csr_read_1(sc, reg) + struct cue_softc *sc; + int reg; +{ + usb_device_request_t req; + usbd_status err; + u_int8_t val = 0; + int s; + + s = splusb(); + + req.bmRequestType = UT_READ_VENDOR_DEVICE; + req.bRequest = CUE_CMD_READREG; + USETW(req.wValue, 0); + USETW(req.wIndex, reg); + USETW(req.wLength, 1); + + err = usbd_do_request(sc->cue_udev, &req, &val); + + splx(s); + + if (err) + return(0); + + return(val); +} + +static int csr_read_2(sc, reg) + struct cue_softc *sc; + int reg; +{ + usb_device_request_t req; + usbd_status err; + u_int16_t val = 0; + int s; + + s = splusb(); + + req.bmRequestType = UT_READ_VENDOR_DEVICE; + req.bRequest = CUE_CMD_READREG; + USETW(req.wValue, 0); + USETW(req.wIndex, reg); + USETW(req.wLength, 2); + + err = usbd_do_request(sc->cue_udev, &req, &val); + + splx(s); + + if (err) + return(0); + + return(val); +} + +static int csr_write_1(sc, reg, val) + struct cue_softc *sc; + int reg, val; +{ + usb_device_request_t req; + usbd_status err; + int s; + + s = splusb(); + + req.bmRequestType = UT_WRITE_VENDOR_DEVICE; + req.bRequest = CUE_CMD_WRITEREG; + USETW(req.wValue, val); + USETW(req.wIndex, reg); + USETW(req.wLength, 0); + + err = usbd_do_request(sc->cue_udev, &req, NULL); + + splx(s); + + if (err) + return(-1); + + return(0); +} + +#ifdef notdef +static int csr_write_2(sc, reg, val) + struct cue_softc *sc; + int reg, val; +{ + usb_device_request_t req; + usbd_status err; + int s; + + s = splusb(); + + req.bmRequestType = UT_WRITE_VENDOR_DEVICE; + req.bRequest = CUE_CMD_WRITEREG; + USETW(req.wValue, val); + USETW(req.wIndex, reg); + USETW(req.wLength, 0); + + err = usbd_do_request(sc->cue_udev, &req, NULL); + + splx(s); + + if (err) + return(-1); + + return(0); +} +#endif + +static int cue_mem(sc, cmd, addr, buf, len) + struct cue_softc *sc; + int cmd; + int addr; + void *buf; + int len; +{ + usb_device_request_t req; + usbd_status err; + int s; + + s = splusb(); + + if (cmd == CUE_CMD_READSRAM) + req.bmRequestType = UT_READ_VENDOR_DEVICE; + else + req.bmRequestType = UT_WRITE_VENDOR_DEVICE; + req.bRequest = cmd; + USETW(req.wValue, 0); + USETW(req.wIndex, addr); + USETW(req.wLength, len); + + err = usbd_do_request(sc->cue_udev, &req, buf); + + splx(s); + + if (err) + return(-1); + + return(0); +} + +static int cue_getmac(sc, buf) + struct cue_softc *sc; + void *buf; +{ + usb_device_request_t req; + usbd_status err; + int s; + + s = splusb(); + + req.bmRequestType = UT_READ_VENDOR_DEVICE; + req.bRequest = CUE_CMD_GET_MACADDR; + USETW(req.wValue, 0); + USETW(req.wIndex, 0); + USETW(req.wLength, ETHER_ADDR_LEN); + + err = usbd_do_request(sc->cue_udev, &req, buf); + + splx(s); + + if (err) { + printf("cue%d: read MAC address failed\n", sc->cue_unit); + return(-1); + } + + return(0); +} + +#define CUE_POLY 0xEDB88320 +#define CUE_BITS 9 + +static u_int32_t cue_crc(addr) + caddr_t addr; +{ + u_int32_t idx, bit, data, crc; + + /* Compute CRC for the address value. */ + crc = 0xFFFFFFFF; /* initial value */ + + for (idx = 0; idx < 6; idx++) { + for (data = *addr++, bit = 0; bit < 8; bit++, data >>= 1) + crc = (crc >> 1) ^ (((crc ^ data) & 1) ? CUE_POLY : 0); + } + + return (crc & ((1 << CUE_BITS) - 1)); +} + +static void cue_setmulti(sc) + struct cue_softc *sc; +{ + struct ifnet *ifp; + struct ifmultiaddr *ifma; + u_int32_t h = 0, i; + + ifp = &sc->arpcom.ac_if; + + if (ifp->if_flags & IFF_ALLMULTI || ifp->if_flags & IFF_PROMISC) { + for (i = 0; i < CUE_MCAST_TABLE_LEN; i++) + sc->cue_mctab[i] = 0xFF; + cue_mem(sc, CUE_CMD_WRITESRAM, CUE_MCAST_TABLE_ADDR, + &sc->cue_mctab, CUE_MCAST_TABLE_LEN); + return; + } + + /* first, zot all the existing hash bits */ + for (i = 0; i < CUE_MCAST_TABLE_LEN; i++) + sc->cue_mctab[i] = 0; + + /* now program new ones */ + for (ifma = ifp->if_multiaddrs.lh_first; ifma != NULL; + ifma = ifma->ifma_link.le_next) { + if (ifma->ifma_addr->sa_family != AF_LINK) + continue; + h = cue_crc(LLADDR((struct sockaddr_dl *)ifma->ifma_addr)); + sc->cue_mctab[h >> 3] |= 1 << (h & 0xF); + } + + /* + * Also include the broadcast address in the filter + * so we can receive broadcast frames. + */ + h = cue_crc(etherbroadcastaddr); + sc->cue_mctab[h >> 4] |= 1 << (h & 0xF); + + cue_mem(sc, CUE_CMD_WRITESRAM, CUE_MCAST_TABLE_ADDR, + &sc->cue_mctab, CUE_MCAST_TABLE_LEN); + + return; +} + +static void cue_reset(sc) + struct cue_softc *sc; +{ + usb_device_request_t req; + usbd_status err; + int s; + + s = splusb(); + + req.bmRequestType = UT_WRITE_VENDOR_DEVICE; + req.bRequest = CUE_CMD_RESET; + USETW(req.wValue, 0); + USETW(req.wIndex, 0); + USETW(req.wLength, 0); + err = usbd_do_request(sc->cue_udev, &req, NULL); + + splx(s); + + if (err) + printf("cue%d: reset failed\n", sc->cue_unit); + + /* Wait a little while for the chip to get its brains in order. */ + DELAY(1000); + return; +} + +/* + * Probe for a Pegasus chip. + */ +USB_MATCH(cue) +{ + USB_MATCH_START(cue, uaa); + struct cue_type *t; + usb_device_descriptor_t *dd; + + if (!uaa->iface) + return(UMATCH_NONE); + + dd = &uaa->device->ddesc; + + t = cue_devs; + while(t->cue_name != NULL) { + if (uaa->vendor == t->cue_vid && + uaa->product == t->cue_did) { + USETW(dd->bcdDevice, 0x220); + uaa->device->quirks = usbd_find_quirk(dd); + device_set_desc(self, t->cue_name); + return(UMATCH_VENDOR_PRODUCT); + } + t++; + } + + return(UMATCH_NONE); +} + +/* + * Attach the interface. Allocate softc structures, do ifmedia + * setup and ethernet/BPF attach. + */ +USB_ATTACH(cue) +{ + USB_ATTACH_START(cue, sc, uaa); + char devinfo[1024]; + int s; + u_char eaddr[ETHER_ADDR_LEN]; + struct ifnet *ifp; + usb_interface_descriptor_t *id; + usb_endpoint_descriptor_t *ed; + int i; + + s = splimp(); + + bzero(sc, sizeof(struct cue_softc)); + sc->cue_iface = uaa->iface; + sc->cue_udev = uaa->device; + sc->cue_unit = device_get_unit(self); + + id = usbd_get_interface_descriptor(uaa->iface); + + usbd_devinfo(uaa->device, 0, devinfo); + device_set_desc_copy(self, devinfo); + printf("%s: %s\n", USBDEVNAME(self), devinfo); + + /* Find endpoints. */ + for (i = 0; i < id->bNumEndpoints; i++) { + ed = usbd_interface2endpoint_descriptor(uaa->iface, i); + if (!ed) { + printf("cue%d: couldn't get ep %d\n", + sc->cue_unit, i); + splx(s); + USB_ATTACH_ERROR_RETURN; + } + if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_IN && + (ed->bmAttributes & UE_XFERTYPE) == UE_BULK) { + sc->cue_ed[CUE_ENDPT_RX] = ed->bEndpointAddress; + } else if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_OUT && + (ed->bmAttributes & UE_XFERTYPE) == UE_BULK) { + sc->cue_ed[CUE_ENDPT_TX] = ed->bEndpointAddress; + } else if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_IN && + (ed->bmAttributes & UE_XFERTYPE) == UE_INTERRUPT) { + sc->cue_ed[CUE_ENDPT_INTR] = ed->bEndpointAddress; + } + } +#ifdef foo + /* Reset the adapter. */ + cue_reset(sc); + printf("reset...\n"); +#endif + /* + * Get station address. + */ + cue_getmac(sc, &eaddr); + + /* + * A CATC chip was detected. Inform the world. + */ + printf("cue%d: Ethernet address: %6D\n", sc->cue_unit, eaddr, ":"); + + bcopy(eaddr, (char *)&sc->arpcom.ac_enaddr, ETHER_ADDR_LEN); + + ifp = &sc->arpcom.ac_if; + ifp->if_softc = sc; + ifp->if_unit = sc->cue_unit; + ifp->if_name = "cue"; + ifp->if_mtu = ETHERMTU; + ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; + ifp->if_ioctl = cue_ioctl; + ifp->if_output = ether_output; + ifp->if_start = cue_start; + ifp->if_watchdog = cue_watchdog; + ifp->if_init = cue_init; + ifp->if_baudrate = 10000000; + ifp->if_snd.ifq_maxlen = IFQ_MAXLEN; + + cue_qdat.ifp = ifp; + cue_qdat.if_rxstart = cue_rxstart; + + /* + * Call MI attach routines. + */ + if_attach(ifp); + ether_ifattach(ifp); + callout_handle_init(&sc->cue_stat_ch); + bpfattach(ifp, DLT_EN10MB, sizeof(struct ether_header)); + usb_register_netisr(); + + splx(s); + USB_ATTACH_SUCCESS_RETURN; +} + +static int cue_detach(dev) + device_t dev; +{ + struct cue_softc *sc; + struct ifnet *ifp; + int s; + + s = splusb(); + + sc = device_get_softc(dev); + ifp = &sc->arpcom.ac_if; + + untimeout(cue_tick, sc, sc->cue_stat_ch); + if_detach(ifp); + + if (sc->cue_ep[CUE_ENDPT_TX] != NULL) + usbd_abort_pipe(sc->cue_ep[CUE_ENDPT_TX]); + if (sc->cue_ep[CUE_ENDPT_RX] != NULL) + usbd_abort_pipe(sc->cue_ep[CUE_ENDPT_RX]); + if (sc->cue_ep[CUE_ENDPT_INTR] != NULL) + usbd_abort_pipe(sc->cue_ep[CUE_ENDPT_INTR]); + + splx(s); + + return(0); +} + +/* + * Initialize an RX descriptor and attach an MBUF cluster. + */ +static int cue_newbuf(sc, c, m) + struct cue_softc *sc; + struct cue_chain *c; + struct mbuf *m; +{ + struct mbuf *m_new = NULL; + + if (m == NULL) { + MGETHDR(m_new, M_DONTWAIT, MT_DATA); + if (m_new == NULL) { + printf("cue%d: no memory for rx list " + "-- packet dropped!\n", sc->cue_unit); + return(ENOBUFS); + } + + MCLGET(m_new, M_DONTWAIT); + if (!(m_new->m_flags & M_EXT)) { + printf("cue%d: no memory for rx list " + "-- packet dropped!\n", sc->cue_unit); + m_freem(m_new); + return(ENOBUFS); + } + m_new->m_len = m_new->m_pkthdr.len = MCLBYTES; + } else { + m_new = m; + m_new->m_len = m_new->m_pkthdr.len = MCLBYTES; + m_new->m_data = m_new->m_ext.ext_buf; + } + + m_adj(m_new, ETHER_ALIGN); + c->cue_mbuf = m_new; + + return(0); +} + +static int cue_rx_list_init(sc) + struct cue_softc *sc; +{ + struct cue_cdata *cd; + struct cue_chain *c; + int i; + + cd = &sc->cue_cdata; + for (i = 0; i < CUE_RX_LIST_CNT; i++) { + c = &cd->cue_rx_chain[i]; + c->cue_sc = sc; + c->cue_idx = i; + c->cue_accum = 0; + if (cue_newbuf(sc, c, NULL) == ENOBUFS) + return(ENOBUFS); + if (c->cue_xfer == NULL) { + c->cue_xfer = usbd_alloc_xfer(sc->cue_udev); + if (c->cue_xfer == NULL) + return(ENOBUFS); + } + } + + return(0); +} + +static int cue_tx_list_init(sc) + struct cue_softc *sc; +{ + struct cue_cdata *cd; + struct cue_chain *c; + int i; + + cd = &sc->cue_cdata; + for (i = 0; i < CUE_TX_LIST_CNT; i++) { + c = &cd->cue_tx_chain[i]; + c->cue_sc = sc; + c->cue_idx = i; + c->cue_mbuf = NULL; + if (c->cue_xfer == NULL) { + c->cue_xfer = usbd_alloc_xfer(sc->cue_udev); + if (c->cue_xfer == NULL) + return(ENOBUFS); + } + c->cue_buf = malloc(CUE_BUFSZ, M_USBDEV, M_NOWAIT); + if (c->cue_buf == NULL) + return(ENOBUFS); + } + + return(0); +} + +static void cue_rxstart(ifp) + struct ifnet *ifp; +{ + struct cue_softc *sc; + struct cue_chain *c; + + sc = ifp->if_softc; + c = &sc->cue_cdata.cue_rx_chain[sc->cue_cdata.cue_rx_prod]; + + if (cue_newbuf(sc, c, NULL) == ENOBUFS) { + ifp->if_ierrors++; + return; + } + + /* Setup new transfer. */ + usbd_setup_xfer(c->cue_xfer, sc->cue_ep[CUE_ENDPT_RX], + c, mtod(c->cue_mbuf, char *), CUE_CUTOFF, USBD_SHORT_XFER_OK, + USBD_NO_TIMEOUT, cue_rxeof); + usbd_transfer(c->cue_xfer); + + return; +} + +/* + * A frame has been uploaded: pass the resulting mbuf chain up to + * the higher level protocols. + */ +static void cue_rxeof(xfer, priv, status) + usbd_xfer_handle xfer; + usbd_private_handle priv; + usbd_status status; +{ + struct cue_softc *sc; + struct cue_chain *c; + struct mbuf *m; + struct ifnet *ifp; + int total_len = 0; + u_int16_t len; + + c = priv; + sc = c->cue_sc; + ifp = &sc->arpcom.ac_if; + + if (!(ifp->if_flags & IFF_RUNNING)) + return; + + if (status != USBD_NORMAL_COMPLETION) { + if (status == USBD_NOT_STARTED || status == USBD_CANCELLED) + return; + printf("cue%d: usb error on rx: %s\n", sc->cue_unit, + usbd_errstr(status)); + if (status == USBD_STALLED) + usbd_clear_endpoint_stall(sc->cue_ep[CUE_ENDPT_RX]); + goto done; + } + + usbd_get_xfer_status(xfer, NULL, NULL, &total_len, NULL); + + /* + * See if we've already accumulated some data from + * a previous transfer. + */ + if (c->cue_accum) { + total_len += c->cue_accum; + c->cue_accum = 0; + } + + m = c->cue_mbuf; + len = *mtod(m, u_int16_t *); + + /* + * Check to see if this is just the first chunk of a + * split transfer. We really need a more reliable way + * to detect this. + */ + if (len != total_len && total_len == CUE_CUTOFF) { + c->cue_accum = CUE_CUTOFF; + usbd_setup_xfer(xfer, sc->cue_ep[CUE_ENDPT_RX], + c, mtod(c->cue_mbuf, char *) + CUE_CUTOFF, + CUE_CUTOFF, USBD_SHORT_XFER_OK, + USBD_NO_TIMEOUT, cue_rxeof); + usbd_transfer(xfer); + return; + } + + /* No errors; receive the packet. */ + total_len = len; + + if (len < sizeof(struct ether_header)) { + ifp->if_ierrors++; + goto done; + } + + ifp->if_ipackets++; + m_adj(m, sizeof(u_int16_t)); + m->m_pkthdr.rcvif = (struct ifnet *)&cue_qdat; + m->m_pkthdr.len = m->m_len = total_len; + + /* Put the packet on the special USB input queue. */ + usb_ether_input(m); + + return; +done: + /* Setup new transfer. */ + usbd_setup_xfer(c->cue_xfer, sc->cue_ep[CUE_ENDPT_RX], + c, mtod(c->cue_mbuf, char *), CUE_CUTOFF, USBD_SHORT_XFER_OK, + USBD_NO_TIMEOUT, cue_rxeof); + usbd_transfer(c->cue_xfer); + + return; +} + +/* + * A frame was downloaded to the chip. It's safe for us to clean up + * the list buffers. + */ + +static void cue_txeof(xfer, priv, status) + usbd_xfer_handle xfer; + usbd_private_handle priv; + usbd_status status; +{ + struct cue_softc *sc; + struct cue_chain *c; + struct ifnet *ifp; + usbd_status err; + int s; + + s = splimp(); + + c = priv; + sc = c->cue_sc; + ifp = &sc->arpcom.ac_if; + + if (status != USBD_NORMAL_COMPLETION) { + if (status == USBD_NOT_STARTED || status == USBD_CANCELLED) { + splx(s); + return; + } + printf("cue%d: usb error on tx: %s\n", sc->cue_unit, + usbd_errstr(status)); +#ifdef foo + if (status == USBD_STALLED) + usbd_clear_endpoint_stall(sc->cue_ep[CUE_ENDPT_TX]); +#endif + splx(s); + return; + } + + ifp->if_timer = 0; + ifp->if_flags &= ~IFF_OACTIVE; + usbd_get_xfer_status(c->cue_xfer, NULL, NULL, NULL, &err); + + c->cue_mbuf->m_pkthdr.rcvif = ifp; + usb_tx_done(c->cue_mbuf); + c->cue_mbuf = NULL; + + if (err) + ifp->if_oerrors++; + else + ifp->if_opackets++; + + splx(s); + + return; +} + +static void cue_tick(xsc) + void *xsc; +{ + struct cue_softc *sc; + struct ifnet *ifp; + int s; + + s = splimp(); + + sc = xsc; + + if (sc == NULL) { + splx(s); + return; + } + + ifp = &sc->arpcom.ac_if; + + ifp->if_collisions += csr_read_2(sc, CUE_TX_SINGLECOLL); + ifp->if_collisions += csr_read_2(sc, CUE_TX_MULTICOLL); + ifp->if_collisions += csr_read_2(sc, CUE_TX_EXCESSCOLL); + + if (csr_read_2(sc, CUE_RX_FRAMEERR)) + ifp->if_ierrors++; + + sc->cue_stat_ch = timeout(cue_tick, sc, hz); + + splx(s); + + return; +} + +static int cue_encap(sc, m, idx) + struct cue_softc *sc; + struct mbuf *m; + int idx; +{ + int total_len; + struct cue_chain *c; + usbd_status err; + + c = &sc->cue_cdata.cue_tx_chain[idx]; + + /* + * Copy the mbuf data into a contiguous buffer, leaving two + * bytes at the beginning to hold the frame length. + */ + m_copydata(m, 0, m->m_pkthdr.len, c->cue_buf + 2); + c->cue_mbuf = m; + + total_len = m->m_pkthdr.len + 2; +#ifdef foo + total_len += 64 - (total_len % 64); +#endif + /* The first two bytes are the frame length */ + c->cue_buf[0] = (u_int8_t)m->m_pkthdr.len; + c->cue_buf[1] = (u_int8_t)(m->m_pkthdr.len >> 8); + + usbd_setup_xfer(c->cue_xfer, sc->cue_ep[CUE_ENDPT_TX], + c, c->cue_buf, total_len, 0, 10000, cue_txeof); + + /* Transmit */ + err = usbd_transfer(c->cue_xfer); + if (err != USBD_IN_PROGRESS) { + cue_stop(sc); + return(EIO); + } + + sc->cue_cdata.cue_tx_cnt++; + + return(0); +} + +static void cue_start(ifp) + struct ifnet *ifp; +{ + struct cue_softc *sc; + struct mbuf *m_head = NULL; + + sc = ifp->if_softc; + + if (ifp->if_flags & IFF_OACTIVE) + return; + + IF_DEQUEUE(&ifp->if_snd, m_head); + if (m_head == NULL) + return; + + if (cue_encap(sc, m_head, 0)) { + IF_PREPEND(&ifp->if_snd, m_head); + ifp->if_flags |= IFF_OACTIVE; + return; + } + + /* + * If there's a BPF listener, bounce a copy of this frame + * to him. + */ + if (ifp->if_bpf) + bpf_mtap(ifp, m_head); + + ifp->if_flags |= IFF_OACTIVE; + + /* + * Set a timeout in case the chip goes out to lunch. + */ + ifp->if_timer = 5; + + return; +} + +static void cue_init(xsc) + void *xsc; +{ + struct cue_softc *sc = xsc; + struct ifnet *ifp = &sc->arpcom.ac_if; + struct cue_chain *c; + usbd_status err; + int i, s; + + if (ifp->if_flags & IFF_RUNNING) + return; + + s = splimp(); + + /* + * Cancel pending I/O and free all RX/TX buffers. + */ +#ifdef foo + cue_reset(sc); +#endif + + /* Set MAC address */ + for (i = 0; i < ETHER_ADDR_LEN; i++) + csr_write_1(sc, CUE_PAR0 - i, sc->arpcom.ac_enaddr[i]); + + /* Enable RX logic. */ + csr_write_1(sc, CUE_ETHCTL, CUE_ETHCTL_RX_ON|CUE_ETHCTL_MCAST_ON); + + /* If we want promiscuous mode, set the allframes bit. */ + if (ifp->if_flags & IFF_PROMISC) { + CUE_SETBIT(sc, CUE_ETHCTL, CUE_ETHCTL_PROMISC); + } else { + CUE_CLRBIT(sc, CUE_ETHCTL, CUE_ETHCTL_PROMISC); + } + + /* Init TX ring. */ + if (cue_tx_list_init(sc) == ENOBUFS) { + printf("cue%d: tx list init failed\n", sc->cue_unit); + splx(s); + return; + } + + /* Init RX ring. */ + if (cue_rx_list_init(sc) == ENOBUFS) { + printf("cue%d: rx list init failed\n", sc->cue_unit); + splx(s); + return; + } + + /* Load the multicast filter. */ + cue_setmulti(sc); + + /* + * Set the number of RX and TX buffers that we want + * to reserve inside the ASIC. + */ + csr_write_1(sc, CUE_RX_BUFPKTS, CUE_RX_FRAMES); + csr_write_1(sc, CUE_TX_BUFPKTS, CUE_TX_FRAMES); + + /* Set advanced operation modes. */ + csr_write_1(sc, CUE_ADVANCED_OPMODES, + CUE_AOP_EMBED_RXLEN|0x01); /* 1 wait state */ + + /* Program the LED operation. */ + csr_write_1(sc, CUE_LEDCTL, CUE_LEDCTL_FOLLOW_LINK); + + /* Open RX and TX pipes. */ + err = usbd_open_pipe(sc->cue_iface, sc->cue_ed[CUE_ENDPT_RX], + USBD_EXCLUSIVE_USE, &sc->cue_ep[CUE_ENDPT_RX]); + if (err) { + printf("cue%d: open rx pipe failed: %s\n", + sc->cue_unit, usbd_errstr(err)); + splx(s); + return; + } + err = usbd_open_pipe(sc->cue_iface, sc->cue_ed[CUE_ENDPT_TX], + USBD_EXCLUSIVE_USE, &sc->cue_ep[CUE_ENDPT_TX]); + if (err) { + printf("cue%d: open tx pipe failed: %s\n", + sc->cue_unit, usbd_errstr(err)); + splx(s); + return; + } + + /* Start up the receive pipe. */ + for (i = 0; i < CUE_RX_LIST_CNT; i++) { + c = &sc->cue_cdata.cue_rx_chain[i]; + usbd_setup_xfer(c->cue_xfer, sc->cue_ep[CUE_ENDPT_RX], + c, mtod(c->cue_mbuf, char *), CUE_CUTOFF, + USBD_SHORT_XFER_OK, USBD_NO_TIMEOUT, cue_rxeof); + usbd_transfer(c->cue_xfer); + } + + ifp->if_flags |= IFF_RUNNING; + ifp->if_flags &= ~IFF_OACTIVE; + + (void)splx(s); + + sc->cue_stat_ch = timeout(cue_tick, sc, hz); + + return; +} + +static int cue_ioctl(ifp, command, data) + struct ifnet *ifp; + u_long command; + caddr_t data; +{ + struct cue_softc *sc = ifp->if_softc; + int s, error = 0; + + s = splimp(); + + switch(command) { + case SIOCSIFADDR: + case SIOCGIFADDR: + case SIOCSIFMTU: + error = ether_ioctl(ifp, command, data); + break; + case SIOCSIFFLAGS: + if (ifp->if_flags & IFF_UP) { + if (ifp->if_flags & IFF_RUNNING && + ifp->if_flags & IFF_PROMISC && + !(sc->cue_if_flags & IFF_PROMISC)) { + CUE_SETBIT(sc, CUE_ETHCTL, CUE_ETHCTL_PROMISC); + cue_setmulti(sc); + } else if (ifp->if_flags & IFF_RUNNING && + !(ifp->if_flags & IFF_PROMISC) && + sc->cue_if_flags & IFF_PROMISC) { + CUE_CLRBIT(sc, CUE_ETHCTL, CUE_ETHCTL_PROMISC); + cue_setmulti(sc); + } else if (!(ifp->if_flags & IFF_RUNNING)) + cue_init(sc); + } else { + if (ifp->if_flags & IFF_RUNNING) + cue_stop(sc); + } + sc->cue_if_flags = ifp->if_flags; + error = 0; + break; + case SIOCADDMULTI: + case SIOCDELMULTI: + cue_setmulti(sc); + error = 0; + break; + default: + error = EINVAL; + break; + } + + (void)splx(s); + + return(error); +} + +static void cue_watchdog(ifp) + struct ifnet *ifp; +{ + struct cue_softc *sc; + + sc = ifp->if_softc; + + ifp->if_oerrors++; + printf("cue%d: watchdog timeout\n", sc->cue_unit); + + /* + * The polling business is a kludge to avoid allowing the + * USB code to call tsleep() in usbd_delay_ms(), which will + * kill us since the watchdog routine is invoked from + * interrupt context. + */ + sc->cue_udev->bus->use_polling++; + cue_stop(sc); + cue_init(sc); + sc->cue_udev->bus->use_polling--; + + if (ifp->if_snd.ifq_head != NULL) + cue_start(ifp); + + return; +} + +/* + * Stop the adapter and free any mbufs allocated to the + * RX and TX lists. + */ +static void cue_stop(sc) + struct cue_softc *sc; +{ + usbd_status err; + struct ifnet *ifp; + int i; + + ifp = &sc->arpcom.ac_if; + ifp->if_timer = 0; + + csr_write_1(sc, CUE_ETHCTL, 0); + cue_reset(sc); + untimeout(cue_tick, sc, sc->cue_stat_ch); + + /* Stop transfers. */ + if (sc->cue_ep[CUE_ENDPT_RX] != NULL) { + err = usbd_abort_pipe(sc->cue_ep[CUE_ENDPT_RX]); + if (err) { + printf("cue%d: abort rx pipe failed: %s\n", + sc->cue_unit, usbd_errstr(err)); + } + err = usbd_close_pipe(sc->cue_ep[CUE_ENDPT_RX]); + if (err) { + printf("cue%d: close rx pipe failed: %s\n", + sc->cue_unit, usbd_errstr(err)); + } + sc->cue_ep[CUE_ENDPT_RX] = NULL; + } + + if (sc->cue_ep[CUE_ENDPT_TX] != NULL) { + err = usbd_abort_pipe(sc->cue_ep[CUE_ENDPT_TX]); + if (err) { + printf("cue%d: abort tx pipe failed: %s\n", + sc->cue_unit, usbd_errstr(err)); + } + err = usbd_close_pipe(sc->cue_ep[CUE_ENDPT_TX]); + if (err) { + printf("cue%d: close tx pipe failed: %s\n", + sc->cue_unit, usbd_errstr(err)); + } + sc->cue_ep[CUE_ENDPT_TX] = NULL; + } + + if (sc->cue_ep[CUE_ENDPT_INTR] != NULL) { + err = usbd_abort_pipe(sc->cue_ep[CUE_ENDPT_INTR]); + if (err) { + printf("cue%d: abort intr pipe failed: %s\n", + sc->cue_unit, usbd_errstr(err)); + } + err = usbd_close_pipe(sc->cue_ep[CUE_ENDPT_INTR]); + if (err) { + printf("cue%d: close intr pipe failed: %s\n", + sc->cue_unit, usbd_errstr(err)); + } + sc->cue_ep[CUE_ENDPT_INTR] = NULL; + } + + /* Free RX resources. */ + for (i = 0; i < CUE_RX_LIST_CNT; i++) { + if (sc->cue_cdata.cue_rx_chain[i].cue_buf != NULL) { + free(sc->cue_cdata.cue_rx_chain[i].cue_buf, M_USBDEV); + sc->cue_cdata.cue_rx_chain[i].cue_buf = NULL; + } + if (sc->cue_cdata.cue_rx_chain[i].cue_mbuf != NULL) { + m_freem(sc->cue_cdata.cue_rx_chain[i].cue_mbuf); + sc->cue_cdata.cue_rx_chain[i].cue_mbuf = NULL; + } + if (sc->cue_cdata.cue_rx_chain[i].cue_xfer != NULL) { + usbd_free_xfer(sc->cue_cdata.cue_rx_chain[i].cue_xfer); + sc->cue_cdata.cue_rx_chain[i].cue_xfer = NULL; + } + } + + /* Free TX resources. */ + for (i = 0; i < CUE_TX_LIST_CNT; i++) { + if (sc->cue_cdata.cue_tx_chain[i].cue_buf != NULL) { + free(sc->cue_cdata.cue_tx_chain[i].cue_buf, M_USBDEV); + sc->cue_cdata.cue_tx_chain[i].cue_buf = NULL; + } + if (sc->cue_cdata.cue_tx_chain[i].cue_mbuf != NULL) { + m_freem(sc->cue_cdata.cue_tx_chain[i].cue_mbuf); + sc->cue_cdata.cue_tx_chain[i].cue_mbuf = NULL; + } + if (sc->cue_cdata.cue_tx_chain[i].cue_xfer != NULL) { + usbd_free_xfer(sc->cue_cdata.cue_tx_chain[i].cue_xfer); + sc->cue_cdata.cue_tx_chain[i].cue_xfer = NULL; + } + } + + ifp->if_flags &= ~(IFF_RUNNING | IFF_OACTIVE); + + return; +} + +/* + * Stop all chip I/O so that the kernel's probe routines don't + * get confused by errant DMAs when rebooting. + */ +static void cue_shutdown(dev) + device_t dev; +{ + struct cue_softc *sc; + + sc = device_get_softc(dev); + + cue_reset(sc); + cue_stop(sc); + + return; +} diff --git a/sys/dev/usb/if_cuereg.h b/sys/dev/usb/if_cuereg.h new file mode 100644 index 0000000..346cdb5 --- /dev/null +++ b/sys/dev/usb/if_cuereg.h @@ -0,0 +1,181 @@ +/* + * Copyright (c) 1997, 1998, 1999, 2000 + * Bill Paul <wpaul@ee.columbia.edu>. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by Bill Paul. + * 4. Neither the name of the author nor the names of any co-contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY Bill Paul AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL Bill Paul OR THE VOICES IN HIS HEAD + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF + * THE POSSIBILITY OF SUCH DAMAGE. + * + * $FreeBSD$ + */ + +/* + * Definitions for the CATC Netmate II USB to ethernet controller. + */ + + +/* + * Vendor specific control commands. + */ +#define CUE_CMD_RESET 0xF4 +#define CUE_CMD_GET_MACADDR 0xF2 +#define CUE_CMD_WRITEREG 0xFA +#define CUE_CMD_READREG 0xFB +#define CUE_CMD_READSRAM 0xF1 +#define CUE_CMD_WRITESRAM 0xFC + +/* + * Internal registers + */ +#define CUE_TX_BUFCNT 0x20 +#define CUE_RX_BUFCNT 0x21 +#define CUE_ADVANCED_OPMODES 0x22 +#define CUE_TX_BUFPKTS 0x23 +#define CUE_RX_BUFPKTS 0x24 +#define CUE_RX_MAXCHAIN 0x25 + +#define CUE_ETHCTL 0x60 +#define CUE_ETHSTS 0x61 +#define CUE_PAR5 0x62 +#define CUE_PAR4 0x63 +#define CUE_PAR3 0x64 +#define CUE_PAR2 0x65 +#define CUE_PAR1 0x66 +#define CUE_PAR0 0x67 + +/* Error counters, all 16 bits wide. */ +#define CUE_TX_SINGLECOLL 0x69 +#define CUE_TX_MULTICOLL 0x6B +#define CUE_TX_EXCESSCOLL 0x6D +#define CUE_RX_FRAMEERR 0x6F + +#define CUE_LEDCTL 0x81 + +/* Advenced operating mode register */ +#define CUE_AOP_SRAMWAITS 0x03 +#define CUE_AOP_EMBED_RXLEN 0x08 +#define CUE_AOP_RXCOMBINE 0x10 +#define CUE_AOP_TXCOMBINE 0x20 +#define CUE_AOP_EVEN_PKT_READS 0x40 +#define CUE_AOP_LOOPBK 0x80 + +/* Ethernet control register */ +#define CUE_ETHCTL_RX_ON 0x01 +#define CUE_ETHCTL_LINK_POLARITY 0x02 +#define CUE_ETHCTL_LINK_FORCE_OK 0x04 +#define CUE_ETHCTL_MCAST_ON 0x08 +#define CUE_ETHCTL_PROMISC 0x10 + +/* Ethernet status register */ +#define CUE_ETHSTS_NO_CARRIER 0x01 +#define CUE_ETHSTS_LATECOLL 0x02 +#define CUE_ETHSTS_EXCESSCOLL 0x04 +#define CUE_ETHSTS_TXBUF_AVAIL 0x08 +#define CUE_ETHSTS_BAD_POLARITY 0x10 +#define CUE_ETHSTS_LINK_OK 0x20 + +/* LED control register */ +#define CUE_LEDCTL_BLINK_1X 0x00 +#define CUE_LEDCTL_BLINK_2X 0x01 +#define CUE_LEDCTL_BLINK_QUARTER_ON 0x02 +#define CUE_LEDCTL_BLINK_QUARTER_OFF 0x03 +#define CUE_LEDCTL_OFF 0x04 +#define CUE_LEDCTL_FOLLOW_LINK 0x08 + +/* + * Address in ASIC's internal SRAM where the + * multicast hash table lives. The table is 64 bytes long, + * giving us a 512-bit table. We have to set the bit that + * corresponds to the broadcast address in order to enable + * reception of broadcast frames. + */ +#define CUE_MCAST_TABLE_ADDR 0xFA80 +#define CUE_MCAST_TABLE_LEN 64 + +#define CUE_TIMEOUT 1000 +#define ETHER_ALIGN 2 +#define CUE_BUFSZ 1536 +#define CUE_CUTOFF 1088 +#define CUE_MIN_FRAMELEN 60 +#define CUE_RX_FRAMES 10 +#define CUE_TX_FRAMES 10 + +#define CUE_RX_LIST_CNT 1 +#define CUE_TX_LIST_CNT 1 + +#define CUE_CTL_READ 0x01 +#define CUE_CTL_WRITE 0x02 + +/* + * The interrupt endpoint is currently unused + * by the KLSI part. + */ +#define CUE_ENDPT_RX 0x0 +#define CUE_ENDPT_TX 0x1 +#define CUE_ENDPT_INTR 0x2 +#define CUE_ENDPT_MAX 0x3 + +struct cue_type { + u_int16_t cue_vid; + u_int16_t cue_did; + char *cue_name; +}; + +struct cue_softc; + +struct cue_chain { + struct cue_softc *cue_sc; + usbd_xfer_handle cue_xfer; + char *cue_buf; + struct mbuf *cue_mbuf; + int cue_accum; + int cue_idx; +}; + +struct cue_cdata { + struct cue_chain cue_tx_chain[CUE_TX_LIST_CNT]; + struct cue_chain cue_rx_chain[CUE_RX_LIST_CNT]; + int cue_tx_prod; + int cue_tx_cons; + int cue_tx_cnt; + int cue_rx_prod; +}; + +#define CUE_INC(x, y) (x) = (x + 1) % y + +struct cue_softc { + struct arpcom arpcom; + usbd_device_handle cue_udev; + usbd_interface_handle cue_iface; + int cue_ed[CUE_ENDPT_MAX]; + usbd_pipe_handle cue_ep[CUE_ENDPT_MAX]; + int cue_unit; + u_int8_t cue_mctab[CUE_MCAST_TABLE_LEN]; + int cue_if_flags; + u_int16_t cue_rxfilt; + struct cue_cdata cue_cdata; + struct callout_handle cue_stat_ch; +}; diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index ee6713e..b66d11e 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -215,4 +215,5 @@ pseudo-device bpf #Berkeley packet filter #device ums0 # Mouse # USB Ethernet #device aue0 # ADMtek USB ethernet +#device cue0 # CATC USB ethernet #device kue0 # Kawasaki LSI USB ethernet diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT index 3a284bd..1c50f92 100644 --- a/sys/i386/conf/LINT +++ b/sys/i386/conf/LINT @@ -2370,11 +2370,15 @@ device ums0 # eval board. device aue0 # +# CATC USB-EL1201A USB ethernet. Supports the CATC Netmate +# and Netmate II, and the Belkin F5U111. +device cue0 +# # Kawasaki LSI ethernet. Supports the LinkSys USB10T, # Entrega USB-NET-E45, Peracom Ethernet Adapter, the # 3Com 3c19250, the ADS Technologies USB-10BT, the ATen UC10T, -# the Netgear EA101, the D-Link DSB-650, and the SMC 2102USB -# and 2104USB. +# the Netgear EA101, the D-Link DSB-650, the SMC 2102USB +# and 2104USB, and the Corega USB-T. device kue0 # debugging options for the USB subsystem diff --git a/sys/i386/conf/NEWCARD b/sys/i386/conf/NEWCARD index 557874d..13601fc 100644 --- a/sys/i386/conf/NEWCARD +++ b/sys/i386/conf/NEWCARD @@ -223,6 +223,7 @@ pseudo-device bpf #Berkeley packet filter #device umass0 # Disks/Mass storage - Requires scbus and da0 #device ums0 # Mouse #device aue0 # ADMtek USB ethernet +#device cue0 # CATC USB ethernet #device kue0 # Kawasaki LSI USB ethernet options DDB diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index 3a284bd..1c50f92 100644 --- a/sys/i386/conf/NOTES +++ b/sys/i386/conf/NOTES @@ -2370,11 +2370,15 @@ device ums0 # eval board. device aue0 # +# CATC USB-EL1201A USB ethernet. Supports the CATC Netmate +# and Netmate II, and the Belkin F5U111. +device cue0 +# # Kawasaki LSI ethernet. Supports the LinkSys USB10T, # Entrega USB-NET-E45, Peracom Ethernet Adapter, the # 3Com 3c19250, the ADS Technologies USB-10BT, the ATen UC10T, -# the Netgear EA101, the D-Link DSB-650, and the SMC 2102USB -# and 2104USB. +# the Netgear EA101, the D-Link DSB-650, the SMC 2102USB +# and 2104USB, and the Corega USB-T. device kue0 # debugging options for the USB subsystem diff --git a/sys/i386/conf/PCCARD b/sys/i386/conf/PCCARD index 8cdfe37..0e34303 100644 --- a/sys/i386/conf/PCCARD +++ b/sys/i386/conf/PCCARD @@ -214,4 +214,5 @@ pseudo-device bpf #Berkeley packet filter #device umass0 # Disks/Mass storage - Requires scbus and da0 #device ums0 # Mouse #device aue0 # ADMtek USB ethernet +#device cue0 # CATC USB ethernet #device kue0 # Kawasaki LSI USB ethernet diff --git a/sys/i386/i386/userconfig.c b/sys/i386/i386/userconfig.c index 6f9844a..376f049 100644 --- a/sys/i386/i386/userconfig.c +++ b/sys/i386/i386/userconfig.c @@ -378,6 +378,7 @@ static DEV_INFO device_info[] = { {"plip", "Parallel Port IP link", FLG_FIXED, CLS_NETWORK}, {"aue", "ADMtek AN986 USB ethernet adapter", FLG_FIXED, CLS_NETWORK}, +{"cue", "CATC USB ethernet adapter", FLG_FIXED, CLS_NETWORK}, {"kue", "Kawasaki LSI USB ethernet adapter", FLG_FIXED, CLS_NETWORK}, {"cs", "IBM EtherJet, CS89x0-based Ethernet adapters",0, CLS_NETWORK}, {"ed", "NE1000,NE2000,3C503,WD/SMC80xx Ethernet adapters",0, CLS_NETWORK}, diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 49a91f1..266f404 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -2,7 +2,7 @@ # XXX present but broken: ip_mroute_mod pcic -SUBDIR= aha amr aue ccd cd9660 coda dc fdesc fxp if_disc if_ef if_ppp \ +SUBDIR= aha amr aue ccd cd9660 coda cue dc fdesc fxp if_disc if_ef if_ppp \ if_sl if_tun ipfilter ipfw joy kernfs kue md mfs mii mlx msdos \ ncp netgraph nfs ntfs nullfs \ nwfs portal procfs rl sf sis sk ste ti tl \ diff --git a/sys/modules/cue/Makefile b/sys/modules/cue/Makefile new file mode 100644 index 0000000..fc50723 --- /dev/null +++ b/sys/modules/cue/Makefile @@ -0,0 +1,10 @@ +# $FreeBSD$ + +S = ${.CURDIR}/../.. +.PATH: $S/dev/usb +KMOD = if_cue +SRCS = if_cue.c opt_bdg.h opt_usb.h device_if.h bus_if.h +SRCS += miibus_if.h +CFLAGS += ${DEBUG_FLAGS} + +.include <bsd.kmod.mk> diff --git a/usr.sbin/sade/devices.c b/usr.sbin/sade/devices.c index a7591b9..32b8e7d 100644 --- a/usr.sbin/sade/devices.c +++ b/usr.sbin/sade/devices.c @@ -86,6 +86,7 @@ static struct _devname { { DEVICE_TYPE_FLOPPY, "fd%d", "floppy drive unit A", 2, 0, 64, 4, 'b' }, { DEVICE_TYPE_FLOPPY, "worm%d", "SCSI optical disk / CDR", 23, 0, 1, 4, 'b' }, { DEVICE_TYPE_NETWORK, "aue", "ADMtek USB ethernet adapter" }, + { DEVICE_TYPE_NETWORK, "cue", "CATC USB ethernet adapter" }, { DEVICE_TYPE_NETWORK, "fpa", "DEC DEFPA PCI FDDI card" }, { DEVICE_TYPE_NETWORK, "sr", "SDL T1/E1 sync serial PCI card" }, { DEVICE_TYPE_NETWORK, "cc3i", "SDL HSSI sync serial PCI card" }, diff --git a/usr.sbin/sysinstall/devices.c b/usr.sbin/sysinstall/devices.c index a7591b9..32b8e7d 100644 --- a/usr.sbin/sysinstall/devices.c +++ b/usr.sbin/sysinstall/devices.c @@ -86,6 +86,7 @@ static struct _devname { { DEVICE_TYPE_FLOPPY, "fd%d", "floppy drive unit A", 2, 0, 64, 4, 'b' }, { DEVICE_TYPE_FLOPPY, "worm%d", "SCSI optical disk / CDR", 23, 0, 1, 4, 'b' }, { DEVICE_TYPE_NETWORK, "aue", "ADMtek USB ethernet adapter" }, + { DEVICE_TYPE_NETWORK, "cue", "CATC USB ethernet adapter" }, { DEVICE_TYPE_NETWORK, "fpa", "DEC DEFPA PCI FDDI card" }, { DEVICE_TYPE_NETWORK, "sr", "SDL T1/E1 sync serial PCI card" }, { DEVICE_TYPE_NETWORK, "cc3i", "SDL HSSI sync serial PCI card" }, |