if_ath.c: make ath_hal_reg_write_tgt more readable

[open-ath9k-htc-firmware.git] / target_firmware / wlan / if_ath.c

diff --git a/target_firmware/wlan/if_ath.c b/target_firmware/wlan/if_ath.c
index aa43c23238ddd417ae894bc686adceaaff631e01..896e72b56ff8506d7658e27937150d8f04cb38af 100755 (executable)
--- a/target_firmware/wlan/if_ath.c
+++ b/target_firmware/wlan/if_ath.c
@@ -255,9 +255,7 @@ static a_int32_t ath_rxdesc_init(struct ath_softc_tgt *sc, struct ath_rx_desc *d
        ds->ds_link = 0;
        adf_nbuf_peek_header(ds->ds_nbuf, &anbdata, &anblen);
 
-       ah->ah_setupRxDesc(ah, ds,
-                           adf_nbuf_tailroom(ds->ds_nbuf),
-                           0);
+       ah->ah_setupRxDesc(ds, adf_nbuf_tailroom(ds->ds_nbuf), 0);
 
        if (sc->sc_rxlink == NULL) {
                ah->ah_setRxDP(ah, ds->ds_daddr);
@@ -544,22 +542,18 @@ static void ath_beacon_setup(struct ath_softc_tgt *sc,
        rt  = sc->sc_currates;
        rate = rt->info[rix].rateCode;
 
-       ah->ah_setupTxDesc(ah, ds
+       ah->ah_setupTxDesc(ds
                            , adf_nbuf_len(skb) + IEEE80211_CRC_LEN
                            , sizeof(struct ieee80211_frame)
                            , HAL_PKT_TYPE_BEACON
                            , MAX_RATE_POWER
                            , rate, 1
                            , HAL_TXKEYIX_INVALID
-                           , 0
                            , flags
                            , 0
-                           , 0
-                           , 0
-                           , 0
-                           , ATH_COMP_PROC_NO_COMP_NO_CCS);
+                           , 0);
 
-       ah->ah_fillTxDesc(ah, ds
+       ah->ah_fillTxDesc(ds
                           , asf_roundup(adf_nbuf_len(skb), 4)
                           , AH_TRUE
                           , AH_TRUE
@@ -569,7 +563,7 @@ static void ath_beacon_setup(struct ath_softc_tgt *sc,
        series[0].Rate = rate;
        series[0].ChSel = sc->sc_ic.ic_tx_chainmask;
        series[0].RateFlags = 0;
-       ah->ah_set11nRateScenario(ah, ds, 0, 0, 0, series, 4, 0);
+       ah->ah_set11nRateScenario(ds, 0, 0, series, 4, 0);
 }
 
 static void ath_tgt_send_beacon(struct ath_softc_tgt *sc, adf_nbuf_t bc_hdr,
@@ -1431,10 +1425,7 @@ static void ath_hal_reg_write_tgt(void *Context, A_UINT16 Command,
                t = (struct registerWrite *)(data+i);
 
                if( t->reg > 0xffff ) {
-                       a_uint32_t *pReg = (a_uint32_t *)t->reg;
-
-                       *pReg = t->val;
-
+                       HAL_WORD_REG_WRITE(t->reg, t->val);
 #if defined(PROJECT_K2)
                        if( t->reg == 0x50040 ) {
                                static uint8_t flg=0;
@@ -1450,20 +1441,19 @@ static void ath_hal_reg_write_tgt(void *Context, A_UINT16 Command,
 #if defined(PROJECT_K2)
                        if( t->reg == 0x7014 ) {
                                static uint8_t resetPLL = 0;
-                               a_uint32_t *pReg;
 
                                if( resetPLL == 0 ) {
-                                       t->reg = 0x50044;
-                                       pReg = (a_uint32_t *)t->reg;
-                                       *pReg = 0;
+                                       /* here we write to core register */
+                                       HAL_WORD_REG_WRITE(MAGPIE_REG_RST_PWDN_CTRL_ADDR, 0x0);
+                                       /* and here to mac register */
                                        ath_hal_reg_write_target(ah, 0x786c,
                                                 ath_hal_reg_read_target(ah,0x786c) | 0x6000000);
                                        ath_hal_reg_write_target(ah, 0x786c,
                                                 ath_hal_reg_read_target(ah,0x786c) & (~0x6000000));
-                                       *pReg = 0x20;
+
+                                       HAL_WORD_REG_WRITE(MAGPIE_REG_RST_PWDN_CTRL_ADDR, 0x20);
                                        resetPLL = 1;
                                }
-                               t->reg = 0x7014;
                        }
 #elif defined(PROJECT_MAGPIE) && !defined (FPGA)
                        if( t->reg == 0x7014 ){