skyfall/rtl8188eu
1
0
Fork 0
mirror of https://github.com/lwfinger/rtl8188eu.git synced 2025-05-07 05:53:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rtl8188eu: Remove some of the alternatives to u32

Browse source 
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2018-11-30 16:12:11 -06:00
parent 1e72b90b99
commit 248ac6b84b
9 changed files with 106 additions and 110 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/basic_types.h
View file

@ -49,8 +49,8 @@
#define u8 u8
#define u16 u16
#define UINT u32
#define ULONG u32
#define u32 u32
#define u32 u32
typedef void (*proc_t)(void *);

4
include/drv_types.h
View file

@ -390,7 +390,7 @@ struct registry_priv {
};
/* For registry parameters */
#define RGTRY_OFT(field) ((ULONG)FIELD_OFFSET(struct registry_priv, field))
#define RGTRY_OFT(field) ((u32)FIELD_OFFSET(struct registry_priv, field))
#define RGTRY_SZ(field) sizeof(((struct registry_priv *) 0)->field)
#define GetRegAmplifierType2G(_Adapter) (_Adapter->registrypriv.AmplifierType_2G)
@ -404,7 +404,7 @@ struct registry_priv {
#define GetRegGLNAType(_Adapter) (_Adapter->registrypriv.GLNA_Type)
#define GetRegPowerTrackingType(_Adapter) (_Adapter->registrypriv.PowerTracking_Type)
#define BSSID_OFT(field) ((ULONG)FIELD_OFFSET(WLAN_BSSID_EX, field))
#define BSSID_OFT(field) ((u32)FIELD_OFFSET(WLAN_BSSID_EX, field))
#define BSSID_SZ(field) sizeof(((PWLAN_BSSID_EX) 0)->field)
#define BW_MODE_2G(bw_mode) ((bw_mode) & 0x0F)

6
include/rtw_bt_mp.h
View file

@ -178,9 +178,9 @@ NDIS_STATUS
MPTBT_SendOidBT(
IN PADAPTER pAdapter,
IN void * InformationBuffer,
IN ULONG InformationBufferLength,
OUT PULONG BytesRead,
OUT PULONG BytesNeeded
IN u32 InformationBufferLength,
OUT u32 * BytesRead,
OUT u32 * BytesNeeded
);
void

42
include/rtw_mp.h
View file

@ -106,15 +106,11 @@ struct mp_tx {
#define s8Byte s64
#define ps8Byte s64*
#define UINT u32
#define ULONG u32
#define PULONG u32*
typedef struct _RT_PMAC_PKT_INFO {
u8 MCS;
u8 Nss;
u8 Nsts;
UINT N_sym;
u32 N_sym;
u8 SIGA2B3;
} RT_PMAC_PKT_INFO, *PRT_PMAC_PKT_INFO;
@ -133,8 +129,8 @@ typedef struct _RT_PMAC_TX_INFO {
u8 BandWidth:3; /* 0: 20 1:40 2:80Mhz */
u8 m_STBC; /* bSTBC + 1 */
u16 PacketPeriod;
UINT PacketCount;
UINT PacketLength;
u32 PacketCount;
u32 PacketLength;
u8 PacketPattern;
u16 SFD;
u8 SignalField;
@ -181,27 +177,27 @@ typedef struct _MPT_CONTEXT {
MPT_WORK_ITEM_HANDLER CurrMptAct;
/* 1=Start, 0=Stop from UI. */
ULONG MptTestStart;
u32 MptTestStart;
/* _TEST_MODE, defined in MPT_Req2.h */
ULONG MptTestItem;
u32 MptTestItem;
/* Variable needed in each implementation of CurrMptAct. */
ULONG MptActType; /* Type of action performed in CurrMptAct. */
u32 MptActType; /* Type of action performed in CurrMptAct. */
/* The Offset of IO operation is depend of MptActType. */
ULONG MptIoOffset;
u32 MptIoOffset;
/* The Value of IO operation is depend of MptActType. */
ULONG MptIoValue;
u32 MptIoValue;
/* The RfPath of IO operation is depend of MptActType. */
ULONG mpt_rf_path;
u32 mpt_rf_path;
WIRELESS_MODE MptWirelessModeToSw; /* Wireless mode to switch. */
u8 MptChannelToSw; /* Channel to switch. */
u8 MptInitGainToSet; /* Initial gain to set. */
/* ULONG bMptAntennaA; */ /* TRUE if we want to use antenna A. */
ULONG MptBandWidth; /* bandwidth to switch. */
/* u32 bMptAntennaA; */ /* TRUE if we want to use antenna A. */
u32 MptBandWidth; /* bandwidth to switch. */
ULONG mpt_rate_index;/* rate index. */
u32 mpt_rate_index;/* rate index. */
/* Register value kept for Single Carrier Tx test. */
u8 btMpCckTxPower;
@ -211,13 +207,13 @@ typedef struct _MPT_CONTEXT {
u8 TxPwrLevel[4]; /* rf-A, rf-B*/
u32 RegTxPwrLimit;
/* Content of RCR Regsiter for Mass Production Test. */
ULONG MptRCR;
u32 MptRCR;
/* TRUE if we only receive packets with specific pattern. */
bool bMptFilterPattern;
/* Rx OK count, statistics used in Mass Production Test. */
ULONG MptRxOkCnt;
u32 MptRxOkCnt;
/* Rx CRC32 error count, statistics used in Mass Production Test. */
ULONG MptRxCrcErrCnt;
u32 MptRxCrcErrCnt;
bool bCckContTx; /* TRUE if we are in CCK Continuous Tx test. */
bool bOfdmContTx; /* TRUE if we are in OFDM Continuous Tx test. */
@ -237,7 +233,7 @@ typedef struct _MPT_CONTEXT {
/* ACK counter asked by K.Y.. */
bool bMptEnableAckCounter;
ULONG MptAckCounter;
u32 MptAckCounter;
/* SD3 Willis For 8192S to save 1T/2T RF table for ACUT Only fro ACUT delete later ~~~! */
/* s1Byte BufOfLines[2][MAX_LINES_HWCONFIG_TXT][MAX_BYTES_LINE_HWCONFIG_TXT]; */
@ -260,7 +256,7 @@ typedef struct _MPT_CONTEXT {
u1Byte c2hBuf[32];
u1Byte btInBuf[100];
ULONG mptOutLen;
u32 mptOutLen;
u1Byte mptOutBuf[100];
RT_PMAC_TX_INFO PMacTxInfo;
RT_PMAC_PKT_INFO PMacPktInfo;
@ -704,7 +700,7 @@ void hal_mpt_SetCarrierSuppressionTx(PADAPTER pAdapter, u8 bStart);
void mpt_ProSetPMacTx(PADAPTER Adapter);
void MP_PHY_SetRFPathSwitch(PADAPTER pAdapter , bool bMain);
u8 MP_PHY_QueryRFPathSwitch(PADAPTER pAdapter);
ULONG mpt_ProQueryCalTxPower(PADAPTER pAdapter, u8 RfPath);
u32 mpt_ProQueryCalTxPower(PADAPTER pAdapter, u8 RfPath);
void MPT_PwrCtlDM(PADAPTER padapter, u32 bstart);
u8 mpt_to_mgnt_rate(u32 MptRateIdx);
u8 rtw_mpRateParseFunc(PADAPTER pAdapter, u8 *targetStr);
@ -728,7 +724,7 @@ PMAC_Nsym_generator(
);
void
L_SIG_generator(
UINT N_SYM, /* Max: 750*/
u32 N_SYM, /* Max: 750*/
PRT_PMAC_TX_INFO pPMacTxInfo,
PRT_PMAC_PKT_INFO pPMacPktInfo
);

2
include/usb_osintf.h
View file

@ -22,7 +22,7 @@
#include <usb_vendor_req.h>
#define USBD_HALTED(Status) ((ULONG)(Status) >> 30 == 3)
#define USBD_HALTED(Status) ((u32)(Status) >> 30 == 3)
u8 usbvendorrequest(struct dvobj_priv *pdvobjpriv, RT_USB_BREQUEST brequest, RT_USB_WVALUE wvalue, u8 windex, void *data, u8 datalen, u8 isdirectionin);

76
include/wlan_bssdef.h
View file

@ -32,11 +32,11 @@ typedef long NDIS_802_11_RSSI; /* in dBm */
typedef unsigned char NDIS_802_11_RATES[NDIS_802_11_LENGTH_RATES]; /* Set of 8 data rates */
typedef unsigned char NDIS_802_11_RATES_EX[NDIS_802_11_LENGTH_RATES_EX]; /* Set of 16 data rates */
typedef ULONG NDIS_802_11_KEY_INDEX;
typedef u32 NDIS_802_11_KEY_INDEX;
typedef unsigned long long NDIS_802_11_KEY_RSC;
typedef struct _NDIS_802_11_SSID {
ULONG SsidLength;
u32 SsidLength;
u8 Ssid[32];
} NDIS_802_11_SSID, *PNDIS_802_11_SSID;
@ -49,10 +49,10 @@ typedef enum _NDIS_802_11_NETWORK_TYPE {
} NDIS_802_11_NETWORK_TYPE, *PNDIS_802_11_NETWORK_TYPE;
typedef struct _NDIS_802_11_CONFIGURATION_FH {
ULONG Length; /* Length of structure */
ULONG HopPattern; /* As defined by 802.11, MSB set */
ULONG HopSet; /* to one if non-802.11 */
ULONG DwellTime; /* units are Kusec */
u32 Length; /* Length of structure */
u32 HopPattern; /* As defined by 802.11, MSB set */
u32 HopSet; /* to one if non-802.11 */
u32 DwellTime; /* units are Kusec */
} NDIS_802_11_CONFIGURATION_FH, *PNDIS_802_11_CONFIGURATION_FH;
/*
@ -60,10 +60,10 @@ typedef struct _NDIS_802_11_CONFIGURATION_FH {
ODI Handler will convert the channel number to freq. number.
*/
typedef struct _NDIS_802_11_CONFIGURATION {
ULONG Length; /* Length of structure */
ULONG BeaconPeriod; /* units are Kusec */
ULONG ATIMWindow; /* units are Kusec */
ULONG DSConfig; /* channel number */
u32 Length; /* Length of structure */
u32 BeaconPeriod; /* units are Kusec */
u32 ATIMWindow; /* units are Kusec */
u32 DSConfig; /* channel number */
NDIS_802_11_CONFIGURATION_FH FHConfig;
} NDIS_802_11_CONFIGURATION, *PNDIS_802_11_CONFIGURATION;
@ -91,7 +91,7 @@ typedef struct _NDIS_802_11_VARIABLE_IEs {
/*
Length is the 4 bytes multiples of the sume of
sizeof (NDIS_802_11_MAC_ADDRESS) + 2 + sizeof (NDIS_802_11_SSID) + sizeof (ULONG)
sizeof (NDIS_802_11_MAC_ADDRESS) + 2 + sizeof (NDIS_802_11_SSID) + sizeof (u32)
+ sizeof (NDIS_802_11_RSSI) + sizeof (NDIS_802_11_NETWORK_TYPE) + sizeof (NDIS_802_11_CONFIGURATION)
+ sizeof (NDIS_802_11_RATES_EX) + IELength
@ -148,15 +148,15 @@ typedef struct _NDIS_802_11_AI_RESFI {
} NDIS_802_11_AI_RESFI, *PNDIS_802_11_AI_RESFI;
typedef struct _NDIS_802_11_ASSOCIATION_INFORMATION {
ULONG Length;
u32 Length;
u16 AvailableRequestFixedIEs;
NDIS_802_11_AI_REQFI RequestFixedIEs;
ULONG RequestIELength;
ULONG OffsetRequestIEs;
u32 RequestIELength;
u32 OffsetRequestIEs;
u16 AvailableResponseFixedIEs;
NDIS_802_11_AI_RESFI ResponseFixedIEs;
ULONG ResponseIELength;
ULONG OffsetResponseIEs;
u32 ResponseIELength;
u32 OffsetResponseIEs;
} NDIS_802_11_ASSOCIATION_INFORMATION, *PNDIS_802_11_ASSOCIATION_INFORMATION;
typedef enum _NDIS_802_11_RELOAD_DEFAULTS {
@ -166,31 +166,31 @@ typedef enum _NDIS_802_11_RELOAD_DEFAULTS {
/* Key mapping keys require a BSSID */
typedef struct _NDIS_802_11_KEY {
ULONG Length; /* Length of this structure */
ULONG KeyIndex;
ULONG KeyLength; /* length of key in bytes */
u32 Length; /* Length of this structure */
u32 KeyIndex;
u32 KeyLength; /* length of key in bytes */
NDIS_802_11_MAC_ADDRESS BSSID;
NDIS_802_11_KEY_RSC KeyRSC;
u8 KeyMaterial[32]; /* variable length depending on above field */
} NDIS_802_11_KEY, *PNDIS_802_11_KEY;
typedef struct _NDIS_802_11_REMOVE_KEY {
ULONG Length; /* Length of this structure */
ULONG KeyIndex;
u32 Length; /* Length of this structure */
u32 KeyIndex;
NDIS_802_11_MAC_ADDRESS BSSID;
} NDIS_802_11_REMOVE_KEY, *PNDIS_802_11_REMOVE_KEY;
typedef struct _NDIS_802_11_WEP {
ULONG Length; /* Length of this structure */
ULONG KeyIndex; /* 0 is the per-client key, 1-N are the global keys */
ULONG KeyLength; /* length of key in bytes */
u32 Length; /* Length of this structure */
u32 KeyIndex; /* 0 is the per-client key, 1-N are the global keys */
u32 KeyLength; /* length of key in bytes */
u8 KeyMaterial[16];/* variable length depending on above field */
} NDIS_802_11_WEP, *PNDIS_802_11_WEP;
typedef struct _NDIS_802_11_AUTHENTICATION_REQUEST {
ULONG Length; /* Length of structure */
u32 Length; /* Length of structure */
NDIS_802_11_MAC_ADDRESS Bssid;
ULONG Flags;
u32 Flags;
} NDIS_802_11_AUTHENTICATION_REQUEST, *PNDIS_802_11_AUTHENTICATION_REQUEST;
typedef enum _NDIS_802_11_STATUS_TYPE {
@ -220,8 +220,8 @@ typedef struct _NDIS_802_11_AUTHENTICATION_EVENT {
} NDIS_802_11_AUTHENTICATION_EVENT, *PNDIS_802_11_AUTHENTICATION_EVENT;
typedef struct _NDIS_802_11_TEST {
ULONG Length;
ULONG Type;
u32 Length;
u32 Type;
union {
NDIS_802_11_AUTHENTICATION_EVENT AuthenticationEvent;
NDIS_802_11_RSSI RssiTrigger;
@ -256,18 +256,18 @@ typedef struct _WLAN_BCN_INFO {
* WLAN_BSSID_EX and get_WLAN_BSSID_EX_sz()
*/
typedef struct _WLAN_BSSID_EX {
ULONG Length;
u32 Length;
NDIS_802_11_MAC_ADDRESS MacAddress;
u8 Reserved[2];/* [0]: IS beacon frame */
NDIS_802_11_SSID Ssid;
ULONG Privacy;
u32 Privacy;
NDIS_802_11_RSSI Rssi;/* (in dBM,raw data ,get from PHY) */
NDIS_802_11_NETWORK_TYPE NetworkTypeInUse;
NDIS_802_11_CONFIGURATION Configuration;
NDIS_802_11_NETWORK_INFRASTRUCTURE InfrastructureMode;
NDIS_802_11_RATES_EX SupportedRates;
WLAN_PHY_INFO PhyInfo;
ULONG IELength;
u32 IELength;
u8 IEs[MAX_IE_SZ]; /* (timestamp, beacon interval, and capability information) */
}
__attribute__((packed))
@ -335,12 +335,12 @@ enum UAPSD_MAX_SP {
typedef struct _PMKID_CANDIDATE {
NDIS_802_11_MAC_ADDRESS BSSID;
ULONG Flags;
u32 Flags;
} PMKID_CANDIDATE, *PPMKID_CANDIDATE;
typedef struct _NDIS_802_11_PMKID_CANDIDATE_LIST {
ULONG Version; /* Version of the structure */
ULONG NumCandidates; /* No. of pmkid candidates */
u32 Version; /* Version of the structure */
u32 NumCandidates; /* No. of pmkid candidates */
PMKID_CANDIDATE CandidateList[1];
} NDIS_802_11_PMKID_CANDIDATE_LIST, *PNDIS_802_11_PMKID_CANDIDATE_LIST;
@ -352,10 +352,10 @@ typedef struct _NDIS_802_11_AUTHENTICATION_ENCRYPTION {
} NDIS_802_11_AUTHENTICATION_ENCRYPTION, *PNDIS_802_11_AUTHENTICATION_ENCRYPTION;
typedef struct _NDIS_802_11_CAPABILITY {
ULONG Length;
ULONG Version;
ULONG NoOfPMKIDs;
ULONG NoOfAuthEncryptPairsSupported;
u32 Length;
u32 Version;
u32 NoOfPMKIDs;
u32 NoOfAuthEncryptPairsSupported;
NDIS_802_11_AUTHENTICATION_ENCRYPTION AuthenticationEncryptionSupported[1];
} NDIS_802_11_CAPABILITY, *PNDIS_802_11_CAPABILITY;