These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git] / kernel / drivers / staging / rtl8192e / rtl8192e / r8192E_dev.c
index 2869602..e9c4f97 100644 (file)
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
  * The full GNU General Public License is included in this distribution in the
  * file called LICENSE.
  *
 #include "rtl_dm.h"
 #include "rtl_wx.h"
 
-static int WDCAPARA_ADD[] = {EDCAPARA_BE, EDCAPARA_BK, EDCAPARA_VI, EDCAPARA_VO};
+static int WDCAPARA_ADD[] = {EDCAPARA_BE, EDCAPARA_BK, EDCAPARA_VI,
+                            EDCAPARA_VO};
 
-void rtl8192e_start_beacon(struct net_device *dev)
+void rtl92e_start_beacon(struct net_device *dev)
 {
        struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
        struct rtllib_network *net = &priv->rtllib->current_network;
@@ -40,30 +37,29 @@ void rtl8192e_start_beacon(struct net_device *dev)
        u16 BcnCW = 6;
        u16 BcnIFS = 0xf;
 
-       DMESG("Enabling beacon TX");
-       rtl8192_irq_disable(dev);
+       rtl92e_irq_disable(dev);
 
-       write_nic_word(dev, ATIMWND, 2);
+       rtl92e_writew(dev, ATIMWND, 2);
 
-       write_nic_word(dev, BCN_INTERVAL, net->beacon_interval);
-       write_nic_word(dev, BCN_DRV_EARLY_INT, 10);
-       write_nic_word(dev, BCN_DMATIME, 256);
+       rtl92e_writew(dev, BCN_INTERVAL, net->beacon_interval);
+       rtl92e_writew(dev, BCN_DRV_EARLY_INT, 10);
+       rtl92e_writew(dev, BCN_DMATIME, 256);
 
-       write_nic_byte(dev, BCN_ERR_THRESH, 100);
+       rtl92e_writeb(dev, BCN_ERR_THRESH, 100);
 
        BcnTimeCfg |= BcnCW<<BCN_TCFG_CW_SHIFT;
        BcnTimeCfg |= BcnIFS<<BCN_TCFG_IFS;
-       write_nic_word(dev, BCN_TCFG, BcnTimeCfg);
-       rtl8192_irq_enable(dev);
+       rtl92e_writew(dev, BCN_TCFG, BcnTimeCfg);
+       rtl92e_irq_enable(dev);
 }
 
-static void rtl8192e_update_msr(struct net_device *dev)
+static void _rtl92e_update_msr(struct net_device *dev)
 {
        struct r8192_priv *priv = rtllib_priv(dev);
        u8 msr;
        enum led_ctl_mode LedAction = LED_CTL_NO_LINK;
 
-       msr  = read_nic_byte(dev, MSR);
+       msr  = rtl92e_readb(dev, MSR);
        msr &= ~MSR_LINK_MASK;
 
        switch (priv->rtllib->iw_mode) {
@@ -90,33 +86,31 @@ static void rtl8192e_update_msr(struct net_device *dev)
                break;
        }
 
-       write_nic_byte(dev, MSR, msr);
+       rtl92e_writeb(dev, MSR, msr);
        if (priv->rtllib->LedControlHandler)
                priv->rtllib->LedControlHandler(dev, LedAction);
 }
 
-void rtl8192e_SetHwReg(struct net_device *dev, u8 variable, u8 *val)
+void rtl92e_set_reg(struct net_device *dev, u8 variable, u8 *val)
 {
        struct r8192_priv *priv = rtllib_priv(dev);
 
        switch (variable) {
        case HW_VAR_BSSID:
-               write_nic_dword(dev, BSSIDR, ((u32 *)(val))[0]);
-               write_nic_word(dev, BSSIDR+2, ((u16 *)(val+2))[0]);
+               rtl92e_writel(dev, BSSIDR, ((u32 *)(val))[0]);
+               rtl92e_writew(dev, BSSIDR+2, ((u16 *)(val+2))[0]);
                break;
 
        case HW_VAR_MEDIA_STATUS:
        {
                enum rt_op_mode OpMode = *((enum rt_op_mode *)(val));
-               enum led_ctl_mode LedAction = LED_CTL_NO_LINK;
-               u8              btMsr = read_nic_byte(dev, MSR);
+               u8 btMsr = rtl92e_readb(dev, MSR);
 
                btMsr &= 0xfc;
 
                switch (OpMode) {
                case RT_OP_MODE_INFRASTRUCTURE:
                        btMsr |= MSR_INFRA;
-                       LedAction = LED_CTL_LINK;
                        break;
 
                case RT_OP_MODE_IBSS:
@@ -125,7 +119,6 @@ void rtl8192e_SetHwReg(struct net_device *dev, u8 variable, u8 *val)
 
                case RT_OP_MODE_AP:
                        btMsr |= MSR_AP;
-                       LedAction = LED_CTL_LINK;
                        break;
 
                default:
@@ -133,7 +126,7 @@ void rtl8192e_SetHwReg(struct net_device *dev, u8 variable, u8 *val)
                        break;
                }
 
-               write_nic_byte(dev, MSR, btMsr);
+               rtl92e_writeb(dev, MSR, btMsr);
 
        }
        break;
@@ -143,7 +136,7 @@ void rtl8192e_SetHwReg(struct net_device *dev, u8 variable, u8 *val)
                u32     RegRCR, Type;
 
                Type = ((u8 *)(val))[0];
-               RegRCR = read_nic_dword(dev, RCR);
+               RegRCR = rtl92e_readl(dev, RCR);
                priv->ReceiveConfig = RegRCR;
 
                if (Type == true)
@@ -151,7 +144,7 @@ void rtl8192e_SetHwReg(struct net_device *dev, u8 variable, u8 *val)
                else if (Type == false)
                        RegRCR &= (~RCR_CBSSID);
 
-               write_nic_dword(dev, RCR, RegRCR);
+               rtl92e_writel(dev, RCR, RegRCR);
                priv->ReceiveConfig = RegRCR;
 
        }
@@ -160,7 +153,7 @@ void rtl8192e_SetHwReg(struct net_device *dev, u8 variable, u8 *val)
        case HW_VAR_SLOT_TIME:
 
                priv->slot_time = val[0];
-               write_nic_byte(dev, SLOT_TIME, val[0]);
+               rtl92e_writeb(dev, SLOT_TIME, val[0]);
 
                break;
 
@@ -172,12 +165,12 @@ void rtl8192e_SetHwReg(struct net_device *dev, u8 variable, u8 *val)
                regTmp = priv->basic_rate;
                if (priv->short_preamble)
                        regTmp |= BRSR_AckShortPmb;
-               write_nic_dword(dev, RRSR, regTmp);
+               rtl92e_writel(dev, RRSR, regTmp);
                break;
        }
 
        case HW_VAR_CPU_RST:
-               write_nic_dword(dev, CPU_GEN, ((u32 *)(val))[0]);
+               rtl92e_writel(dev, CPU_GEN, ((u32 *)(val))[0]);
                break;
 
        case HW_VAR_AC_PARAM:
@@ -187,40 +180,39 @@ void rtl8192e_SetHwReg(struct net_device *dev, u8 variable, u8 *val)
                u8              u1bAIFS;
                u32             u4bAcParam;
                u8 mode = priv->rtllib->mode;
-               struct rtllib_qos_parameters *qos_parameters =
+               struct rtllib_qos_parameters *qop =
                         &priv->rtllib->current_network.qos_data.parameters;
 
-               u1bAIFS = qos_parameters->aifs[pAcParam] *
+               u1bAIFS = qop->aifs[pAcParam] *
                          ((mode&(IEEE_G|IEEE_N_24G)) ? 9 : 20) + aSifsTime;
 
-               dm_init_edca_turbo(dev);
+               rtl92e_dm_init_edca_turbo(dev);
 
-               u4bAcParam = (((le16_to_cpu(
-                                       qos_parameters->tx_op_limit[pAcParam])) <<
-                            AC_PARAM_TXOP_LIMIT_OFFSET) |
-                            ((le16_to_cpu(qos_parameters->cw_max[pAcParam])) <<
-                            AC_PARAM_ECW_MAX_OFFSET) |
-                            ((le16_to_cpu(qos_parameters->cw_min[pAcParam])) <<
-                            AC_PARAM_ECW_MIN_OFFSET) |
-                            (((u32)u1bAIFS) << AC_PARAM_AIFS_OFFSET));
+               u4bAcParam = (le16_to_cpu(qop->tx_op_limit[pAcParam]) <<
+                             AC_PARAM_TXOP_LIMIT_OFFSET) |
+                               ((le16_to_cpu(qop->cw_max[pAcParam])) <<
+                                AC_PARAM_ECW_MAX_OFFSET) |
+                               ((le16_to_cpu(qop->cw_min[pAcParam])) <<
+                                AC_PARAM_ECW_MIN_OFFSET) |
+                               (((u32)u1bAIFS) << AC_PARAM_AIFS_OFFSET);
 
                RT_TRACE(COMP_DBG, "%s():HW_VAR_AC_PARAM eACI:%x:%x\n",
                         __func__, eACI, u4bAcParam);
                switch (eACI) {
                case AC1_BK:
-                       write_nic_dword(dev, EDCAPARA_BK, u4bAcParam);
+                       rtl92e_writel(dev, EDCAPARA_BK, u4bAcParam);
                        break;
 
                case AC0_BE:
-                       write_nic_dword(dev, EDCAPARA_BE, u4bAcParam);
+                       rtl92e_writel(dev, EDCAPARA_BE, u4bAcParam);
                        break;
 
                case AC2_VI:
-                       write_nic_dword(dev, EDCAPARA_VI, u4bAcParam);
+                       rtl92e_writel(dev, EDCAPARA_VI, u4bAcParam);
                        break;
 
                case AC3_VO:
-                       write_nic_dword(dev, EDCAPARA_VO, u4bAcParam);
+                       rtl92e_writel(dev, EDCAPARA_VO, u4bAcParam);
                        break;
 
                default:
@@ -242,7 +234,7 @@ void rtl8192e_SetHwReg(struct net_device *dev, u8 variable, u8 *val)
                union aci_aifsn *pAciAifsn = (union aci_aifsn *) &
                                              (qos_parameters->aifs[0]);
                u8 acm = pAciAifsn->f.acm;
-               u8 AcmCtrl = read_nic_byte(dev, AcmHwCtrl);
+               u8 AcmCtrl = rtl92e_readb(dev, AcmHwCtrl);
 
                RT_TRACE(COMP_DBG, "===========>%s():HW_VAR_ACM_CTRL:%x\n",
                         __func__, eACI);
@@ -290,20 +282,20 @@ void rtl8192e_SetHwReg(struct net_device *dev, u8 variable, u8 *val)
                RT_TRACE(COMP_QOS,
                         "SetHwReg8190pci(): [HW_VAR_ACM_CTRL] Write 0x%X\n",
                         AcmCtrl);
-               write_nic_byte(dev, AcmHwCtrl, AcmCtrl);
+               rtl92e_writeb(dev, AcmHwCtrl, AcmCtrl);
                break;
        }
 
        case HW_VAR_SIFS:
-               write_nic_byte(dev, SIFS, val[0]);
-               write_nic_byte(dev, SIFS+1, val[0]);
+               rtl92e_writeb(dev, SIFS, val[0]);
+               rtl92e_writeb(dev, SIFS+1, val[0]);
                break;
 
        case HW_VAR_RF_TIMING:
        {
                u8 Rf_Timing = *((u8 *)val);
 
-               write_nic_byte(dev, rFPGA0_RFTiming1, Rf_Timing);
+               rtl92e_writeb(dev, rFPGA0_RFTiming1, Rf_Timing);
                break;
        }
 
@@ -313,34 +305,35 @@ void rtl8192e_SetHwReg(struct net_device *dev, u8 variable, u8 *val)
 
 }
 
-static void rtl8192_read_eeprom_info(struct net_device *dev)
+static void _rtl92e_read_eeprom_info(struct net_device *dev)
 {
        struct r8192_priv *priv = rtllib_priv(dev);
-
+       const u8 bMac_Tmp_Addr[ETH_ALEN] = {0x00, 0xe0, 0x4c, 0x00, 0x00, 0x01};
        u8 tempval;
        u8 ICVer8192, ICVer8256;
        u16 i, usValue, IC_Version;
        u16 EEPROMId;
-       u8 bMac_Tmp_Addr[6] = {0x00, 0xe0, 0x4c, 0x00, 0x00, 0x01};
 
-       RT_TRACE(COMP_INIT, "====> rtl8192_read_eeprom_info\n");
+       RT_TRACE(COMP_INIT, "====> _rtl92e_read_eeprom_info\n");
 
-       EEPROMId = eprom_read(dev, 0);
+       EEPROMId = rtl92e_eeprom_read(dev, 0);
        if (EEPROMId != RTL8190_EEPROM_ID) {
-               RT_TRACE(COMP_ERR, "EEPROM ID is invalid:%x, %x\n",
-                        EEPROMId, RTL8190_EEPROM_ID);
+               netdev_err(dev, "%s(): Invalid EEPROM ID: %x\n", __func__,
+                          EEPROMId);
                priv->AutoloadFailFlag = true;
        } else {
                priv->AutoloadFailFlag = false;
        }
 
        if (!priv->AutoloadFailFlag) {
-               priv->eeprom_vid = eprom_read(dev, EEPROM_VID >> 1);
-               priv->eeprom_did = eprom_read(dev, EEPROM_DID >> 1);
+               priv->eeprom_vid = rtl92e_eeprom_read(dev, EEPROM_VID >> 1);
+               priv->eeprom_did = rtl92e_eeprom_read(dev, EEPROM_DID >> 1);
 
-               usValue = eprom_read(dev, (u16)(EEPROM_Customer_ID>>1)) >> 8;
+               usValue = rtl92e_eeprom_read(dev,
+                                            (u16)(EEPROM_Customer_ID>>1)) >> 8;
                priv->eeprom_CustomerID = (u8)(usValue & 0xff);
-               usValue = eprom_read(dev, EEPROM_ICVersion_ChannelPlan>>1);
+               usValue = rtl92e_eeprom_read(dev,
+                                            EEPROM_ICVersion_ChannelPlan>>1);
                priv->eeprom_ChannelPlan = usValue&0xff;
                IC_Version = (usValue & 0xff00)>>8;
 
@@ -378,12 +371,12 @@ static void rtl8192_read_eeprom_info(struct net_device *dev)
 
        if (!priv->AutoloadFailFlag) {
                for (i = 0; i < 6; i += 2) {
-                       usValue = eprom_read(dev,
+                       usValue = rtl92e_eeprom_read(dev,
                                 (u16)((EEPROM_NODE_ADDRESS_BYTE_0 + i) >> 1));
                        *(u16 *)(&dev->dev_addr[i]) = usValue;
                }
        } else {
-               memcpy(dev->dev_addr, bMac_Tmp_Addr, 6);
+               ether_addr_copy(dev->dev_addr, bMac_Tmp_Addr);
        }
 
        RT_TRACE(COMP_INIT, "Permanent Address = %pM\n",
@@ -398,8 +391,8 @@ static void rtl8192_read_eeprom_info(struct net_device *dev)
 
        if (priv->card_8192_version > VERSION_8190_BD) {
                if (!priv->AutoloadFailFlag) {
-                       tempval = (eprom_read(dev, (EEPROM_RFInd_PowerDiff >>
-                                             1))) & 0xff;
+                       tempval = (rtl92e_eeprom_read(dev,
+                                                     (EEPROM_RFInd_PowerDiff >> 1))) & 0xff;
                        priv->EEPROMLegacyHTTxPowerDiff = tempval & 0xf;
 
                        if (tempval&0x80)
@@ -413,7 +406,7 @@ static void rtl8192_read_eeprom_info(struct net_device *dev)
                        priv->EEPROMLegacyHTTxPowerDiff);
 
                if (!priv->AutoloadFailFlag)
-                       priv->EEPROMThermalMeter = (u8)(((eprom_read(dev,
+                       priv->EEPROMThermalMeter = (u8)(((rtl92e_eeprom_read(dev,
                                                   (EEPROM_ThermalMeter>>1))) &
                                                   0xff00)>>8);
                else
@@ -424,7 +417,7 @@ static void rtl8192_read_eeprom_info(struct net_device *dev)
 
                if (priv->epromtype == EEPROM_93C46) {
                        if (!priv->AutoloadFailFlag) {
-                               usValue = eprom_read(dev,
+                               usValue = rtl92e_eeprom_read(dev,
                                          EEPROM_TxPwDiff_CrystalCap >> 1);
                                priv->EEPROMAntPwDiff = (usValue&0x0fff);
                                priv->EEPROMCrystalCap = (u8)((usValue & 0xf000)
@@ -442,7 +435,7 @@ static void rtl8192_read_eeprom_info(struct net_device *dev)
 
                        for (i = 0; i < 14; i += 2) {
                                if (!priv->AutoloadFailFlag)
-                                       usValue = eprom_read(dev,
+                                       usValue = rtl92e_eeprom_read(dev,
                                                  (u16)((EEPROM_TxPwIndex_CCK +
                                                  i) >> 1));
                                else
@@ -458,7 +451,7 @@ static void rtl8192_read_eeprom_info(struct net_device *dev)
                        }
                        for (i = 0; i < 14; i += 2) {
                                if (!priv->AutoloadFailFlag)
-                                       usValue = eprom_read(dev,
+                                       usValue = rtl92e_eeprom_read(dev,
                                                (u16)((EEPROM_TxPwIndex_OFDM_24G
                                                + i) >> 1));
                                else
@@ -562,7 +555,7 @@ static void rtl8192_read_eeprom_info(struct net_device *dev)
                RT_TRACE(COMP_INIT, "\n2T4R config\n");
        }
 
-       init_rate_adaptive(dev);
+       rtl92e_init_adaptive_rate(dev);
 
        priv->rf_chip = RF_8256;
 
@@ -627,23 +620,23 @@ static void rtl8192_read_eeprom_info(struct net_device *dev)
        RT_TRACE(COMP_TRACE, "<==== ReadAdapterInfo\n");
 }
 
-void rtl8192_get_eeprom_size(struct net_device *dev)
+void rtl92e_get_eeprom_size(struct net_device *dev)
 {
        u16 curCR;
        struct r8192_priv *priv = rtllib_priv(dev);
 
        RT_TRACE(COMP_INIT, "===========>%s()\n", __func__);
-       curCR = read_nic_dword(dev, EPROM_CMD);
+       curCR = rtl92e_readl(dev, EPROM_CMD);
        RT_TRACE(COMP_INIT, "read from Reg Cmd9346CR(%x):%x\n", EPROM_CMD,
                 curCR);
        priv->epromtype = (curCR & EPROM_CMD_9356SEL) ? EEPROM_93C56 :
                          EEPROM_93C46;
        RT_TRACE(COMP_INIT, "<===========%s(), epromtype:%d\n", __func__,
                 priv->epromtype);
-       rtl8192_read_eeprom_info(dev);
+       _rtl92e_read_eeprom_info(dev);
 }
 
-static void rtl8192_hwconfig(struct net_device *dev)
+static void _rtl92e_hwconfig(struct net_device *dev)
 {
        u32 regRATR = 0, regRRSR = 0;
        u8 regBwOpMode = 0, regTmp = 0;
@@ -685,26 +678,26 @@ static void rtl8192_hwconfig(struct net_device *dev)
                break;
        }
 
-       write_nic_byte(dev, BW_OPMODE, regBwOpMode);
+       rtl92e_writeb(dev, BW_OPMODE, regBwOpMode);
        {
                u32 ratr_value = 0;
 
                ratr_value = regRATR;
                if (priv->rf_type == RF_1T2R)
                        ratr_value &= ~(RATE_ALL_OFDM_2SS);
-               write_nic_dword(dev, RATR0, ratr_value);
-               write_nic_byte(dev, UFWP, 1);
+               rtl92e_writel(dev, RATR0, ratr_value);
+               rtl92e_writeb(dev, UFWP, 1);
        }
-       regTmp = read_nic_byte(dev, 0x313);
+       regTmp = rtl92e_readb(dev, 0x313);
        regRRSR = ((regTmp) << 24) | (regRRSR & 0x00ffffff);
-       write_nic_dword(dev, RRSR, regRRSR);
+       rtl92e_writel(dev, RRSR, regRRSR);
 
-       write_nic_word(dev, RETRY_LIMIT,
-                       priv->ShortRetryLimit << RETRY_LIMIT_SHORT_SHIFT |
-                       priv->LongRetryLimit << RETRY_LIMIT_LONG_SHIFT);
+       rtl92e_writew(dev, RETRY_LIMIT,
+                     priv->ShortRetryLimit << RETRY_LIMIT_SHORT_SHIFT |
+                     priv->LongRetryLimit << RETRY_LIMIT_LONG_SHIFT);
 }
 
-bool rtl8192_adapter_start(struct net_device *dev)
+bool rtl92e_start_adapter(struct net_device *dev)
 {
        struct r8192_priv *priv = rtllib_priv(dev);
        u32 ulRegRead;
@@ -720,125 +713,124 @@ bool rtl8192_adapter_start(struct net_device *dev)
        priv->being_init_adapter = true;
 
 start:
-       rtl8192_pci_resetdescring(dev);
+       rtl92e_reset_desc_ring(dev);
        priv->Rf_Mode = RF_OP_By_SW_3wire;
        if (priv->ResetProgress == RESET_TYPE_NORESET) {
-               write_nic_byte(dev, ANAPAR, 0x37);
+               rtl92e_writeb(dev, ANAPAR, 0x37);
                mdelay(500);
        }
-       priv->pFirmware->firmware_status = FW_STATUS_0_INIT;
+       priv->pFirmware->status = FW_STATUS_0_INIT;
 
        if (priv->RegRfOff)
                priv->rtllib->eRFPowerState = eRfOff;
 
-       ulRegRead = read_nic_dword(dev, CPU_GEN);
-       if (priv->pFirmware->firmware_status == FW_STATUS_0_INIT)
+       ulRegRead = rtl92e_readl(dev, CPU_GEN);
+       if (priv->pFirmware->status == FW_STATUS_0_INIT)
                ulRegRead |= CPU_GEN_SYSTEM_RESET;
-       else if (priv->pFirmware->firmware_status == FW_STATUS_5_READY)
+       else if (priv->pFirmware->status == FW_STATUS_5_READY)
                ulRegRead |= CPU_GEN_FIRMWARE_RESET;
        else
-               RT_TRACE(COMP_ERR,
-                        "ERROR in %s(): undefined firmware state(%d)\n",
-                        __func__,   priv->pFirmware->firmware_status);
+               netdev_err(dev, "%s(): undefined firmware state: %d.\n",
+                          __func__, priv->pFirmware->status);
 
-       write_nic_dword(dev, CPU_GEN, ulRegRead);
+       rtl92e_writel(dev, CPU_GEN, ulRegRead);
 
-       ICVersion = read_nic_byte(dev, IC_VERRSION);
+       ICVersion = rtl92e_readb(dev, IC_VERRSION);
        if (ICVersion >= 0x4) {
-               SwitchingRegulatorOutput = read_nic_byte(dev, SWREGULATOR);
+               SwitchingRegulatorOutput = rtl92e_readb(dev, SWREGULATOR);
                if (SwitchingRegulatorOutput  != 0xb8) {
-                       write_nic_byte(dev, SWREGULATOR, 0xa8);
+                       rtl92e_writeb(dev, SWREGULATOR, 0xa8);
                        mdelay(1);
-                       write_nic_byte(dev, SWREGULATOR, 0xb8);
+                       rtl92e_writeb(dev, SWREGULATOR, 0xb8);
                }
        }
        RT_TRACE(COMP_INIT, "BB Config Start!\n");
-       rtStatus = rtl8192_BBConfig(dev);
+       rtStatus = rtl92e_config_bb(dev);
        if (!rtStatus) {
-               RT_TRACE(COMP_ERR, "BB Config failed\n");
+               netdev_warn(dev, "%s(): Failed to configure BB\n", __func__);
                return rtStatus;
        }
        RT_TRACE(COMP_INIT, "BB Config Finished!\n");
 
        priv->LoopbackMode = RTL819X_NO_LOOPBACK;
        if (priv->ResetProgress == RESET_TYPE_NORESET) {
-               ulRegRead = read_nic_dword(dev, CPU_GEN);
+               ulRegRead = rtl92e_readl(dev, CPU_GEN);
                if (priv->LoopbackMode == RTL819X_NO_LOOPBACK)
                        ulRegRead = ((ulRegRead & CPU_GEN_NO_LOOPBACK_MSK) |
                                     CPU_GEN_NO_LOOPBACK_SET);
                else if (priv->LoopbackMode == RTL819X_MAC_LOOPBACK)
                        ulRegRead |= CPU_CCK_LOOPBACK;
                else
-                       RT_TRACE(COMP_ERR,
-                                "Serious error: wrong loopback mode setting\n");
+                       netdev_err(dev, "%s: Invalid loopback mode setting.\n",
+                                  __func__);
 
-               write_nic_dword(dev, CPU_GEN, ulRegRead);
+               rtl92e_writel(dev, CPU_GEN, ulRegRead);
 
                udelay(500);
        }
-       rtl8192_hwconfig(dev);
-       write_nic_byte(dev, CMDR, CR_RE | CR_TE);
-
-       write_nic_byte(dev, PCIF, ((MXDMA2_NoLimit<<MXDMA2_RX_SHIFT) |
-                      (MXDMA2_NoLimit<<MXDMA2_TX_SHIFT)));
-       write_nic_dword(dev, MAC0, ((u32 *)dev->dev_addr)[0]);
-       write_nic_word(dev, MAC4, ((u16 *)(dev->dev_addr + 4))[0]);
-       write_nic_dword(dev, RCR, priv->ReceiveConfig);
-
-       write_nic_dword(dev, RQPN1,  NUM_OF_PAGE_IN_FW_QUEUE_BK <<
-                       RSVD_FW_QUEUE_PAGE_BK_SHIFT |
-                       NUM_OF_PAGE_IN_FW_QUEUE_BE <<
-                       RSVD_FW_QUEUE_PAGE_BE_SHIFT |
-                       NUM_OF_PAGE_IN_FW_QUEUE_VI <<
-                       RSVD_FW_QUEUE_PAGE_VI_SHIFT |
-                       NUM_OF_PAGE_IN_FW_QUEUE_VO <<
-                       RSVD_FW_QUEUE_PAGE_VO_SHIFT);
-       write_nic_dword(dev, RQPN2, NUM_OF_PAGE_IN_FW_QUEUE_MGNT <<
-                       RSVD_FW_QUEUE_PAGE_MGNT_SHIFT);
-       write_nic_dword(dev, RQPN3, APPLIED_RESERVED_QUEUE_IN_FW |
-                       NUM_OF_PAGE_IN_FW_QUEUE_BCN <<
-                       RSVD_FW_QUEUE_PAGE_BCN_SHIFT|
-                       NUM_OF_PAGE_IN_FW_QUEUE_PUB <<
-                       RSVD_FW_QUEUE_PAGE_PUB_SHIFT);
-
-       rtl8192_tx_enable(dev);
-       rtl8192_rx_enable(dev);
-       ulRegRead = (0xFFF00000 & read_nic_dword(dev, RRSR))  |
+       _rtl92e_hwconfig(dev);
+       rtl92e_writeb(dev, CMDR, CR_RE | CR_TE);
+
+       rtl92e_writeb(dev, PCIF, ((MXDMA2_NoLimit<<MXDMA2_RX_SHIFT) |
+                                 (MXDMA2_NoLimit<<MXDMA2_TX_SHIFT)));
+       rtl92e_writel(dev, MAC0, ((u32 *)dev->dev_addr)[0]);
+       rtl92e_writew(dev, MAC4, ((u16 *)(dev->dev_addr + 4))[0]);
+       rtl92e_writel(dev, RCR, priv->ReceiveConfig);
+
+       rtl92e_writel(dev, RQPN1, NUM_OF_PAGE_IN_FW_QUEUE_BK <<
+                     RSVD_FW_QUEUE_PAGE_BK_SHIFT |
+                     NUM_OF_PAGE_IN_FW_QUEUE_BE <<
+                     RSVD_FW_QUEUE_PAGE_BE_SHIFT |
+                     NUM_OF_PAGE_IN_FW_QUEUE_VI <<
+                     RSVD_FW_QUEUE_PAGE_VI_SHIFT |
+                     NUM_OF_PAGE_IN_FW_QUEUE_VO <<
+                     RSVD_FW_QUEUE_PAGE_VO_SHIFT);
+       rtl92e_writel(dev, RQPN2, NUM_OF_PAGE_IN_FW_QUEUE_MGNT <<
+                     RSVD_FW_QUEUE_PAGE_MGNT_SHIFT);
+       rtl92e_writel(dev, RQPN3, APPLIED_RESERVED_QUEUE_IN_FW |
+                     NUM_OF_PAGE_IN_FW_QUEUE_BCN <<
+                     RSVD_FW_QUEUE_PAGE_BCN_SHIFT|
+                     NUM_OF_PAGE_IN_FW_QUEUE_PUB <<
+                     RSVD_FW_QUEUE_PAGE_PUB_SHIFT);
+
+       rtl92e_tx_enable(dev);
+       rtl92e_rx_enable(dev);
+       ulRegRead = (0xFFF00000 & rtl92e_readl(dev, RRSR))  |
                     RATE_ALL_OFDM_AG | RATE_ALL_CCK;
-       write_nic_dword(dev, RRSR, ulRegRead);
-       write_nic_dword(dev, RATR0+4*7, (RATE_ALL_OFDM_AG | RATE_ALL_CCK));
+       rtl92e_writel(dev, RRSR, ulRegRead);
+       rtl92e_writel(dev, RATR0+4*7, (RATE_ALL_OFDM_AG | RATE_ALL_CCK));
 
-       write_nic_byte(dev, ACK_TIMEOUT, 0x30);
+       rtl92e_writeb(dev, ACK_TIMEOUT, 0x30);
 
        if (priv->ResetProgress == RESET_TYPE_NORESET)
-               rtl8192_SetWirelessMode(dev, priv->rtllib->mode);
-       CamResetAllEntry(dev);
+               rtl92e_set_wireless_mode(dev, priv->rtllib->mode);
+       rtl92e_cam_reset(dev);
        {
                u8 SECR_value = 0x0;
 
                SECR_value |= SCR_TxEncEnable;
                SECR_value |= SCR_RxDecEnable;
                SECR_value |= SCR_NoSKMC;
-               write_nic_byte(dev, SECR, SECR_value);
+               rtl92e_writeb(dev, SECR, SECR_value);
        }
-       write_nic_word(dev, ATIMWND, 2);
-       write_nic_word(dev, BCN_INTERVAL, 100);
+       rtl92e_writew(dev, ATIMWND, 2);
+       rtl92e_writew(dev, BCN_INTERVAL, 100);
        {
                int i;
 
                for (i = 0; i < QOS_QUEUE_NUM; i++)
-                       write_nic_dword(dev, WDCAPARA_ADD[i], 0x005e4332);
+                       rtl92e_writel(dev, WDCAPARA_ADD[i], 0x005e4332);
        }
-       write_nic_byte(dev, 0xbe, 0xc0);
+       rtl92e_writeb(dev, 0xbe, 0xc0);
 
-       rtl8192_phy_configmac(dev);
+       rtl92e_config_mac(dev);
 
        if (priv->card_8192_version > (u8) VERSION_8190_BD) {
-               rtl8192_phy_getTxPower(dev);
-               rtl8192_phy_setTxPower(dev, priv->chan);
+               rtl92e_get_tx_power(dev);
+               rtl92e_set_tx_power(dev, priv->chan);
        }
 
-       tmpvalue = read_nic_byte(dev, IC_VERRSION);
+       tmpvalue = rtl92e_readb(dev, IC_VERRSION);
        priv->IC_Cut = tmpvalue;
        RT_TRACE(COMP_INIT, "priv->IC_Cut= 0x%x\n", priv->IC_Cut);
        if (priv->IC_Cut >= IC_VersionCut_D) {
@@ -853,7 +845,7 @@ start:
        }
 
        RT_TRACE(COMP_INIT, "Load Firmware!\n");
-       bfirmwareok = init_firmware(dev);
+       bfirmwareok = rtl92e_init_fw(dev);
        if (!bfirmwareok) {
                if (retry_times < 10) {
                        retry_times++;
@@ -866,37 +858,34 @@ start:
        RT_TRACE(COMP_INIT, "Load Firmware finished!\n");
        if (priv->ResetProgress == RESET_TYPE_NORESET) {
                RT_TRACE(COMP_INIT, "RF Config Started!\n");
-               rtStatus = rtl8192_phy_RFConfig(dev);
+               rtStatus = rtl92e_config_phy(dev);
                if (!rtStatus) {
-                       RT_TRACE(COMP_ERR, "RF Config failed\n");
+                       netdev_info(dev, "RF Config failed\n");
                        return rtStatus;
                }
                RT_TRACE(COMP_INIT, "RF Config Finished!\n");
        }
-       rtl8192_phy_updateInitGain(dev);
 
-       rtl8192_setBBreg(dev, rFPGA0_RFMOD, bCCKEn, 0x1);
-       rtl8192_setBBreg(dev, rFPGA0_RFMOD, bOFDMEn, 0x1);
+       rtl92e_set_bb_reg(dev, rFPGA0_RFMOD, bCCKEn, 0x1);
+       rtl92e_set_bb_reg(dev, rFPGA0_RFMOD, bOFDMEn, 0x1);
 
-       write_nic_byte(dev, 0x87, 0x0);
+       rtl92e_writeb(dev, 0x87, 0x0);
 
        if (priv->RegRfOff) {
                RT_TRACE((COMP_INIT | COMP_RF | COMP_POWER),
                          "%s(): Turn off RF for RegRfOff ----------\n",
                          __func__);
-               MgntActSet_RF_State(dev, eRfOff, RF_CHANGE_BY_SW, true);
+               rtl92e_set_rf_state(dev, eRfOff, RF_CHANGE_BY_SW);
        } else if (priv->rtllib->RfOffReason > RF_CHANGE_BY_PS) {
                RT_TRACE((COMP_INIT|COMP_RF|COMP_POWER),
                         "%s(): Turn off RF for RfOffReason(%d) ----------\n",
                         __func__, priv->rtllib->RfOffReason);
-               MgntActSet_RF_State(dev, eRfOff, priv->rtllib->RfOffReason,
-                                   true);
+               rtl92e_set_rf_state(dev, eRfOff, priv->rtllib->RfOffReason);
        } else if (priv->rtllib->RfOffReason >= RF_CHANGE_BY_IPS) {
                RT_TRACE((COMP_INIT|COMP_RF|COMP_POWER),
                         "%s(): Turn off RF for RfOffReason(%d) ----------\n",
                         __func__, priv->rtllib->RfOffReason);
-               MgntActSet_RF_State(dev, eRfOff, priv->rtllib->RfOffReason,
-                                   true);
+               rtl92e_set_rf_state(dev, eRfOff, priv->rtllib->RfOffReason);
        } else {
                RT_TRACE((COMP_INIT|COMP_RF|COMP_POWER), "%s(): RF-ON\n",
                          __func__);
@@ -910,16 +899,15 @@ start:
                priv->Rf_Mode = RF_OP_By_SW_3wire;
 
        if (priv->ResetProgress == RESET_TYPE_NORESET) {
-               dm_initialize_txpower_tracking(dev);
+               rtl92e_dm_init_txpower_tracking(dev);
 
                if (priv->IC_Cut >= IC_VersionCut_D) {
-                       tmpRegA = rtl8192_QueryBBReg(dev,
-                                 rOFDM0_XATxIQImbalance, bMaskDWord);
-                       tmpRegC = rtl8192_QueryBBReg(dev,
-                                 rOFDM0_XCTxIQImbalance, bMaskDWord);
+                       tmpRegA = rtl92e_get_bb_reg(dev, rOFDM0_XATxIQImbalance,
+                                                   bMaskDWord);
+                       tmpRegC = rtl92e_get_bb_reg(dev, rOFDM0_XCTxIQImbalance,
+                                                   bMaskDWord);
                        for (i = 0; i < TxBBGainTableLength; i++) {
-                               if (tmpRegA ==
-                                   priv->txbbgain_table[i].txbbgain_value) {
+                               if (tmpRegA == dm_tx_bb_gain[i]) {
                                        priv->rfa_txpowertrackingindex = (u8)i;
                                        priv->rfa_txpowertrackingindex_real =
                                                 (u8)i;
@@ -929,11 +917,11 @@ start:
                                }
                        }
 
-                       TempCCk = rtl8192_QueryBBReg(dev,
-                                 rCCK0_TxFilter1, bMaskByte2);
+                       TempCCk = rtl92e_get_bb_reg(dev, rCCK0_TxFilter1,
+                                                   bMaskByte2);
 
                        for (i = 0; i < CCKTxBBGainTableLength; i++) {
-                               if (TempCCk == priv->cck_txbbgain_table[i].ccktxbb_valuearray[0]) {
+                               if (TempCCk == dm_cck_tx_bb_gain[i][0]) {
                                        priv->CCKPresentAttentuation_20Mdefault = (u8)i;
                                        break;
                                }
@@ -957,13 +945,13 @@ start:
                        priv->btxpower_tracking = false;
                }
        }
-       rtl8192_irq_enable(dev);
+       rtl92e_irq_enable(dev);
 end:
        priv->being_init_adapter = false;
        return rtStatus;
 }
 
-static void rtl8192_net_update(struct net_device *dev)
+static void _rtl92e_net_update(struct net_device *dev)
 {
 
        struct r8192_priv *priv = rtllib_priv(dev);
@@ -972,27 +960,27 @@ static void rtl8192_net_update(struct net_device *dev)
        u16 rate_config = 0;
 
        net = &priv->rtllib->current_network;
-       rtl8192_config_rate(dev, &rate_config);
+       rtl92e_config_rate(dev, &rate_config);
        priv->dot11CurrentPreambleMode = PREAMBLE_AUTO;
         priv->basic_rate = rate_config &= 0x15f;
-       write_nic_dword(dev, BSSIDR, ((u32 *)net->bssid)[0]);
-       write_nic_word(dev, BSSIDR+4, ((u16 *)net->bssid)[2]);
+       rtl92e_writel(dev, BSSIDR, ((u32 *)net->bssid)[0]);
+       rtl92e_writew(dev, BSSIDR+4, ((u16 *)net->bssid)[2]);
 
        if (priv->rtllib->iw_mode == IW_MODE_ADHOC) {
-               write_nic_word(dev, ATIMWND, 2);
-               write_nic_word(dev, BCN_DMATIME, 256);
-               write_nic_word(dev, BCN_INTERVAL, net->beacon_interval);
-               write_nic_word(dev, BCN_DRV_EARLY_INT, 10);
-               write_nic_byte(dev, BCN_ERR_THRESH, 100);
+               rtl92e_writew(dev, ATIMWND, 2);
+               rtl92e_writew(dev, BCN_DMATIME, 256);
+               rtl92e_writew(dev, BCN_INTERVAL, net->beacon_interval);
+               rtl92e_writew(dev, BCN_DRV_EARLY_INT, 10);
+               rtl92e_writeb(dev, BCN_ERR_THRESH, 100);
 
                BcnTimeCfg |= (BcnCW<<BCN_TCFG_CW_SHIFT);
                BcnTimeCfg |= BcnIFS<<BCN_TCFG_IFS;
 
-               write_nic_word(dev, BCN_TCFG, BcnTimeCfg);
+               rtl92e_writew(dev, BCN_TCFG, BcnTimeCfg);
        }
 }
 
-void rtl8192_link_change(struct net_device *dev)
+void rtl92e_link_change(struct net_device *dev)
 {
        struct r8192_priv *priv = rtllib_priv(dev);
        struct rtllib_device *ieee = priv->rtllib;
@@ -1001,20 +989,20 @@ void rtl8192_link_change(struct net_device *dev)
                return;
 
        if (ieee->state == RTLLIB_LINKED) {
-               rtl8192_net_update(dev);
+               _rtl92e_net_update(dev);
                priv->ops->update_ratr_table(dev);
-               if ((KEY_TYPE_WEP40 == ieee->pairwise_key_type) ||
-                   (KEY_TYPE_WEP104 == ieee->pairwise_key_type))
-                       EnableHWSecurityConfig8192(dev);
+               if ((ieee->pairwise_key_type == KEY_TYPE_WEP40) ||
+                   (ieee->pairwise_key_type == KEY_TYPE_WEP104))
+                       rtl92e_enable_hw_security_config(dev);
        } else {
-               write_nic_byte(dev, 0x173, 0);
+               rtl92e_writeb(dev, 0x173, 0);
        }
-       rtl8192e_update_msr(dev);
+       _rtl92e_update_msr(dev);
 
        if (ieee->iw_mode == IW_MODE_INFRA || ieee->iw_mode == IW_MODE_ADHOC) {
                u32 reg = 0;
 
-               reg = read_nic_dword(dev, RCR);
+               reg = rtl92e_readl(dev, RCR);
                if (priv->rtllib->state == RTLLIB_LINKED) {
                        if (ieee->IntelPromiscuousModeInfo.bPromiscuousOn)
                                ;
@@ -1023,12 +1011,12 @@ void rtl8192_link_change(struct net_device *dev)
                } else
                        priv->ReceiveConfig = reg &= ~RCR_CBSSID;
 
-               write_nic_dword(dev, RCR, reg);
+               rtl92e_writel(dev, RCR, reg);
        }
 }
 
-void rtl8192_AllowAllDestAddr(struct net_device *dev,
-                             bool bAllowAllDA, bool WriteIntoReg)
+void rtl92e_set_monitor_mode(struct net_device *dev, bool bAllowAllDA,
+                            bool WriteIntoReg)
 {
        struct r8192_priv *priv = rtllib_priv(dev);
 
@@ -1038,10 +1026,10 @@ void rtl8192_AllowAllDestAddr(struct net_device *dev,
                priv->ReceiveConfig &= ~RCR_AAP;
 
        if (WriteIntoReg)
-               write_nic_dword(dev, RCR, priv->ReceiveConfig);
+               rtl92e_writel(dev, RCR, priv->ReceiveConfig);
 }
 
-static u8 MRateToHwRate8190Pci(u8 rate)
+static u8 _rtl92e_rate_mgn_to_hw(u8 rate)
 {
        u8  ret = DESC90_RATE1M;
 
@@ -1139,7 +1127,8 @@ static u8 MRateToHwRate8190Pci(u8 rate)
        return ret;
 }
 
-static u8 rtl8192_MapHwQueueToFirmwareQueue(u8 QueueID, u8 priority)
+static u8 _rtl92e_hw_queue_to_fw_queue(struct net_device *dev, u8 QueueID,
+                                      u8 priority)
 {
        u8 QueueSelect = 0x0;
 
@@ -1172,16 +1161,27 @@ static u8 rtl8192_MapHwQueueToFirmwareQueue(u8 QueueID, u8 priority)
                QueueSelect = QSLT_HIGH;
                break;
        default:
-               RT_TRACE(COMP_ERR,
-                        "TransmitTCB(): Impossible Queue Selection: %d\n",
-                        QueueID);
+               netdev_warn(dev, "%s(): Impossible Queue Selection: %d\n",
+                           __func__, QueueID);
                break;
        }
        return QueueSelect;
 }
 
-void  rtl8192_tx_fill_desc(struct net_device *dev, struct tx_desc *pdesc,
-                          struct cb_desc *cb_desc, struct sk_buff *skb)
+static u8 _rtl92e_query_is_short(u8 TxHT, u8 TxRate, struct cb_desc *tcb_desc)
+{
+       u8   tmp_Short;
+
+       tmp_Short = (TxHT == 1) ? ((tcb_desc->bUseShortGI) ? 1 : 0) :
+                       ((tcb_desc->bUseShortPreamble) ? 1 : 0);
+       if (TxHT == 1 && TxRate != DESC90_RATEMCS15)
+               tmp_Short = 0;
+
+       return tmp_Short;
+}
+
+void  rtl92e_fill_tx_desc(struct net_device *dev, struct tx_desc *pdesc,
+                         struct cb_desc *cb_desc, struct sk_buff *skb)
 {
        struct r8192_priv *priv = rtllib_priv(dev);
        dma_addr_t mapping = pci_map_single(priv->pdev, skb->data, skb->len,
@@ -1191,14 +1191,13 @@ void  rtl8192_tx_fill_desc(struct net_device *dev, struct tx_desc *pdesc,
        pTxFwInfo = (struct tx_fwinfo_8190pci *)skb->data;
        memset(pTxFwInfo, 0, sizeof(struct tx_fwinfo_8190pci));
        pTxFwInfo->TxHT = (cb_desc->data_rate & 0x80) ? 1 : 0;
-       pTxFwInfo->TxRate = MRateToHwRate8190Pci((u8)cb_desc->data_rate);
+       pTxFwInfo->TxRate = _rtl92e_rate_mgn_to_hw((u8)cb_desc->data_rate);
        pTxFwInfo->EnableCPUDur = cb_desc->bTxEnableFwCalcDur;
-       pTxFwInfo->Short = rtl8192_QueryIsShort(pTxFwInfo->TxHT,
-                                               pTxFwInfo->TxRate,
-                                               cb_desc);
+       pTxFwInfo->Short = _rtl92e_query_is_short(pTxFwInfo->TxHT,
+                                                 pTxFwInfo->TxRate, cb_desc);
 
        if (pci_dma_mapping_error(priv->pdev, mapping))
-               RT_TRACE(COMP_ERR, "DMA Mapping error\n");
+               netdev_err(dev, "%s(): DMA Mapping error\n", __func__);
        if (cb_desc->bAMPDUEnable) {
                pTxFwInfo->AllowAggregation = 1;
                pTxFwInfo->RxMF = cb_desc->ampdu_factor;
@@ -1213,7 +1212,7 @@ void  rtl8192_tx_fill_desc(struct net_device *dev, struct tx_desc *pdesc,
        pTxFwInfo->CtsEnable = (cb_desc->bCTSEnable) ? 1 : 0;
        pTxFwInfo->RtsSTBC = (cb_desc->bRTSSTBC) ? 1 : 0;
        pTxFwInfo->RtsHT = (cb_desc->rts_rate&0x80) ? 1 : 0;
-       pTxFwInfo->RtsRate = MRateToHwRate8190Pci((u8)cb_desc->rts_rate);
+       pTxFwInfo->RtsRate = _rtl92e_rate_mgn_to_hw((u8)cb_desc->rts_rate);
        pTxFwInfo->RtsBandwidth = 0;
        pTxFwInfo->RtsSubcarrier = cb_desc->RTSSC;
        pTxFwInfo->RtsShort = (pTxFwInfo->RtsHT == 0) ?
@@ -1274,9 +1273,9 @@ void  rtl8192_tx_fill_desc(struct net_device *dev, struct tx_desc *pdesc,
 
        pdesc->PktId = 0x0;
 
-       pdesc->QueueSelect = rtl8192_MapHwQueueToFirmwareQueue(
-                                               cb_desc->queue_index,
-                                               cb_desc->priority);
+       pdesc->QueueSelect = _rtl92e_hw_queue_to_fw_queue(dev,
+                                                         cb_desc->queue_index,
+                                                         cb_desc->priority);
        pdesc->TxFWInfoSize = sizeof(struct tx_fwinfo_8190pci);
 
        pdesc->DISFB = cb_desc->bTxDisableRateFallBack;
@@ -1289,16 +1288,15 @@ void  rtl8192_tx_fill_desc(struct net_device *dev, struct tx_desc *pdesc,
        pdesc->TxBuffAddr = mapping;
 }
 
-void  rtl8192_tx_fill_cmd_desc(struct net_device *dev,
-                              struct tx_desc_cmd *entry,
-                              struct cb_desc *cb_desc, struct sk_buff *skb)
+void  rtl92e_fill_tx_cmd_desc(struct net_device *dev, struct tx_desc_cmd *entry,
+                             struct cb_desc *cb_desc, struct sk_buff *skb)
 {
        struct r8192_priv *priv = rtllib_priv(dev);
        dma_addr_t mapping = pci_map_single(priv->pdev, skb->data, skb->len,
                         PCI_DMA_TODEVICE);
 
        if (pci_dma_mapping_error(priv->pdev, mapping))
-               RT_TRACE(COMP_ERR, "DMA Mapping error\n");
+               netdev_err(dev, "%s(): DMA Mapping error\n", __func__);
        memset(entry, 0, 12);
        entry->LINIP = cb_desc->bLastIniPkt;
        entry->FirstSeg = 1;
@@ -1321,7 +1319,7 @@ void  rtl8192_tx_fill_cmd_desc(struct net_device *dev,
        entry->OWN = 1;
 }
 
-static u8 HwRateToMRate90(bool bIsHT, u8 rate)
+static u8 _rtl92e_rate_hw_to_mgn(bool bIsHT, u8 rate)
 {
        u8  ret_rate = 0x02;
 
@@ -1366,7 +1364,7 @@ static u8 HwRateToMRate90(bool bIsHT, u8 rate)
 
                default:
                        RT_TRACE(COMP_RECV,
-                                "HwRateToMRate90(): Non supportedRate [%x], bIsHT = %d!!!\n",
+                                "_rtl92e_rate_hw_to_mgn(): Non supportedRate [%x], bIsHT = %d!!!\n",
                                 rate, bIsHT);
                        break;
                }
@@ -1427,7 +1425,7 @@ static u8 HwRateToMRate90(bool bIsHT, u8 rate)
 
                default:
                        RT_TRACE(COMP_RECV,
-                                "HwRateToMRate90(): Non supported Rate [%x], bIsHT = %d!!!\n",
+                                "_rtl92e_rate_hw_to_mgn(): Non supported Rate [%x], bIsHT = %d!!!\n",
                                 rate, bIsHT);
                        break;
                }
@@ -1436,7 +1434,7 @@ static u8 HwRateToMRate90(bool bIsHT, u8 rate)
        return ret_rate;
 }
 
-static long rtl8192_signal_scale_mapping(struct r8192_priv *priv, long currsig)
+static long _rtl92e_signal_scale_mapping(struct r8192_priv *priv, long currsig)
 {
        long retsig;
 
@@ -1472,7 +1470,7 @@ static long rtl8192_signal_scale_mapping(struct r8192_priv *priv, long currsig)
                        _pdrvinfo->RxRate == DESC90_RATE11M) &&\
                        !_pdrvinfo->RxHT)
 
-static void rtl8192_query_rxphystatus(
+static void _rtl92e_query_rxphystatus(
        struct r8192_priv *priv,
        struct rtllib_rx_stats *pstats,
        struct rx_desc  *pdesc,
@@ -1509,8 +1507,9 @@ static void rtl8192_query_rxphystatus(
        pstats->bPacketBeacon = precord_stats->bPacketBeacon = bPacketBeacon;
        pstats->bToSelfBA = precord_stats->bToSelfBA = bToSelfBA;
        if (check_reg824 == 0) {
-               reg824_bit9 = rtl8192_QueryBBReg(priv->rtllib->dev,
-                             rFPGA0_XA_HSSIParameter2, 0x200);
+               reg824_bit9 = rtl92e_get_bb_reg(priv->rtllib->dev,
+                                               rFPGA0_XA_HSSIParameter2,
+                                               0x200);
                check_reg824 = 1;
        }
 
@@ -1578,7 +1577,7 @@ static void rtl8192_query_rxphystatus(
                        }
                }
 
-               pwdb_all = rtl819x_query_rxpwrpercentage(rx_pwr_all);
+               pwdb_all = rtl92e_rx_db_to_percent(rx_pwr_all);
                pstats->RxPWDBAll = precord_stats->RxPWDBAll = pwdb_all;
                pstats->RecvSignalPower = rx_pwr_all;
 
@@ -1618,7 +1617,7 @@ static void rtl8192_query_rxphystatus(
                        rx_snrX /= 2;
                        priv->stats.rxSNRdB[i] = (long)rx_snrX;
 
-                       RSSI = rtl819x_query_rxpwrpercentage(rx_pwr[i]);
+                       RSSI = rtl92e_rx_db_to_percent(rx_pwr[i]);
                        if (priv->brfpath_rxenable[i])
                                total_rssi += RSSI;
 
@@ -1631,7 +1630,7 @@ static void rtl8192_query_rxphystatus(
 
 
                rx_pwr_all = (((pofdm_buf->pwdb_all) >> 1) & 0x7f) - 106;
-               pwdb_all = rtl819x_query_rxpwrpercentage(rx_pwr_all);
+               pwdb_all = rtl92e_rx_db_to_percent(rx_pwr_all);
 
                pstats->RxPWDBAll = precord_stats->RxPWDBAll = pwdb_all;
                pstats->RxPower = precord_stats->RxPower =      rx_pwr_all;
@@ -1648,7 +1647,7 @@ static void rtl8192_query_rxphystatus(
 
                        rx_evmX /= 2;
 
-                       evm = rtl819x_evm_dbtopercentage(rx_evmX);
+                       evm = rtl92e_evm_db_to_percent(rx_evmX);
                        if (bpacket_match_bssid) {
                                if (i == 0) {
                                        pstats->SignalQuality = (u8)(evm &
@@ -1675,18 +1674,18 @@ static void rtl8192_query_rxphystatus(
 
        if (is_cck_rate) {
                pstats->SignalStrength = precord_stats->SignalStrength =
-                                        (u8)(rtl8192_signal_scale_mapping(priv,
+                                        (u8)(_rtl92e_signal_scale_mapping(priv,
                                         (long)pwdb_all));
 
        } else {
                if (rf_rx_num != 0)
                        pstats->SignalStrength = precord_stats->SignalStrength =
-                                        (u8)(rtl8192_signal_scale_mapping(priv,
+                                        (u8)(_rtl92e_signal_scale_mapping(priv,
                                         (long)(total_rssi /= rf_rx_num)));
        }
 }
 
-static void rtl8192_process_phyinfo(struct r8192_priv *priv, u8 *buffer,
+static void _rtl92e_process_phyinfo(struct r8192_priv *priv, u8 *buffer,
                                    struct rtllib_rx_stats *prev_st,
                                    struct rtllib_rx_stats *curr_st)
 {
@@ -1724,8 +1723,8 @@ static void rtl8192_process_phyinfo(struct r8192_priv *priv, u8 *buffer,
                slide_rssi_index = 0;
 
        tmp_val = priv->stats.slide_rssi_total/slide_rssi_statistics;
-       priv->stats.signal_strength = rtl819x_translate_todbm(priv,
-                                     (u8)tmp_val);
+       priv->stats.signal_strength = rtl92e_translate_to_dbm(priv,
+                                                             (u8)tmp_val);
        curr_st->rssi = priv->stats.signal_strength;
        if (!prev_st->bPacketMatchBSSID) {
                if (!prev_st->bToSelfBA)
@@ -1735,13 +1734,10 @@ static void rtl8192_process_phyinfo(struct r8192_priv *priv, u8 *buffer,
        if (!bcheck)
                return;
 
-       rtl819x_process_cck_rxpathsel(priv, prev_st);
-
        priv->stats.num_process_phyinfo++;
        if (!prev_st->bIsCCK && prev_st->bPacketToSelf) {
                for (rfpath = RF90_PATH_A; rfpath < RF90_PATH_C; rfpath++) {
-                       if (!rtl8192_phy_CheckIsLegalRFPath(priv->rtllib->dev,
-                           rfpath))
+                       if (!rtl92e_is_legal_rf_path(priv->rtllib->dev, rfpath))
                                continue;
                        RT_TRACE(COMP_DBG,
                                 "Jacken -> pPreviousstats->RxMIMOSignalStrength[rfpath]  = %d\n",
@@ -1816,7 +1812,7 @@ static void rtl8192_process_phyinfo(struct r8192_priv *priv, u8 *buffer,
                                        (RX_SMOOTH-1)) +
                                        (prev_st->RxPWDBAll)) / (RX_SMOOTH);
                }
-               rtl819x_update_rxsignalstatistics8190pci(priv, prev_st);
+               rtl92e_update_rx_statistics(priv, prev_st);
        }
 
        if (prev_st->SignalQuality != 0) {
@@ -1861,11 +1857,11 @@ static void rtl8192_process_phyinfo(struct r8192_priv *priv, u8 *buffer,
        }
 }
 
-static void rtl8192_TranslateRxSignalStuff(struct net_device *dev,
-                                          struct sk_buff *skb,
-                                          struct rtllib_rx_stats *pstats,
-                                          struct rx_desc *pdesc,
-                                          struct rx_fwinfo *pdrvinfo)
+static void _rtl92e_translate_rx_signal_stats(struct net_device *dev,
+                                             struct sk_buff *skb,
+                                             struct rtllib_rx_stats *pstats,
+                                             struct rx_desc *pdesc,
+                                             struct rx_fwinfo *pdrvinfo)
 {
        struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
        bool bpacket_match_bssid, bpacket_toself;
@@ -1885,7 +1881,7 @@ static void rtl8192_TranslateRxSignalStuff(struct net_device *dev,
        praddr = hdr->addr1;
 
        bpacket_match_bssid =
-               ((RTLLIB_FTYPE_CTL != type) &&
+               ((type != RTLLIB_FTYPE_CTL) &&
                 ether_addr_equal(priv->rtllib->current_network.bssid,
                                  (fc & RTLLIB_FCTL_TODS) ? hdr->addr1 :
                                  (fc & RTLLIB_FCTL_FROMDS) ? hdr->addr2 :
@@ -1899,14 +1895,14 @@ static void rtl8192_TranslateRxSignalStuff(struct net_device *dev,
                priv->stats.numpacket_matchbssid++;
        if (bpacket_toself)
                priv->stats.numpacket_toself++;
-       rtl8192_process_phyinfo(priv, tmp_buf, &previous_stats, pstats);
-       rtl8192_query_rxphystatus(priv, pstats, pdesc, pdrvinfo,
+       _rtl92e_process_phyinfo(priv, tmp_buf, &previous_stats, pstats);
+       _rtl92e_query_rxphystatus(priv, pstats, pdesc, pdrvinfo,
                                  &previous_stats, bpacket_match_bssid,
                                  bpacket_toself, bPacketBeacon, bToSelfBA);
-       rtl8192_record_rxdesc_forlateruse(pstats, &previous_stats);
+       rtl92e_copy_mpdu_stats(pstats, &previous_stats);
 }
 
-static void rtl8192_UpdateReceivedRateHistogramStatistics(
+static void _rtl92e_update_received_rate_histogram_stats(
                                           struct net_device *dev,
                                           struct rtllib_rx_stats *pstats)
 {
@@ -2019,10 +2015,8 @@ static void rtl8192_UpdateReceivedRateHistogramStatistics(
        priv->stats.received_rate_histogram[rcvType][rateIndex]++;
 }
 
-bool rtl8192_rx_query_status_desc(struct net_device *dev,
-                                 struct rtllib_rx_stats *stats,
-                                 struct rx_desc *pdesc,
-                                 struct sk_buff *skb)
+bool rtl92e_get_rx_stats(struct net_device *dev, struct rtllib_rx_stats *stats,
+                        struct rx_desc *pdesc, struct sk_buff *skb)
 {
        struct r8192_priv *priv = rtllib_priv(dev);
        struct rx_fwinfo *pDrvInfo = NULL;
@@ -2055,28 +2049,27 @@ bool rtl8192_rx_query_status_desc(struct net_device *dev,
 
        pDrvInfo = (struct rx_fwinfo *)(skb->data + stats->RxBufShift);
 
-       stats->rate = HwRateToMRate90((bool)pDrvInfo->RxHT,
-                                    (u8)pDrvInfo->RxRate);
+       stats->rate = _rtl92e_rate_hw_to_mgn((bool)pDrvInfo->RxHT,
+                                            (u8)pDrvInfo->RxRate);
        stats->bShortPreamble = pDrvInfo->SPLCP;
 
-       rtl8192_UpdateReceivedRateHistogramStatistics(dev, stats);
+       _rtl92e_update_received_rate_histogram_stats(dev, stats);
 
        stats->bIsAMPDU = (pDrvInfo->PartAggr == 1);
        stats->bFirstMPDU = (pDrvInfo->PartAggr == 1) &&
                            (pDrvInfo->FirstAGGR == 1);
 
        stats->TimeStampLow = pDrvInfo->TSFL;
-       stats->TimeStampHigh = read_nic_dword(dev, TSFR+4);
+       stats->TimeStampHigh = rtl92e_readl(dev, TSFR+4);
 
-       rtl819x_UpdateRxPktTimeStamp(dev, stats);
+       rtl92e_update_rx_pkt_timestamp(dev, stats);
 
        if ((stats->RxBufShift + stats->RxDrvInfoSize) > 0)
                stats->bShift = 1;
 
        stats->RxIs40MHzPacket = pDrvInfo->BW;
 
-       rtl8192_TranslateRxSignalStuff(dev, skb, stats, pdesc,
-                                      pDrvInfo);
+       _rtl92e_translate_rx_signal_stats(dev, skb, stats, pdesc, pDrvInfo);
 
        if (pDrvInfo->FirstAGGR == 1 || pDrvInfo->PartAggr == 1)
                RT_TRACE(COMP_RXDESC,
@@ -2092,7 +2085,7 @@ bool rtl8192_rx_query_status_desc(struct net_device *dev,
        return true;
 }
 
-void rtl8192_halt_adapter(struct net_device *dev, bool reset)
+void rtl92e_stop_adapter(struct net_device *dev, bool reset)
 {
        struct r8192_priv *priv = rtllib_priv(dev);
        int i;
@@ -2105,7 +2098,7 @@ void rtl8192_halt_adapter(struct net_device *dev, bool reset)
 
        if (!priv->rtllib->bSupportRemoteWakeUp) {
                u1bTmp = 0x0;
-               write_nic_byte(dev, CMDR, u1bTmp);
+               rtl92e_writeb(dev, CMDR, u1bTmp);
        }
 
        mdelay(20);
@@ -2116,18 +2109,18 @@ void rtl8192_halt_adapter(struct net_device *dev, bool reset)
                priv->bHwRfOffAction = 2;
 
                if (!priv->rtllib->bSupportRemoteWakeUp) {
-                       PHY_SetRtl8192eRfOff(dev);
-                       ulRegRead = read_nic_dword(dev, CPU_GEN);
+                       rtl92e_set_rf_off(dev);
+                       ulRegRead = rtl92e_readl(dev, CPU_GEN);
                        ulRegRead |= CPU_GEN_SYSTEM_RESET;
-                       write_nic_dword(dev, CPU_GEN, ulRegRead);
+                       rtl92e_writel(dev, CPU_GEN, ulRegRead);
                } else {
-                       write_nic_dword(dev, WFCRC0, 0xffffffff);
-                       write_nic_dword(dev, WFCRC1, 0xffffffff);
-                       write_nic_dword(dev, WFCRC2, 0xffffffff);
+                       rtl92e_writel(dev, WFCRC0, 0xffffffff);
+                       rtl92e_writel(dev, WFCRC1, 0xffffffff);
+                       rtl92e_writel(dev, WFCRC2, 0xffffffff);
 
 
-                       write_nic_byte(dev, PMR, 0x5);
-                       write_nic_byte(dev, MacBlkCtrl, 0xa);
+                       rtl92e_writeb(dev, PMR, 0x5);
+                       rtl92e_writeb(dev, MacBlkCtrl, 0xa);
                }
        }
 
@@ -2139,7 +2132,7 @@ void rtl8192_halt_adapter(struct net_device *dev, bool reset)
        skb_queue_purge(&priv->skb_queue);
 }
 
-void rtl8192_update_ratr_table(struct net_device *dev)
+void rtl92e_update_ratr_table(struct net_device *dev)
 {
        struct r8192_priv *priv = rtllib_priv(dev);
        struct rtllib_device *ieee = priv->rtllib;
@@ -2148,7 +2141,7 @@ void rtl8192_update_ratr_table(struct net_device *dev)
        u16 rate_config = 0;
        u8 rate_index = 0;
 
-       rtl8192_config_rate(dev, &rate_config);
+       rtl92e_config_rate(dev, &rate_config);
        ratr_value = rate_config | *pMcsRate << 12;
        switch (ieee->mode) {
        case IEEE_A:
@@ -2182,12 +2175,12 @@ void rtl8192_update_ratr_table(struct net_device *dev)
        else if (!ieee->pHTInfo->bCurTxBW40MHz &&
                  ieee->pHTInfo->bCurShortGI20MHz)
                ratr_value |= 0x80000000;
-       write_nic_dword(dev, RATR0+rate_index*4, ratr_value);
-       write_nic_byte(dev, UFWP, 1);
+       rtl92e_writel(dev, RATR0+rate_index*4, ratr_value);
+       rtl92e_writeb(dev, UFWP, 1);
 }
 
 void
-rtl8192_InitializeVariables(struct net_device  *dev)
+rtl92e_init_variables(struct net_device  *dev)
 {
        struct r8192_priv *priv = rtllib_priv(dev);
 
@@ -2202,14 +2195,6 @@ rtl8192_InitializeVariables(struct net_device  *dev)
        priv->ShortRetryLimit = 0x30;
        priv->LongRetryLimit = 0x30;
 
-       priv->EarlyRxThreshold = 7;
-       priv->pwrGroupCnt = 0;
-
-       priv->bIgnoreSilentReset = false;
-       priv->enable_gpio0 = 0;
-
-       priv->TransmitConfig = 0;
-
        priv->ReceiveConfig = RCR_ADD3  |
                RCR_AMF | RCR_ADF |
                RCR_AICV |
@@ -2224,74 +2209,70 @@ rtl8192_InitializeVariables(struct net_device  *dev)
                            IMR_RDU | IMR_RXFOVW | IMR_TXFOVW |
                            IMR_BcnInt | IMR_TBDOK | IMR_TBDER);
 
-
-       priv->MidHighPwrTHR_L1 = 0x3B;
-       priv->MidHighPwrTHR_L2 = 0x40;
        priv->PwrDomainProtect = false;
 
        priv->bfirst_after_down = false;
 }
 
-void rtl8192_EnableInterrupt(struct net_device *dev)
+void rtl92e_enable_irq(struct net_device *dev)
 {
        struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
 
        priv->irq_enabled = 1;
 
-       write_nic_dword(dev, INTA_MASK, priv->irq_mask[0]);
+       rtl92e_writel(dev, INTA_MASK, priv->irq_mask[0]);
 
 }
 
-void rtl8192_DisableInterrupt(struct net_device *dev)
+void rtl92e_disable_irq(struct net_device *dev)
 {
        struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
 
-       write_nic_dword(dev, INTA_MASK, 0);
+       rtl92e_writel(dev, INTA_MASK, 0);
 
        priv->irq_enabled = 0;
 }
 
-void rtl8192_ClearInterrupt(struct net_device *dev)
+void rtl92e_clear_irq(struct net_device *dev)
 {
        u32 tmp = 0;
 
-       tmp = read_nic_dword(dev, ISR);
-       write_nic_dword(dev, ISR, tmp);
+       tmp = rtl92e_readl(dev, ISR);
+       rtl92e_writel(dev, ISR, tmp);
 }
 
 
-void rtl8192_enable_rx(struct net_device *dev)
+void rtl92e_enable_rx(struct net_device *dev)
 {
        struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
 
-       write_nic_dword(dev, RDQDA, priv->rx_ring_dma[RX_MPDU_QUEUE]);
+       rtl92e_writel(dev, RDQDA, priv->rx_ring_dma[RX_MPDU_QUEUE]);
 }
 
 static const u32 TX_DESC_BASE[] = {
        BKQDA, BEQDA, VIQDA, VOQDA, HCCAQDA, CQDA, MQDA, HQDA, BQDA
 };
 
-void rtl8192_enable_tx(struct net_device *dev)
+void rtl92e_enable_tx(struct net_device *dev)
 {
        struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
        u32 i;
 
        for (i = 0; i < MAX_TX_QUEUE_COUNT; i++)
-               write_nic_dword(dev, TX_DESC_BASE[i], priv->tx_ring[i].dma);
+               rtl92e_writel(dev, TX_DESC_BASE[i], priv->tx_ring[i].dma);
 }
 
 
-void rtl8192_interrupt_recognized(struct net_device *dev, u32 *p_inta,
-                                 u32 *p_intb)
+void rtl92e_ack_irq(struct net_device *dev, u32 *p_inta, u32 *p_intb)
 {
-       *p_inta = read_nic_dword(dev, ISR);
-       write_nic_dword(dev, ISR, *p_inta);
+       *p_inta = rtl92e_readl(dev, ISR);
+       rtl92e_writel(dev, ISR, *p_inta);
 }
 
-bool rtl8192_HalRxCheckStuck(struct net_device *dev)
+bool rtl92e_is_rx_stuck(struct net_device *dev)
 {
        struct r8192_priv *priv = rtllib_priv(dev);
-       u16               RegRxCounter = read_nic_word(dev, 0x130);
+       u16               RegRxCounter = rtl92e_readw(dev, 0x130);
        bool              bStuck = false;
        static u8         rx_chk_cnt;
        u32             SlotIndex = 0, TotalRxStuckCount = 0;
@@ -2352,11 +2333,11 @@ bool rtl8192_HalRxCheckStuck(struct net_device *dev)
        return bStuck;
 }
 
-bool rtl8192_HalTxCheckStuck(struct net_device *dev)
+bool rtl92e_is_tx_stuck(struct net_device *dev)
 {
        struct r8192_priv *priv = rtllib_priv(dev);
        bool    bStuck = false;
-       u16     RegTxCounter = read_nic_word(dev, 0x128);
+       u16     RegTxCounter = rtl92e_readw(dev, 0x128);
 
        RT_TRACE(COMP_RESET, "%s():RegTxCounter is %d,TxCounter is %d\n",
                 __func__, RegTxCounter, priv->TxCounter);
@@ -2369,7 +2350,7 @@ bool rtl8192_HalTxCheckStuck(struct net_device *dev)
        return bStuck;
 }
 
-bool rtl8192_GetNmodeSupportBySecCfg(struct net_device *dev)
+bool rtl92e_get_nmode_support_by_sec(struct net_device *dev)
 {
        struct r8192_priv *priv = rtllib_priv(dev);
        struct rtllib_device *ieee = priv->rtllib;
@@ -2383,34 +2364,10 @@ bool rtl8192_GetNmodeSupportBySecCfg(struct net_device *dev)
        }
 }
 
-bool rtl8192_GetHalfNmodeSupportByAPs(struct net_device *dev)
+bool rtl92e_is_halfn_supported_by_ap(struct net_device *dev)
 {
-       bool Reval;
        struct r8192_priv *priv = rtllib_priv(dev);
        struct rtllib_device *ieee = priv->rtllib;
 
-       if (ieee->bHalfWirelessN24GMode == true)
-               Reval = true;
-       else
-               Reval =  false;
-
-       return Reval;
-}
-
-u8 rtl8192_QueryIsShort(u8 TxHT, u8 TxRate, struct cb_desc *tcb_desc)
-{
-       u8   tmp_Short;
-
-       tmp_Short = (TxHT == 1) ? ((tcb_desc->bUseShortGI) ? 1 : 0) :
-                       ((tcb_desc->bUseShortPreamble) ? 1 : 0);
-       if (TxHT == 1 && TxRate != DESC90_RATEMCS15)
-               tmp_Short = 0;
-
-       return tmp_Short;
-}
-
-void ActUpdateChannelAccessSetting(struct net_device *dev,
-       enum wireless_mode WirelessMode,
-       struct channel_access_setting *ChnlAccessSetting)
-{
+       return ieee->bHalfWirelessN24GMode;
 }