Changeset 173 for freebsd-mos-driver

Timestamp:

Sep 2, 2010, 3:01:30 PM (14 years ago)

Author:

Rick van der Zwet

Message:

Locking and calls sorted properly

Location:

freebsd-mos-driver

Files:

• if_mos.c (modified) (11 diffs)
• if_mosreg.h (modified) (2 diffs)

freebsd-mos-driver/if_mos.c

@@ -517 +517 @@
         val |= (MOS_CTL_TX_ENB | MOS_CTL_RX_ENB);
         err = mos_reg_write_1(sc, MOS_CTL, val);
-        MOS_UNLOCK(sc);
 
         if (err)
@@ -711 +710 @@
 
 
-        DPRINTFN(11,"%s:", "mos");
+        DPRINTF("%s:", "mos");
 
         if (sc->mos_flags & MCS7730) {
-                DPRINTFN(11," MCS7730");
+                DPRINTF(" MCS7730");
         } else if (sc->mos_flags & MCS7830) {
-                DPRINTFN(11," MCS7830");
+                DPRINTF(" MCS7830");
         }
 
@@ -788 +787 @@
         struct usb_page_cache *pc;
 
-        DPRINTFN(10, "%s: %s: enter\n", "mos",__func__);
+        DPRINTF("%s: %s: enter\n", "mos",__func__);
 
         usbd_xfer_status(xfer, &actlen, NULL, NULL, NULL);
@@ -844 +843 @@
         usbd_transfer_submit(xfer);
         uether_rxflush(ue);
-        DPRINTFN(10,"%s: %s: start rx\n", "mos", __func__);
+        DPRINTF("%s: %s: start rx\n", "mos", __func__);
 
         return;
@@ -871 +870 @@
         if (status != USB_ST_SETUP) {
                 if (status == USB_ST_TRANSFERRED) {
-                        DPRINTFN(11, "transfer of %d bytes complete\n", actlen);
+                        DPRINTF("transfer of %d bytes complete\n", actlen);
                         ifp->if_opackets++;
                 } else {
-                        DPRINTFN(11, "%s: usb error on tx: %s\n", "mos", usbd_errstr(status));
+                        DPRINTF("%s: usb error on tx: %s\n", "mos", usbd_errstr(status));
                         ifp->if_oerrors++;
                         if (error == USB_ERR_CANCELLED) {
@@ -898 +897 @@
         usbd_transfer_submit(xfer);
 
-        if (IFQ_IS_EMPTY(&ifp->if_snd) == 0)
-                mos_start(&sc->sc_ue);
-
         ifp->if_opackets++;
         return;
@@ -909 +905 @@
 {
         struct mos_softc *sc = uether_getsc(ue);
-        struct ifnet *ifp = uether_getifp(ue);
         struct mii_data *mii = GET_MII(sc);
 
-        if (sc == NULL)
-                return;
-
         MOS_LOCK_ASSERT(sc, MA_OWNED);
-        DPRINTFN(0xff,"%s: %s: enter\n", "mos", __func__);
+        DPRINTF("%s: %s: enter\n", "mos", __func__);
 
         mii_tick(mii);
@@ -924 +916 @@
                          "mos", __func__);
                 sc->mos_link++;
-                if (IFQ_IS_EMPTY(&ifp->if_snd) == 0)
-                        mos_start(&sc->sc_ue);
+                mos_start(ue);
         }
 }
@@ -964 +955 @@
 {
         struct mos_softc *sc = uether_getsc(ue);
-        struct ifnet *ifp = uether_getifp(ue);
-        struct mbuf             *m_head = NULL;
-
-        sc = ifp->if_softc;
-
-        if (!sc->mos_link)
-                return;
-
-        //if (ifp->if_flags & IFF_OACTIVE)
-        //      return;
-
-        IFQ_POLL(&ifp->if_snd, m_head);
-        if (m_head == NULL)
-                return;
-
-        //if (mos_encap(sc, m_head, 0)) {
-        //      ifp->if_flags |= IFF_OACTIVE;
-        //      return;
-        //}
-        IFQ_DEQUEUE(&ifp->if_snd, m_head);
 
         /*
-         * If there's a BPF listener, bounce a copy of this frame
-         * to him.
+         * start the USB transfers, if not already started:
          */
-        BPF_MTAP(ifp, m_head);
-
-        /*
-         * Set a timeout in case the chip goes out to lunch.
-         */
-        //ifp->if_timer = 5;
-
-        return;
+        usbd_transfer_start(sc->sc_xfer[MOS_ENDPT_TX]);
+        usbd_transfer_start(sc->sc_xfer[MOS_ENDPT_RX]);
+        usbd_transfer_start(sc->sc_xfer[MOS_ENDPT_INTR]);
 }
 
@@ -1042 +1007 @@
         mos_setmulti(ue);
 
-        mii_mediachg(GET_MII(sc));
+        usbd_xfer_set_stall(sc->sc_xfer[MOS_ENDPT_TX]);
 
         ifp->if_flags |= IFF_DRV_RUNNING;
@@ -1062 +1027 @@
 
         //XXX: Porting, how? mos_txeof(c->mos_xfer, c, stat);
-
-        if (!IFQ_IS_EMPTY(&ifp->if_snd))
-                mos_start(&sc->sc_ue);
 }
 

freebsd-mos-driver/if_mosreg.h

@@ -179 +179 @@
 
 struct mos_softc {
+        struct usb_ether        sc_ue;
 //      struct device           mos_dev;
 //#define GET_MII(sc) (&(sc)->mos_mii)
@@ -212 +213 @@
 
 
-        struct usb_ether        sc_ue;
         struct mtx              sc_mtx;
         struct usb_xfer *sc_xfer[MOS_ENDPT_MAX];