[Zrouter-src-freebsd] ZRouter.org: push to FreeBSD HEAD tree
zrouter-src-freebsd at zrouter.org
zrouter-src-freebsd at zrouter.org
Tue Mar 13 12:25:16 UTC 2012
details: http://zrouter.org/hg/FreeBSD/head//rev/98a2b67999c5
changeset: 432:98a2b67999c5
user: ray at terran.dlink.ua
date: Tue Mar 13 14:26:03 2012 +0200
description:
style(9)
diffstat:
head/sys/dev/ral/rt2860.c | 744 +++++++++++++++++++--------------------------
1 files changed, 312 insertions(+), 432 deletions(-)
diffs (1647 lines):
diff -r 91f9422fc6f8 -r 98a2b67999c5 head/sys/dev/ral/rt2860.c
--- a/head/sys/dev/ral/rt2860.c Tue Mar 13 13:59:17 2012 +0200
+++ b/head/sys/dev/ral/rt2860.c Tue Mar 13 14:26:03 2012 +0200
@@ -4834,8 +4834,7 @@
txwi->mpdu_density_flags |=
(RT2860_TXWI_FLAGS_TS << RT2860_TXWI_FLAGS_SHIFT);
- if (ieee80211_radiotap_active_vap(vap))
- {
+ if (ieee80211_radiotap_active_vap(vap)) {
tap = &sc->txtap;
tap->flags = IEEE80211_RADIOTAP_F_DATAPAD;
@@ -4863,16 +4862,13 @@
if (ampdu)
tap->flags |= IEEE80211_RADIOTAP_F_CFP;
- if (wh->i_fc[1] & IEEE80211_FC1_WEP)
- {
+ if (wh->i_fc[1] & IEEE80211_FC1_WEP) {
wh->i_fc[1] &= ~IEEE80211_FC1_WEP;
ieee80211_radiotap_tx(vap, m);
wh->i_fc[1] |= IEEE80211_FC1_WEP;
- }
- else
- {
+ } else {
ieee80211_radiotap_tx(vap, m);
}
}
@@ -4884,8 +4880,7 @@
error = bus_dmamap_load_mbuf_sg(ring->data_dma_tag, data->dma_map, m,
dma_seg, &ndmasegs, BUS_DMA_NOWAIT);
- if (error != 0)
- {
+ if (error != 0) {
/* too many fragments, linearize */
RT2860_DPRINTF(sc, RT2860_DEBUG_TX,
@@ -4902,8 +4897,7 @@
error = bus_dmamap_load_mbuf_sg(ring->data_dma_tag,
data->dma_map, m, dma_seg, &ndmasegs, BUS_DMA_NOWAIT);
- if (error != 0)
- {
+ if (error != 0) {
device_printf(sc->sc_dev, "could not load mbuf DMA "
"map: ndmasegs=%d, len=%d, error=%d\n",
ndmasegs, m->m_pkthdr.len, error);
@@ -4918,8 +4912,8 @@
/* determine how many Tx descs are required */
ndescs = 1 + ndmasegs / 2;
- if ((ring->desc_queued + ndescs) > (RT2860_SOFTC_TX_RING_DESC_COUNT - 2))
- {
+ if ((ring->desc_queued + ndescs) >
+ (RT2860_SOFTC_TX_RING_DESC_COUNT - 2)) {
RT2860_DPRINTF(sc, RT2860_DEBUG_TX,
"%s: there are not enough Tx descs\n",
device_get_nameunit(sc->sc_dev));
@@ -4948,19 +4942,20 @@
qsel = RT2860_TXDESC_QSEL_EDCA;
- desc->sdp0 = htole32(ring->seg0_phys_addr + ring->data_cur * RT2860_TX_DATA_SEG0_SIZE);
+ desc->sdp0 = htole32(ring->seg0_phys_addr + ring->data_cur *
+ RT2860_TX_DATA_SEG0_SIZE);
desc->sdl0 = htole16(dmalen);
desc->qsel_flags = (qsel << RT2860_TXDESC_QSEL_SHIFT);
/* set up payload segments */
- for (i = ndmasegs, j = 0; i >= 2; i -= 2)
- {
+ for (i = ndmasegs, j = 0; i >= 2; i -= 2) {
desc->sdp1 = htole32(dma_seg[j].ds_addr);
desc->sdl1 = htole16(dma_seg[j].ds_len);
ring->desc_queued++;
- ring->desc_cur = (ring->desc_cur + 1) % RT2860_SOFTC_TX_RING_DESC_COUNT;
+ ring->desc_cur = (ring->desc_cur + 1) %
+ RT2860_SOFTC_TX_RING_DESC_COUNT;
j++;
@@ -4975,13 +4970,11 @@
/* finalize last payload segment */
- if (i > 0)
- {
+ if (i > 0) {
desc->sdp1 = htole32(dma_seg[j].ds_addr);
- desc->sdl1 = htole16(dma_seg[j].ds_len | RT2860_TXDESC_SDL1_LASTSEG);
- }
- else
- {
+ desc->sdl1 = htole16(dma_seg[j].ds_len |
+ RT2860_TXDESC_SDL1_LASTSEG);
+ } else {
desc->sdl0 |= htole16(RT2860_TXDESC_SDL0_LASTSEG);
desc->sdl1 = 0;
}
@@ -5123,8 +5116,7 @@
for (i = 0; i < RT2860_SOFTC_TX_RING_COUNT; i++)
rt2860_reset_tx_ring(sc, &sc->tx_ring[i]);
- for (i = 0; i < RT2860_SOFTC_TX_RING_COUNT; i++)
- {
+ for (i = 0; i < RT2860_SOFTC_TX_RING_COUNT; i++) {
rt2860_io_mac_write(sc, RT2860_REG_SCHDMA_TX_BASE_PTR(i),
sc->tx_ring[i].desc_phys_addr);
rt2860_io_mac_write(sc, RT2860_REG_SCHDMA_TX_MAX_CNT(i),
@@ -5175,8 +5167,7 @@
for (i = 0; i < RT2860_SOFTC_TX_RING_COUNT; i++)
rt2860_reset_tx_ring(sc, &sc->tx_ring[i]);
- for (i = 0; i < RT2860_SOFTC_TX_RING_COUNT; i++)
- {
+ for (i = 0; i < RT2860_SOFTC_TX_RING_COUNT; i++) {
rt2860_io_mac_write(sc, RT2860_REG_SCHDMA_TX_BASE_PTR(i),
sc->tx_ring[i].desc_phys_addr);
rt2860_io_mac_write(sc, RT2860_REG_SCHDMA_TX_MAX_CNT(i),
@@ -5227,8 +5218,7 @@
for (i = 0; i < RT2860_SOFTC_TX_RING_COUNT; i++)
rt2860_reset_tx_ring(sc, &sc->tx_ring[i]);
- for (i = 0; i < RT2860_SOFTC_TX_RING_COUNT; i++)
- {
+ for (i = 0; i < RT2860_SOFTC_TX_RING_COUNT; i++) {
rt2860_io_mac_write(sc, RT2860_REG_SCHDMA_TX_BASE_PTR(i),
sc->tx_ring[i].desc_phys_addr);
rt2860_io_mac_write(sc, RT2860_REG_SCHDMA_TX_MAX_CNT(i),
@@ -5263,8 +5253,7 @@
RT2860_SOFTC_LOCK(sc);
- if (!(sc->intr_disable_mask & RT2860_REG_INT_FIFO_STA_FULL))
- {
+ if (!(sc->intr_disable_mask & RT2860_REG_INT_FIFO_STA_FULL)) {
rt2860_intr_disable(sc, RT2860_REG_INT_FIFO_STA_FULL);
taskqueue_enqueue(sc->taskqueue, &sc->fifo_sta_full_task);
@@ -5288,8 +5277,7 @@
RT2860_SOFTC_LOCK(sc);
- if (!(sc->intr_disable_mask & RT2860_REG_INT_RX_DONE))
- {
+ if (!(sc->intr_disable_mask & RT2860_REG_INT_RX_DONE)) {
rt2860_intr_disable(sc, RT2860_REG_INT_RX_DONE);
taskqueue_enqueue(sc->taskqueue, &sc->rx_done_task);
@@ -5317,8 +5305,7 @@
RT2860_SOFTC_LOCK(sc);
- if (!(sc->intr_disable_mask & (RT2860_REG_INT_TX_AC0_DONE << qid)))
- {
+ if (!(sc->intr_disable_mask & (RT2860_REG_INT_TX_AC0_DONE << qid))) {
rt2860_intr_disable(sc, (RT2860_REG_INT_TX_AC0_DONE << qid));
taskqueue_enqueue(sc->taskqueue, &sc->tx_done_task);
@@ -5354,16 +5341,13 @@
RT2860_SOFTC_LOCK(sc);
- if ((sc->intr_pending_mask & RT2860_REG_INT_RX_DONE) || again)
- {
+ if ((sc->intr_pending_mask & RT2860_REG_INT_RX_DONE) || again) {
RT2860_DPRINTF(sc, RT2860_DEBUG_RX,
"%s: Rx done task: scheduling again\n",
device_get_nameunit(sc->sc_dev));
taskqueue_enqueue(sc->taskqueue, &sc->rx_done_task);
- }
- else
- {
+ } else {
rt2860_intr_enable(sc, RT2860_REG_INT_RX_DONE);
}
@@ -5390,12 +5374,12 @@
if (!(ifp->if_drv_flags & IFF_DRV_RUNNING))
return;
- for (i = RT2860_SOFTC_TX_RING_COUNT - 1; i >= 0; i--)
- {
- if (sc->intr_pending_mask & (RT2860_REG_INT_TX_AC0_DONE << i))
- {
- sc->intr_pending_mask &= ~(RT2860_REG_INT_TX_AC0_DONE << i);
-
+ for (i = RT2860_SOFTC_TX_RING_COUNT - 1; i >= 0; i--) {
+ if (sc->intr_pending_mask &
+ (RT2860_REG_INT_TX_AC0_DONE << i)) {
+
+ sc->intr_pending_mask &=
+ ~(RT2860_REG_INT_TX_AC0_DONE << i);
rt2860_tx_eof(sc, &sc->tx_ring[i]);
}
}
@@ -5416,8 +5400,7 @@
rt2860_intr_enable(sc, ~sc->intr_pending_mask &
(sc->intr_disable_mask & intr_mask));
- if (sc->intr_pending_mask & intr_mask)
- {
+ if (sc->intr_pending_mask & intr_mask) {
RT2860_DPRINTF(sc, RT2860_DEBUG_TX,
"%s: Tx done task: scheduling again\n",
device_get_nameunit(sc->sc_dev));
@@ -5455,16 +5438,13 @@
RT2860_SOFTC_LOCK(sc);
- if (sc->intr_pending_mask & RT2860_REG_INT_FIFO_STA_FULL)
- {
+ if (sc->intr_pending_mask & RT2860_REG_INT_FIFO_STA_FULL) {
RT2860_DPRINTF(sc, RT2860_DEBUG_STATS,
"%s: FIFO statistic full task: scheduling again\n",
device_get_nameunit(sc->sc_dev));
taskqueue_enqueue(sc->taskqueue, &sc->fifo_sta_full_task);
- }
- else
- {
+ } else {
rt2860_intr_enable(sc, RT2860_REG_INT_FIFO_STA_FULL);
}
@@ -5502,20 +5482,21 @@
rt2860_update_stats(sc);
- if ((sc->periodic_round % 10) == 0)
- {
+ if ((sc->periodic_round % 10) == 0) {
rt2860_bbp_tuning(sc);
rt2860_update_raw_counters(sc);
rt2860_watchdog(sc);
- if (vap != NULL && vap->iv_opmode != IEEE80211_M_MONITOR && vap->iv_state == IEEE80211_S_RUN)
- {
+ if (vap != NULL && vap->iv_opmode != IEEE80211_M_MONITOR &&
+ vap->iv_state == IEEE80211_S_RUN) {
if (vap->iv_opmode == IEEE80211_M_STA)
- rt2860_amrr_update_iter_func(vap, vap->iv_bss);
+ rt2860_amrr_update_iter_func(vap,
+ vap->iv_bss);
else
- ieee80211_iterate_nodes(&ic->ic_sta, rt2860_amrr_update_iter_func, vap);
+ ieee80211_iterate_nodes(&ic->ic_sta,
+ rt2860_amrr_update_iter_func, vap);
}
}
@@ -5557,8 +5538,7 @@
nframes = 0;
- while (limit != 0)
- {
+ while (limit != 0) {
index = rt2860_io_mac_read(sc, RT2860_REG_SCHDMA_RX_DRX_IDX);
if (ring->cur == index)
break;
@@ -5576,8 +5556,7 @@
nframes++;
mnew = m_getjcl(M_DONTWAIT, MT_DATA, M_PKTHDR, MJUMPAGESIZE);
- if (mnew == NULL)
- {
+ if (mnew == NULL) {
sc->rx_mbuf_alloc_errors++;
ifp->if_ierrors++;
goto skip;
@@ -5587,8 +5566,7 @@
error = bus_dmamap_load_mbuf_sg(ring->data_dma_tag, ring->spare_dma_map,
mnew, segs, &nsegs, BUS_DMA_NOWAIT);
- if (error != 0)
- {
+ if (error != 0) {
RT2860_DPRINTF(sc, RT2860_DEBUG_RX,
"%s: could not load Rx mbuf DMA map: error=%d, nsegs=%d\n",
device_get_nameunit(sc->sc_dev), error, nsegs);
@@ -5634,8 +5612,7 @@
/* check for L2 padding between IEEE 802.11 frame header and body */
- if (desc_flags & RT2860_RXDESC_FLAGS_L2PAD)
- {
+ if (desc_flags & RT2860_RXDESC_FLAGS_L2PAD) {
RT2860_DPRINTF(sc, RT2860_DEBUG_RX,
"%s: L2 padding: len=%d\n",
device_get_nameunit(sc->sc_dev), len);
@@ -5649,16 +5626,14 @@
/* check for crc errors */
- if (desc_flags & RT2860_RXDESC_FLAGS_CRC_ERR)
- {
+ if (desc_flags & RT2860_RXDESC_FLAGS_CRC_ERR) {
RT2860_DPRINTF(sc, RT2860_DEBUG_RX,
"%s: rxdesc: crc error\n",
device_get_nameunit(sc->sc_dev));
ifp->if_ierrors++;
- if (!(ifp->if_flags & IFF_PROMISC))
- {
+ if (!(ifp->if_flags & IFF_PROMISC)) {
m_freem(m);
goto skip;
}
@@ -5668,42 +5643,44 @@
/* check for cipher errors */
#ifndef RT2860_NO_HW_CRYPTO
- if (desc_flags & RT2860_RXDESC_FLAGS_DECRYPTED)
- {
- cipher_err = ((desc_flags >> RT2860_RXDESC_FLAGS_CIPHER_ERR_SHIFT) &
- RT2860_RXDESC_FLAGS_CIPHER_ERR_MASK);
- if (cipher_err == RT2860_RXDESC_FLAGS_CIPHER_ERR_NONE)
- {
+ if (desc_flags & RT2860_RXDESC_FLAGS_DECRYPTED) {
+ cipher_err = ((desc_flags >>
+ RT2860_RXDESC_FLAGS_CIPHER_ERR_SHIFT) &
+ RT2860_RXDESC_FLAGS_CIPHER_ERR_MASK);
+ if (cipher_err ==
+ RT2860_RXDESC_FLAGS_CIPHER_ERR_NONE) {
if (wh->i_fc[1] & IEEE80211_FC1_WEP)
wh->i_fc[1] &= ~IEEE80211_FC1_WEP;
m->m_flags |= M_WEP;
sc->rx_cipher_no_errors++;
- }
- else
- {
+ } else {
RT2860_DPRINTF(sc, RT2860_DEBUG_RX_CRYPT,
- "%s: rxdesc: cipher error=0x%02x keyidx=%d\n",
- device_get_nameunit(sc->sc_dev), cipher_err,
- (rxwi->udf_bssidx_keyidx >> RT2860_RXWI_KEYIDX_SHIFT) &
- RT2860_RXWI_KEYIDX_MASK);
-
- if (cipher_err == RT2860_RXDESC_FLAGS_CIPHER_ERR_ICV)
+ "%s: rxdesc: cipher error=0x%02x "
+ "keyidx=%d\n",
+ device_get_nameunit(sc->sc_dev),
+ cipher_err,
+ (rxwi->udf_bssidx_keyidx >>
+ RT2860_RXWI_KEYIDX_SHIFT) &
+ RT2860_RXWI_KEYIDX_MASK);
+
+ if (cipher_err ==
+ RT2860_RXDESC_FLAGS_CIPHER_ERR_ICV)
sc->rx_cipher_icv_errors++;
- else if (cipher_err == RT2860_RXDESC_FLAGS_CIPHER_ERR_MIC)
+ else if (cipher_err ==
+ RT2860_RXDESC_FLAGS_CIPHER_ERR_MIC)
sc->rx_cipher_mic_errors++;
- else if (cipher_err == RT2860_RXDESC_FLAGS_CIPHER_ERR_INVALID_KEY)
+ else if (cipher_err ==
+ RT2860_RXDESC_FLAGS_CIPHER_ERR_INVALID_KEY)
sc->rx_cipher_invalid_key_errors++;
- if ((cipher_err == RT2860_RXDESC_FLAGS_CIPHER_ERR_MIC) &&
- (desc_flags & RT2860_RXDESC_FLAGS_MYBSS))
- {
+ /* XXX style(9) */
+ if ((cipher_err == RT2860_RXDESC_FLAGS_CIPHER_ERR_MIC) && (desc_flags & RT2860_RXDESC_FLAGS_MYBSS)) {
ni = ieee80211_find_rxnode(ic, (const struct ieee80211_frame_min *) wh);
if (ni != NULL)
{
- keyidx = (rxwi->udf_bssidx_keyidx >> RT2860_RXWI_KEYIDX_SHIFT) &
- RT2860_RXWI_KEYIDX_MASK;
+ keyidx = (rxwi->udf_bssidx_keyidx >> RT2860_RXWI_KEYIDX_SHIFT) & RT2860_RXWI_KEYIDX_MASK;
ieee80211_notify_michael_failure(ni->ni_vap, wh, keyidx);
@@ -5713,25 +5690,21 @@
ifp->if_ierrors++;
- if (!(ifp->if_flags & IFF_PROMISC))
- {
+ if (!(ifp->if_flags & IFF_PROMISC)) {
m_free(m);
goto skip;
}
}
- }
- else
- {
- if (wh->i_fc[1] & IEEE80211_FC1_WEP)
- {
+ } else {
+ if (wh->i_fc[1] & IEEE80211_FC1_WEP) {
RT2860_DPRINTF(sc, RT2860_DEBUG_RX,
- "%s: rxdesc: not decrypted but protected flag set\n",
+ "%s: rxdesc: not decrypted but "
+ "protected flag set\n",
device_get_nameunit(sc->sc_dev));
ifp->if_ierrors++;
- if (!(ifp->if_flags & IFF_PROMISC))
- {
+ if (!(ifp->if_flags & IFF_PROMISC)) {
m_free(m);
goto skip;
}
@@ -5740,8 +5713,7 @@
#endif
/* check for A-MPDU */
- if (desc_flags & RT2860_RXDESC_FLAGS_BA)
- {
+ if (desc_flags & RT2860_RXDESC_FLAGS_BA) {
m->m_flags |= M_AMPDU;
sc->rx_ampdu++;
@@ -5750,22 +5722,17 @@
sc->rx_ampdu_retries++;
ampdu = 1;
- }
- else
- {
+ } else {
ampdu = 0;
}
/* check for A-MSDU */
- if (desc_flags & RT2860_RXDESC_FLAGS_AMSDU)
- {
+ if (desc_flags & RT2860_RXDESC_FLAGS_AMSDU) {
sc->rx_amsdu++;
amsdu = 1;
- }
- else
- {
+ } else {
amsdu = 0;
}
@@ -5784,8 +5751,7 @@
seq = ((rxwi->seq_frag >> RT2860_RXWI_SEQ_SHIFT) & RT2860_RXWI_SEQ_MASK);
frag = ((rxwi->seq_frag >> RT2860_RXWI_FRAG_SHIFT) & RT2860_RXWI_FRAG_MASK);
- if (ieee80211_radiotap_active(ic))
- {
+ if (ieee80211_radiotap_active(ic)) {
tap = &sc->rxtap;
tap->flags = (desc_flags & RT2860_RXDESC_FLAGS_L2PAD) ? IEEE80211_RADIOTAP_F_DATAPAD : 0;
@@ -5835,32 +5801,31 @@
rssi_dbm_rel = 127;
RT2860_DPRINTF(sc, RT2860_DEBUG_RX,
- "%s: received frame: len=%d, phymode=%d, bw=%d, shortgi=%d, stbc=0x%02x, mcs=%d, "
- "ant=%d, rssi=%d/%d/%d, snr=%d/%d, wcid=0x%02x, ampdu=%d, amsdu=%d, tid=%d, seq=%d, frag=%d, "
+ "%s: received frame: len=%d, phymode=%d, bw=%d, "
+ "shortgi=%d, stbc=0x%02x, mcs=%d, "
+ "ant=%d, rssi=%d/%d/%d, snr=%d/%d, wcid=0x%02x, "
+ "ampdu=%d, amsdu=%d, tid=%d, seq=%d, frag=%d, "
"retry=%d, rssi_dbm=%d, rssi_dbm_rel=%d\n",
device_get_nameunit(sc->sc_dev),
len, phymode, bw, shortgi, stbc, mcs,
ant, rxwi->rssi[0], rxwi->rssi[1], rxwi->rssi[2],
rxwi->snr[0], rxwi->snr[1],
- rxwi->wcid, ampdu, amsdu, tid, seq, frag, (wh->i_fc[1] & IEEE80211_FC1_RETRY) ? 1 : 0,
+ rxwi->wcid, ampdu, amsdu, tid, seq, frag,
+ (wh->i_fc[1] & IEEE80211_FC1_RETRY) ? 1 : 0,
rssi_dbm, rssi_dbm_rel);
ni = ieee80211_find_rxnode(ic, (struct ieee80211_frame_min *) wh);
- if (ni != NULL)
- {
+ if (ni != NULL) {
rni = (struct rt2860_softc_node *) ni;
- for (i = 0; i < RT2860_SOFTC_RSSI_COUNT; i++)
- {
+ for (i = 0; i < RT2860_SOFTC_RSSI_COUNT; i++) {
rni->last_rssi[i] = rxwi->rssi[i];
rni->last_rssi_dbm[i] = rt2860_rssi2dbm(sc, rxwi->rssi[i], i);
}
ieee80211_input(ni, m, rssi_dbm_rel, RT2860_NOISE_FLOOR);
ieee80211_free_node(ni);
- }
- else
- {
+ } else {
ieee80211_input_all(ic, m, rssi_dbm_rel, RT2860_NOISE_FLOOR);
}
@@ -5909,9 +5874,9 @@
ndescs = 0;
nframes = 0;
- for (;;)
- {
- index = rt2860_io_mac_read(sc, RT2860_REG_SCHDMA_TX_DTX_IDX(ring->qid));
+ for (;;) {
+ index = rt2860_io_mac_read(sc,
+ RT2860_REG_SCHDMA_TX_DTX_IDX(ring->qid));
if (ring->desc_next == index)
break;
@@ -5925,8 +5890,7 @@
BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE);
if (desc->sdl0 & htole16(RT2860_TXDESC_SDL0_LASTSEG) ||
- desc->sdl1 & htole16(RT2860_TXDESC_SDL1_LASTSEG))
- {
+ desc->sdl1 & htole16(RT2860_TXDESC_SDL1_LASTSEG)) {
nframes++;
data = &ring->data[ring->data_next];
@@ -6063,12 +6027,9 @@
rssi = ieee80211_getrssi(vap);
- if (IEEE80211_IS_CHAN_2GHZ(ni->ni_chan))
- {
+ if (IEEE80211_IS_CHAN_2GHZ(ni->ni_chan)) {
new = 0x2e + sc->lna_gain[group];
- }
- else
- {
+ } else {
if (!IEEE80211_IS_CHAN_HT40(ni->ni_chan))
new = 0x32 + sc->lna_gain[group] * 5 / 3;
else
@@ -6100,16 +6061,18 @@
"%s: watchdog: TXRXQ_PCNT=0x%08x\n",
device_get_nameunit(sc->sc_dev), tmp);
- if (((tmp >> RT2860_REG_TX0Q_PCNT_SHIFT) & RT2860_REG_TX0Q_PCNT_MASK) != 0)
- {
+ if (((tmp >> RT2860_REG_TX0Q_PCNT_SHIFT) &
+ RT2860_REG_TX0Q_PCNT_MASK) != 0) {
sc->tx_queue_not_empty[0]++;
rt2860_io_mac_write(sc, RT2860_REG_PBF_CFG, 0xf40012);
- for (ntries = 0; ntries < 10; ntries++)
- {
- tmp = rt2860_io_mac_read(sc, RT2860_REG_PBF_TXRXQ_PCNT);
- if (((tmp >> RT2860_REG_TX0Q_PCNT_SHIFT) & RT2860_REG_TX0Q_PCNT_MASK) == 0)
+ for (ntries = 0; ntries < 10; ntries++) {
+ tmp = rt2860_io_mac_read(sc,
+ RT2860_REG_PBF_TXRXQ_PCNT);
+
+ if (((tmp >> RT2860_REG_TX0Q_PCNT_SHIFT) &
+ RT2860_REG_TX0Q_PCNT_MASK) == 0)
break;
DELAY(1);
@@ -6118,16 +6081,16 @@
rt2860_io_mac_write(sc, RT2860_REG_PBF_CFG, 0xf40006);
}
- if (((tmp >> RT2860_REG_TX1Q_PCNT_SHIFT) & RT2860_REG_TX1Q_PCNT_MASK) != 0)
- {
+ if (((tmp >> RT2860_REG_TX1Q_PCNT_SHIFT) &
+ RT2860_REG_TX1Q_PCNT_MASK) != 0) {
sc->tx_queue_not_empty[1]++;
rt2860_io_mac_write(sc, RT2860_REG_PBF_CFG, 0xf4000a);
- for (ntries = 0; ntries < 10; ntries++)
- {
+ for (ntries = 0; ntries < 10; ntries++) {
tmp = rt2860_io_mac_read(sc, RT2860_REG_PBF_TXRXQ_PCNT);
- if (((tmp >> RT2860_REG_TX1Q_PCNT_SHIFT) & RT2860_REG_TX1Q_PCNT_MASK) == 0)
+ if (((tmp >> RT2860_REG_TX1Q_PCNT_SHIFT) &
+ RT2860_REG_TX1Q_PCNT_MASK) == 0)
break;
DELAY(1);
@@ -6152,8 +6115,8 @@
/* drain Tx status FIFO (maxsize = 16) */
while ((stats = rt2860_io_mac_read(sc, RT2860_REG_TX_STA_FIFO)) &
- RT2860_REG_TX_STA_FIFO_VALID)
- {
+ RT2860_REG_TX_STA_FIFO_VALID) {
+
wcid = (stats >> RT2860_REG_TX_STA_FIFO_WCID_SHIFT) &
RT2860_REG_TX_STA_FIFO_WCID_MASK;
@@ -6294,8 +6257,7 @@
rt2860_io_mac_write(sc, RT2860_REG_SYS_CTRL, RT2860_REG_TX_ENABLE);
- for (ntries = 0; ntries < 200; ntries++)
- {
+ for (ntries = 0; ntries < 200; ntries++) {
tmp = rt2860_io_mac_read(sc, RT2860_REG_SCHDMA_WPDMA_GLO_CFG);
if (!(tmp & (RT2860_REG_TX_DMA_BUSY | RT2860_REG_RX_DMA_BUSY)))
break;
@@ -6303,8 +6265,7 @@
DELAY(1000);
}
- if (ntries == 200)
- {
+ if (ntries == 200) {
device_printf(sc->sc_dev, "timeout waiting for DMA engine\n");
return -1;
}
@@ -6323,8 +6284,7 @@
tmp = RT2860_REG_RX_FILTER_DROP_CRC_ERR |
RT2860_REG_RX_FILTER_DROP_PHY_ERR;
- if (ic->ic_opmode != IEEE80211_M_MONITOR)
- {
+ if (ic->ic_opmode != IEEE80211_M_MONITOR) {
tmp |= RT2860_REG_RX_FILTER_DROP_DUPL |
RT2860_REG_RX_FILTER_DROP_CTS |
RT2860_REG_RX_FILTER_DROP_BA |
@@ -6366,8 +6326,7 @@
RT2860_SOFTC_RX_RING_DATA_COUNT * sizeof(struct rt2860_rxdesc), 1,
RT2860_SOFTC_RX_RING_DATA_COUNT * sizeof(struct rt2860_rxdesc),
0, NULL, NULL, &ring->desc_dma_tag);
- if (error != 0)
- {
+ if (error != 0) {
device_printf(sc->sc_dev,
"could not create Rx desc DMA tag\n");
goto fail;
@@ -6375,8 +6334,7 @@
error = bus_dmamem_alloc(ring->desc_dma_tag, (void **) &ring->desc,
BUS_DMA_NOWAIT | BUS_DMA_ZERO, &ring->desc_dma_map);
- if (error != 0)
- {
+ if (error != 0) {
device_printf(sc->sc_dev,
"could not allocate Rx desc DMA memory\n");
goto fail;
@@ -6386,8 +6344,7 @@
ring->desc,
RT2860_SOFTC_RX_RING_DATA_COUNT * sizeof(struct rt2860_rxdesc),
rt2860_dma_map_addr, &ring->desc_phys_addr, 0);
- if (error != 0)
- {
+ if (error != 0) {
device_printf(sc->sc_dev,
"could not load Rx desc DMA map\n");
goto fail;
@@ -6397,22 +6354,19 @@
BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL,
MJUMPAGESIZE, 1, MJUMPAGESIZE, 0, NULL, NULL,
&ring->data_dma_tag);
- if (error != 0)
- {
+ if (error != 0) {
device_printf(sc->sc_dev,
"could not create Rx data DMA tag\n");
goto fail;
}
- for (i = 0; i < RT2860_SOFTC_RX_RING_DATA_COUNT; i++)
- {
+ for (i = 0; i < RT2860_SOFTC_RX_RING_DATA_COUNT; i++) {
desc = &ring->desc[i];
data = &ring->data[i];
error = bus_dmamap_create(ring->data_dma_tag, 0,
&data->dma_map);
- if (error != 0)
- {
+ if (error != 0) {
device_printf(sc->sc_dev,
"could not create Rx data DMA map\n");
goto fail;
@@ -6420,8 +6374,7 @@
data->m = m_getjcl(M_DONTWAIT, MT_DATA, M_PKTHDR,
MJUMPAGESIZE);
- if (data->m == NULL)
- {
+ if (data->m == NULL) {
device_printf(sc->sc_dev,
"could not allocate Rx mbuf\n");
error = ENOMEM;
@@ -6432,8 +6385,7 @@
error = bus_dmamap_load_mbuf_sg(ring->data_dma_tag,
data->dma_map, data->m, segs, &nsegs, BUS_DMA_NOWAIT);
- if (error != 0)
- {
+ if (error != 0) {
device_printf(sc->sc_dev,
"could not load Rx mbuf DMA map\n");
goto fail;
@@ -6448,8 +6400,7 @@
error = bus_dmamap_create(ring->data_dma_tag, 0,
&ring->spare_dma_map);
- if (error != 0)
- {
+ if (error != 0) {
device_printf(sc->sc_dev,
"could not create Rx spare DMA map\n");
goto fail;
@@ -6642,8 +6593,7 @@
struct rt2860_txdesc *desc;
int i;
- for (i = 0; i < RT2860_SOFTC_TX_RING_DESC_COUNT; i++)
- {
+ for (i = 0; i < RT2860_SOFTC_TX_RING_DESC_COUNT; i++) {
desc = &ring->desc[i];
desc->sdl0 = 0;
@@ -6660,12 +6610,10 @@
bus_dmamap_sync(ring->seg0_dma_tag, ring->seg0_dma_map,
BUS_DMASYNC_PREWRITE);
- for (i = 0; i < RT2860_SOFTC_TX_RING_DATA_COUNT; i++)
- {
+ for (i = 0; i < RT2860_SOFTC_TX_RING_DATA_COUNT; i++) {
data = &ring->data[i];
- if (data->m != NULL)
- {
+ if (data->m != NULL) {
bus_dmamap_sync(ring->data_dma_tag, data->dma_map,
BUS_DMASYNC_POSTWRITE);
bus_dmamap_unload(ring->data_dma_tag, data->dma_map);
@@ -6673,8 +6621,7 @@
data->m = NULL;
}
- if (data->ni != NULL)
- {
+ if (data->ni != NULL) {
ieee80211_free_node(data->ni);
data->ni = NULL;
}
@@ -6694,8 +6641,7 @@
struct rt2860_softc_tx_data *data;
int i;
- if (ring->desc != NULL)
- {
+ if (ring->desc != NULL) {
bus_dmamap_sync(ring->desc_dma_tag, ring->desc_dma_map,
BUS_DMASYNC_POSTWRITE);
bus_dmamap_unload(ring->desc_dma_tag, ring->desc_dma_map);
@@ -6706,8 +6652,7 @@
if (ring->desc_dma_tag != NULL)
bus_dma_tag_destroy(ring->desc_dma_tag);
- if (ring->seg0 != NULL)
- {
+ if (ring->seg0 != NULL) {
bus_dmamap_sync(ring->seg0_dma_tag, ring->seg0_dma_map,
BUS_DMASYNC_POSTWRITE);
bus_dmamap_unload(ring->seg0_dma_tag, ring->seg0_dma_map);
@@ -6718,12 +6663,10 @@
if (ring->seg0_dma_tag != NULL)
bus_dma_tag_destroy(ring->seg0_dma_tag);
- for (i = 0; i < RT2860_SOFTC_TX_RING_DATA_COUNT; i++)
- {
+ for (i = 0; i < RT2860_SOFTC_TX_RING_DATA_COUNT; i++) {
data = &ring->data[i];
- if (data->m != NULL)
- {
+ if (data->m != NULL) {
bus_dmamap_sync(ring->data_dma_tag, data->dma_map,
BUS_DMASYNC_POSTWRITE);
bus_dmamap_unload(ring->data_dma_tag, data->dma_map);
@@ -7095,8 +7038,7 @@
amrr_node->retrycnt = 0;
amrr_node->success_threshold = amrr->min_success_threshold;
- if (ni->ni_flags & IEEE80211_NODE_HT)
- {
+ if (ni->ni_flags & IEEE80211_NODE_HT) {
rs = (const struct ieee80211_rateset *) &ni->ni_htrates;
for (amrr_node->rate_index = rs->rs_nrates - 1;
@@ -7104,9 +7046,7 @@
amrr_node->rate_index--) ;
ni->ni_txrate = rs->rs_rates[amrr_node->rate_index] | IEEE80211_RATE_MCS;
- }
- else
- {
+ } else {
rs = &ni->ni_rates;
for (amrr_node->rate_index = rs->rs_nrates - 1;
@@ -7131,23 +7071,23 @@
amrr = amrr_node->amrr;
if (RT2860_AMRR_IS_ENOUGH(amrr_node) &&
- (ticks - amrr_node->ticks) > amrr->interval)
- {
+ (ticks - amrr_node->ticks) > amrr->interval) {
rate_index = rt2860_amrr_update(amrr, amrr_node, ni);
- if (rate_index != amrr_node->rate_index)
- {
+ if (rate_index != amrr_node->rate_index) {
if (ni->ni_flags & IEEE80211_NODE_HT)
- ni->ni_txrate = ni->ni_htrates.rs_rates[rate_index] | IEEE80211_RATE_MCS;
+ ni->ni_txrate =
+ ni->ni_htrates.rs_rates[rate_index] |
+ IEEE80211_RATE_MCS;
else
- ni->ni_txrate = ni->ni_rates.rs_rates[rate_index] & IEEE80211_RATE_VAL;
+ ni->ni_txrate =
+ ni->ni_rates.rs_rates[rate_index] &
+ IEEE80211_RATE_VAL;
amrr_node->rate_index = rate_index;
}
amrr_node->ticks = ticks;
- }
- else
- {
+ } else {
rate_index = amrr_node->rate_index;
}
@@ -7174,37 +7114,29 @@
rate_index = amrr_node->rate_index;
- if (RT2860_AMRR_IS_SUCCESS(amrr_node))
- {
+ if (RT2860_AMRR_IS_SUCCESS(amrr_node)) {
amrr_node->success++;
if ((amrr_node->success >= amrr_node->success_threshold) &&
(rate_index + 1 < rs->rs_nrates) &&
- (!(ni->ni_flags & IEEE80211_NODE_HT) || (rs->rs_rates[rate_index + 1] & IEEE80211_RATE_VAL) < (amrr->ntxpath * 8)))
- {
+ (!(ni->ni_flags & IEEE80211_NODE_HT) ||
+ (rs->rs_rates[rate_index + 1] & IEEE80211_RATE_VAL) <
+ (amrr->ntxpath * 8))) {
amrr_node->recovery = 1;
amrr_node->success = 0;
rate_index++;
- }
- else
- {
+ } else {
amrr_node->recovery = 0;
}
- }
- else if (RT2860_AMRR_IS_FAILURE(amrr_node))
- {
+ } else if (RT2860_AMRR_IS_FAILURE(amrr_node)) {
amrr_node->success = 0;
- if (rate_index > 0)
- {
- if (amrr_node->recovery)
- {
+ if (rate_index > 0) {
+ if (amrr_node->recovery) {
amrr_node->success_threshold *= 2;
if (amrr_node->success_threshold > amrr->max_success_threshold)
amrr_node->success_threshold = amrr->max_success_threshold;
- }
- else
- {
+ } else {
amrr_node->success_threshold = amrr->min_success_threshold;
}
@@ -7506,8 +7438,7 @@
if (((sc->mac_rev & 0xffff0000) != 0x30710000) &&
((sc->mac_rev & 0xffff0000) != 0x30900000) &&
((sc->mac_rev & 0xffff0000) != 0x35720000) &&
- ((sc->mac_rev & 0xffff0000) != 0x33900000))
- {
+ ((sc->mac_rev & 0xffff0000) != 0x33900000)) {
RT2860_IO_EEPROM_RAISE_CLK(sc, tmp);
RT2860_IO_EEPROM_LOWER_CLK(sc, tmp);
}
@@ -7543,8 +7474,7 @@
i = 0;
- do
- {
+ do {
*ptr++ = rt2860_io_eeprom_read(sc, addr + i);
i += sizeof(uint16_t);
@@ -7560,8 +7490,7 @@
int ntries;
uint32_t tmp;
- if (sc->mac_rev == 0x28720200)
- {
+ if (sc->mac_rev == 0x28720200) {
for (ntries = 0; ntries < 100; ntries ++) {
if ( !(rt2860_io_mac_read(sc, RT2860_REG_BBP_CSR_CFG) &
RT2860_REG_BBP_CSR_BUSY) )
@@ -7569,43 +7498,46 @@
DELAY(1);
}
if (ntries == 100) {
- printf("%s:%s: BBP busy after 100 probes\n",device_get_nameunit(sc->sc_dev), __func__);
+ device_printf(sc->sc_dev,
+ "BBP busy after 100 probes\n");
return (0);
}
rt2860_io_mac_write(sc, RT2860_REG_BBP_CSR_CFG,
RT2860_REG_BBP_CSR_READ |
- RT2860_REG_BBP_CSR_KICK | RT2860_REG_BBP_RW_MODE_PARALLEL |
- (reg & RT2860_REG_BBP_REG_MASK) << RT2860_REG_BBP_REG_SHIFT);
+ RT2860_REG_BBP_CSR_KICK |
+ RT2860_REG_BBP_RW_MODE_PARALLEL |
+ (reg & RT2860_REG_BBP_REG_MASK) <<
+ RT2860_REG_BBP_REG_SHIFT);
for (ntries = 0; ntries < 100; ntries ++) {
- if ( !(rt2860_io_mac_read(sc, RT2860_REG_BBP_CSR_CFG) &
+ if ( !(rt2860_io_mac_read(sc,
+ RT2860_REG_BBP_CSR_CFG) &
RT2860_REG_BBP_CSR_BUSY) )
break;
DELAY(1);
}
if (ntries == 100) {
- printf("%s:%s: BBP busy after 100 probes\n",device_get_nameunit(sc->sc_dev), __func__);
+ device_printf(sc->sc_dev,
+ "BBP busy after 100 probes\n");
return (0);
- }
- else {
- return
- ((rt2860_io_mac_read(sc, RT2860_REG_BBP_CSR_CFG) >>
+ } else {
+ return ((rt2860_io_mac_read(sc,
+ RT2860_REG_BBP_CSR_CFG) >>
RT2860_REG_BBP_VAL_SHIFT) &
RT2860_REG_BBP_VAL_MASK);
}
return (0);
}
- for (ntries = 0; ntries < 100; ntries++)
- {
- if (!(rt2860_io_mac_read(sc, RT2860_REG_H2M_MAILBOX_BBP_AGENT) &
+ for (ntries = 0; ntries < 100; ntries++) {
+ if (!(rt2860_io_mac_read(sc,
+ RT2860_REG_H2M_MAILBOX_BBP_AGENT) &
RT2860_REG_BBP_CSR_BUSY))
break;
DELAY(1);
}
- if (ntries == 100)
- {
+ if (ntries == 100) {
device_printf(sc->sc_dev,
"could not read from BBP through MCU: reg=0x%02x\n", reg);
return 0;
@@ -7623,8 +7555,7 @@
DELAY(1000);
- for (ntries = 0; ntries < 100; ntries++)
- {
+ for (ntries = 0; ntries < 100; ntries++) {
tmp = rt2860_io_mac_read(sc, RT2860_REG_H2M_MAILBOX_BBP_AGENT);
if (!(tmp & RT2860_REG_BBP_CSR_BUSY))
return ((tmp >> RT2860_REG_BBP_VAL_SHIFT) &
@@ -7675,8 +7606,7 @@
DELAY(1);
}
- if (ntries == 100)
- {
+ if (ntries == 100) {
device_printf(sc->sc_dev,
"could not write to BBP through MCU: reg=0x%02x\n", reg);
return;
@@ -7701,8 +7631,7 @@
void rt2860_io_rf_write(struct rt2860_softc *sc, uint8_t reg, uint32_t val)
{
int ntries;
- if (sc->mac_rev == 0x28720200)
- {
+ if (sc->mac_rev == 0x28720200) {
for (ntries = 0; ntries < 100; ntries ++) {
if ( !(rt2860_io_mac_read(sc, RT2872_REG_RF_CSR_CFG) &
RT2872_REG_RF_CSR_BUSY) )
@@ -7728,8 +7657,7 @@
RT2860_REG_RF_BUSY))
break;
- if (ntries == 100)
- {
+ if (ntries == 100) {
device_printf(sc->sc_dev,
"could not write to RF: reg=0x%02x\n", reg);
return;
@@ -7744,10 +7672,9 @@
int32_t rt2860_io_rf_read(struct rt2860_softc *sc, uint8_t reg)
{
int ntries;
- if (sc->mac_rev == 0x28720200)
- {
+ if (sc->mac_rev == 0x28720200) {
for (ntries = 0; ntries < 100; ntries ++) {
- if ( !(rt2860_io_mac_read(sc, RT2872_REG_RF_CSR_CFG) &
+ if ( !(rt2860_io_mac_read(sc, RT2872_REG_RF_CSR_CFG) &
RT2872_REG_RF_CSR_BUSY) )
break;
DELAY(1);
@@ -7802,8 +7729,7 @@
if (sc->mac_rev == 0x28720200)
return;
- for (ntries = 0; ntries < 100; ntries++)
- {
+ for (ntries = 0; ntries < 100; ntries++) {
if (!(rt2860_io_mac_read(sc, RT2860_REG_H2M_MAILBOX) &
RT2860_REG_H2M_BUSY))
break;
@@ -7811,8 +7737,7 @@
DELAY(2);
}
- if (ntries == 100)
- {
+ if (ntries == 100) {
device_printf(sc->sc_dev,
"could not read H2M: cmd=0x%02x\n", cmd);
return;
@@ -7834,38 +7759,37 @@
result = -1;
- for (ntries = 0; ntries < 200; ntries++)
- {
+ for (ntries = 0; ntries < 200; ntries++) {
tmp = rt2860_io_mac_read(sc, RT2860_REG_H2M_MAILBOX_CID);
- if (((cid >> RT2860_REG_H2M_CID0_SHIFT) & RT2860_REG_H2M_CID_MASK) == cid)
- {
- mask = (RT2860_REG_H2M_CID_MASK << RT2860_REG_H2M_CID0_SHIFT);
+ if (((cid >> RT2860_REG_H2M_CID0_SHIFT) &
+ RT2860_REG_H2M_CID_MASK) == cid) {
+ mask = (RT2860_REG_H2M_CID_MASK <<
+ RT2860_REG_H2M_CID0_SHIFT);
+ break;
+ } else if (((tmp >> RT2860_REG_H2M_CID1_SHIFT) &
+ RT2860_REG_H2M_CID_MASK) == cid) {
+ mask = (RT2860_REG_H2M_CID_MASK <<
+ RT2860_REG_H2M_CID1_SHIFT);
+ break;
+ } else if (((tmp >> RT2860_REG_H2M_CID2_SHIFT) &
+ RT2860_REG_H2M_CID_MASK) == cid) {
+ mask = (RT2860_REG_H2M_CID_MASK <<
+ RT2860_REG_H2M_CID2_SHIFT);
+ break;
+ } else if (((tmp >> RT2860_REG_H2M_CID3_SHIFT) &
+ RT2860_REG_H2M_CID_MASK) == cid) {
+ mask = (RT2860_REG_H2M_CID_MASK <<
+ RT2860_REG_H2M_CID3_SHIFT);
break;
}
- else if (((tmp >> RT2860_REG_H2M_CID1_SHIFT) & RT2860_REG_H2M_CID_MASK) == cid)
- {
- mask = (RT2860_REG_H2M_CID_MASK << RT2860_REG_H2M_CID1_SHIFT);
- break;
- }
- else if (((tmp >> RT2860_REG_H2M_CID2_SHIFT) & RT2860_REG_H2M_CID_MASK) == cid)
- {
- mask = (RT2860_REG_H2M_CID_MASK << RT2860_REG_H2M_CID2_SHIFT);
- break;
- }
- else if (((tmp >> RT2860_REG_H2M_CID3_SHIFT) & RT2860_REG_H2M_CID_MASK) == cid)
- {
- mask = (RT2860_REG_H2M_CID_MASK << RT2860_REG_H2M_CID3_SHIFT);
- break;
- }
DELAY(100);
}
status = rt2860_io_mac_read(sc, RT2860_REG_H2M_MAILBOX_STATUS);
- if (ntries < 200)
- {
+ if (ntries < 200) {
status &= mask;
if ((status == 0x1) ||
@@ -7894,16 +7818,14 @@
crc = RT2860_IO_BYTE_CRC16(rt2860_io_byte_rev(ucode[i]), crc);
if (ucode[len - 2] != rt2860_io_byte_rev(crc >> 8) ||
- ucode[len - 1] != rt2860_io_byte_rev(crc))
- {
+ ucode[len - 1] != rt2860_io_byte_rev(crc)) {
device_printf(sc->sc_dev, "wrong microcode crc\n");
return EINVAL;
}
rt2860_io_mac_write(sc, RT2860_REG_PBF_SYS_CTRL, RT2860_REG_HST_PM_SEL);
- for(i = 0; i < len; i += 4)
- {
+ for(i = 0; i < len; i += 4) {
rt2860_io_mac_write(sc, RT2860_REG_MCU_UCODE_BASE + i,
(ucode[i+3] << 24) | (ucode[i+2] << 16) |
(ucode[i+1] << 8) | ucode[i]);
@@ -7928,8 +7850,7 @@
if (sc->mac_rev != 0x28720200) {
- for (ntries = 0; ntries < 1000; ntries++)
- {
+ for (ntries = 0; ntries < 1000; ntries++) {
if (rt2860_io_mac_read(sc, RT2860_REG_PBF_SYS_CTRL) &
RT2860_REG_MCU_READY)
break;
@@ -7937,8 +7858,7 @@
DELAY(1000);
}
- if (ntries == 1000)
- {
+ if (ntries == 1000) {
device_printf(sc->sc_dev,
"timeout waiting for MCU to initialize\n");
return ETIMEDOUT;
@@ -7962,8 +7882,7 @@
tmp &= ~(RT2860_REG_EEDO | RT2860_REG_EEDI);
- do
- {
+ do {
tmp &= ~RT2860_REG_EEDI;
if(val & mask)
@@ -7997,8 +7916,7 @@
tmp &= ~(RT2860_REG_EEDO | RT2860_REG_EEDI);
- for(i = 0; i < 16; i++)
- {
+ for(i = 0; i < 16; i++) {
val = (val << 1);
RT2860_IO_EEPROM_RAISE_CLK(sc, tmp);
@@ -8023,8 +7941,7 @@
int i;
uint8_t tmp;
- for(i = 0, tmp = 0; ; i++)
- {
+ for(i = 0, tmp = 0; ; i++) {
if(byte & 0x80)
tmp |= 0x80;
@@ -8119,23 +8036,19 @@
/* read RF information */
val = rt2860_io_eeprom_read(sc, RT2860_EEPROM_ANTENNA);
- if (val == 0xffff)
- {
+ if (val == 0xffff) {
device_printf(sc->sc_dev, "invalid EEPROM antenna info\n");
sc->rf_rev = RT2860_EEPROM_RF_2820;
sc->ntxpath = 1;
sc->nrxpath = 2;
- }
- else
- {
+ } else {
sc->rf_rev = (val >> 8) & 0xf;
sc->ntxpath = (val >> 4) & 0xf;
sc->nrxpath = (val & 0xf);
}
- if ((sc->mac_rev != 0x28830300) && (sc->nrxpath > 2))
- {
+ if ((sc->mac_rev != 0x28830300) && (sc->nrxpath > 2)) {
/* only 2 Rx streams for RT2860 series */
sc->nrxpath = 2;
@@ -8174,12 +8087,9 @@
val = rt2860_io_eeprom_read(sc, RT2860_EEPROM_RF_FREQ_OFF);
- if ((val & 0xff) != 0xff)
- {
+ if ((val & 0xff) != 0xff) {
sc->rf_freq_off = (val & 0xff);
- }
- else
- {
+ } else {
device_printf(sc->sc_dev, "invalid EEPROM RF freq offset\n");
sc->rf_freq_off = 0;
@@ -8190,15 +8100,15 @@
/* read LEDs operating mode */
- if (((val >> 8) & 0xff) != 0xff)
- {
+ if (((val >> 8) & 0xff) != 0xff) {
sc->led_cntl = ((val >> 8) & 0xff);
- sc->led_off[0] = rt2860_io_eeprom_read(sc, RT2860_EEPROM_LED1_OFF);
- sc->led_off[1] = rt2860_io_eeprom_read(sc, RT2860_EEPROM_LED2_OFF);
- sc->led_off[2] = rt2860_io_eeprom_read(sc, RT2860_EEPROM_LED3_OFF);
- }
- else
- {
+ sc->led_off[0] = rt2860_io_eeprom_read(sc,
+ RT2860_EEPROM_LED1_OFF);
+ sc->led_off[1] = rt2860_io_eeprom_read(sc,
+ RT2860_EEPROM_LED2_OFF);
+ sc->led_off[2] = rt2860_io_eeprom_read(sc,
+ RT2860_EEPROM_LED3_OFF);
+ } else {
device_printf(sc->sc_dev, "invalid EEPROM LED settings\n");
sc->led_cntl = RT2860_EEPROM_LED_CNTL_DEFAULT;
@@ -8250,10 +8160,9 @@
sc->rssi_off_5ghz[2] = (val & 0xff);
sc->lna_gain[3] = (val >> 8) & 0xff;
- for (i = 2; i < RT2860_SOFTC_LNA_GAIN_COUNT; i++)
- {
- if (sc->lna_gain[i] == 0x00 || sc->lna_gain[i] == (int8_t) 0xff)
- {
+ for (i = 2; i < RT2860_SOFTC_LNA_GAIN_COUNT; i++) {
+ if (sc->lna_gain[i] == 0x00 ||
+ sc->lna_gain[i] == (int8_t) 0xff) {
device_printf(sc->sc_dev,
"invalid EEPROM LNA gain #%d: 0x%02x\n",
i, sc->lna_gain[i]);
@@ -8267,11 +8176,9 @@
device_get_nameunit(sc->sc_dev),
sc->lna_gain[0], sc->lna_gain[1], sc->lna_gain[2], sc->lna_gain[3]);
- for (i = 0; i < RT2860_SOFTC_RSSI_OFF_COUNT; i++)
- {
+ for (i = 0; i < RT2860_SOFTC_RSSI_OFF_COUNT; i++) {
if (sc->rssi_off_2ghz[i] < RT2860_EEPROM_RSSI_OFF_MIN ||
- sc->rssi_off_2ghz[i] > RT2860_EEPROM_RSSI_OFF_MAX)
- {
+ sc->rssi_off_2ghz[i] > RT2860_EEPROM_RSSI_OFF_MAX) {
device_printf(sc->sc_dev,
"invalid EEPROM RSSI offset #%d (2GHz): 0x%02x\n",
i, sc->rssi_off_2ghz[i]);
@@ -8280,8 +8187,7 @@
}
if (sc->rssi_off_5ghz[i] < RT2860_EEPROM_RSSI_OFF_MIN ||
- sc->rssi_off_5ghz[i] > RT2860_EEPROM_RSSI_OFF_MAX)
- {
+ sc->rssi_off_5ghz[i] > RT2860_EEPROM_RSSI_OFF_MAX) {
device_printf(sc->sc_dev,
"invalid EEPROM RSSI offset #%d (5GHz): 0x%02x\n",
i, sc->rssi_off_5ghz[i]);
@@ -8293,23 +8199,26 @@
RT2860_DPRINTF(sc, RT2860_DEBUG_EEPROM,
"%s: EEPROM RSSI offsets 2GHz=%d/%d/%d\n",
device_get_nameunit(sc->sc_dev),
- sc->rssi_off_2ghz[0], sc->rssi_off_2ghz[1], sc->rssi_off_2ghz[2]);
+ sc->rssi_off_2ghz[0], sc->rssi_off_2ghz[1],
+ sc->rssi_off_2ghz[2]);
RT2860_DPRINTF(sc, RT2860_DEBUG_EEPROM,
"%s: EEPROM RSSI offsets 5GHz=%d/%d/%d\n",
device_get_nameunit(sc->sc_dev),
- sc->rssi_off_5ghz[0], sc->rssi_off_5ghz[1], sc->rssi_off_5ghz[2]);
+ sc->rssi_off_5ghz[0], sc->rssi_off_5ghz[1],
+ sc->rssi_off_5ghz[2]);
/* read Tx power settings for 2GHz channels */
- for (i = 0; i < 14; i += 2)
- {
- val = rt2860_io_eeprom_read(sc, RT2860_EEPROM_TXPOW1_2GHZ_BASE + i / 2);
+ for (i = 0; i < 14; i += 2) {
+ val = rt2860_io_eeprom_read(sc,
+ RT2860_EEPROM_TXPOW1_2GHZ_BASE + i / 2);
sc->txpow1[i + 0] = (int8_t) (val & 0xff);
sc->txpow1[i + 1] = (int8_t) (val >> 8);
- val = rt2860_io_eeprom_read(sc, RT2860_EEPROM_TXPOW2_2GHZ_BASE + i / 2);
+ val = rt2860_io_eeprom_read(sc,
+ RT2860_EEPROM_TXPOW2_2GHZ_BASE + i / 2);
sc->txpow2[i + 0] = (int8_t) (val & 0xff);
sc->txpow2[i + 1] = (int8_t) (val >> 8);
@@ -8319,12 +8228,14 @@
for (; i < RT2860_SOFTC_TXPOW_COUNT; i += 2)
{
- val = rt2860_io_eeprom_read(sc, RT2860_EEPROM_TXPOW1_5GHZ_BASE + i / 2);
+ val = rt2860_io_eeprom_read(sc,
+ RT2860_EEPROM_TXPOW1_5GHZ_BASE + i / 2);
sc->txpow1[i + 0] = (int8_t) (val & 0xff);
sc->txpow1[i + 1] = (int8_t) (val >> 8);
- val = rt2860_io_eeprom_read(sc, RT2860_EEPROM_TXPOW2_5GHZ_BASE + i / 2);
+ val = rt2860_io_eeprom_read(sc,
+ RT2860_EEPROM_TXPOW2_5GHZ_BASE + i / 2);
sc->txpow2[i + 0] = (int8_t) (val & 0xff);
sc->txpow2[i + 1] = (int8_t) (val >> 8);
@@ -8332,11 +8243,9 @@
/* fix broken Tx power settings */
- for (i = 0; i < 14; i++)
- {
+ for (i = 0; i < 14; i++) {
if (sc->txpow1[i] < RT2860_EEPROM_TXPOW_2GHZ_MIN ||
- sc->txpow1[i] > RT2860_EEPROM_TXPOW_2GHZ_MAX)
- {
+ sc->txpow1[i] > RT2860_EEPROM_TXPOW_2GHZ_MAX) {
device_printf(sc->sc_dev,
"invalid EEPROM Tx power1 #%d (2GHz): 0x%02x\n",
i, sc->txpow1[i]);
@@ -8345,8 +8254,7 @@
}
if (sc->txpow2[i] < RT2860_EEPROM_TXPOW_2GHZ_MIN ||
- sc->txpow2[i] > RT2860_EEPROM_TXPOW_2GHZ_MAX)
- {
+ sc->txpow2[i] > RT2860_EEPROM_TXPOW_2GHZ_MAX) {
device_printf(sc->sc_dev,
"invalid EEPROM Tx power2 #%d (2GHz): 0x%02x\n",
i, sc->txpow2[i]);
@@ -8355,11 +8263,9 @@
}
}
- for (; i < RT2860_SOFTC_TXPOW_COUNT; i++)
- {
+ for (; i < RT2860_SOFTC_TXPOW_COUNT; i++) {
if (sc->txpow1[i] < RT2860_EEPROM_TXPOW_5GHZ_MIN ||
- sc->txpow1[i] > RT2860_EEPROM_TXPOW_5GHZ_MAX)
- {
+ sc->txpow1[i] > RT2860_EEPROM_TXPOW_5GHZ_MAX) {
device_printf(sc->sc_dev,
"invalid EEPROM Tx power1 #%d (5GHz): 0x%02x\n",
i, sc->txpow1[i]);
@@ -8368,8 +8274,7 @@
}
if (sc->txpow2[i] < RT2860_EEPROM_TXPOW_5GHZ_MIN ||
- sc->txpow2[i] > RT2860_EEPROM_TXPOW_5GHZ_MAX)
- {
+ sc->txpow2[i] > RT2860_EEPROM_TXPOW_5GHZ_MAX) {
device_printf(sc->sc_dev,
"invalid EEPROM Tx power2 #%d (5GHz): 0x%02x\n",
i, sc->txpow2[i]);
@@ -8385,24 +8290,24 @@
sc->txpow_rate_delta_2ghz = 0;
sc->txpow_rate_delta_5ghz = 0;
- if ((val & 0xff) != 0xff)
- {
+ if ((val & 0xff) != 0xff) {
if (val & 0x80)
sc->txpow_rate_delta_2ghz = (val & 0xf);
if (!(val & 0x40))
- sc->txpow_rate_delta_2ghz = -sc->txpow_rate_delta_2ghz;
+ sc->txpow_rate_delta_2ghz =
+ -sc->txpow_rate_delta_2ghz;
}
val >>= 8;
- if ((val & 0xff) != 0xff)
- {
+ if ((val & 0xff) != 0xff) {
if (val & 0x80)
sc->txpow_rate_delta_5ghz = (val & 0xf);
if (!(val & 0x40))
- sc->txpow_rate_delta_5ghz = -sc->txpow_rate_delta_5ghz;
+ sc->txpow_rate_delta_5ghz =
+ -sc->txpow_rate_delta_5ghz;
}
RT2860_DPRINTF(sc, RT2860_DEBUG_EEPROM,
@@ -8412,8 +8317,7 @@
/* read Tx power per rate */
- for (i = 0; i < RT2860_SOFTC_TXPOW_RATE_COUNT; i++)
- {
+ for (i = 0; i < RT2860_SOFTC_TXPOW_RATE_COUNT; i++) {
rt2860_io_eeprom_read_multi(sc, RT2860_EEPROM_TXPOW_RATE_BASE + i * sizeof(uint32_t),
&tmp, sizeof(uint32_t));
@@ -8540,8 +8444,7 @@
int8_t b4;
int i;
- for (i = 0; i < 8; i++)
- {
+ for (i = 0; i < 8; i++) {
b4 = txpow_rate & 0xf;
b4 += delta;
@@ -8613,49 +8516,48 @@
*/
const char *rt2860_rf_name(int rf_rev)
{
- switch (rf_rev)
- {
- case RT2860_EEPROM_RF_2820:
- return "RT2820 2.4G 2T3R";
-
- case RT2860_EEPROM_RF_2850:
- return "RT2850 2.4G/5G 2T3R";
-
- case RT2860_EEPROM_RF_2720:
- return "RT2720 2.4G 1T2R";
-
- case RT2860_EEPROM_RF_2750:
- return "RT2750 2.4G/5G 1T2R";
-
- case RT2860_EEPROM_RF_3020:
- return "RT3020 2.4G 1T1R";
-
- case RT2860_EEPROM_RF_2020:
- return "RT2020 2.4G B/G";
-
- case RT2860_EEPROM_RF_3021:
- return "RT3021 2.4G 1T2R";
-
- case RT2860_EEPROM_RF_3022:
- return "RT3022 2.4G 2T2R";
-
- case RT2860_EEPROM_RF_3052:
- return "RT3052 2.4G/5G 2T2R";
-
- case RT2860_EEPROM_RF_2853:
- return "RT2853 2.4G.5G 3T3R";
-
- case RT2860_EEPROM_RF_3320:
- return "RT3320 2.4G 1T1R with PA";
-
- case RT2860_EEPROM_RF_3322:
- return "RT3322 2.4G 2T2R with PA";
-
- case RT2860_EEPROM_RF_3053:
- return "RT3053 2.4G/5G 3T3R";
-
- default:
- return "unknown";
+ switch (rf_rev) {
+ case RT2860_EEPROM_RF_2820:
+ return "RT2820 2.4G 2T3R";
+
+ case RT2860_EEPROM_RF_2850:
+ return "RT2850 2.4G/5G 2T3R";
+
+ case RT2860_EEPROM_RF_2720:
+ return "RT2720 2.4G 1T2R";
+
+ case RT2860_EEPROM_RF_2750:
+ return "RT2750 2.4G/5G 1T2R";
+
+ case RT2860_EEPROM_RF_3020:
+ return "RT3020 2.4G 1T1R";
+
+ case RT2860_EEPROM_RF_2020:
+ return "RT2020 2.4G B/G";
+
+ case RT2860_EEPROM_RF_3021:
+ return "RT3021 2.4G 1T2R";
+
+ case RT2860_EEPROM_RF_3022:
+ return "RT3022 2.4G 2T2R";
+
+ case RT2860_EEPROM_RF_3052:
+ return "RT3052 2.4G/5G 2T2R";
+
+ case RT2860_EEPROM_RF_2853:
+ return "RT2853 2.4G.5G 3T3R";
+
+ case RT2860_EEPROM_RF_3320:
+ return "RT3320 2.4G 1T1R with PA";
+
+ case RT2860_EEPROM_RF_3322:
+ return "RT3322 2.4G 2T2R with PA";
+
+ case RT2860_EEPROM_RF_3053:
+ return "RT3053 2.4G/5G 3T3R";
+
+ default:
+ return "unknown";
}
}
@@ -8691,21 +8593,15 @@
rt2860_io_bbp_write(sc, 64, 0x37 - sc->lna_gain[group]);
rt2860_io_bbp_write(sc, 86, 0x00);
- if (group == 0)
- {
- if (sc->ext_lna_2ghz)
- {
+ if (group == 0) {
+ if (sc->ext_lna_2ghz) {
rt2860_io_bbp_write(sc, 82, 0x62);
rt2860_io_bbp_write(sc, 75, 0x46);
- }
- else
- {
+ } else {
rt2860_io_bbp_write(sc, 82, 0x84);
rt2860_io_bbp_write(sc, 75, 0x50);
}
- }
- else
- {
+ } else {
rt2860_io_bbp_write(sc, 82, 0xf2);
if (sc->ext_lna_5ghz)
@@ -8714,13 +8610,11 @@
rt2860_io_bbp_write(sc, 75, 0x50);
}
- if (group == 0)
- {
+ if (group == 0) {
tmp = 0x2e + sc->lna_gain[group];
- }
- else
- {
- if ((ic->ic_flags & IEEE80211_F_SCAN) || !IEEE80211_IS_CHAN_HT40(c))
+ } else {
+ if ((ic->ic_flags & IEEE80211_F_SCAN) ||
+ !IEEE80211_IS_CHAN_HT40(c))
tmp = 0x32 + sc->lna_gain[group] * 5 / 3;
else
tmp = 0x3a + sc->lna_gain[group] * 5 / 3;
@@ -8792,16 +8686,12 @@
rt2860_io_bbp_write(sc, 3, tmp);
- if (sc->mac_rev == 0x28600100)
- {
- if (!IEEE80211_IS_CHAN_HT40(c))
- {
+ if (sc->mac_rev == 0x28600100) {
+ if (!IEEE80211_IS_CHAN_HT40(c)) {
rt2860_io_bbp_write(sc, 69, 0x16);
rt2860_io_bbp_write(sc, 70, 0x08);
rt2860_io_bbp_write(sc, 73, 0x12);
- }
- else
- {
+ } else {
rt2860_io_bbp_write(sc, 69, 0x1a);
rt2860_io_bbp_write(sc, 70, 0x0a);
rt2860_io_bbp_write(sc, 73, 0x16);
@@ -9228,43 +9118,34 @@
else if (sc->nrxpath == 1)
r2 |= (1 << 17) | (1 << 6);
- if (IEEE80211_IS_CHAN_2GHZ(c))
- {
+ if (IEEE80211_IS_CHAN_2GHZ(c)) {
r3 = (r3 & 0xffffc1ff) | (txpow1 << 9);
r4 = (r4 & ~0x001f87c0) | (sc->rf_freq_off << 15) |
(txpow2 << 6);
- }
- else
- {
+ } else {
r3 = r3 & 0xffffc1ff;
r4 = (r4 & ~0x001f87c0) | (sc->rf_freq_off << 15);
- if (txpow1 >= RT2860_EEPROM_TXPOW_5GHZ_MIN && txpow1 < 0)
- {
+ if (txpow1 >= RT2860_EEPROM_TXPOW_5GHZ_MIN && txpow1 < 0) {
txpow1 = (-RT2860_EEPROM_TXPOW_5GHZ_MIN + txpow1);
if (txpow1 > RT2860_EEPROM_TXPOW_5GHZ_MAX)
txpow1 = RT2860_EEPROM_TXPOW_5GHZ_MAX;
r3 |= (txpow1 << 10);
- }
- else
- {
+ } else {
if (txpow1 > RT2860_EEPROM_TXPOW_5GHZ_MAX)
txpow1 = RT2860_EEPROM_TXPOW_5GHZ_MAX;
r3 |= (txpow1 << 10) | (1 << 9);
}
- if (txpow2 >= RT2860_EEPROM_TXPOW_5GHZ_MIN && txpow2 < 0)
- {
+ if (txpow2 >= RT2860_EEPROM_TXPOW_5GHZ_MIN && txpow2 < 0) {
txpow2 = (-RT2860_EEPROM_TXPOW_5GHZ_MIN + txpow2);
if (txpow2 > RT2860_EEPROM_TXPOW_5GHZ_MAX)
txpow2 = RT2860_EEPROM_TXPOW_5GHZ_MAX;
r4 |= (txpow2 << 7);
- }
- else
- {
+ } else {
if (txpow2 > RT2860_EEPROM_TXPOW_5GHZ_MAX)
txpow2 = RT2860_EEPROM_TXPOW_5GHZ_MAX;
@@ -9394,4 +9275,3 @@
DELAY(1000);
}
-
More information about the Zrouter-src-freebsd
mailing list