Changeset 269

Timestamp:

Feb 6, 2011, 10:22:05 AM (14 years ago)

Author:

Rick van der Zwet

Message:

• Get the right status header values.

• Some cosmetic hacks

File:

• freebsd-mos-driver/if_mos.c (modified) (5 diffs)

freebsd-mos-driver/if_mos.c

@@ -794 +794 @@
         struct ifnet            *ifp = uether_getifp(ue);
 
-        u_int8_t                rxstat = 0;
-        u_int32_t               actlen;
-        u_int16_t               pktlen = 0;
-        struct mbuf             *stat;
+        uint8_t                 rxstat = 0;
+        uint32_t                actlen;
+        uint16_t                pktlen = 0;
         struct usb_page_cache *pc;
 
@@ -808 +807 @@
         case USB_ST_TRANSFERRED:
                 DPRINTF("read_callback actlen : %d\n", actlen);
-                if (actlen <= 1)
+                if (actlen <= 1) {
                         ifp->if_ierrors++;
                         goto tr_setup;
-
-                usbd_copy_out(pc, actlen - sizeof(stat), &stat,
-                    sizeof(stat));
+                }
 
                 /* evaluate status byte at the end */
-                pktlen = actlen - 1;
-                rxstat = stat->m_pktdat[pktlen] & MOS_RXSTS_MASK;
+                usbd_copy_out(pc, actlen - sizeof(rxstat), &rxstat,
+                    sizeof(rxstat));
 
                 if (rxstat != MOS_RXSTS_VALID) {
@@ -835 +832 @@
 
                 if ( pktlen < sizeof(struct ether_header) ) {
+                        DPRINTF("mos: pktlen %i is smaller than ether_header %i\n", pktlen, sizeof(struct ether_header));
                         ifp->if_ierrors++;
                         goto tr_setup;
@@ -840 +838 @@
 
                 uether_rxbuf(ue, pc, 0, actlen);
-
   /* FALLTHROUGH */
         case USB_ST_SETUP:
@@ -908 +905 @@
                 ifp->if_opackets++;
                 return;
-  default: /* Error */
-                        DPRINTF("%s: usb error on tx: %s\n", "mos", usbd_errstr(error));
-                        ifp->if_oerrors++;
-                        if (error != USB_ERR_CANCELLED) {
-                          /* try to clear stall first */
-                          usbd_xfer_set_stall(xfer);
-                          goto tr_setup;
-                        }
-      return;
+        default: /* Error */
+                DPRINTF("%s: usb error on tx: %s\n", "mos", usbd_errstr(error));
+                ifp->if_oerrors++;
+                if (error != USB_ERR_CANCELLED) {
+                  /* try to clear stall first */
+                  usbd_xfer_set_stall(xfer);
+                  goto tr_setup;
+                }
+                return;
         }
 }