rtl8188eu: Replace LONG variants with the standard uxx form

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

core/rtw_mlme.c

@@ -701,7 +701,7 @@ void rtw_update_scanned_network(struct adapter *adapter, struct wlan_bssid_ex *t
 {
 	unsigned long irqL;
 	struct list_head *plist, *phead;
-	ULONG	bssid_ex_sz;
+	u32	bssid_ex_sz;
 	struct mlme_priv	*pmlmepriv = &(adapter->mlmepriv);
 	struct mlme_ext_priv	*pmlmeext = &(adapter->mlmeextpriv);
 	struct wifidirect_info *pwdinfo = &(adapter->wdinfo);
@@ -732,7 +732,7 @@ void rtw_update_scanned_network(struct adapter *adapter, struct wlan_bssid_ex *t
 		if ((unsigned long)(pnetwork) < 0x7ffffff)
 		{
 #ifdef PLATFORM_OS_XP
-			KeBugCheckEx(0x87111c1c, (ULONG_PTR)pnetwork, 0, 0, 0);
+			KeBugCheckEx(0x87111c1c, (u32_PTR)pnetwork, 0, 0, 0);
 #endif
 		}
 

include/basic_types.h

@@ -32,8 +32,6 @@
 
 	typedef	signed int sint;
 
-	#define ULONG u32
-
 	typedef void (*proc_t)(void*);
 
 	typedef		__kernel_size_t	SIZE_T;

include/drv_types.h

@@ -165,9 +165,9 @@ 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 BSSID_OFT(field) ((ULONG)FIELD_OFFSET(struct wlan_bssid_ex,field))
+#define BSSID_OFT(field) ((u32)FIELD_OFFSET(struct wlan_bssid_ex,field))
 #define BSSID_SZ(field)   sizeof(((struct wlan_bssid_ex *) 0)->field)
 
 #define is_primary_adapter(adapter) (1)

include/rtw_mp.h

@@ -149,8 +149,8 @@ struct mp_tx {
 #define MP_MAX_LINES		1000
 #define MP_MAX_LINES_BYTES	256
 
-#define ULONG u32
+#define u32 u32
-#define PULONG u32*
+#define Pu32 u32*
 
 struct mpt_context {
 	/*  Indicate if we have started Mass Production Test. */
@@ -172,23 +172,23 @@ struct mpt_context {
 	void (*CurrMptAct)(void * Adapter);
 
 	/*  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			MptRfPath;
+	u32			MptRfPath;
 
 	WIRELESS_MODE		MptWirelessModeToSw;	/*  Wireless mode to switch. */
 	u8			MptChannelToSw;		/*  Channel to switch. */
 	u8			MptInitGainToSet;	/*  Initial gain to set. */
-	ULONG			MptBandWidth;		/*  bandwidth to switch. */
+	u32			MptBandWidth;		/*  bandwidth to switch. */
-	ULONG			MptRateIndex;		/*  rate index. */
+	u32			MptRateIndex;		/*  rate index. */
 	/*  Register value kept for Single Carrier Tx test. */
 	u8			btMpCckTxPower;
 	/*  Register value kept for Single Carrier Tx test. */
@@ -197,13 +197,13 @@ struct mpt_context {
 	u8			TxPwrLevel[2];	/*  rf-A, rf-B */
 
 	/*  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. */
@@ -217,7 +217,7 @@ 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 ~~~! */
 	/* s8		BufOfLines[2][MAX_LINES_HWCONFIG_TXT][MAX_BYTES_LINE_HWCONFIG_TXT]; */
@@ -237,7 +237,7 @@ struct mpt_context {
 	u8			c2hBuf[20];
 
 	u8          btInBuf[100];
-	ULONG			mptOutLen;
+	u32			mptOutLen;
 	u8          mptOutBuf[100];
 };
 

include/usb_osintf.h

@@ -25,7 +25,7 @@
 #include <drv_types.h>
 #include <usb_vendor_req.h>
 
-#define USBD_HALTED(Status) ((ULONG)(Status) >> 30 == 3)
+#define USBD_HALTED(Status) ((u32)(Status) >> 30 == 3)
 
 
 /* uint usb_dvobj_init(struct adapter * adapter); */

include/usb_vendor_req.h

@@ -54,6 +54,6 @@ typedef enum _RT_USB_WVALUE {
 /* bool usbvendorrequest(PCE_USB_DEVICE	CEdevice, RT_USB_BREQUEST bRequest, RT_USB_WVALUE wValue, u8 wIndex, void * Data, u8 DataLength, bool isDirectionIn); */
 /* bool CEusbGetStatusRequest(PCE_USB_DEVICE CEdevice, IN u16 Op, IN u16 Index, void * Data); */
 /* bool CEusbFeatureRequest(PCE_USB_DEVICE CEdevice, IN u16 Op, IN u16 FeatureSelector, IN u16 Index); */
-/* bool CEusbGetDescriptorRequest(PCE_USB_DEVICE CEdevice, IN short urbLength, IN u8 DescriptorType, IN u8 Index, IN u16 LanguageId, IN void *  TransferBuffer, IN ULONG TransferBufferLength); */
+/* bool CEusbGetDescriptorRequest(PCE_USB_DEVICE CEdevice, IN short urbLength, IN u8 DescriptorType, IN u8 Index, IN u16 LanguageId, IN void *  TransferBuffer, IN u32 TransferBufferLength); */
 
 #endif

include/wlan_bssdef.h

@@ -27,7 +27,7 @@
 #define NDIS_802_11_LENGTH_RATES_EX     16
 
 struct ndis_802_11_ssid {
-	ULONG  SsidLength;
+	u32 SsidLength;
 	u8 Ssid[32];
 };
 
@@ -40,10 +40,10 @@ enum NDIS_802_11_NETWORK_TYPE {
 };
 
 struct ndis_802_11_configuration_fh {
-	ULONG           Length;             /*  Length of structure */
+	u32           Length;             /*  Length of structure */
-	ULONG           HopPattern;         /*  As defined by 802.11, MSB set */
+	u32           HopPattern;         /*  As defined by 802.11, MSB set */
-	ULONG           HopSet;             /*  to one if non-802.11 */
+	u32           HopSet;             /*  to one if non-802.11 */
-	ULONG           DwellTime;          /*  units are Kusec */
+	u32           DwellTime;          /*  units are Kusec */
 };
 
 /*
@@ -51,10 +51,10 @@ struct ndis_802_11_configuration_fh {
 	ODI Handler will convert the channel number to freq. number.
 */
 struct ndis_802_11_configuration {
-    ULONG           Length;             /*  Length of structure */
+	u32 Length;             /*  Length of structure */
-    ULONG           BeaconPeriod;       /*  units are Kusec */
+	u32 BeaconPeriod;       /*  units are Kusec */
-    ULONG           ATIMWindow;         /*  units are Kusec */
+	u32 ATIMWindow;         /*  units are Kusec */
-    ULONG           DSConfig;           /*  Frequency, units are kHz */
+	u32 DSConfig;           /*  Frequency, units are kHz */
 	struct ndis_802_11_configuration_fh    FHConfig;
 };
 /*  struct ndis_802_11_configuration, *Pstruct ndis_802_11_configuration; */
@@ -83,7 +83,7 @@ struct ndis_802_11_variable_ies {
 
 /*
 Length is the 4 bytes multiples of the sume of
-	sizeof (6) + 2 + sizeof (struct ndis_802_11_ssid) + sizeof (ULONG)
+	sizeof (6) + 2 + sizeof (struct ndis_802_11_ssid) + sizeof (u32)
 +   sizeof (long) + sizeof (enum NDIS_802_11_NETWORK_TYPE) + sizeof (struct ndis_802_11_configuration)
 +   sizeof (NDIS_802_11_LENGTH_RATES_EX) + IELength
 
@@ -130,31 +130,31 @@ enum NDIS_802_11_WEP_STATUS {
 
 /*  Key mapping keys require a BSSID */
 struct ndis_802_11_key {
-    ULONG           Length;             /*  Length of this structure */
+	u32 Length;             /*  Length of this structure */
-    ULONG           KeyIndex;
+	u32 KeyIndex;
-    ULONG           KeyLength;          /*  length of key in bytes */
+	u32 KeyLength;          /*  length of key in bytes */
 	u8 BSSID[ETH_ALEN];
 	unsigned long long KeyRSC;
 	u8 KeyMaterial[32];     /*  variable length depending on above field */
 };
 
 struct ndis_802_11_remove_key {
-    ULONG                   Length;        /*  Length of this structure */
+	u32 Length;        /*  Length of this structure */
-    ULONG                   KeyIndex;
+	u32 KeyIndex;
 	u8 BSSID[ETH_ALEN];
 };
 
 struct ndis_802_11_wep {
-    ULONG     Length;        /*  Length of this structure */
+	u32 Length;        /*  Length of this structure */
-    ULONG     KeyIndex;      /*  0 is the per-client key, 1-N are the global keys */
+	u32 KeyIndex;      /*  0 is the per-client key, 1-N are the global keys */
-    ULONG     KeyLength;     /*  length of key in bytes */
+	u32 KeyLength;     /*  length of key in bytes */
 	u8     KeyMaterial[16];/*  variable length depending on above field */
 };
 
 struct ndis_802_11_authentication_request {
-    ULONG Length;            /*  Length of structure */
+	u32 Length;            /*  Length of structure */
 	u8 Bssid[ETH_ALEN];
-    ULONG Flags;
+	u32 Flags;
 };
 
 enum NDIS_802_11_STATUS_TYPE {
@@ -211,18 +211,18 @@ struct wlan_bcn_info {
 *   struct wlan_bssid_ex and get_wlan_bssid_ex_sz()
 */
 struct wlan_bssid_ex {
-	ULONG  Length;
+	u32  Length;
 	u8  MacAddress[ETH_ALEN];
 	u8  Reserved[2];/* 0]: IS beacon frame */
 	struct ndis_802_11_ssid  Ssid;
-	ULONG  Privacy;
+	u32  Privacy;
 	long  Rssi;/* in dBM,raw data ,get from PHY) */
 	enum NDIS_802_11_NETWORK_TYPE  NetworkTypeInUse;
 	struct ndis_802_11_configuration  Configuration;
 	enum NDIS_802_11_NETWORK_INFRASTRUCTURE  InfrastructureMode;
 	u8  SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
 	struct wlan_phy_info PhyInfo;
-	ULONG  IELength;
+	u32  IELength;
 	u8  IEs[MAX_IE_SZ];	/* timestamp, beacon interval, and capability information) */
 } __packed;