From 4b573cbd5a5388df6da1e958f00638c8eff951c3 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Tue, 30 Dec 2014 18:05:09 -0600 Subject: [PATCH] rtl8188eu: Replace UINT, USHORT and UCHAR with u32, u16, and u8 Signed-off-by: Larry Finger --- core/rtw_recv.c | 4 ++-- include/basic_types.h | 3 --- include/ethernet.h | 14 +++++++------- include/rtw_bt_mp.h | 14 +++++++------- include/rtw_mp.h | 3 --- include/usb_vendor_req.h | 8 ++++---- include/wlan_bssdef.h | 36 ++++++++++++++++++------------------ 7 files changed, 38 insertions(+), 44 deletions(-) diff --git a/core/rtw_recv.c b/core/rtw_recv.c index 5a089f5..85cca23 100755 --- a/core/rtw_recv.c +++ b/core/rtw_recv.c @@ -2424,8 +2424,8 @@ _func_enter_; { #ifdef PLATFORM_OS_XP NDIS_PACKET_8021Q_INFO VlanPriInfo; - UINT32 UserPriority = precvframe->u.hdr.attrib.priority; - UINT32 VlanID = (pvlan!=NULL ? get_vlan_id(pvlan) : 0 ); + u3232 UserPriority = precvframe->u.hdr.attrib.priority; + u3232 VlanID = (pvlan!=NULL ? get_vlan_id(pvlan) : 0 ); VlanPriInfo.Value = // Get current value. NDIS_PER_PACKET_INFO_FROM_PACKET(precvframe->u.hdr.pkt, Ieee8021QInfo); diff --git a/include/basic_types.h b/include/basic_types.h index c6309ed..d91d207 100755 --- a/include/basic_types.h +++ b/include/basic_types.h @@ -34,9 +34,6 @@ typedef signed int sint; - #define UCHAR u8 - #define USHORT u16 - #define UINT u32 #define ULONG u32 typedef void (*proc_t)(void*); diff --git a/include/ethernet.h b/include/ethernet.h index 12d2e41..6b6c94e 100755 --- a/include/ethernet.h +++ b/include/ethernet.h @@ -28,14 +28,14 @@ #define MINIMUM_ETHERNET_PACKET_SIZE 60 //!< Minimum Ethernet Packet Size #define MAXIMUM_ETHERNET_PACKET_SIZE 1514 //!< Maximum Ethernet Packet Size -#define RT_ETH_IS_MULTICAST(_pAddr) ((((UCHAR *)(_pAddr))[0]&0x01)!=0) //!< Is Multicast Address? +#define RT_ETH_IS_MULTICAST(_pAddr) ((((u8 *)(_pAddr))[0]&0x01)!=0) //!< Is Multicast Address? #define RT_ETH_IS_BROADCAST(_pAddr) ( \ - ((UCHAR *)(_pAddr))[0]==0xff && \ - ((UCHAR *)(_pAddr))[1]==0xff && \ - ((UCHAR *)(_pAddr))[2]==0xff && \ - ((UCHAR *)(_pAddr))[3]==0xff && \ - ((UCHAR *)(_pAddr))[4]==0xff && \ - ((UCHAR *)(_pAddr))[5]==0xff ) //!< Is Broadcast Address? + ((u8 *)(_pAddr))[0]==0xff && \ + ((u8 *)(_pAddr))[1]==0xff && \ + ((u8 *)(_pAddr))[2]==0xff && \ + ((u8 *)(_pAddr))[3]==0xff && \ + ((u8 *)(_pAddr))[4]==0xff && \ + ((u8 *)(_pAddr))[5]==0xff ) //!< Is Broadcast Address? #endif // #ifndef __INC_ETHERNET_H diff --git a/include/rtw_bt_mp.h b/include/rtw_bt_mp.h index a282476..0790399 100755 --- a/include/rtw_bt_mp.h +++ b/include/rtw_bt_mp.h @@ -230,16 +230,16 @@ void mptbt_BtControlProcess( #define BT_MAX_C2H_LEN 20 typedef struct _BT_REQ_CMD{ - UCHAR opCodeVer; - UCHAR OpCode; - USHORT paraLength; - UCHAR pParamStart[100]; + u8 opCodeVer; + u8 OpCode; + u16 paraLength; + u8 pParamStart[100]; } BT_REQ_CMD, *PBT_REQ_CMD; typedef struct _BT_RSP_CMD{ - USHORT status; - USHORT paraLength; - UCHAR pParamStart[100]; + u16 status; + u16 paraLength; + u8 pParamStart[100]; } BT_RSP_CMD, *PBT_RSP_CMD; diff --git a/include/rtw_mp.h b/include/rtw_mp.h index aa81c9f..ef3c214 100755 --- a/include/rtw_mp.h +++ b/include/rtw_mp.h @@ -160,9 +160,6 @@ struct mp_tx #define MP_MAX_LINES 1000 #define MP_MAX_LINES_BYTES 256 -#define UCHAR u8 -#define USHORT u16 -#define UINT u32 #define ULONG u32 #define PULONG u32* diff --git a/include/usb_vendor_req.h b/include/usb_vendor_req.h index 53b1249..3b7c867 100755 --- a/include/usb_vendor_req.h +++ b/include/usb_vendor_req.h @@ -51,9 +51,9 @@ typedef enum _RT_USB_WVALUE { } RT_USB_WVALUE; -//BOOLEAN usbvendorrequest(PCE_USB_DEVICE CEdevice, RT_USB_BREQUEST bRequest, RT_USB_WVALUE wValue, UCHAR wIndex, void * Data, UCHAR DataLength, BOOLEAN isDirectionIn); -//BOOLEAN CEusbGetStatusRequest(PCE_USB_DEVICE CEdevice, IN USHORT Op, IN USHORT Index, void * Data); -//BOOLEAN CEusbFeatureRequest(PCE_USB_DEVICE CEdevice, IN USHORT Op, IN USHORT FeatureSelector, IN USHORT Index); -//BOOLEAN CEusbGetDescriptorRequest(PCE_USB_DEVICE CEdevice, IN short urbLength, IN UCHAR DescriptorType, IN UCHAR Index, IN USHORT LanguageId, IN void * TransferBuffer, IN ULONG TransferBufferLength); +//BOOLEAN usbvendorrequest(PCE_USB_DEVICE CEdevice, RT_USB_BREQUEST bRequest, RT_USB_WVALUE wValue, u8 wIndex, void * Data, u8 DataLength, BOOLEAN isDirectionIn); +//BOOLEAN CEusbGetStatusRequest(PCE_USB_DEVICE CEdevice, IN u16 Op, IN u16 Index, void * Data); +//BOOLEAN CEusbFeatureRequest(PCE_USB_DEVICE CEdevice, IN u16 Op, IN u16 FeatureSelector, IN u16 Index); +//BOOLEAN CEusbGetDescriptorRequest(PCE_USB_DEVICE CEdevice, IN short urbLength, IN u8 DescriptorType, IN u8 Index, IN u16 LanguageId, IN void * TransferBuffer, IN ULONG TransferBufferLength); #endif diff --git a/include/wlan_bssdef.h b/include/wlan_bssdef.h index 1d06ba0..2951cbd 100755 --- a/include/wlan_bssdef.h +++ b/include/wlan_bssdef.h @@ -39,7 +39,7 @@ typedef unsigned long long NDIS_802_11_KEY_RSC; typedef struct _NDIS_802_11_SSID { ULONG SsidLength; - UCHAR Ssid[32]; + u8 Ssid[32]; } NDIS_802_11_SSID, *PNDIS_802_11_SSID; typedef enum _NDIS_802_11_NETWORK_TYPE @@ -90,18 +90,18 @@ typedef enum _NDIS_802_11_NETWORK_INFRASTRUCTURE typedef struct _NDIS_802_11_FIXED_IEs { - UCHAR Timestamp[8]; - USHORT BeaconInterval; - USHORT Capabilities; + u8 Timestamp[8]; + u16 BeaconInterval; + u16 Capabilities; } NDIS_802_11_FIXED_IEs, *PNDIS_802_11_FIXED_IEs; typedef struct _NDIS_802_11_VARIABLE_IEs { - UCHAR ElementID; - UCHAR Length; - UCHAR data[1]; + u8 ElementID; + u8 Length; + u8 data[1]; } NDIS_802_11_VARIABLE_IEs, *PNDIS_802_11_VARIABLE_IEs; @@ -161,26 +161,26 @@ typedef enum _NDIS_802_11_WEP_STATUS typedef struct _NDIS_802_11_AI_REQFI { - USHORT Capabilities; - USHORT ListenInterval; + u16 Capabilities; + u16 ListenInterval; NDIS_802_11_MAC_ADDRESS CurrentAPAddress; } NDIS_802_11_AI_REQFI, *PNDIS_802_11_AI_REQFI; typedef struct _NDIS_802_11_AI_RESFI { - USHORT Capabilities; - USHORT StatusCode; - USHORT AssociationId; + u16 Capabilities; + u16 StatusCode; + u16 AssociationId; } NDIS_802_11_AI_RESFI, *PNDIS_802_11_AI_RESFI; typedef struct _NDIS_802_11_ASSOCIATION_INFORMATION { ULONG Length; - USHORT AvailableRequestFixedIEs; + u16 AvailableRequestFixedIEs; NDIS_802_11_AI_REQFI RequestFixedIEs; ULONG RequestIELength; ULONG OffsetRequestIEs; - USHORT AvailableResponseFixedIEs; + u16 AvailableResponseFixedIEs; NDIS_802_11_AI_RESFI ResponseFixedIEs; ULONG ResponseIELength; ULONG OffsetResponseIEs; @@ -200,7 +200,7 @@ typedef struct _NDIS_802_11_KEY ULONG KeyLength; // length of key in bytes NDIS_802_11_MAC_ADDRESS BSSID; NDIS_802_11_KEY_RSC KeyRSC; - UCHAR KeyMaterial[32]; // variable length depending on above field + u8 KeyMaterial[32]; // variable length depending on above field } NDIS_802_11_KEY, *PNDIS_802_11_KEY; typedef struct _NDIS_802_11_REMOVE_KEY @@ -215,7 +215,7 @@ 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 - UCHAR KeyMaterial[16];// variable length depending on above field + u8 KeyMaterial[16];// variable length depending on above field } NDIS_802_11_WEP, *PNDIS_802_11_WEP; typedef struct _NDIS_802_11_AUTHENTICATION_REQUEST @@ -298,7 +298,7 @@ typedef struct _WLAN_BSSID_EX { ULONG Length; NDIS_802_11_MAC_ADDRESS MacAddress; - UCHAR Reserved[2];//[0]: IS beacon frame + u8 Reserved[2];//[0]: IS beacon frame NDIS_802_11_SSID Ssid; ULONG Privacy; NDIS_802_11_RSSI Rssi;//(in dBM,raw data ,get from PHY) @@ -308,7 +308,7 @@ typedef struct _WLAN_BSSID_EX NDIS_802_11_RATES_EX SupportedRates; WLAN_PHY_INFO PhyInfo; ULONG IELength; - UCHAR IEs[MAX_IE_SZ]; //(timestamp, beacon interval, and capability information) + u8 IEs[MAX_IE_SZ]; //(timestamp, beacon interval, and capability information) } __attribute__((packed)) WLAN_BSSID_EX, *PWLAN_BSSID_EX;