rtl8723au: Replace u2Byte with u16

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

diff --git a/hal/HalHWImg8723A_BB.c b/hal/HalHWImg8723A_BB.c
index 394fab5..43aab02 100644 (file)
--- a/hal/HalHWImg8723A_BB.c
+++ b/hal/HalHWImg8723A_BB.c
@@ -229,7 +229,7 @@ ODM_ReadAndConfig_AGC_TAB_1T_8723A(
 
        u4Byte     hex         = 0;
        u4Byte     i           = 0;
-       u2Byte     count       = 0;
+       u16     count       = 0;
        pu4Byte    ptr_array   = NULL;
        u8     platform    = pDM_Odm->SupportPlatform;
        u8     interfaceValue   = pDM_Odm->SupportInterface;
@@ -500,7 +500,7 @@ ODM_ReadAndConfig_PHY_REG_1T_8723A(
 
        u4Byte     hex         = 0;
        u4Byte     i           = 0;
-       u2Byte     count       = 0;
+       u16     count       = 0;
        pu4Byte    ptr_array   = NULL;
        u8     platform    = pDM_Odm->SupportPlatform;
        u8     interfaceValue   = pDM_Odm->SupportInterface;
@@ -579,7 +579,7 @@ ODM_ReadAndConfig_PHY_REG_MP_8723A(
 
        u4Byte     hex         = 0;
        u4Byte     i           = 0;
-       u2Byte     count       = 0;
+       u16     count       = 0;
        pu4Byte    ptr_array   = NULL;
        u8     platform    = pDM_Odm->SupportPlatform;
        u8     interfaceValue   = pDM_Odm->SupportInterface;
@@ -766,7 +766,7 @@ ODM_ReadAndConfig_PHY_REG_PG_8723A(
 {
        u4Byte     hex = 0;
        u4Byte     i           = 0;
-       u2Byte     count       = 0;
+       u16     count       = 0;
        pu4Byte    ptr_array   = NULL;
        u8     platform    = pDM_Odm->SupportPlatform;
        u8     interfaceValue   = pDM_Odm->SupportInterface;

diff --git a/hal/HalHWImg8723A_MAC.c b/hal/HalHWImg8723A_MAC.c
index 4f35a14..af7902a 100644 (file)
--- a/hal/HalHWImg8723A_MAC.c
+++ b/hal/HalHWImg8723A_MAC.c
@@ -155,7 +155,7 @@ ODM_ReadAndConfig_MAC_REG_8723A(
 
        u4Byte     hex         = 0;
        u4Byte     i           = 0;
-       u2Byte     count       = 0;
+       u16     count       = 0;
        pu4Byte    ptr_array   = NULL;
        u8     platform    = pDM_Odm->SupportPlatform;
        u8     interfaceValue   = pDM_Odm->SupportInterface;

diff --git a/hal/HalHWImg8723A_RF.c b/hal/HalHWImg8723A_RF.c
index f2ce122..523c81b 100644 (file)
--- a/hal/HalHWImg8723A_RF.c
+++ b/hal/HalHWImg8723A_RF.c
@@ -225,7 +225,7 @@ ODM_ReadAndConfig_RadioA_1T_8723A(
 
        u4Byte     hex         = 0;
        u4Byte     i           = 0;
-       u2Byte     count       = 0;
+       u16     count       = 0;
        pu4Byte    ptr_array   = NULL;
        u8     platform    = pDM_Odm->SupportPlatform;
        u8     interfaceValue   = pDM_Odm->SupportInterface;

diff --git a/hal/odm.c b/hal/odm.c
index 8a34305..90aa9aa 100644 (file)
--- a/hal/odm.c
+++ b/hal/odm.c
@@ -26,7 +26,7 @@
 
 
 
-const u2Byte dB_Invert_Table[8][12] = {
+const u16 dB_Invert_Table[8][12] = {
        {       1,              1,              1,              2,              2,              2,              2,              3,              3,              3,              4,              4},
        {       4,              5,              6,              6,              7,              8,              9,              10,             11,             13,             14,             16},
        {       18,             20,             22,             25,             28,             32,             35,             40,             45,             50,             56,             63},
@@ -882,7 +882,7 @@ void
 ODM_CmnInfoPtrArrayHook(
                PDM_ODM_T               pDM_Odm,
                ODM_CMNINFO_E   CmnInfo,
-               u2Byte                  Index,
+               u16                     Index,
                void *                  pValue
        )
 {

diff --git a/hal/odm_interface.c b/hal/odm_interface.c
index 76d95ce..501c235 100644 (file)
--- a/hal/odm_interface.c
+++ b/hal/odm_interface.c
@@ -47,7 +47,7 @@ ODM_Read1Byte(
 }
 
 
-u2Byte
+u16
 ODM_Read2Byte(
        PDM_ODM_T               pDM_Odm,
        u4Byte                  RegAddr
@@ -112,7 +112,7 @@ void
 ODM_Write2Byte(
        PDM_ODM_T               pDM_Odm,
        u4Byte                  RegAddr,
-       u2Byte                  Data
+       u16                     Data
        )
 {
 #if(DM_ODM_SUPPORT_TYPE & (ODM_AP|ODM_ADSL))

diff --git a/hal/rtl8723a_hal_init.c b/hal/rtl8723a_hal_init.c
index 2ed900f..2e45b38 100644 (file)
--- a/hal/rtl8723a_hal_init.c
+++ b/hal/rtl8723a_hal_init.c
@@ -2716,7 +2716,7 @@ Hal_InitPGData(
                        // Read all Content from EEPROM or EFUSE.
                        for(i = 0; i < HWSET_MAX_SIZE; i += 2)
                        {
-//                             value16 = EF2Byte(ReadEEprom(pAdapter, (u2Byte) (i>>1)));
+//                             value16 = EF2Byte(ReadEEprom(pAdapter, (u16) (i>>1)));
 //                             *((u16*)(&PROMContent[i])) = value16;
                        }
                }

diff --git a/hal/rtl8723a_rf6052.c b/hal/rtl8723a_rf6052.c
index ead122a..17467ba 100644 (file)
--- a/hal/rtl8723a_rf6052.c
+++ b/hal/rtl8723a_rf6052.c
@@ -80,7 +80,7 @@ static        RF_SHADOW_T     RF_Shadow[RF6052_MAX_PATH][RF6052_MAX_REG];
  *
  * Overview:   For RL6052, we must change some RF settign for 1T or 2T.
  *
- * Input:              u2Byte DataRate         // 0x80-8f, 0x90-9f
+ * Input:              u16 DataRate            // 0x80-8f, 0x90-9f
  *
  * Output:      NONE
  *

diff --git a/include/odm.h b/include/odm.h
index 35845d8..c7bc461 100644 (file)
--- a/include/odm.h
+++ b/include/odm.h
@@ -771,11 +771,11 @@ typedef struct _ODM_RA_Info_
        u8 LowestRate;
        u4Byte NscUp;
        u4Byte NscDown;
-       u2Byte RTY[5];
+       u16 RTY[5];
        u4Byte TOTAL;
-       u2Byte DROP;
+       u16 DROP;
        u8 Active;
-       u2Byte RptTime;
+       u16 RptTime;
        u8 RAWaitingCounter;
        u8 RAPendingCounter;
 #if 1 //POWER_TRAINING_ACTIVE == 1 // For compile  pass only~!
@@ -1065,7 +1065,7 @@ typedef  struct DM_Out_Source_Dynamic_Mechanism_Structure
        PSTA_INFO_T             pODM_StaInfo[ODM_ASSOCIATE_ENTRY_NUM];
 
 #if (RATE_ADAPTIVE_SUPPORT == 1)
-       u2Byte                  CurrminRptTime;
+       u16                     CurrminRptTime;
        ODM_RA_INFO_T   RAInfo[ODM_ASSOCIATE_ENTRY_NUM]; //Use MacID as array index. STA MacID=0, VWiFi Client MacID={1, ODM_ASSOCIATE_ENTRY_NUM-1} //YJ,add,120119
 #endif
        //
@@ -1483,7 +1483,7 @@ void
 ODM_CmnInfoPtrArrayHook(
                PDM_ODM_T               pDM_Odm,
                ODM_CMNINFO_E   CmnInfo,
-               u2Byte                  Index,
+               u16                     Index,
                void *                  pValue
        );
 

diff --git a/include/odm_interface.h b/include/odm_interface.h
index 69f427e..e4b1b45 100644 (file)
--- a/include/odm_interface.h
+++ b/include/odm_interface.h
@@ -104,7 +104,7 @@ ODM_Read1Byte(
        u4Byte                  RegAddr
        );
 
-u2Byte
+u16
 ODM_Read2Byte(
        PDM_ODM_T               pDM_Odm,
        u4Byte                  RegAddr
@@ -127,7 +127,7 @@ void
 ODM_Write2Byte(
        PDM_ODM_T               pDM_Odm,
        u4Byte                  RegAddr,
-       u2Byte                  Data
+       u16                     Data
        );
 
 void

diff --git a/include/odm_types.h b/include/odm_types.h
index e591256..a09a56a 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 u2Byte          u16
-       #define pu2Byte                 u16*
-
        #define u4Byte          u32
        #define pu4Byte                 u32*