Changeset 200

Timestamp:

Oct 10, 2010, 12:28:20 PM (14 years ago)

Author:

Rick van der Zwet

Message:

Nasty restructure:

• Wrong number of indexes where loaded CONFIG_NO instead of ENDPT_MAX

• Syntax restore/cleanup

• Removed bunch of testing calles

Location:

freebsd-mos-driver

Files:

• Makefile (modified) (1 diff)
• if_mos.c (modified) (6 diffs)

freebsd-mos-driver/Makefile

@@ -26 +26 @@
 core:
         kgdb /usr/obj/usr/src/sys/GENERIC/kernel.debug `ls /var/crash/vmcore.* | tail -1`
+
+ipload: load
+        sleep 5
+        ifconfig ue0 10.0.1.1/24

freebsd-mos-driver/if_mos.c

@@ -703 +703 @@
         iface_index = MOS_IFACE_IDX;
         error = usbd_transfer_setup(uaa->device, &iface_index,
-            sc->sc_xfer, mos_config, MOS_CONFIG_NO,
+            sc->sc_xfer, mos_config, MOS_ENDPT_MAX,
             sc, &sc->sc_mtx);
 
@@ -753 +753 @@
         mos_chip_init(sc);
 
+        // ifp = GET_IFP(sc);
+        // ifp->if_softc = sc;
+        // ifp->if_flags = IFF_SIMPLEX | IFF_MULTICAST;
+        // ifp->if_ioctl = mos_ioctl;
+        // ifp->if_start = mos_start;
+        // ifp->if_watchdog = mos_watchdog;
+        // strlcpy(ifp->if_xname, sc->mos_dev.dv_xname, IFNAMSIZ);
+
+        // IFQ_SET_READY(&ifp->if_snd);
+        // ifp->if_capabilities = IFCAP_VLAN_MTU;
+
         sc->mos_attached = 1;
 }
@@ -762 +773 @@
         struct usb_ether *ue = &sc->sc_ue;
 
-        usbd_transfer_unsetup(sc->sc_xfer, MOS_CONFIG_NO);
+        usbd_transfer_unsetup(sc->sc_xfer, MOS_ENDPT_MAX);
         uether_ifdetach(ue);
         mtx_destroy(&sc->sc_mtx);
@@ -806 +817 @@
                 /* evaluate status byte at the end */
                 pktlen = actlen - 1;
-                //rxstat = stat[pktlen] & MOS_RXSTS_MASK;
-                if (stat != NULL) {
-                  m_freem(stat);
-                } else {
-                  DPRINTF("Potential NULL error\n");
-                }
+                rxstat = stat->m_pktdat[pktlen] & MOS_RXSTS_MASK;
 
                 if (rxstat != MOS_RXSTS_VALID) {
@@ -1030 +1036 @@
         struct mos_softc *sc = usbd_xfer_softc(xfer);
         struct ifnet *ifp = uether_getifp(&sc->sc_ue);
+        //struct usb_page_cache *pc;
         int actlen;
 
+        DPRINTF("%s: %s: enter\n", "mos", __func__);
         ifp->if_oerrors++;
         printf("%s: watchdog timeout\n", "mos");
@@ -1038 +1046 @@
 
         //XXX: Porting, how? mos_txeof(c->mos_xfer, c, stat);
+        switch (USB_GET_STATE(xfer)) {
+        case USB_ST_TRANSFERRED:
+                        //pc = usbd_xfer_get_frame(xfer, 0);
+                        //usbd_copy_out(pc, 0, &pkt, sizeof(pkt));
+                /* FALLTHROUGH */
+        case USB_ST_SETUP:
+tr_setup:
+                usbd_xfer_set_frame_len(xfer, 0, usbd_xfer_max_len(xfer));
+                usbd_transfer_submit(xfer);
+                return;
+        default:                        /* Error */
+                if (error != USB_ERR_CANCELLED) {
+                        /* try to clear stall first */
+                        usbd_xfer_set_stall(xfer);
+                        goto tr_setup;
+                }
+                return;
+        }
 }