skyfall/rtl8188eu
1
0
Fork 0
mirror of https://github.com/lwfinger/rtl8188eu.git synced 2024-11-10 15:39:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rtl8188eu: Change u2Byte to u16

Browse source 
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2014-12-30 16:52:58 -06:00
parent 007b33ebde
commit 5f39818cb5
14 changed files with 61 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
hal/Hal8188ERateAdaptive.c
View file

@ -65,11 +65,11 @@ static u1Byte RSSI_THRESHOLD[RATESIZE] = {0,0,0,0,
0x18,0x1a,0x1d,0x1f,0x21,0x27,0x29,0x2a,
0,0,0,0x1f,0x23,0x28,0x2a,0x2c};
static u2Byte N_THRESHOLD_HIGH[RATESIZE] = {4,4,8,16,
static u16 N_THRESHOLD_HIGH[RATESIZE] = {4,4,8,16,
24,36,48,72,96,144,192,216,
60,80,100,160,240,400,560,640,
300,320,480,720,1000,1200,1600,2000};
static u2Byte N_THRESHOLD_LOW[RATESIZE] = {2,2,4,8,
static u16 N_THRESHOLD_LOW[RATESIZE] = {2,2,4,8,
12,18,24,36,48,72,96,108,
30,40,50,80,120,200,280,320,
150,160,240,360,500,600,800,1000};
@ -99,7 +99,7 @@ static u4Byte INIT_RATE_FALLBACK_TABLE[16]={0x0f8ff015, // 0: 40M BGN mode
0, // 15:
};
static u1Byte PendingForRateUpFail[5]={2,10,24,40,60};
static u2Byte DynamicTxRPTTiming[6]={0x186a, 0x30d4, 0x493e, 0x61a8, 0x7a12 ,0x927c}; // 200ms-1200ms
static u16 DynamicTxRPTTiming[6]={0x186a, 0x30d4, 0x493e, 0x61a8, 0x7a12 ,0x927c}; // 200ms-1200ms
// End Rate adaptive parameters
@ -582,7 +582,7 @@ odm_PTDecision_8188E(
static void
odm_RATxRPTTimerSetting(
IN PDM_ODM_T pDM_Odm,
IN u2Byte minRptTime
IN u16 minRptTime
)
{
ODM_RT_TRACE(pDM_Odm,ODM_COMP_RATE_ADAPTIVE, ODM_DBG_TRACE,(" =====>odm_RATxRPTTimerSetting()\n"));
@ -791,7 +791,7 @@ ODM_RA_SetRSSI_8188E(
void
ODM_RA_Set_TxRPT_Time(
IN PDM_ODM_T pDM_Odm,
IN u2Byte minRptTime
IN u16 minRptTime
)
{
ODM_Write2Byte(pDM_Odm, REG_TX_RPT_TIME, minRptTime);
@ -802,7 +802,7 @@ void
ODM_RA_TxRPT2Handle_8188E(
IN PDM_ODM_T pDM_Odm,
IN pu1Byte TxRPT_Buf,
IN u2Byte TxRPT_Len,
IN u16 TxRPT_Len,
IN u4Byte MacIDValidEntry0,
IN u4Byte MacIDValidEntry1
)
@ -811,7 +811,7 @@ ODM_RA_TxRPT2Handle_8188E(
u1Byte MacId = 0;
pu1Byte pBuffer = NULL;
u4Byte valid = 0, ItemNum = 0;
u2Byte minRptTime = 0x927c;
u16 minRptTime = 0x927c;
ODM_RT_TRACE(pDM_Odm,ODM_COMP_RATE_ADAPTIVE, ODM_DBG_LOUD, ("=====>ODM_RA_TxRPT2Handle_8188E(): valid0=%d valid1=%d BufferLength=%d\n",
MacIDValidEntry0, MacIDValidEntry1, TxRPT_Len));
@ -832,13 +832,13 @@ ODM_RA_TxRPT2Handle_8188E(
if(valid)
{
pRAInfo->RTY[0] = (u2Byte)GET_TX_REPORT_TYPE1_RERTY_0(pBuffer);
pRAInfo->RTY[1] = (u2Byte)GET_TX_REPORT_TYPE1_RERTY_1(pBuffer);
pRAInfo->RTY[2] = (u2Byte)GET_TX_REPORT_TYPE1_RERTY_2(pBuffer);
pRAInfo->RTY[3] = (u2Byte)GET_TX_REPORT_TYPE1_RERTY_3(pBuffer);
pRAInfo->RTY[4] = (u2Byte)GET_TX_REPORT_TYPE1_RERTY_4(pBuffer);
pRAInfo->DROP = (u2Byte)GET_TX_REPORT_TYPE1_DROP_0(pBuffer);
pRAInfo->DROP1= (u2Byte)GET_TX_REPORT_TYPE1_DROP_1(pBuffer);
pRAInfo->RTY[0] = (u16)GET_TX_REPORT_TYPE1_RERTY_0(pBuffer);
pRAInfo->RTY[1] = (u16)GET_TX_REPORT_TYPE1_RERTY_1(pBuffer);
pRAInfo->RTY[2] = (u16)GET_TX_REPORT_TYPE1_RERTY_2(pBuffer);
pRAInfo->RTY[3] = (u16)GET_TX_REPORT_TYPE1_RERTY_3(pBuffer);
pRAInfo->RTY[4] = (u16)GET_TX_REPORT_TYPE1_RERTY_4(pBuffer);
pRAInfo->DROP = (u16)GET_TX_REPORT_TYPE1_DROP_0(pBuffer);
pRAInfo->DROP1= (u16)GET_TX_REPORT_TYPE1_DROP_1(pBuffer);
pRAInfo->TOTAL = pRAInfo->RTY[0] + \
pRAInfo->RTY[1] + \
pRAInfo->RTY[2] + \
@ -919,7 +919,7 @@ ODM_RA_TxRPT2Handle_8188E(
static void
odm_RATxRPTTimerSetting(
IN PDM_ODM_T pDM_Odm,
IN u2Byte minRptTime
IN u16 minRptTime
)
{
return;
@ -1002,7 +1002,7 @@ ODM_RA_SetRSSI_8188E(
void
ODM_RA_Set_TxRPT_Time(
IN PDM_ODM_T pDM_Odm,
IN u2Byte minRptTime
IN u16 minRptTime
)
{
return;
@ -1012,7 +1012,7 @@ void
ODM_RA_TxRPT2Handle_8188E(
IN PDM_ODM_T pDM_Odm,
IN pu1Byte TxRPT_Buf,
IN u2Byte TxRPT_Len,
IN u16 TxRPT_Len,
IN u4Byte MacIDValidEntry0,
IN u4Byte MacIDValidEntry1
)

4
hal/Hal8188ERateAdaptive.h
View file

@ -91,7 +91,7 @@ void
ODM_RA_TxRPT2Handle_8188E(
IN PDM_ODM_T pDM_Odm,
IN pu1Byte TxRPT_Buf,
IN u2Byte TxRPT_Len,
IN u16 TxRPT_Len,
IN u4Byte MacIDValidEntry0,
IN u4Byte MacIDValidEntry1
);
@ -100,7 +100,7 @@ ODM_RA_TxRPT2Handle_8188E(
void
ODM_RA_Set_TxRPT_Time(
IN PDM_ODM_T pDM_Odm,
IN u2Byte minRptTime
IN u16 minRptTime
);
#endif

18
hal/HalHWImg8188E_BB.c
View file

@ -336,7 +336,7 @@ ODM_ReadAndConfig_AGC_TAB_1T_8188E(
u4Byte hex = 0;
u4Byte i = 0;
u2Byte count = 0;
u16 count = 0;
pu4Byte ptr_array = NULL;
u1Byte platform = pDM_Odm->SupportPlatform;
u1Byte interfaceValue = pDM_Odm->SupportInterface;
@ -378,7 +378,7 @@ ODM_ReadAndConfig_AGC_TAB_1T_8188E(
if(biol){
if(rtw_IOL_cmd_boundary_handle(pxmit_frame))
bndy_cnt++;
rtw_IOL_append_WD_cmd(pxmit_frame,(u2Byte)v1, v2,bMaskDWord);
rtw_IOL_append_WD_cmd(pxmit_frame,(u16)v1, v2,bMaskDWord);
}
else
#endif //#ifdef CONFIG_IOL_IOREG_CFG
@ -411,7 +411,7 @@ ODM_ReadAndConfig_AGC_TAB_1T_8188E(
if(biol){
if(rtw_IOL_cmd_boundary_handle(pxmit_frame))
bndy_cnt++;
rtw_IOL_append_WD_cmd(pxmit_frame,(u2Byte)v1, v2,bMaskDWord);
rtw_IOL_append_WD_cmd(pxmit_frame,(u16)v1, v2,bMaskDWord);
}
else
#endif //#ifdef CONFIG_IOL_IOREG_CFG
@ -606,7 +606,7 @@ ODM_ReadAndConfig_AGC_TAB_1T_ICUT_8188E(
u4Byte hex = 0;
u4Byte i = 0;
u2Byte count = 0;
u16 count = 0;
pu4Byte ptr_array = NULL;
u1Byte platform = pDM_Odm->SupportPlatform;
u1Byte _interface = pDM_Odm->SupportInterface;
@ -898,7 +898,7 @@ ODM_ReadAndConfig_PHY_REG_1T_8188E(
u4Byte hex = 0;
u4Byte i = 0;
u2Byte count = 0;
u16 count = 0;
pu4Byte ptr_array = NULL;
u1Byte platform = pDM_Odm->SupportPlatform;
u1Byte interfaceValue = pDM_Odm->SupportInterface;
@ -969,7 +969,7 @@ ODM_ReadAndConfig_PHY_REG_1T_8188E(
if (v1 == 0xa24)
pDM_Odm->RFCalibrateInfo.RegA24 = v2;
rtw_IOL_append_WD_cmd(pxmit_frame,(u2Byte)v1, v2,bMaskDWord);
rtw_IOL_append_WD_cmd(pxmit_frame,(u16)v1, v2,bMaskDWord);
#ifdef CONFIG_IOL_IOREG_CFG_DBG
cmpdata[cmpdata_idx].addr = v1;
cmpdata[cmpdata_idx].value= v2;
@ -1030,7 +1030,7 @@ ODM_ReadAndConfig_PHY_REG_1T_8188E(
if (v1 == 0xa24)
pDM_Odm->RFCalibrateInfo.RegA24 = v2;
rtw_IOL_append_WD_cmd(pxmit_frame,(u2Byte)v1, v2,bMaskDWord);
rtw_IOL_append_WD_cmd(pxmit_frame,(u16)v1, v2,bMaskDWord);
#ifdef CONFIG_IOL_IOREG_CFG_DBG
cmpdata[cmpdata_idx].addr = v1;
cmpdata[cmpdata_idx].value= v2;
@ -1307,7 +1307,7 @@ ODM_ReadAndConfig_PHY_REG_1T_ICUT_8188E(
u4Byte hex = 0;
u4Byte i = 0;
u2Byte count = 0;
u16 count = 0;
pu4Byte ptr_array = NULL;
u1Byte platform = pDM_Odm->SupportPlatform;
u1Byte _interface = pDM_Odm->SupportInterface;
@ -1390,7 +1390,7 @@ ODM_ReadAndConfig_PHY_REG_PG_8188E(
{
u4Byte hex = 0;
u4Byte i = 0;
u2Byte count = 0;
u16 count = 0;
pu4Byte ptr_array = NULL;
u1Byte platform = pDM_Odm->SupportPlatform;
u1Byte interfaceValue = pDM_Odm->SupportInterface;

8
hal/HalHWImg8188E_MAC.c
View file

@ -164,7 +164,7 @@ ODM_ReadAndConfig_MAC_REG_8188E(
u4Byte hex = 0;
u4Byte i = 0;
u2Byte count = 0;
u16 count = 0;
pu4Byte ptr_array = NULL;
u1Byte platform = pDM_Odm->SupportPlatform;
u1Byte interfaceValue = pDM_Odm->SupportInterface;
@ -215,7 +215,7 @@ ODM_ReadAndConfig_MAC_REG_8188E(
if(rtw_IOL_cmd_boundary_handle(pxmit_frame))
bndy_cnt++;
rtw_IOL_append_WB_cmd(pxmit_frame,(u2Byte)v1, (u1Byte)v2,0xFF);
rtw_IOL_append_WB_cmd(pxmit_frame,(u16)v1, (u1Byte)v2,0xFF);
#ifdef CONFIG_IOL_IOREG_CFG_DBG
cmpdata[cmpdata_idx].addr = v1;
cmpdata[cmpdata_idx].value= v2;
@ -253,7 +253,7 @@ ODM_ReadAndConfig_MAC_REG_8188E(
if(biol){
if(rtw_IOL_cmd_boundary_handle(pxmit_frame))
bndy_cnt++;
rtw_IOL_append_WB_cmd(pxmit_frame,(u2Byte)v1, (u1Byte)v2,0xFF);
rtw_IOL_append_WB_cmd(pxmit_frame,(u16)v1, (u1Byte)v2,0xFF);
#ifdef CONFIG_IOL_IOREG_CFG_DBG
cmpdata[cmpdata_idx].addr = v1;
cmpdata[cmpdata_idx].value= v2;
@ -436,7 +436,7 @@ ODM_ReadAndConfig_MAC_REG_ICUT_8188E(
u4Byte hex = 0;
u4Byte i = 0;
u2Byte count = 0;
u16 count = 0;
pu4Byte ptr_array = NULL;
u1Byte platform = pDM_Odm->SupportPlatform;
u1Byte _interface = pDM_Odm->SupportInterface;

8
hal/HalHWImg8188E_RF.c
View file

@ -185,7 +185,7 @@ ODM_ReadAndConfig_RadioA_1T_8188E(
u4Byte hex = 0;
u4Byte i = 0;
u2Byte count = 0;
u16 count = 0;
pu4Byte ptr_array = NULL;
u1Byte platform = pDM_Odm->SupportPlatform;
u1Byte interfaceValue = pDM_Odm->SupportInterface;
@ -253,7 +253,7 @@ ODM_ReadAndConfig_RadioA_1T_8188E(
rtw_IOL_append_DELAY_US_cmd(pxmit_frame,1);
}
else{
rtw_IOL_append_WRF_cmd(pxmit_frame, ODM_RF_PATH_A,(u2Byte)v1, v2,bRFRegOffsetMask) ;
rtw_IOL_append_WRF_cmd(pxmit_frame, ODM_RF_PATH_A,(u16)v1, v2,bRFRegOffsetMask) ;
#ifdef CONFIG_IOL_IOREG_CFG_DBG
cmpdata[cmpdata_idx].addr = v1;
cmpdata[cmpdata_idx].value= v2;
@ -314,7 +314,7 @@ ODM_ReadAndConfig_RadioA_1T_8188E(
rtw_IOL_append_DELAY_US_cmd(pxmit_frame,1);
}
else{
rtw_IOL_append_WRF_cmd(pxmit_frame, ODM_RF_PATH_A,(u2Byte)v1, v2,bRFRegOffsetMask) ;
rtw_IOL_append_WRF_cmd(pxmit_frame, ODM_RF_PATH_A,(u16)v1, v2,bRFRegOffsetMask) ;
#ifdef CONFIG_IOL_IOREG_CFG_DBG
cmpdata[cmpdata_idx].addr = v1;
cmpdata[cmpdata_idx].value= v2;
@ -502,7 +502,7 @@ ODM_ReadAndConfig_RadioA_1T_ICUT_8188E(
u4Byte hex = 0;
u4Byte i = 0;
u2Byte count = 0;
u16 count = 0;
pu4Byte ptr_array = NULL;
u1Byte platform = pDM_Odm->SupportPlatform;
u1Byte _interface = pDM_Odm->SupportInterface;

4
hal/odm.c
View file

@ -26,7 +26,7 @@
u32 GlobalDebugLevel;
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},
@ -873,7 +873,7 @@ void
ODM_CmnInfoPtrArrayHook(
IN PDM_ODM_T pDM_Odm,
IN ODM_CMNINFO_E CmnInfo,
IN u2Byte Index,
IN u16 Index,
IN void * pValue
)
{

12
hal/odm.h
View file

@ -770,12 +770,12 @@ typedef struct _ODM_RA_Info_
u1Byte LowestRate;
u4Byte NscUp;
u4Byte NscDown;
u2Byte RTY[5];
u16 RTY[5];
u4Byte TOTAL;
u2Byte DROP;//Retry over or drop
u2Byte DROP1;//LifeTime over
u16 DROP;//Retry over or drop
u16 DROP1;//LifeTime over
u1Byte Active;
u2Byte RptTime;
u16 RptTime;
u1Byte RAWaitingCounter;
u1Byte RAPendingCounter;
#if 1 //POWER_TRAINING_ACTIVE == 1 // For compile pass only~!
@ -1105,7 +1105,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
//
@ -1512,7 +1512,7 @@ void
ODM_CmnInfoPtrArrayHook(
PDM_ODM_T pDM_Odm,
ODM_CMNINFO_E CmnInfo,
u2Byte Index,
u16 Index,
void * pValue
);

4
hal/odm_interface.c
View file

@ -38,7 +38,7 @@ ODM_Read1Byte(
}
u2Byte
u16
ODM_Read2Byte(
IN PDM_ODM_T pDM_Odm,
IN u4Byte RegAddr
@ -73,7 +73,7 @@ void
ODM_Write2Byte(
IN PDM_ODM_T pDM_Odm,
IN u4Byte RegAddr,
IN u2Byte Data
IN u16 Data
)
{
struct adapter * Adapter = pDM_Odm->Adapter;

4
hal/odm_interface.h
View file

@ -97,7 +97,7 @@ ODM_Read1Byte(
IN u4Byte RegAddr
);
u2Byte
u16
ODM_Read2Byte(
IN PDM_ODM_T pDM_Odm,
IN u4Byte RegAddr
@ -120,7 +120,7 @@ void
ODM_Write2Byte(
IN PDM_ODM_T pDM_Odm,
IN u4Byte RegAddr,
IN u2Byte Data
IN u16 Data
);
void

3
hal/odm_types.h
View file

@ -56,9 +56,6 @@ typedef enum _RT_SPINLOCK_TYPE{
#define u1Byte u8
#define pu1Byte u8*
#define u2Byte u16
#define pu2Byte u16*
#define u4Byte u32
#define pu4Byte u32*

22
hal/rtl8188e_hal_init.c
View file

@ -225,7 +225,7 @@ efuse_phymap_to_logical(u8 * phymap, u16 _offset, u16 _size_byte, u8 *pbuf)
//RTPRINT(FEEPROM, EFUSE_READ_ALL, ("Data=0x%x\n", *rtemp8));
efuse_utilized++;
eFuseWord[offset][i] |= (((u2Byte)rtemp8 << 8) & 0xff00);
eFuseWord[offset][i] |= (((u16)rtemp8 << 8) & 0xff00);
if(eFuse_Addr >= EFUSE_REAL_CONTENT_LEN_88E)
break;
@ -1318,7 +1318,7 @@ Hal_EfuseReadEFuse88E(
//RTPRINT(FEEPROM, EFUSE_READ_ALL, ("Data=0x%x\n", *rtemp8));
efuse_utilized++;
eFuseWord[offset][i] |= (((u2Byte)*rtemp8 << 8) & 0xff00);
eFuseWord[offset][i] |= (((u16)*rtemp8 << 8) & 0xff00);
if(eFuse_Addr >= EFUSE_REAL_CONTENT_LEN_88E)
break;
@ -1609,36 +1609,36 @@ Hal_EFUSEGetEfuseDefinition_Pseudo88E(
case TYPE_EFUSE_REAL_CONTENT_LEN:
{
u16* pu2Tmp;
pu2Tmp = (pu2Byte)pOut;
pu2Tmp = (u16 *)pOut;
*pu2Tmp = EFUSE_REAL_CONTENT_LEN_88E;
}
break;
case TYPE_EFUSE_CONTENT_LEN_BANK:
{
u16* pu2Tmp;
pu2Tmp = (pu2Byte)pOut;
pu2Tmp = (u16 *)pOut;
*pu2Tmp = EFUSE_REAL_CONTENT_LEN_88E;
}
break;
case TYPE_AVAILABLE_EFUSE_BYTES_BANK:
{
u16* pu2Tmp;
pu2Tmp = (pu2Byte)pOut;
*pu2Tmp = (u2Byte)(EFUSE_REAL_CONTENT_LEN_88E-EFUSE_OOB_PROTECT_BYTES_88E);
pu2Tmp = (u16 *)pOut;
*pu2Tmp = (u16)(EFUSE_REAL_CONTENT_LEN_88E-EFUSE_OOB_PROTECT_BYTES_88E);
}
break;
case TYPE_AVAILABLE_EFUSE_BYTES_TOTAL:
{
u16* pu2Tmp;
pu2Tmp = (pu2Byte)pOut;
*pu2Tmp = (u2Byte)(EFUSE_REAL_CONTENT_LEN_88E-EFUSE_OOB_PROTECT_BYTES_88E);
pu2Tmp = (u16 *)pOut;
*pu2Tmp = (u16)(EFUSE_REAL_CONTENT_LEN_88E-EFUSE_OOB_PROTECT_BYTES_88E);
}
break;
case TYPE_EFUSE_MAP_LEN:
{
u16* pu2Tmp;
pu2Tmp = (pu2Byte)pOut;
*pu2Tmp = (u2Byte)EFUSE_MAP_LEN_88E;
pu2Tmp = (u16 *)pOut;
*pu2Tmp = (u16)EFUSE_MAP_LEN_88E;
}
break;
case TYPE_EFUSE_PROTECT_BYTES_BANK:
@ -2969,7 +2969,7 @@ Hal_InitPGData88E(struct adapter *padapter)
// Read all Content from EEPROM or EFUSE.
for(i = 0; i < HWSET_MAX_SIZE_88E; i += 2)
{
// value16 = EF2Byte(ReadEEprom(pAdapter, (u2Byte) (i>>1)));
// value16 = EF2Byte(ReadEEprom(pAdapter, (u16) (i>>1)));
// *((u16*)(&PROMContent[i])) = value16;
}
}

2
hal/rtl8188e_rf6052.c
View file

@ -81,7 +81,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
*

2
include/rtw_bt_mp.h
View file

@ -51,7 +51,7 @@ typedef struct _BT_TXRX_PARAMETERS{
u1Byte txrxTxPktInterval;
u1Byte txrxPayloadType;
u1Byte txrxPktType;
u2Byte txrxPayloadLen;
u16 txrxPayloadLen;
u4Byte txrxPktHeader;
u1Byte txrxWhitenCoeff;
u1Byte txrxBdaddr[6];

3
include/rtw_mp.h
View file

@ -166,9 +166,6 @@ struct mp_tx
#define u1Byte u8
#define pu1Byte u8*
#define u2Byte u16
#define pu2Byte u16*
#define u4Byte u32
#define pu4Byte u32*