rtl8723au: Replace u8Byte with u64

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

diff --git a/hal/odm.c b/hal/odm.c
index 00ccce6..6496d91 100644 (file)
--- a/hal/odm.c
+++ b/hal/odm.c
@@ -779,11 +779,11 @@ ODM_CmnInfoHook(
                        break;
 
                case    ODM_CMNINFO_TX_UNI:
-                       pDM_Odm->pNumTxBytesUnicast = (u8Byte *)pValue;
+                       pDM_Odm->pNumTxBytesUnicast = (u64 *)pValue;
                        break;
 
                case    ODM_CMNINFO_RX_UNI:
-                       pDM_Odm->pNumRxBytesUnicast = (u8Byte *)pValue;
+                       pDM_Odm->pNumRxBytesUnicast = (u64 *)pValue;
                        break;
 
                case    ODM_CMNINFO_WM_MODE:
@@ -913,7 +913,7 @@ void
 ODM_CmnInfoUpdate(
                PDM_ODM_T               pDM_Odm,
                u32                     CmnInfo,
-               u8Byte                  Value
+               u64                     Value
        )
 {
        //
@@ -3513,10 +3513,10 @@ odm_SwAntDivChkAntSwitchNIC(
        pSWAT_T         pDM_SWAT_Table = &pDM_Odm->DM_SWAT_Table;
        s4Byte                  curRSSI=100, RSSI_A, RSSI_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 u64            lastTxOkCnt=0, lastRxOkCnt=0;
+       u64                     curTxOkCnt, curRxOkCnt;
+       //static u64            TXByteCnt_A=0, TXByteCnt_B=0, RXByteCnt_A=0, RXByteCnt_B=0;
+       u64                     CurByteCnt=0, PreByteCnt=0;
        //static u8             TrafficLoad = TRAFFIC_LOW;
        u8                      Score_A=0, Score_B=0;
        u8                      i;

diff --git a/hal/rtl8723a_phycfg.c b/hal/rtl8723a_phycfg.c
index d6b0192..0f14842 100644 (file)
--- a/hal/rtl8723a_phycfg.c
+++ b/hal/rtl8723a_phycfg.c
@@ -2055,7 +2055,7 @@ _PHY_SetBWMode92C(
 
        // Added it for 20/40 mhz switch time evaluation by guangan 070531
        //u32                           NowL, NowH;
-       //u8Byte                                BeginTime, EndTime;
+       //u64                           BeginTime, EndTime;
 
        /*RT_TRACE(COMP_SCAN, DBG_LOUD, ("==>PHY_SetBWModeCallback8192C()  Switch to %s bandwidth\n", \
                                        pHalData->CurrentChannelBW == HT_CHANNEL_WIDTH_20?"20MHz":"40MHz"))*/
@@ -2076,7 +2076,7 @@ _PHY_SetBWMode92C(
        // Added it for 20/40 mhz switch time evaluation by guangan 070531
        //NowL = PlatformEFIORead4Byte(Adapter, TSFR);
        //NowH = PlatformEFIORead4Byte(Adapter, TSFR+4);
-       //BeginTime = ((u8Byte)NowH << 32) + NowL;
+       //BeginTime = ((u64)NowH << 32) + NowL;
 
        //3//
        //3//<1>Set MAC register
@@ -2151,7 +2151,7 @@ _PHY_SetBWMode92C(
        // Added it for 20/40 mhz switch time evaluation by guangan 070531
        //NowL = PlatformEFIORead4Byte(Adapter, TSFR);
        //NowH = PlatformEFIORead4Byte(Adapter, TSFR+4);
-       //EndTime = ((u8Byte)NowH << 32) + NowL;
+       //EndTime = ((u64)NowH << 32) + NowL;
        //RT_TRACE(COMP_SCAN, DBG_LOUD, ("SetBWModeCallback8190Pci: time of SetBWMode = %I64d us!\n", (EndTime - BeginTime)));
 
        //3<3>Set RF related register

diff --git a/hal/usb_halinit.c b/hal/usb_halinit.c
index 8e8c6c0..3629ee2 100644 (file)
--- a/hal/usb_halinit.c
+++ b/hal/usb_halinit.c
@@ -3182,7 +3182,7 @@ GetHalDefVar8192CUsb(
                        break;
                case HW_DEF_ODM_DBG_FLAG:
                        {
-                               u8Byte  DebugComponents = *((u32*)pValue);
+                               u64     DebugComponents = *((u32*)pValue);
                                PDM_ODM_T       pDM_Odm = &(pHalData->odmpriv);
                                printk("pDM_Odm->DebugComponents = 0x%llx \n",pDM_Odm->DebugComponents );
                        }
@@ -3270,7 +3270,7 @@ SetHalDefVar8192CUsb(
                        break;
                case HW_DEF_ODM_DBG_FLAG:
                        {
-                               u8Byte  DebugComponents = *((u8Byte*)pValue);
+                               u64     DebugComponents = *((u64*)pValue);
                                PDM_ODM_T       pDM_Odm = &(pHalData->odmpriv);
                                pDM_Odm->DebugComponents = DebugComponents;
                        }

diff --git a/include/odm.h b/include/odm.h
index af18037..1e3c7a9 100644 (file)
--- a/include/odm.h
+++ b/include/odm.h
@@ -263,23 +263,23 @@ typedef struct _SW_Antenna_Switch_
        s4Byte          RSSI_cnt_A;
        s4Byte          RSSI_cnt_B;
 
-       u8Byte          lastTxOkCnt;
-       u8Byte          lastRxOkCnt;
-       u8Byte          TXByteCnt_A;
-       u8Byte          TXByteCnt_B;
-       u8Byte          RXByteCnt_A;
-       u8Byte          RXByteCnt_B;
+       u64             lastTxOkCnt;
+       u64             lastRxOkCnt;
+       u64             TXByteCnt_A;
+       u64             TXByteCnt_B;
+       u64             RXByteCnt_A;
+       u64             RXByteCnt_B;
        u8              TrafficLoad;
        RT_TIMER        SwAntennaSwitchTimer;
 /* CE Platform use
 #ifdef CONFIG_SW_ANTENNA_DIVERSITY
        _timer SwAntennaSwitchTimer;
-       u8Byte lastTxOkCnt;
-       u8Byte lastRxOkCnt;
-       u8Byte TXByteCnt_A;
-       u8Byte TXByteCnt_B;
-       u8Byte RXByteCnt_A;
-       u8Byte RXByteCnt_B;
+       u64 lastTxOkCnt;
+       u64 lastRxOkCnt;
+       u64 TXByteCnt_A;
+       u64 TXByteCnt_B;
+       u64 RXByteCnt_A;
+       u64 RXByteCnt_B;
        u8 DoubleComfirm;
        u8 TrafficLoad;
        //SW Antenna Switch
@@ -367,9 +367,9 @@ typedef struct _ODM_Phy_Dbg_Info_
 {
        //ODM Write,debug info
        s1Byte          RxSNRdB[MAX_PATH_NUM_92CS];
-       u8Byte          NumQryPhyStatus;
-       u8Byte          NumQryPhyStatusCCK;
-       u8Byte          NumQryPhyStatusOFDM;
+       u64             NumQryPhyStatus;
+       u64             NumQryPhyStatusCCK;
+       u64             NumQryPhyStatusOFDM;
        //Others
        s4Byte          RxEVM[MAX_PATH_NUM_92CS];
 
@@ -508,7 +508,7 @@ typedef enum _ODM_Common_Info_Definition
        ODM_CMNINFO_WIFI_DISPLAY,
        ODM_CMNINFO_LINK,
        ODM_CMNINFO_RSSI_MIN,
-       ODM_CMNINFO_DBG_COMP,                           // u8Byte
+       ODM_CMNINFO_DBG_COMP,                           // u64
        ODM_CMNINFO_DBG_LEVEL,                          // u32
        ODM_CMNINFO_RA_THRESHOLD_HIGH,          // u8
        ODM_CMNINFO_RA_THRESHOLD_LOW,           // u8
@@ -943,7 +943,7 @@ typedef  struct DM_Out_Source_Dynamic_Mechanism_Structure
 
        rtl8192cd_priv          fake_priv;
 
-       u8Byte                  DebugComponents;
+       u64                     DebugComponents;
        u32                     DebugLevel;
 
 //------ ODM HANDLE, DRIVER NEEDS NOT TO HOOK------//
@@ -1013,9 +1013,9 @@ typedef  struct DM_Out_Source_Dynamic_Mechanism_Structure
        // MAC PHY Mode SMSP/DMSP/DMDP = 0/1/2
        u8                      *pMacPhyMode;
        //TX Unicast byte count
-       u8Byte                  *pNumTxBytesUnicast;
+       u64                     *pNumTxBytesUnicast;
        //RX Unicast byte count
-       u8Byte                  *pNumRxBytesUnicast;
+       u64                     *pNumRxBytesUnicast;
        // Wireless mode B/G/A/N = BIT0/BIT1/BIT2/BIT3
        u8                      *pWirelessMode; //ODM_WIRELESS_MODE_E
        // Frequence band 2.4G/5G = 0/1
@@ -1491,7 +1491,7 @@ void
 ODM_CmnInfoUpdate(
                PDM_ODM_T               pDM_Odm,
                u32                     CmnInfo,
-               u8Byte                  Value
+               u64                     Value
        );
 
 void

diff --git a/include/odm_types.h b/include/odm_types.h
index 609c036..d9e888d 100644 (file)
--- a/include/odm_types.h
+++ b/include/odm_types.h
@@ -52,9 +52,6 @@ typedef enum _RT_SPINLOCK_TYPE{
 
        #include <basic_types.h>
 
-       #define u8Byte          u64
-       #define pu8Byte                 u64*
-
        #define s1Byte          s8
        #define ps1Byte                 s8*