rtl8723au: Replace s4Byte with s32

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

diff --git a/core/rtw_security.c b/core/rtw_security.c
index 6efb62c..ac03ea2 100644 (file)
--- a/core/rtw_security.c
+++ b/core/rtw_security.c
@@ -286,7 +286,7 @@ _func_exit_;
 /* 3           =====TKIP related===== */
 
 static u32 secmicgetuint32( u8 * p )
-/*  Convert from Byte[] to Us4Byte32 in a portable way */
+/*  Convert from Byte[] to u32 in a portable way */
 {
        s32 i;
        u32 res = 0;
@@ -300,7 +300,7 @@ _func_exit_;
 }
 
 static void secmicputuint32( u8 * p, u32 val )
-/*  Convert from Us4Byte32 to Byte[] in a portable way */
+/*  Convert from long to Byte[] in a portable way */
 {
        long i;
 _func_enter_;

diff --git a/hal/odm.c b/hal/odm.c
index 6496d91..41641f1 100644 (file)
--- a/hal/odm.c
+++ b/hal/odm.c
@@ -2396,7 +2396,7 @@ odm_RefreshRateAdaptiveMaskAPADSL(
 bool
 ODM_RAStateCheck(
                PDM_ODM_T               pDM_Odm,
-               s4Byte                  RSSI,
+               s32                     RSSI,
                bool                    bForceUpdate,
                u8 *                    pRATRState
        )
@@ -3511,7 +3511,7 @@ odm_SwAntDivChkAntSwitchNIC(
        //PMGNT_INFO            pMgntInfo = &(Adapter->MgntInfo);
        //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;
+       s32                     curRSSI=100, RSSI_A, RSSI_B;
        u8                      nextAntenna=Antenna_B;
        //static u64            lastTxOkCnt=0, lastRxOkCnt=0;
        u64                     curTxOkCnt, curRxOkCnt;

diff --git a/hal/odm_HWConfig.c b/hal/odm_HWConfig.c
index 7ac4fa6..29c52ba 100644 (file)
--- a/hal/odm_HWConfig.c
+++ b/hal/odm_HWConfig.c
@@ -65,13 +65,13 @@ odm_QueryRxPwrPercentage(
 // 2012/01/12 MH MOve some signal strength smooth method to MP HAL layer.
 // IF other SW team do not support the feature, remove this section.??
 //
-s4Byte
+s32
 odm_SignalScaleMapping_92CSeries_patch_RT_CID_819x_Lenovo(
        PDM_ODM_T pDM_Odm,
-       s4Byte CurrSig
+       s32 CurrSig
 )
 {
-       s4Byte RetSig;
+       s32 RetSig;
 #if (DM_ODM_SUPPORT_TYPE == ODM_MP)
        //if(pDM_Odm->SupportInterface  == ODM_ITRF_PCIE)
        {
@@ -121,13 +121,13 @@ odm_SignalScaleMapping_92CSeries_patch_RT_CID_819x_Lenovo(
        return RetSig;
 }
 
-s4Byte
+s32
 odm_SignalScaleMapping_92CSeries_patch_RT_CID_819x_Netcore(
  PDM_ODM_T pDM_Odm,
-       s4Byte CurrSig
+       s32 CurrSig
 )
 {
-       s4Byte RetSig;
+       s32 RetSig;
 #if (DM_ODM_SUPPORT_TYPE == ODM_MP)
        //if(pDM_Odm->SupportInterface  == ODM_ITRF_USB)
        {
@@ -182,13 +182,13 @@ odm_SignalScaleMapping_92CSeries_patch_RT_CID_819x_Netcore(
 }
 
 
-s4Byte
+s32
 odm_SignalScaleMapping_92CSeries(
        PDM_ODM_T pDM_Odm,
-       s4Byte CurrSig
+       s32 CurrSig
 )
 {
-       s4Byte RetSig;
+       s32 RetSig;
 #if (DEV_BUS_TYPE == RT_PCI_INTERFACE)
        if(pDM_Odm->SupportInterface  == ODM_ITRF_PCIE)
        {
@@ -275,10 +275,10 @@ odm_SignalScaleMapping_92CSeries(
 #endif
        return RetSig;
 }
-s4Byte
+s32
 odm_SignalScaleMapping(
        PDM_ODM_T pDM_Odm,
-       s4Byte CurrSig
+       s32 CurrSig
 )
 {
        if(     (pDM_Odm->SupportPlatform == ODM_MP) &&
@@ -633,7 +633,7 @@ odm_RxPhyStatus92CSeries_Parsing(
 
                #if (DM_ODM_SUPPORT_TYPE &  (/*ODM_MP|*/ODM_CE|ODM_AP|ODM_ADSL))
                        //Get Rx snr value in DB
-                       pPhyInfo->RxSNR[i] = pDM_Odm->PhyDbgInfo.RxSNRdB[i] = (s4Byte)(pPhyStaRpt->path_rxsnr[i]/2);
+                       pPhyInfo->RxSNR[i] = pDM_Odm->PhyDbgInfo.RxSNRdB[i] = (s32)(pPhyStaRpt->path_rxsnr[i]/2);
                #endif
 
                        /* Record Signal Strength for next packet */
@@ -753,7 +753,7 @@ odm_Process_RSSIForDM(
        )
 {
 
-       s4Byte                  UndecoratedSmoothedPWDB, UndecoratedSmoothedCCK, UndecoratedSmoothedOFDM, RSSI_Ave;
+       s32                     UndecoratedSmoothedPWDB, UndecoratedSmoothedCCK, UndecoratedSmoothedOFDM, RSSI_Ave;
        u8                      isCCKrate=0;
        u8                      RSSI_max, RSSI_min, i;
        u32                     OFDM_pkt=0;

diff --git a/include/odm.h b/include/odm.h
index 1e3c7a9..6153cf2 100644 (file)
--- a/include/odm.h
+++ b/include/odm.h
@@ -243,7 +243,7 @@ typedef struct _RX_High_Power_
 typedef struct _SW_Antenna_Switch_
 {
        u8              try_flag;
-       s4Byte          PreRSSI;
+       s32             PreRSSI;
        u8              CurAntenna;
        u8              PreAntenna;
        u8              RSSI_Trying;
@@ -258,10 +258,10 @@ typedef struct _SW_Antenna_Switch_
        bool            ANTA_ON;        //To indicate Ant A is or not
        bool            ANTB_ON;        //To indicate Ant B is on or not
 
-       s4Byte          RSSI_sum_A;
-       s4Byte          RSSI_sum_B;
-       s4Byte          RSSI_cnt_A;
-       s4Byte          RSSI_cnt_B;
+       s32             RSSI_sum_A;
+       s32             RSSI_sum_B;
+       s32             RSSI_cnt_A;
+       s32             RSSI_cnt_B;
 
        u64             lastTxOkCnt;
        u64             lastRxOkCnt;
@@ -371,7 +371,7 @@ typedef struct _ODM_Phy_Dbg_Info_
        u64             NumQryPhyStatusCCK;
        u64             NumQryPhyStatusOFDM;
        //Others
-       s4Byte          RxEVM[MAX_PATH_NUM_92CS];
+       s32             RxEVM[MAX_PATH_NUM_92CS];
 
 }ODM_PHY_DBG_INFO_T;
 
@@ -793,7 +793,7 @@ typedef struct _ODM_RA_Info_
 
 typedef struct _IQK_MATRIX_REGS_SETTING{
        bool    bIQKDone;
-       s4Byte          Value[1][IQK_Matrix_REG_NUM];
+       s32             Value[1][IQK_Matrix_REG_NUM];
 }IQK_MATRIX_REGS_SETTING,*PIQK_MATRIX_REGS_SETTING;
 
 
@@ -802,10 +802,10 @@ typedef struct ODM_RF_Calibration_Structure
        //for tx power tracking
 
        u32     RegA24; // for TempCCK
-       s4Byte  RegE94;
-       s4Byte  RegE9C;
-       s4Byte  RegEB4;
-       s4Byte  RegEBC;
+       s32     RegE94;
+       s32     RegE9C;
+       s32     RegEB4;
+       s32     RegEBC;
 
        //u8 bTXPowerTracking;
        u8              TXPowercount;
@@ -1425,7 +1425,7 @@ ODM_TXPowerTrackingCheck(
 bool
 ODM_RAStateCheck(
                PDM_ODM_T               pDM_Odm,
-               s4Byte                  RSSI,
+               s32                     RSSI,
                bool                    bForceUpdate,
                u8 *                    pRATRState
        );

diff --git a/include/odm_interface.h b/include/odm_interface.h
index 049e90e..094c979 100644 (file)
--- a/include/odm_interface.h
+++ b/include/odm_interface.h
@@ -201,7 +201,7 @@ ODM_FreeMemory(
        u32             length
        );
 
-s4Byte ODM_CompareMemory(
+s32 ODM_CompareMemory(
        PDM_ODM_T       pDM_Odm,
        void *           pBuf1,
        void *           pBuf2,

diff --git a/include/odm_types.h b/include/odm_types.h
index d9e888d..e4f0415 100644 (file)
--- a/include/odm_types.h
+++ b/include/odm_types.h
@@ -58,12 +58,6 @@ typedef enum _RT_SPINLOCK_TYPE{
        #define s2Byte          s16
        #define ps2Byte                 s16*
 
-       #define s4Byte          s32
-       #define ps4Byte                 s32*
-
-       #define s8Byte          s64
-       #define ps8Byte                 s64*
-
        #define DEV_BUS_TYPE    RT_USB_INTERFACE
 
        typedef struct timer_list               RT_TIMER, *PRT_TIMER;