diff options
Diffstat (limited to 'sys/dev/usb/if_url.c')
| -rw-r--r-- | sys/dev/usb/if_url.c | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/sys/dev/usb/if_url.c b/sys/dev/usb/if_url.c index 283ef1db96a..bcedf7ffcf8 100644 --- a/sys/dev/usb/if_url.c +++ b/sys/dev/usb/if_url.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_url.c,v 1.6 2002/07/10 18:08:13 deraadt Exp $ */ +/* $OpenBSD: if_url.c,v 1.7 2002/07/25 02:18:10 nate Exp $ */ /* $NetBSD: if_url.c,v 1.2 2002/03/28 21:49:19 ichiro Exp $ */ /* * Copyright (c) 2001, 2002 @@ -82,7 +82,7 @@ #if defined(__NetBSD__) #include <net/if_ether.h> #ifdef INET -#include <netinet/in.h> +#include <netinet/in.h> #include <netinet/if_inarp.h> #endif #endif /* defined(__NetBSD__) */ @@ -433,7 +433,7 @@ url_mem(struct url_softc *sc, int cmd, int offset, void *buf, int len) USBDEVNAME(sc->sc_dev), cmd == URL_CMD_READMEM ? "read" : "write", offset, err)); - } + } return (err); } @@ -449,7 +449,7 @@ url_csr_read_1(struct url_softc *sc, int reg) if (sc->sc_dying) return (0); - + return (url_mem(sc, URL_CMD_READMEM, reg, &val, 1) ? 0 : val); } @@ -464,7 +464,7 @@ url_csr_read_2(struct url_softc *sc, int reg) if (sc->sc_dying) return (0); - + USETW(val, 0); return (url_mem(sc, URL_CMD_READMEM, reg, &val, 2) ? 0 : UGETW(val)); } @@ -480,7 +480,7 @@ url_csr_write_1(struct url_softc *sc, int reg, int aval) if (sc->sc_dying) return (0); - + return (url_mem(sc, URL_CMD_WRITEMEM, reg, &val, 1) ? -1 : 0); } @@ -497,7 +497,7 @@ url_csr_write_2(struct url_softc *sc, int reg, int aval) if (sc->sc_dying) return (0); - + return (url_mem(sc, URL_CMD_WRITEMEM, reg, &val, 2) ? -1 : 0); } @@ -514,7 +514,7 @@ url_csr_write_4(struct url_softc *sc, int reg, int aval) if (sc->sc_dying) return (0); - + return (url_mem(sc, URL_CMD_WRITEMEM, reg, &val, 4) ? -1 : 0); } @@ -527,7 +527,7 @@ url_init(struct ifnet *ifp) int i, s; DPRINTF(("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __func__)); - + if (sc->sc_dying) return (EIO); @@ -563,7 +563,7 @@ url_init(struct ifnet *ifp) else URL_CLRBIT2(sc, URL_RCR, URL_RCR_AAM|URL_RCR_AAP); - + /* Initialize transmit ring */ if (url_tx_list_init(sc) == ENOBUFS) { printf("%s: tx list init failed\n", USBDEVNAME(sc->sc_dev)); @@ -607,7 +607,7 @@ Static void url_reset(struct url_softc *sc) { int i; - + DPRINTF(("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __func__)); if (sc->sc_dying) @@ -720,7 +720,7 @@ url_openpipes(struct url_softc *sc) if (sc->sc_dying) return (EIO); - + sc->sc_refcnt++; /* Open RX pipe */ @@ -732,7 +732,7 @@ url_openpipes(struct url_softc *sc) error = EIO; goto done; } - + /* Open TX pipe */ err = usbd_open_pipe(sc->sc_ctl_iface, sc->sc_bulkout_no, USBD_EXCLUSIVE_USE, &sc->sc_pipe_tx); @@ -774,7 +774,7 @@ url_openpipes(struct url_softc *sc) done: if (--sc->sc_refcnt < 0) usb_detach_wakeup(USBDEV(sc->sc_dev)); - + return (error); } @@ -811,7 +811,7 @@ url_newbuf(struct url_softc *sc, struct url_chain *c, struct mbuf *m) return (0); } - + Static int url_rx_list_init(struct url_softc *sc) @@ -840,7 +840,7 @@ url_rx_list_init(struct url_softc *sc) } } } - + return (0); } @@ -870,7 +870,7 @@ url_tx_list_init(struct url_softc *sc) } } } - + return (0); } @@ -879,7 +879,7 @@ url_start(struct ifnet *ifp) { struct url_softc *sc = ifp->if_softc; struct mbuf *m_head = NULL; - + DPRINTF(("%s: %s: enter, link=%d\n", USBDEVNAME(sc->sc_dev), __func__, sc->sc_link)); @@ -1211,7 +1211,7 @@ url_watchdog(struct ifnet *ifp) struct url_chain *c; usbd_status stat; int s; - + DPRINTF(("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __func__)); ifp->if_oerrors++; @@ -1240,7 +1240,7 @@ url_stop(struct ifnet *ifp, int disable) struct url_softc *sc = ifp->if_softc; usbd_status err; int i; - + DPRINTF(("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __func__)); ifp->if_timer = 0; @@ -1642,7 +1642,7 @@ url_ext_miibus_redreg(device_ptr_t dev, int phy, int reg) if (i == URL_TIMEOUT) { printf("%s: MII read timed out\n", USBDEVNAME(sc->sc_dev)); } - + val = url_csr_read_2(sc, URL_PHYDAT); DPRINTF(("%s: %s: phy=%d reg=0x%04x => 0x%04x\n", |