Changeset 3619

Timestamp:

05/07/08 00:18:43 (8 months ago)

Author:

mentor

Message:

Fold descriptor link address byte-swapping for hardware into a common function

Files:

• madwifi/trunk/ath/if_ath.c (modified) (14 diffs)

madwifi/trunk/ath/if_ath.c

@@ -165 +165 @@
-static int ath_desc_alloc(struct ath_softc *);
-static void ath_desc_free(struct ath_softc *);
-
+
+
-
-#ifdef IEEE80211_DEBUG_REFCNT
@@ -2119 +2120 @@
-
-                                        if (uapsd_xmit_q->axq_link) {
-#ifdef AH_NEED_DESC_SWAP
-                                                *uapsd_xmit_q->axq_link =
-
-
-
-
-
+
-                                        }
-                                        /* below leaves an_uapsd_q NULL */
@@ -2905 +2901 @@
-}
-
+/* Swap transmit descriptor pointer for HW. */
+static __inline u_int32_t
+ath_ds_link_swap(u_int32_t dp) {
+#ifdef AH_NEED_DESC_SWAP
+        return swab32(dp);
+#else
+        return (dp);
+#endif
+}
+
-static void
-ath_txq_dump(struct ath_softc *sc, struct ath_txq *txq)
@@ -2991 +2997 @@
-                                txq->axq_qnum, txq->axq_depth);
-                if (txq->axq_link != NULL) {
-
-
-
-
-
+
-                        DPRINTF(sc, ATH_DEBUG_XMIT, "link[%u](%p)=%08llx (%p)\n",
-                                txq->axq_qnum, txq->axq_link,
@@ -3022 +3024 @@
-                        }
-                } else {
-
-
-
-
-
+
-                        DPRINTF(sc, ATH_DEBUG_XMIT, "link[%u] (%p)=%08llx (%p)\n",
-                                txq->axq_qnum, txq->axq_link,
@@ -5163 +5161 @@
-                                                 bfmcast->bf_daddr);
-                        } else {
-
-
-
-
-
+
-                        }
-                        /* Set the MORE_DATA bit for each packet except the last one */
@@ -5292 +5286 @@
-                                                needmark)) != NULL) {
-                                        if (bflink != NULL)
-
-
-
-
-
+
-                                        else /* For the first bf, save bf_addr for later */
-                                                bfaddr = bf->bf_daddr;
@@ -6048 +6038 @@
-                                                ds = prev->bf_desc;
-#endif
-
-
-
-
-
+
-                                        }
-                                } else {
@@ -6202 +6188 @@
-                                 */
-                                if (wmeq->axq_link != NULL) {
-#ifdef AH_NEED_DESC_SWAP
-                                        *wmeq->axq_link = 
-
-
-
-
+
-                                        DPRINTF(sc, ATH_DEBUG_XMIT, 
-                                                        "link[%u](%p)=%08llx (%p)\n",
@@ -6283 +6265 @@
-                                        ATH_TXQ_MOVE_Q(wmeq, txq);
-                                        if (txq->axq_link != NULL) {
-#ifdef AH_NEED_DESC_SWAP
-                                                *(txq->axq_link) = 
-
-
-
-
+
-                                        }
-                                }
@@ -7271 +7249 @@
-                        ath_desc_swap(ds);
-                        if (txq->axq_link) {
-
-
-
-
-
+
-                        }
-                        txq->axq_link = &ds->ds_link;
@@ -7286 +7260 @@
-        }
-        /* make it circular */
-
-
-
-
-
+
-        /* start the queue */
-        ath_hal_puttxbuf(ah, txq->axq_qnum, head->bf_daddr);
@@ -7663 +7633 @@
-                /* add to delivery q */
-                if ((lastbuf = STAILQ_LAST(&an->an_uapsd_q, ath_buf, bf_list))) {
-
-
-
-
-
+
-                }
-                STAILQ_INSERT_TAIL(&an->an_uapsd_q, bf, bf_list);
@@ -7700 +7666 @@
-        /* add to overflow q */
-        if ((lastbuf = STAILQ_LAST(&an->an_uapsd_overflowq, ath_buf, bf_list))) {
-
-
-
-
-
+
-        }
-        STAILQ_INSERT_TAIL(&an->an_uapsd_overflowq, bf, bf_list);