OSDN Git Service

rtl8723au: Replace u1Byte with u8
[android-x86/external-modules-rtl8723au.git] / hal / odm.c
index 9779d85..8a34305 100644 (file)
--- a/hal/odm.c
+++ b/hal/odm.c
@@ -37,7 +37,7 @@ const u2Byte dB_Invert_Table[8][12] = {
        {       17783,  19953,  22387,  25119,  28184,  31623,  35481,  39811,  44668,  50119,  56234,  65535}};
 
 // 20100515 Joseph: Add global variable to keep temporary scan list for antenna switching test.
-//u1Byte                       tmpNumBssDesc;
+//u8                   tmpNumBssDesc;
 //RT_WLAN_BSS  tmpbssDesc[MAX_BSS_DESC];
 
 
@@ -113,7 +113,7 @@ u4Byte OFDMSwingTable[OFDM_TABLE_SIZE_92D] = {
 };
 
 
-u1Byte CCKSwingTable_Ch1_Ch13[CCK_TABLE_SIZE][8] = {
+u8 CCKSwingTable_Ch1_Ch13[CCK_TABLE_SIZE][8] = {
        {0x36, 0x35, 0x2e, 0x25, 0x1c, 0x12, 0x09, 0x04},       // 0, +0dB
        {0x33, 0x32, 0x2b, 0x23, 0x1a, 0x11, 0x08, 0x04},       // 1, -0.5dB
        {0x30, 0x2f, 0x29, 0x21, 0x19, 0x10, 0x08, 0x03},       // 2, -1.0dB
@@ -150,7 +150,7 @@ u1Byte CCKSwingTable_Ch1_Ch13[CCK_TABLE_SIZE][8] = {
 };
 
 
-u1Byte CCKSwingTable_Ch14 [CCK_TABLE_SIZE][8]= {
+u8 CCKSwingTable_Ch14 [CCK_TABLE_SIZE][8]= {
        {0x36, 0x35, 0x2e, 0x1b, 0x00, 0x00, 0x00, 0x00},       // 0, +0dB
        {0x33, 0x32, 0x2b, 0x19, 0x00, 0x00, 0x00, 0x00},       // 1, -0.5dB
        {0x30, 0x2f, 0x29, 0x18, 0x00, 0x00, 0x00, 0x00},       // 2, -1.0dB
@@ -350,7 +350,7 @@ odm_DynamicTxPowerSavePowerIndex(
 void
 odm_DynamicTxPowerWritePowerIndex(
        PDM_ODM_T       pDM_Odm,
-       u1Byte          Value);
+       u8              Value);
 
 void
 odm_DynamicTxPower_92C(
@@ -411,13 +411,13 @@ odm_SwAntDivInit_NIC(
 void
 odm_SwAntDivChkAntSwitch(
                PDM_ODM_T               pDM_Odm,
-               u1Byte                  Step
+               u8                      Step
        );
 
 void
 odm_SwAntDivChkAntSwitchNIC(
                PDM_ODM_T               pDM_Odm,
-               u1Byte          Step
+               u8              Step
        );
 
 
@@ -505,13 +505,13 @@ odm_StaDefAntSel(
  u4Byte                OFDM_Ant2_Cnt,
  u4Byte                CCK_Ant1_Cnt,
  u4Byte                CCK_Ant2_Cnt,
- u1Byte                *pDefAnt
+ u8            *pDefAnt
        );
 
 void
 odm_SetRxIdleAnt(
        PDM_ODM_T       pDM_Odm,
-       u1Byte  Ant,
+       u8      Ant,
    bool   bDualPath
 );
 
@@ -681,15 +681,15 @@ ODM_CmnInfoInit(
                        pDM_Odm->SupportAbility = (u4Byte)Value;
                        break;
                case    ODM_CMNINFO_PLATFORM:
-                       pDM_Odm->SupportPlatform = (u1Byte)Value;
+                       pDM_Odm->SupportPlatform = (u8)Value;
                        break;
 
                case    ODM_CMNINFO_INTERFACE:
-                       pDM_Odm->SupportInterface = (u1Byte)Value;
+                       pDM_Odm->SupportInterface = (u8)Value;
                        break;
 
                case    ODM_CMNINFO_MP_TEST_CHIP:
-                       pDM_Odm->bIsMPChip= (u1Byte)Value;
+                       pDM_Odm->bIsMPChip= (u8)Value;
                        break;
 
                case    ODM_CMNINFO_IC_TYPE:
@@ -697,38 +697,38 @@ ODM_CmnInfoInit(
                        break;
 
                case    ODM_CMNINFO_CUT_VER:
-                       pDM_Odm->CutVersion = (u1Byte)Value;
+                       pDM_Odm->CutVersion = (u8)Value;
                        break;
 
                case    ODM_CMNINFO_FAB_VER:
-                       pDM_Odm->FabVersion = (u1Byte)Value;
+                       pDM_Odm->FabVersion = (u8)Value;
                        break;
 
                case    ODM_CMNINFO_RF_TYPE:
-                       pDM_Odm->RFType = (u1Byte)Value;
+                       pDM_Odm->RFType = (u8)Value;
                        break;
 
                case    ODM_CMNINFO_RF_ANTENNA_TYPE:
-                       pDM_Odm->AntDivType= (u1Byte)Value;
+                       pDM_Odm->AntDivType= (u8)Value;
                        break;
 
                case    ODM_CMNINFO_BOARD_TYPE:
-                       pDM_Odm->BoardType = (u1Byte)Value;
+                       pDM_Odm->BoardType = (u8)Value;
                        break;
 
                case    ODM_CMNINFO_EXT_LNA:
-                       pDM_Odm->ExtLNA = (u1Byte)Value;
+                       pDM_Odm->ExtLNA = (u8)Value;
                        break;
 
                case    ODM_CMNINFO_EXT_PA:
-                       pDM_Odm->ExtPA = (u1Byte)Value;
+                       pDM_Odm->ExtPA = (u8)Value;
                        break;
 
                case    ODM_CMNINFO_EXT_TRSW:
-                       pDM_Odm->ExtTRSW = (u1Byte)Value;
+                       pDM_Odm->ExtTRSW = (u8)Value;
                        break;
                case    ODM_CMNINFO_PATCH_ID:
-                       pDM_Odm->PatchID = (u1Byte)Value;
+                       pDM_Odm->PatchID = (u8)Value;
                        break;
                case    ODM_CMNINFO_BINHCT_TEST:
                        pDM_Odm->bInHctTest = (bool)Value;
@@ -775,7 +775,7 @@ ODM_CmnInfoHook(
                // Dynamic call by reference pointer.
                //
                case    ODM_CMNINFO_MAC_PHY_MODE:
-                       pDM_Odm->pMacPhyMode = (u1Byte *)pValue;
+                       pDM_Odm->pMacPhyMode = (u8 *)pValue;
                        break;
 
                case    ODM_CMNINFO_TX_UNI:
@@ -787,27 +787,27 @@ ODM_CmnInfoHook(
                        break;
 
                case    ODM_CMNINFO_WM_MODE:
-                       pDM_Odm->pWirelessMode = (u1Byte *)pValue;
+                       pDM_Odm->pWirelessMode = (u8 *)pValue;
                        break;
 
                case    ODM_CMNINFO_BAND:
-                       pDM_Odm->pBandType = (u1Byte *)pValue;
+                       pDM_Odm->pBandType = (u8 *)pValue;
                        break;
 
                case    ODM_CMNINFO_SEC_CHNL_OFFSET:
-                       pDM_Odm->pSecChOffset = (u1Byte *)pValue;
+                       pDM_Odm->pSecChOffset = (u8 *)pValue;
                        break;
 
                case    ODM_CMNINFO_SEC_MODE:
-                       pDM_Odm->pSecurity = (u1Byte *)pValue;
+                       pDM_Odm->pSecurity = (u8 *)pValue;
                        break;
 
                case    ODM_CMNINFO_BW:
-                       pDM_Odm->pBandWidth = (u1Byte *)pValue;
+                       pDM_Odm->pBandWidth = (u8 *)pValue;
                        break;
 
                case    ODM_CMNINFO_CHNL:
-                       pDM_Odm->pChannel = (u1Byte *)pValue;
+                       pDM_Odm->pChannel = (u8 *)pValue;
                        break;
 
                case    ODM_CMNINFO_DMSP_GET_VALUE:
@@ -831,7 +831,7 @@ ODM_CmnInfoHook(
                        break;
 
                case    ODM_CMNINFO_ONE_PATH_CCA:
-                       pDM_Odm->pOnePathCCA = (u1Byte *)pValue;
+                       pDM_Odm->pOnePathCCA = (u8 *)pValue;
                        break;
 
                case    ODM_CMNINFO_DRV_STOP:
@@ -847,7 +847,7 @@ ODM_CmnInfoHook(
                        break;
 
                case    ODM_CMNINFO_ANT_TEST:
-                       pDM_Odm->pAntennaTest =  (u1Byte *)pValue;
+                       pDM_Odm->pAntennaTest =  (u8 *)pValue;
                        break;
 
                case    ODM_CMNINFO_NET_CLOSED:
@@ -926,7 +926,7 @@ ODM_CmnInfoUpdate(
                        break;
 
                case    ODM_CMNINFO_RF_TYPE:
-                       pDM_Odm->RFType = (u1Byte)Value;
+                       pDM_Odm->RFType = (u8)Value;
                        break;
 
                case    ODM_CMNINFO_WIFI_DIRECT:
@@ -942,7 +942,7 @@ ODM_CmnInfoUpdate(
                        break;
 
                case    ODM_CMNINFO_RSSI_MIN:
-                       pDM_Odm->RSSI_Min= (u1Byte)Value;
+                       pDM_Odm->RSSI_Min= (u8)Value;
                        break;
 
                case    ODM_CMNINFO_DBG_COMP:
@@ -953,11 +953,11 @@ ODM_CmnInfoUpdate(
                        pDM_Odm->DebugLevel = (u4Byte)Value;
                        break;
                case    ODM_CMNINFO_RA_THRESHOLD_HIGH:
-                       pDM_Odm->RateAdaptive.HighRSSIThresh = (u1Byte)Value;
+                       pDM_Odm->RateAdaptive.HighRSSIThresh = (u8)Value;
                        break;
 
                case    ODM_CMNINFO_RA_THRESHOLD_LOW:
-                       pDM_Odm->RateAdaptive.LowRSSIThresh = (u1Byte)Value;
+                       pDM_Odm->RateAdaptive.LowRSSIThresh = (u8)Value;
                        break;
 #if(BT_30_SUPPORT == 1)
                // The following is for BT HS mode and BT coexist mechanism.
@@ -970,7 +970,7 @@ ODM_CmnInfoUpdate(
                        break;
 
                case ODM_CMNINFO_BT_DIG:
-                       pDM_Odm->btHsDigVal = (u1Byte)Value;
+                       pDM_Odm->btHsDigVal = (u8)Value;
                        break;
 
                case    ODM_CMNINFO_BT_BUSY:
@@ -993,7 +993,7 @@ odm_CommonInfoSelfInit(
        )
 {
        pDM_Odm->bCckHighPower = (bool) ODM_GetBBReg(pDM_Odm, 0x824, BIT9);
-       pDM_Odm->RFPathRxEnable = (u1Byte) ODM_GetBBReg(pDM_Odm, 0xc04, 0x0F);
+       pDM_Odm->RFPathRxEnable = (u8) ODM_GetBBReg(pDM_Odm, 0xc04, 0x0F);
        if(pDM_Odm->SupportICType & (ODM_RTL8192C|ODM_RTL8192D))
        {
 #if(defined(CONFIG_HW_ANTENNA_DIVERSITY))
@@ -1013,8 +1013,8 @@ odm_CommonInfoSelfUpdate(
                PDM_ODM_T               pDM_Odm
        )
 {
-       u1Byte  EntryCnt=0;
-       u1Byte  i;
+       u8      EntryCnt=0;
+       u8      i;
        PSTA_INFO_T     pEntry;
 
        if(*(pDM_Odm->pBandWidth) == ODM_BW40M)
@@ -1116,7 +1116,7 @@ odm_FindMinimumRSSI(
        )
 {
        u4Byte  i;
-       u1Byte  RSSI_Min = 0xFF;
+       u8      RSSI_Min = 0xFF;
 
        for(i=0; i<ODM_ASSOCIATE_ENTRY_NUM; i++)
        {
@@ -1204,19 +1204,19 @@ ODM_ChangeDynamicInitGainThresh(
        {
                if(DM_Value > 30)
                        DM_Value = 30;
-               pDM_DigTable->BackoffVal = (u1Byte)DM_Value;
+               pDM_DigTable->BackoffVal = (u8)DM_Value;
        }
        else if(DM_Type == DIG_TYPE_RX_GAIN_MIN)
        {
                if(DM_Value == 0)
                        DM_Value = 0x1;
-               pDM_DigTable->rx_gain_range_min = (u1Byte)DM_Value;
+               pDM_DigTable->rx_gain_range_min = (u8)DM_Value;
        }
        else if(DM_Type == DIG_TYPE_RX_GAIN_MAX)
        {
                if(DM_Value > 0x50)
                        DM_Value = 0x50;
-               pDM_DigTable->rx_gain_range_max = (u1Byte)DM_Value;
+               pDM_DigTable->rx_gain_range_max = (u8)DM_Value;
        }
 }      /* DM_ChangeDynamicInitGainThresh */
 
@@ -1239,7 +1239,7 @@ int getIGIForDiff(int value_IGI)
 void
 ODM_Write_DIG(
        PDM_ODM_T               pDM_Odm,
-       u1Byte                  CurrentIGI
+       u8                      CurrentIGI
        )
 {
        pDIG_T  pDM_DigTable = &pDM_Odm->DM_DigTable;
@@ -1294,16 +1294,9 @@ odm_DIGbyRSSI_LPS(
        PADAPTER                                        pAdapter =pDM_Odm->Adapter;
        pDIG_T                                          pDM_DigTable = &pDM_Odm->DM_DigTable;
        PFALSE_ALARM_STATISTICS         pFalseAlmCnt = &pDM_Odm->FalseAlmCnt;
-
-#if 0          //and 2.3.5 coding rule
-       struct mlme_priv        *pmlmepriv = &(pAdapter->mlmepriv);
-       HAL_DATA_TYPE   *pHalData = GET_HAL_DATA(pAdapter);
-       struct dm_priv  *pdmpriv = &pHalData->dmpriv;
-#endif
-
-       u1Byte  RSSI_Lower=DM_DIG_MIN_NIC;   //0x1E or 0x1C
-       u1Byte  bFwCurrentInPSMode = FALSE;
-       u1Byte  CurrentIGI=pDM_Odm->RSSI_Min;
+       u8      RSSI_Lower=DM_DIG_MIN_NIC;   //0x1E or 0x1C
+       u8      bFwCurrentInPSMode = FALSE;
+       u8      CurrentIGI=pDM_Odm->RSSI_Min;
 
        if(! (pDM_Odm->SupportICType & (ODM_RTL8723A |ODM_RTL8188E)))
                return;
@@ -1363,7 +1356,7 @@ odm_DIGInit(
 
        //pDM_DigTable->Dig_Enable_Flag = TRUE;
        //pDM_DigTable->Dig_Ext_Port_Stage = DIG_EXT_PORT_STAGE_MAX;
-       pDM_DigTable->CurIGValue = (u1Byte) ODM_GetBBReg(pDM_Odm, ODM_REG(IGI_A,pDM_Odm), ODM_BIT(IGI,pDM_Odm));
+       pDM_DigTable->CurIGValue = (u8) ODM_GetBBReg(pDM_Odm, ODM_REG(IGI_A,pDM_Odm), ODM_BIT(IGI,pDM_Odm));
        //pDM_DigTable->PreIGValue = 0x0;
        //pDM_DigTable->CurSTAConnectState = pDM_DigTable->PreSTAConnectState = DIG_STA_DISCONNECT;
        //pDM_DigTable->CurMultiSTAConnectState = DIG_MultiSTA_DISCONNECT;
@@ -1409,11 +1402,11 @@ odm_DIG(
        pDIG_T                                          pDM_DigTable = &pDM_Odm->DM_DigTable;
        PFALSE_ALARM_STATISTICS         pFalseAlmCnt = &pDM_Odm->FalseAlmCnt;
        pRXHP_T                                         pRX_HP_Table  = &pDM_Odm->DM_RXHP_Table;
-       u1Byte                                          DIG_Dynamic_MIN;
-       u1Byte                                          DIG_MaxOfMin;
+       u8                                              DIG_Dynamic_MIN;
+       u8                                              DIG_MaxOfMin;
        bool                                            FirstConnect, FirstDisConnect;
-       u1Byte                                          dm_dig_max, dm_dig_min;
-       u1Byte                                          CurrentIGI = pDM_DigTable->CurIGValue;
+       u8                                              dm_dig_max, dm_dig_min;
+       u8                                              CurrentIGI = pDM_DigTable->CurIGValue;
 
 
        ODM_RT_TRACE(pDM_Odm,ODM_COMP_DIG, ODM_DBG_LOUD, ("odm_DIG()==>\n"));
@@ -1582,7 +1575,7 @@ odm_DIG(
                        {
                                if(pDM_Odm->AntDivType == CG_TRX_HW_ANTDIV)
                                {
-                                       DIG_Dynamic_MIN = (u1Byte) pDM_DigTable->AntDiv_RSSI_max;
+                                       DIG_Dynamic_MIN = (u8) pDM_DigTable->AntDiv_RSSI_max;
                                        ODM_RT_TRACE(pDM_Odm,ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("odm_DIG(): pDM_DigTable->AntDiv_RSSI_max=%d \n",pDM_DigTable->AntDiv_RSSI_max));
                                }
                        }
@@ -1930,7 +1923,7 @@ odm_CCKPacketDetectionThresh(
 {
 
        pDIG_T  pDM_DigTable = &pDM_Odm->DM_DigTable;
-       u1Byte  CurCCK_CCAThres;
+       u8      CurCCK_CCAThres;
        PFALSE_ALARM_STATISTICS FalseAlmCnt = &(pDM_Odm->FalseAlmCnt);
 
        if(!(pDM_Odm->SupportAbility & (ODM_BB_CCK_PD|ODM_BB_FA_CNT)))
@@ -1972,7 +1965,7 @@ odm_CCKPacketDetectionThresh(
 void
 ODM_Write_CCK_CCA_Thres(
        PDM_ODM_T               pDM_Odm,
-       u1Byte                  CurCCK_CCAThres
+       u8                      CurCCK_CCAThres
        )
 {
        pDIG_T  pDM_DigTable = &pDM_Odm->DM_DigTable;
@@ -2089,12 +2082,12 @@ odm_1R_CCA(
 void
 ODM_RF_Saving(
        PDM_ODM_T       pDM_Odm,
-       u1Byte          bForceInNormal
+       u8              bForceInNormal
        )
 {
        pPS_T   pDM_PSTable = &pDM_Odm->DM_PSTable;
-       u1Byte  Rssi_Up_bound = 30 ;
-       u1Byte  Rssi_Low_bound = 25;
+       u8      Rssi_Up_bound = 30 ;
+       u8      Rssi_Low_bound = 25;
        if(pDM_Odm->PatchID == 40 ) //RT_CID_819x_FUNAI_TV
        {
                Rssi_Up_bound = 50 ;
@@ -2203,12 +2196,12 @@ u4Byte ODM_Get_Rate_Bitmap(
        PDM_ODM_T       pDM_Odm,
        u4Byte          macid,
        u4Byte          ra_mask,
-       u1Byte          rssi_level)
+       u8              rssi_level)
 {
        PSTA_INFO_T     pEntry;
        u4Byte  rate_bitmap = 0x0fffffff;
-       u1Byte  WirelessMode;
-       //u1Byte        WirelessMode =*(pDM_Odm->pWirelessMode);
+       u8      WirelessMode;
+       //u8    WirelessMode =*(pDM_Odm->pWirelessMode);
 
 
        pEntry = pDM_Odm->pODM_StaInfo[macid];
@@ -2359,7 +2352,7 @@ odm_RefreshRateAdaptiveMaskCE(
                PDM_ODM_T               pDM_Odm
        )
 {
-       u1Byte  i;
+       u8      i;
        PADAPTER        pAdapter         =  pDM_Odm->Adapter;
 
        if(pAdapter->bDriverStopped)
@@ -2405,14 +2398,14 @@ ODM_RAStateCheck(
                PDM_ODM_T               pDM_Odm,
                s4Byte                  RSSI,
                bool                    bForceUpdate,
-               pu1Byte                 pRATRState
+               u8 *                    pRATRState
        )
 {
        PODM_RATE_ADAPTIVE pRA = &pDM_Odm->RateAdaptive;
-       const u1Byte GoUpGap = 5;
-       u1Byte HighRSSIThreshForRA = pRA->HighRSSIThresh;
-       u1Byte LowRSSIThreshForRA = pRA->LowRSSIThresh;
-       u1Byte RATRState;
+       const u8 GoUpGap = 5;
+       u8 HighRSSIThreshForRA = pRA->HighRSSIThresh;
+       u8 LowRSSIThreshForRA = pRA->LowRSSIThresh;
+       u8 RATRState;
 
        // Threshold Adjustment:
        // when RSSI state trends to go up one or two levels, make sure RSSI is high enough.
@@ -2498,7 +2491,7 @@ odm_DynamicTxPowerSavePowerIndex(
                PDM_ODM_T               pDM_Odm
        )
 {
-       u1Byte          index;
+       u8              index;
        u4Byte          Power_Index_REG[6] = {0xc90, 0xc91, 0xc92, 0xc98, 0xc99, 0xc9a};
 
        PADAPTER        Adapter = pDM_Odm->Adapter;
@@ -2513,7 +2506,7 @@ odm_DynamicTxPowerRestorePowerIndex(
                PDM_ODM_T               pDM_Odm
        )
 {
-       u1Byte                  index;
+       u8                      index;
        PADAPTER                Adapter = pDM_Odm->Adapter;
 
        HAL_DATA_TYPE   *pHalData = GET_HAL_DATA(Adapter);
@@ -2526,10 +2519,10 @@ odm_DynamicTxPowerRestorePowerIndex(
 void
 odm_DynamicTxPowerWritePowerIndex(
        PDM_ODM_T       pDM_Odm,
-       u1Byte          Value)
+       u8              Value)
 {
 
-       u1Byte                  index;
+       u8                      index;
        u4Byte                  Power_Index_REG[6] = {0xc90, 0xc91, 0xc92, 0xc98, 0xc99, 0xc9a};
 
        for(index = 0; index< 6; index++)
@@ -2692,22 +2685,7 @@ odm_DynamicTxPower_92C(
 
                if(check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE)       // Default port
                {
-               #if 0
-                       //todo: AP Mode
-                       if ((check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == _TRUE) ||
-                              (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) == _TRUE))
-                       {
-                               UndecoratedSmoothedPWDB = pdmpriv->EntryMinUndecoratedSmoothedPWDB;
-                               //ODM_RT_TRACE(pDM_Odm,COMP_HIPWR, DBG_LOUD, ("AP Client PWDB = 0x%x \n", UndecoratedSmoothedPWDB));
-                       }
-                       else
-                       {
-                               UndecoratedSmoothedPWDB = pdmpriv->UndecoratedSmoothedPWDB;
-                               //ODM_RT_TRACE(pDM_Odm,COMP_HIPWR, DBG_LOUD, ("STA Default Port PWDB = 0x%x \n", UndecoratedSmoothedPWDB));
-                       }
-               #else
-               UndecoratedSmoothedPWDB = pdmpriv->EntryMinUndecoratedSmoothedPWDB;
-               #endif
+                       UndecoratedSmoothedPWDB = pdmpriv->EntryMinUndecoratedSmoothedPWDB;
                }
                else // associated entry pwdb
                {
@@ -2789,22 +2767,7 @@ odm_DynamicTxPower_92D(
 
        if(check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE)       // Default port
        {
-       #if 0
-               //todo: AP Mode
-               if ((check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == _TRUE) ||
-              (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) == _TRUE))
-               {
-                       UndecoratedSmoothedPWDB = pdmpriv->EntryMinUndecoratedSmoothedPWDB;
-                       //ODM_RT_TRACE(pDM_Odm,COMP_HIPWR, DBG_LOUD, ("AP Client PWDB = 0x%x \n", UndecoratedSmoothedPWDB));
-               }
-               else
-               {
-                       UndecoratedSmoothedPWDB = pdmpriv->UndecoratedSmoothedPWDB;
-                       //ODM_RT_TRACE(pDM_Odm,COMP_HIPWR, DBG_LOUD, ("STA Default Port PWDB = 0x%x \n", UndecoratedSmoothedPWDB));
-               }
-       #else
-       UndecoratedSmoothedPWDB = pdmpriv->EntryMinUndecoratedSmoothedPWDB;
-       #endif
+               UndecoratedSmoothedPWDB = pdmpriv->EntryMinUndecoratedSmoothedPWDB;
        }
        else // associated entry pwdb
        {
@@ -2982,43 +2945,6 @@ FindMinimumRSSI_Dmsp(
        PADAPTER        pAdapter
 )
 {
-#if 0
-       HAL_DATA_TYPE   *pHalData = GET_HAL_DATA(pAdapter);
-       struct dm_priv  *pdmpriv = &pHalData->dmpriv;
-       s32     Rssi_val_min_back_for_mac0;
-       bool            bGetValueFromBuddyAdapter = dm_DualMacGetParameterFromBuddyAdapter(pAdapter);
-       bool            bRestoreRssi = _FALSE;
-       PADAPTER        BuddyAdapter = pAdapter->BuddyAdapter;
-
-       if(pHalData->MacPhyMode92D == DUALMAC_SINGLEPHY)
-       {
-               if(BuddyAdapter!= NULL)
-               {
-                       if(pHalData->bSlaveOfDMSP)
-                       {
-                               //ODM_RT_TRACE(pDM_Odm,COMP_EASY_CONCURRENT,DBG_LOUD,("bSlavecase of dmsp\n"));
-                               BuddyAdapter->DualMacDMSPControl.RssiValMinForAnotherMacOfDMSP = pdmpriv->MinUndecoratedPWDBForDM;
-                       }
-                       else
-                       {
-                               if(bGetValueFromBuddyAdapter)
-                               {
-                                       //ODM_RT_TRACE(pDM_Odm,COMP_EASY_CONCURRENT,DBG_LOUD,("get new RSSI\n"));
-                                       bRestoreRssi = _TRUE;
-                                       Rssi_val_min_back_for_mac0 = pdmpriv->MinUndecoratedPWDBForDM;
-                                       pdmpriv->MinUndecoratedPWDBForDM = pAdapter->DualMacDMSPControl.RssiValMinForAnotherMacOfDMSP;
-                               }
-                       }
-               }
-
-       }
-
-       if(bRestoreRssi)
-       {
-               bRestoreRssi = _FALSE;
-               pdmpriv->MinUndecoratedPWDBForDM = Rssi_val_min_back_for_mac0;
-       }
-#endif
 }
 
 static void
@@ -3077,11 +3003,6 @@ odm_RSSIMonitorCheckCE(
                                        if(psta->rssi_stat.UndecoratedSmoothedPWDB > tmpEntryMaxPWDB)
                                                tmpEntryMaxPWDB = psta->rssi_stat.UndecoratedSmoothedPWDB;
 
-                                       #if 0
-                                       DBG_8723A("%s mac_id:%u, mac:"MAC_FMT", rssi:%d\n", __func__,
-                                               psta->mac_id, MAC_ARG(psta->hwaddr), psta->rssi_stat.UndecoratedSmoothedPWDB);
-                                       #endif
-
                                        if(psta->rssi_stat.UndecoratedSmoothedPWDB != (-1)) {
                                                #if(RTL8192D_SUPPORT==1)
                                                PWDB_rssi[sta_cnt++] = (psta->mac_id | (psta->rssi_stat.UndecoratedSmoothedPWDB<<16) | ((Adapter->stapriv.asoc_sta_count+1) << 8));
@@ -3103,13 +3024,13 @@ odm_RSSIMonitorCheckCE(
                for(i=0; i< NUM_STA; i++)
                {
                        phead = &(pstapriv->sta_hash[i]);
-                       plist = get_next(phead);
+                       plist = phead->next;
 
                        while ((rtw_end_of_queue_search(phead, plist)) == _FALSE)
                        {
-                               psta = LIST_CONTAINOR(plist, struct sta_info, hash_list);
+                               psta = container_of(plist, struct sta_info, hash_list);
 
-                               plist = get_next(plist);
+                               plist = plist->next;
 
                                if (!memcmp(psta->hwaddr, bcast_addr, ETH_ALEN) ||
                                    !memcmp(psta->hwaddr, myid(&Adapter->eeprompriv), ETH_ALEN))
@@ -3406,7 +3327,7 @@ odm_SwAntDivInit_NIC_8723A(
 {
        pSWAT_T         pDM_SWAT_Table = &pDM_Odm->DM_SWAT_Table;
        PADAPTER                Adapter = pDM_Odm->Adapter;
-       u1Byte                  btAntNum=BT_GetPGAntNum(Adapter);
+       u8                      btAntNum=BT_GetPGAntNum(Adapter);
 
 
        pDM_SWAT_Table->ANTA_ON =TRUE;
@@ -3495,7 +3416,7 @@ ODM_SwAntDivRestAfterLink(
 void
 ODM_SwAntDivChkPerPktRssi(
  PDM_ODM_T     pDM_Odm,
- u1Byte                StationID,
+ u8            StationID,
  PODM_PHY_INFO_T pPhyInfo
        )
 {
@@ -3526,7 +3447,7 @@ ODM_SwAntDivChkPerPktRssi(
 void
 odm_SwAntDivChkAntSwitch(
                PDM_ODM_T               pDM_Odm,
-               u1Byte                  Step
+               u8                      Step
        )
 {
        //
@@ -3572,7 +3493,7 @@ odm_SwAntDivChkAntSwitch(
 void
 ODM_SetAntenna(
        PDM_ODM_T       pDM_Odm,
-       u1Byte          Antenna)
+       u8              Antenna)
 {
        ODM_SetBBReg(pDM_Odm, 0x860, BIT8|BIT9, Antenna);
 }
@@ -3583,7 +3504,7 @@ ODM_SetAntenna(
 void
 odm_SwAntDivChkAntSwitchNIC(
                PDM_ODM_T               pDM_Odm,
-               u1Byte          Step
+               u8              Step
        )
 {
 #if ((RTL8192C_SUPPORT==1)||(RTL8723A_SUPPORT==1))
@@ -3591,14 +3512,14 @@ odm_SwAntDivChkAntSwitchNIC(
        //HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
        pSWAT_T         pDM_SWAT_Table = &pDM_Odm->DM_SWAT_Table;
        s4Byte                  curRSSI=100, RSSI_A, RSSI_B;
-       u1Byte                  nextAntenna=Antenna_B;
+       u8                      nextAntenna=Antenna_B;
        //static u8Byte         lastTxOkCnt=0, lastRxOkCnt=0;
        u8Byte                  curTxOkCnt, curRxOkCnt;
        //static u8Byte         TXByteCnt_A=0, TXByteCnt_B=0, RXByteCnt_A=0, RXByteCnt_B=0;
        u8Byte                  CurByteCnt=0, PreByteCnt=0;
-       //static u1Byte         TrafficLoad = TRAFFIC_LOW;
-       u1Byte                  Score_A=0, Score_B=0;
-       u1Byte                  i;
+       //static u8             TrafficLoad = TRAFFIC_LOW;
+       u8                      Score_A=0, Score_B=0;
+       u8                      i;
 
        if(!(pDM_Odm->SupportAbility & ODM_BB_ANT_DIV))
                return;
@@ -3642,7 +3563,7 @@ odm_SwAntDivChkAntSwitchNIC(
                pDM_SWAT_Table->RSSI_target = 0xff;
 
                {
-                       u1Byte                  index = 0;
+                       u8                      index = 0;
                        PSTA_INFO_T             pEntry = NULL;
 
 
@@ -3970,12 +3891,12 @@ void odm_SwAntDivChkAntSwitchCallback(void *FunctionContext)
 void odm_SwAntDivInit(         PDM_ODM_T               pDM_Odm ) {}
 void ODM_SwAntDivChkPerPktRssi(
  PDM_ODM_T     pDM_Odm,
- u1Byte                StationID,
+ u8            StationID,
  PODM_PHY_INFO_T pPhyInfo
        ) {}
 void odm_SwAntDivChkAntSwitch(
                PDM_ODM_T               pDM_Odm,
-               u1Byte                  Step
+               u8                      Step
        ) {}
 void ODM_SwAntDivResetBeforeLink(              PDM_ODM_T               pDM_Odm ){}
 void ODM_SwAntDivRestAfterLink(                PDM_ODM_T               pDM_Odm ){}
@@ -3995,8 +3916,8 @@ odm_InitHybridAntDiv_88C_92D(
 {
 
        SWAT_T                  *pDM_SWAT_Table = &pDM_Odm->DM_SWAT_Table;
-       u1Byte                  bTxPathSel=0;           //0:Path-A   1:Path-B
-       u1Byte                  i;
+       u8                  bTxPathSel=0;               //0:Path-A   1:Path-B
+       u8                      i;
 
        ODM_RT_TRACE(pDM_Odm, ODM_COMP_ANT_DIV,ODM_DBG_LOUD,("odm_InitHybridAntDiv==============>\n"));
 
@@ -4090,7 +4011,7 @@ odm_StaDefAntSel(
  u4Byte                OFDM_Ant2_Cnt,
  u4Byte                CCK_Ant1_Cnt,
  u4Byte                CCK_Ant2_Cnt,
- u1Byte                *pDefAnt
+ u8            *pDefAnt
 
        )
 {
@@ -4131,7 +4052,7 @@ odm_StaDefAntSel(
 
 #endif
        //u4Byte antsel = ODM_GetBBReg(pDM_Odm, 0xc88, bMaskByte0);
-       //(*pDefAnt)= (u1Byte) antsel;
+       //(*pDefAnt)= (u8) antsel;
 
 
 
@@ -4147,7 +4068,7 @@ odm_StaDefAntSel(
 void
 odm_SetRxIdleAnt(
        PDM_ODM_T       pDM_Odm,
-       u1Byte  Ant,
+       u8      Ant,
    bool   bDualPath
 )
 {
@@ -4181,7 +4102,7 @@ odm_SetRxIdleAnt(
 void
 ODM_AntselStatistics_88C(
                PDM_ODM_T               pDM_Odm,
-               u1Byte                  MacId,
+               u8                      MacId,
                u4Byte                  PWDBAll,
                bool                    isCCKrate
 )
@@ -4227,7 +4148,7 @@ odm_HwAntDiv_92C_92D(
 {
        SWAT_T                  *pDM_SWAT_Table = &pDM_Odm->DM_SWAT_Table;
        u4Byte                  RSSI_Min=0xFF, RSSI, RSSI_Ant1, RSSI_Ant2;
-       u1Byte                  RxIdleAnt, i;
+       u8                      RxIdleAnt, i;
        bool            bRet=FALSE;
        PSTA_INFO_T     pEntry;
 
@@ -4464,12 +4385,6 @@ odm_EdcaTurboCheckCE(
 
                if ((pDM_Odm->DM_EDCA_Table.prv_traffic_idx != trafficIndex) || (!pDM_Odm->DM_EDCA_Table.bCurrentTurboEDCA))
                {
-
-#if 0
-                       //adjust EDCA parameter for BE queue
-                       edca_param = EDCAParam[pmlmeinfo->assoc_AP_vendor][trafficIndex];
-#else
-
                        if((pmlmeinfo->assoc_AP_vendor == HT_IOT_PEER_CISCO) && (pmlmeext->cur_wireless_mode & WIRELESS_11_24N))
                        {
                                edca_param = EDCAParam[pmlmeinfo->assoc_AP_vendor][trafficIndex];
@@ -4478,7 +4393,6 @@ odm_EdcaTurboCheckCE(
                        {
                                edca_param = EDCAParam[HT_IOT_PEER_UNKNOWN][trafficIndex];
                        }
-#endif
                        rtw_write32(Adapter, REG_EDCA_BE_PARAM, edca_param);
 
                        pDM_Odm->DM_EDCA_Table.prv_traffic_idx = trafficIndex;
@@ -4514,7 +4428,7 @@ u4Byte
 GetPSDData(
  PDM_ODM_T     pDM_Odm,
        unsigned int    point,
-       u1Byte initial_gain_psd)
+       u8 initial_gain_psd)
 {
        //unsigned int  val, rfval;
        //int   psd_report;
@@ -4555,8 +4469,8 @@ u4Byte
 ConvertTo_dB(
        u4Byte  Value)
 {
-       u1Byte i;
-       u1Byte j;
+       u8 i;
+       u8 j;
        u4Byte dB;
 
        Value = Value & 0xFFFF;
@@ -4663,7 +4577,7 @@ odm_PHY_ReloadAFERegisters(
 bool
 ODM_SingleDualAntennaDetection(
                PDM_ODM_T               pDM_Odm,
-               u1Byte                  mode
+               u8                      mode
        )
 {
 
@@ -4671,9 +4585,9 @@ ODM_SingleDualAntennaDetection(
        //PDM_ODM_T             pDM_Odm = &pHalData->DM_OutSrc;
        pSWAT_T         pDM_SWAT_Table = &pDM_Odm->DM_SWAT_Table;
        u4Byte          CurrentChannel,RfLoopReg;
-       u1Byte          n;
+       u8              n;
        u4Byte          Reg88c, Regc08, Reg874, Regc50;
-       u1Byte          initial_gain = 0x5a;
+       u8              initial_gain = 0x5a;
        u4Byte          PSD_report_tmp;
        u4Byte          AntA_report = 0x0, AntB_report = 0x0,AntO_report=0x0;
        bool            bResult = TRUE;
@@ -4961,12 +4875,6 @@ void odm_dtc(PDM_ODM_T pDM_Odm)
        u8 sign;
        u8 resp_txagc=0;
 
-       #if 0
-       /* As DIG is disabled, DTC is also disable */
-       if(!(pDM_Odm->SupportAbility & ODM_XXXXXX))
-               return;
-       #endif
-
        if (DTC_BASE < pDM_Odm->RSSI_Min) {
                /* need to decade the CTS TX power */
                sign = 1;
@@ -4978,21 +4886,6 @@ void odm_dtc(PDM_ODM_T pDM_Odm)
                                dtc_steps++;
                }
        }
-#if 0
-       else if (DTC_DWN_BASE > pDM_Odm->RSSI_Min)
-       {
-               /* needs to increase the CTS TX power */
-               sign = 0;
-               dtc_steps = 1;
-               for (i=0;i<ARRAY_SIZE(dtc_table_up);i++)
-               {
-                       if ((dtc_table_up[i] <= pDM_Odm->RSSI_Min) || (dtc_steps>=10))
-                               break;
-                       else
-                               dtc_steps++;
-               }
-       }
-#endif
        else
        {
                sign = 0;