rtl8188eu: Convert u4Bytw to u32

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2014-12-30 16:55:10 -06:00
parent 5f39818cb5
commit 8aad1f53ce
27 changed files with 482 additions and 488 deletions

160
hal/odm.h
View file

@ -138,8 +138,8 @@ typedef struct _Dynamic_Initial_Gain_Threshold_
int RssiLowThresh;
int RssiHighThresh;
u4Byte FALowThresh;
u4Byte FAHighThresh;
u32 FALowThresh;
u32 FAHighThresh;
u1Byte CurSTAConnectState;
u1Byte PreSTAConnectState;
@ -164,15 +164,15 @@ typedef struct _Dynamic_Initial_Gain_Threshold_
u1Byte LargeFAHit;
u1Byte ForbiddenIGI;
u4Byte Recover_cnt;
u32 Recover_cnt;
u1Byte DIG_Dynamic_MIN_0;
u1Byte DIG_Dynamic_MIN_1;
BOOLEAN bMediaConnect_0;
BOOLEAN bMediaConnect_1;
u4Byte AntDiv_RSSI_max;
u4Byte RSSI_max;
u32 AntDiv_RSSI_max;
u32 RSSI_max;
}DIG_T,*pDIG_T;
typedef struct _Dynamic_Power_Saving_
@ -186,25 +186,25 @@ typedef struct _Dynamic_Power_Saving_
int Rssi_val_min;
u1Byte initialize;
u4Byte Reg874,RegC70,Reg85C,RegA74;
u32 Reg874,RegC70,Reg85C,RegA74;
}PS_T,*pPS_T;
typedef struct false_ALARM_STATISTICS{
u4Byte Cnt_Parity_Fail;
u4Byte Cnt_Rate_Illegal;
u4Byte Cnt_Crc8_fail;
u4Byte Cnt_Mcs_fail;
u4Byte Cnt_Ofdm_fail;
u4Byte Cnt_Cck_fail;
u4Byte Cnt_all;
u4Byte Cnt_Fast_Fsync;
u4Byte Cnt_SB_Search_fail;
u4Byte Cnt_OFDM_CCA;
u4Byte Cnt_CCK_CCA;
u4Byte Cnt_CCA_all;
u4Byte Cnt_BW_USC; //Gary
u4Byte Cnt_BW_LSC; //Gary
u32 Cnt_Parity_Fail;
u32 Cnt_Rate_Illegal;
u32 Cnt_Crc8_fail;
u32 Cnt_Mcs_fail;
u32 Cnt_Ofdm_fail;
u32 Cnt_Cck_fail;
u32 Cnt_all;
u32 Cnt_Fast_Fsync;
u32 Cnt_SB_Search_fail;
u32 Cnt_OFDM_CCA;
u32 Cnt_CCK_CCA;
u32 Cnt_CCA_all;
u32 Cnt_BW_USC; //Gary
u32 Cnt_BW_LSC; //Gary
}FALSE_ALARM_STATISTICS, *PFALSE_ALARM_STATISTICS;
typedef struct _Dynamic_Primary_CCA{
@ -260,7 +260,7 @@ typedef struct _SW_Antenna_Switch_
// Before link Antenna Switch check
u1Byte SWAS_NoLink_State;
u4Byte SWAS_NoLink_BK_Reg860;
u32 SWAS_NoLink_BK_Reg860;
BOOLEAN ANTA_ON; //To indicate Ant A is or not
BOOLEAN ANTB_ON; //To indicate Ant B is on or not
@ -279,12 +279,12 @@ typedef struct _SW_Antenna_Switch_
RT_TIMER SwAntennaSwitchTimer;
#ifdef CONFIG_HW_ANTENNA_DIVERSITY
//Hybrid Antenna Diversity
u4Byte CCK_Ant1_Cnt[ASSOCIATE_ENTRY_NUM];
u4Byte CCK_Ant2_Cnt[ASSOCIATE_ENTRY_NUM];
u4Byte OFDM_Ant1_Cnt[ASSOCIATE_ENTRY_NUM];
u4Byte OFDM_Ant2_Cnt[ASSOCIATE_ENTRY_NUM];
u4Byte RSSI_Ant1_Sum[ASSOCIATE_ENTRY_NUM];
u4Byte RSSI_Ant2_Sum[ASSOCIATE_ENTRY_NUM];
u32 CCK_Ant1_Cnt[ASSOCIATE_ENTRY_NUM];
u32 CCK_Ant2_Cnt[ASSOCIATE_ENTRY_NUM];
u32 OFDM_Ant1_Cnt[ASSOCIATE_ENTRY_NUM];
u32 OFDM_Ant2_Cnt[ASSOCIATE_ENTRY_NUM];
u32 RSSI_Ant1_Sum[ASSOCIATE_ENTRY_NUM];
u32 RSSI_Ant2_Sum[ASSOCIATE_ENTRY_NUM];
u1Byte TxAnt[ASSOCIATE_ENTRY_NUM];
u1Byte TargetSTA;
u1Byte antsel;
@ -296,7 +296,7 @@ typedef struct _SW_Antenna_Switch_
typedef struct _EDCA_TURBO_ {
BOOLEAN bCurrentTurboEDCA;
BOOLEAN bIsCurRDLState;
u4Byte prv_traffic_idx; // edca turbo
u32 prv_traffic_idx; // edca turbo
}EDCA_T,*pEDCA_T;
@ -306,7 +306,7 @@ typedef struct _ODM_RATE_ADAPTIVE
u1Byte HighRSSIThresh; // if RSSI > HighRSSIThresh => RATRState is DM_RATR_STA_HIGH
u1Byte LowRSSIThresh; // if RSSI <= LowRSSIThresh => RATRState is DM_RATR_STA_LOW
u1Byte RATRState; // Current RSSI level, DM_RATR_STA_HIGH/DM_RATR_STA_MIDDLE/DM_RATR_STA_LOW
u4Byte LastRATR; // RATR Register Content
u32 LastRATR; // RATR Register Content
} ODM_RATE_ADAPTIVE, *PODM_RATE_ADAPTIVE;
@ -484,7 +484,7 @@ typedef enum _ODM_Common_Info_Definition
ODM_CMNINFO_LINK,
ODM_CMNINFO_RSSI_MIN,
ODM_CMNINFO_DBG_COMP, // u8Byte
ODM_CMNINFO_DBG_LEVEL, // u4Byte
ODM_CMNINFO_DBG_LEVEL, // u32
ODM_CMNINFO_RA_THRESHOLD_HIGH, // u1Byte
ODM_CMNINFO_RA_THRESHOLD_LOW, // u1Byte
ODM_CMNINFO_RF_ANTENNA_TYPE, // u1Byte
@ -758,8 +758,8 @@ typedef enum tag_CCA_Path
typedef struct _ODM_RA_Info_
{
u1Byte RateID;
u4Byte RateMask;
u4Byte RAUseRate;
u32 RateMask;
u32 RAUseRate;
u1Byte RateSGI;
u1Byte RssiStaRA;
u1Byte PreRssiStaRA;
@ -768,10 +768,10 @@ typedef struct _ODM_RA_Info_
u1Byte PreRate;
u1Byte HighestRate;
u1Byte LowestRate;
u4Byte NscUp;
u4Byte NscDown;
u32 NscUp;
u32 NscDown;
u16 RTY[5];
u4Byte TOTAL;
u32 TOTAL;
u16 DROP;//Retry over or drop
u16 DROP1;//LifeTime over
u1Byte Active;
@ -800,7 +800,7 @@ typedef struct ODM_RF_Calibration_Structure
{
//for tx power tracking
u4Byte RegA24; // for TempCCK
u32 RegA24; // for TempCCK
s4Byte RegE94;
s4Byte RegE9C;
s4Byte RegEB4;
@ -830,7 +830,7 @@ typedef struct ODM_RF_Calibration_Structure
BOOLEAN bReloadtxpowerindex;
u1Byte bRfPiEnable;
u4Byte TXPowerTrackingCallbackCnt; //cosa add for debug
u32 TXPowerTrackingCallbackCnt; //cosa add for debug
u1Byte bCCKinCH14;
u1Byte CCK_index;
@ -849,25 +849,25 @@ typedef struct ODM_RF_Calibration_Structure
u1Byte Delta_LCK;
//for IQK
u4Byte RegC04;
u4Byte Reg874;
u4Byte RegC08;
u4Byte RegB68;
u4Byte RegB6C;
u4Byte Reg870;
u4Byte Reg860;
u4Byte Reg864;
u32 RegC04;
u32 Reg874;
u32 RegC08;
u32 RegB68;
u32 RegB6C;
u32 Reg870;
u32 Reg860;
u32 Reg864;
BOOLEAN bIQKInitialized;
BOOLEAN bLCKInProgress;
BOOLEAN bAntennaDetected;
u4Byte ADDA_backup[IQK_ADDA_REG_NUM];
u4Byte IQK_MAC_backup[IQK_MAC_REG_NUM];
u4Byte IQK_BB_backup_recover[9];
u4Byte IQK_BB_backup[IQK_BB_REG_NUM];
u32 ADDA_backup[IQK_ADDA_REG_NUM];
u32 IQK_MAC_backup[IQK_MAC_REG_NUM];
u32 IQK_BB_backup_recover[9];
u32 IQK_BB_backup[IQK_BB_REG_NUM];
//for APK
u4Byte APKoutput[2][2]; //path A/B; output1_1a/output1_2a
u32 APKoutput[2][2]; //path A/B; output1_1a/output1_2a
u1Byte bAPKdone;
u1Byte bAPKThermalMeterIgnore;
u1Byte bDPdone;
@ -884,18 +884,18 @@ typedef struct _FAST_ANTENNA_TRAINNING_
u1Byte antsel_rx_keep_0;
u1Byte antsel_rx_keep_1;
u1Byte antsel_rx_keep_2;
u4Byte antSumRSSI[7];
u4Byte antRSSIcnt[7];
u4Byte antAveRSSI[7];
u32 antSumRSSI[7];
u32 antRSSIcnt[7];
u32 antAveRSSI[7];
u1Byte FAT_State;
u4Byte TrainIdx;
u32 TrainIdx;
u1Byte antsel_a[ODM_ASSOCIATE_ENTRY_NUM];
u1Byte antsel_b[ODM_ASSOCIATE_ENTRY_NUM];
u1Byte antsel_c[ODM_ASSOCIATE_ENTRY_NUM];
u4Byte MainAnt_Sum[ODM_ASSOCIATE_ENTRY_NUM];
u4Byte AuxAnt_Sum[ODM_ASSOCIATE_ENTRY_NUM];
u4Byte MainAnt_Cnt[ODM_ASSOCIATE_ENTRY_NUM];
u4Byte AuxAnt_Cnt[ODM_ASSOCIATE_ENTRY_NUM];
u32 MainAnt_Sum[ODM_ASSOCIATE_ENTRY_NUM];
u32 AuxAnt_Sum[ODM_ASSOCIATE_ENTRY_NUM];
u32 MainAnt_Cnt[ODM_ASSOCIATE_ENTRY_NUM];
u32 AuxAnt_Cnt[ODM_ASSOCIATE_ENTRY_NUM];
u1Byte RxIdleAnt;
BOOLEAN bBecomeLinked;
@ -946,7 +946,7 @@ typedef struct DM_Out_Source_Dynamic_Mechanism_Structure
rtl8192cd_priv fake_priv;
u8Byte DebugComponents;
u4Byte DebugLevel;
u32 DebugLevel;
//------ ODM HANDLE, DRIVER NEEDS NOT TO HOOK------//
BOOLEAN bCckHighPower;
@ -975,11 +975,11 @@ typedef struct DM_Out_Source_Dynamic_Mechanism_Structure
// ODM Platform info AP/ADSL/CE/MP = 1/2/3/4
u1Byte SupportPlatform;
// ODM Support Ability DIG/RATR/TX_PWR_TRACK/ ¡K¡K = 1/2/3/¡K
u4Byte SupportAbility;
u32 SupportAbility;
// ODM PCIE/USB/SDIO/GSPI = 0/1/2/3
u1Byte SupportInterface;
// ODM composite or independent. Bit oriented/ 92C+92D+ .... or any other type = 1/2/3/...
u4Byte SupportICType;
u32 SupportICType;
// Cut Version TestChip/A-cut/B-cut... = 0/1/2/3/...
u1Byte CutVersion;
// Fab Version TSMC/UMC = 0/1
@ -999,7 +999,7 @@ typedef struct DM_Out_Source_Dynamic_Mechanism_Structure
BOOLEAN bWIFITest;
BOOLEAN bDualMacSmartConcurrent;
u4Byte BK_SupportAbility;
u32 BK_SupportAbility;
u1Byte AntDivType;
//-----------HOOK BEFORE REG INIT-----------//
@ -1076,27 +1076,27 @@ typedef struct DM_Out_Source_Dynamic_Mechanism_Structure
u1Byte TxRate;
u1Byte LinkedInterval;
u1Byte preChannel;
u4Byte TxagcOffsetValueA;
u32 TxagcOffsetValueA;
BOOLEAN IsTxagcOffsetPositiveA;
u4Byte TxagcOffsetValueB;
u32 TxagcOffsetValueB;
BOOLEAN IsTxagcOffsetPositiveB;
u8Byte lastTxOkCnt;
u8Byte lastRxOkCnt;
u4Byte BbSwingOffsetA;
u32 BbSwingOffsetA;
BOOLEAN IsBbSwingOffsetPositiveA;
u4Byte BbSwingOffsetB;
u32 BbSwingOffsetB;
BOOLEAN IsBbSwingOffsetPositiveB;
s1Byte TH_L2H_ini;
s1Byte TH_EDCCA_HL_diff;
u4Byte IGI_Base;
u4Byte IGI_target;
u32 IGI_Base;
u32 IGI_target;
BOOLEAN ForceEDCCA;
u1Byte AdapEn_RSSI;
u1Byte AntType;
u1Byte antdiv_rssi;
u1Byte antdiv_period;
u4Byte Force_TH_H;
u4Byte Force_TH_L;
u32 Force_TH_H;
u32 Force_TH_L;
u1Byte IGI_LowerBound;
//2 Define STA info.
@ -1145,7 +1145,7 @@ typedef struct DM_Out_Source_Dynamic_Mechanism_Structure
BOOLEAN RSSI_test;
EDCA_T DM_EDCA_Table;
u4Byte WMMEDCA_BE;
u32 WMMEDCA_BE;
// Copy from SD4 structure
//
// ==================================================
@ -1412,7 +1412,7 @@ typedef enum tag_SW_Antenna_Switch_Definition
#define OFDM_TABLE_SIZE_92D 43
#define CCK_TABLE_SIZE 33
extern u4Byte OFDMSwingTable[OFDM_TABLE_SIZE_92D];
extern u32 OFDMSwingTable[OFDM_TABLE_SIZE_92D];
extern u1Byte CCKSwingTable_Ch1_Ch13[CCK_TABLE_SIZE][8];
extern u1Byte CCKSwingTable_Ch14 [CCK_TABLE_SIZE][8];
@ -1468,9 +1468,9 @@ void ODM_SwAntDivChkPerPktRssi(
PODM_PHY_INFO_T pPhyInfo
);
u4Byte ConvertTo_dB(u4Byte Value);
u32 ConvertTo_dB(u32 Value);
u4Byte
u32
GetPSDData(
PDM_ODM_T pDM_Odm,
unsigned int point,
@ -1481,10 +1481,10 @@ odm_DIGbyRSSI_LPS(
PDM_ODM_T pDM_Odm
);
u4Byte ODM_Get_Rate_Bitmap(
u32 ODM_Get_Rate_Bitmap(
PDM_ODM_T pDM_Odm,
u4Byte macid,
u4Byte ra_mask,
u32 macid,
u32 ra_mask,
u1Byte rssi_level);
void ODM_DMInit(PDM_ODM_T pDM_Odm);
@ -1498,7 +1498,7 @@ void
ODM_CmnInfoInit(
PDM_ODM_T pDM_Odm,
ODM_CMNINFO_E CmnInfo,
u4Byte Value
u32 Value
);
void
@ -1519,7 +1519,7 @@ ODM_CmnInfoPtrArrayHook(
void
ODM_CmnInfoUpdate(
PDM_ODM_T pDM_Odm,
u4Byte CmnInfo,
u32 CmnInfo,
u8Byte Value
);
@ -1547,7 +1547,7 @@ void
ODM_AntselStatistics_88C(
PDM_ODM_T pDM_Odm,
u1Byte MacId,
u4Byte PWDBAll,
u32 PWDBAll,
BOOLEAN isCCKrate
);