Changeset 267 for freebsd-mos-driver

Timestamp:

Feb 5, 2011, 1:39:22 PM (14 years ago)

Author:

Rick van der Zwet

Message:

Random blips and pieces to try non to core-dump all the time.

Location:

freebsd-mos-driver

Files:

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

freebsd-mos-driver/Makefile

@@ -30 +30 @@
         sleep 5
         ifconfig ue0 10.0.1.1/24
+
+code:
+        vim -o /usr/src/sys/dev/usb/net/if_rue.c if_mos.c

freebsd-mos-driver/if_mos.c

@@ -2 +2 @@
 #define USB_DEBUG 1
 /*
- * Copyright (c) 2010 Rick van der Zwet <info@rickvanderzwet.nl>
+ * Copyright (c) 2011 Rick van der Zwet <info@rickvanderzwet.nl>
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -441 +441 @@
         }
         if (i == MOS_TIMEOUT) {
-                printf("%s: MII read timeout\n", "mos");
+                DPRINTF("%s: %s: MII read timeout\n", "mos", __func__);
         }
 
@@ -473 +473 @@
         }
         if (i == MOS_TIMEOUT) {
-                printf("%s: MII write timeout\n", "mos");
+                DPRINTF("%s: MII write timeout\n", "mos");
         }
 
@@ -520 +520 @@
 
         if (err)
-                printf("%s: media change failed\n", "mos");
+                DPRINTF("%s: media change failed\n", "mos");
 
         if (!locked)
@@ -747 +747 @@
         int err = mos_readmac(sc, ue->ue_eaddr);
         if (err) {
-                printf("couldn't get MAC address\n");
+                DPRINTF("couldn't get MAC address\n");
         }
         DPRINTF("address: %s\n", ether_sprintf(ue->ue_eaddr));
@@ -872 +872 @@
         struct usb_page_cache *pc;
         struct mbuf *m;
-        int actlen;
 
         DPRINTF("%s: %s: enter\n", "mos",__func__);
 
-        usbd_xfer_status(xfer, &actlen, NULL, NULL, NULL);
-        pc = usbd_xfer_get_frame(xfer, 0);
 
         switch (USB_GET_STATE(xfer)) {
         case USB_ST_TRANSFERRED:
-                DPRINTF("transfer of %d bytes complete\n", actlen);
+                DPRINTF("transfer of complete\n");
                 ifp->if_opackets++;
                 /* FALLTHROUGH */
@@ -890 +887 @@
                  */
                 IFQ_DRV_DEQUEUE(&ifp->if_snd, m);
+                if (m == NULL)
+                        return;
+
+                pc = usbd_xfer_get_frame(xfer, 0);
+                usbd_m_copy_in(pc, 0, m, 0, m->m_pkthdr.len);
 
                 usbd_xfer_set_frame_len(xfer, 0, m->m_pkthdr.len);
 
-                usbd_m_copy_in(pc, 0, m, 0, m->m_pkthdr.len);
 
                 /*
@@ -1036 +1037 @@
         struct mos_softc *sc = usbd_xfer_softc(xfer);
         struct ifnet *ifp = uether_getifp(&sc->sc_ue);
-        //struct usb_page_cache *pc;
+        struct usb_page_cache *pc;
         int actlen;
 
-        DPRINTF("%s: %s: enter\n", "mos", __func__);
+        // DPRINTF("%s: %s: enter\n", "mos", __func__);
         ifp->if_oerrors++;
-        printf("%s: watchdog timeout\n", "mos");
 
         usbd_xfer_status(xfer, &actlen, NULL, NULL, NULL);
@@ -1048 +1048 @@
         switch (USB_GET_STATE(xfer)) {
         case USB_ST_TRANSFERRED:
-                        //pc = usbd_xfer_get_frame(xfer, 0);
-                        //usbd_copy_out(pc, 0, &pkt, sizeof(pkt));
+                // DPRINTF("State is ST_TRANS\n");
+
+                pc = usbd_xfer_get_frame(xfer, 0);
+                //usbd_copy_out(pc, 0, &pkt, sizeof(pkt));
                 /* FALLTHROUGH */
         case USB_ST_SETUP:
 tr_setup:
+                //DPRINTF("State is ST_SETUP\n");
                 usbd_xfer_set_frame_len(xfer, 0, usbd_xfer_max_len(xfer));
                 usbd_transfer_submit(xfer);
                 return;
         default:                        /* Error */
+                DPRINTF("State is default\n");
                 if (error != USB_ERR_CANCELLED) {
                         /* try to clear stall first */