mirror of
https://github.com/lwfinger/rtl8188eu.git
synced 2024-11-10 15:39:38 +00:00
rtl8188eu: Replace UINT, USHORT and UCHAR with u32, u16, and u8
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
parent
1038ee1874
commit
4b573cbd5a
7 changed files with 38 additions and 44 deletions
|
@ -2424,8 +2424,8 @@ _func_enter_;
|
||||||
{
|
{
|
||||||
#ifdef PLATFORM_OS_XP
|
#ifdef PLATFORM_OS_XP
|
||||||
NDIS_PACKET_8021Q_INFO VlanPriInfo;
|
NDIS_PACKET_8021Q_INFO VlanPriInfo;
|
||||||
UINT32 UserPriority = precvframe->u.hdr.attrib.priority;
|
u3232 UserPriority = precvframe->u.hdr.attrib.priority;
|
||||||
UINT32 VlanID = (pvlan!=NULL ? get_vlan_id(pvlan) : 0 );
|
u3232 VlanID = (pvlan!=NULL ? get_vlan_id(pvlan) : 0 );
|
||||||
|
|
||||||
VlanPriInfo.Value = // Get current value.
|
VlanPriInfo.Value = // Get current value.
|
||||||
NDIS_PER_PACKET_INFO_FROM_PACKET(precvframe->u.hdr.pkt, Ieee8021QInfo);
|
NDIS_PER_PACKET_INFO_FROM_PACKET(precvframe->u.hdr.pkt, Ieee8021QInfo);
|
||||||
|
|
|
@ -34,9 +34,6 @@
|
||||||
|
|
||||||
typedef signed int sint;
|
typedef signed int sint;
|
||||||
|
|
||||||
#define UCHAR u8
|
|
||||||
#define USHORT u16
|
|
||||||
#define UINT u32
|
|
||||||
#define ULONG u32
|
#define ULONG u32
|
||||||
|
|
||||||
typedef void (*proc_t)(void*);
|
typedef void (*proc_t)(void*);
|
||||||
|
|
|
@ -28,14 +28,14 @@
|
||||||
#define MINIMUM_ETHERNET_PACKET_SIZE 60 //!< Minimum Ethernet Packet Size
|
#define MINIMUM_ETHERNET_PACKET_SIZE 60 //!< Minimum Ethernet Packet Size
|
||||||
#define MAXIMUM_ETHERNET_PACKET_SIZE 1514 //!< Maximum 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) ( \
|
#define RT_ETH_IS_BROADCAST(_pAddr) ( \
|
||||||
((UCHAR *)(_pAddr))[0]==0xff && \
|
((u8 *)(_pAddr))[0]==0xff && \
|
||||||
((UCHAR *)(_pAddr))[1]==0xff && \
|
((u8 *)(_pAddr))[1]==0xff && \
|
||||||
((UCHAR *)(_pAddr))[2]==0xff && \
|
((u8 *)(_pAddr))[2]==0xff && \
|
||||||
((UCHAR *)(_pAddr))[3]==0xff && \
|
((u8 *)(_pAddr))[3]==0xff && \
|
||||||
((UCHAR *)(_pAddr))[4]==0xff && \
|
((u8 *)(_pAddr))[4]==0xff && \
|
||||||
((UCHAR *)(_pAddr))[5]==0xff ) //!< Is Broadcast Address?
|
((u8 *)(_pAddr))[5]==0xff ) //!< Is Broadcast Address?
|
||||||
|
|
||||||
|
|
||||||
#endif // #ifndef __INC_ETHERNET_H
|
#endif // #ifndef __INC_ETHERNET_H
|
||||||
|
|
|
@ -230,16 +230,16 @@ void mptbt_BtControlProcess(
|
||||||
#define BT_MAX_C2H_LEN 20
|
#define BT_MAX_C2H_LEN 20
|
||||||
|
|
||||||
typedef struct _BT_REQ_CMD{
|
typedef struct _BT_REQ_CMD{
|
||||||
UCHAR opCodeVer;
|
u8 opCodeVer;
|
||||||
UCHAR OpCode;
|
u8 OpCode;
|
||||||
USHORT paraLength;
|
u16 paraLength;
|
||||||
UCHAR pParamStart[100];
|
u8 pParamStart[100];
|
||||||
} BT_REQ_CMD, *PBT_REQ_CMD;
|
} BT_REQ_CMD, *PBT_REQ_CMD;
|
||||||
|
|
||||||
typedef struct _BT_RSP_CMD{
|
typedef struct _BT_RSP_CMD{
|
||||||
USHORT status;
|
u16 status;
|
||||||
USHORT paraLength;
|
u16 paraLength;
|
||||||
UCHAR pParamStart[100];
|
u8 pParamStart[100];
|
||||||
} BT_RSP_CMD, *PBT_RSP_CMD;
|
} BT_RSP_CMD, *PBT_RSP_CMD;
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -160,9 +160,6 @@ struct mp_tx
|
||||||
#define MP_MAX_LINES 1000
|
#define MP_MAX_LINES 1000
|
||||||
#define MP_MAX_LINES_BYTES 256
|
#define MP_MAX_LINES_BYTES 256
|
||||||
|
|
||||||
#define UCHAR u8
|
|
||||||
#define USHORT u16
|
|
||||||
#define UINT u32
|
|
||||||
#define ULONG u32
|
#define ULONG u32
|
||||||
#define PULONG u32*
|
#define PULONG u32*
|
||||||
|
|
||||||
|
|
|
@ -51,9 +51,9 @@ typedef enum _RT_USB_WVALUE {
|
||||||
} 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 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 USHORT Op, IN USHORT Index, void * Data);
|
//BOOLEAN CEusbGetStatusRequest(PCE_USB_DEVICE CEdevice, IN u16 Op, IN u16 Index, void * Data);
|
||||||
//BOOLEAN CEusbFeatureRequest(PCE_USB_DEVICE CEdevice, IN USHORT Op, IN USHORT FeatureSelector, IN USHORT Index);
|
//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 UCHAR DescriptorType, IN UCHAR Index, IN USHORT LanguageId, IN void * TransferBuffer, IN ULONG TransferBufferLength);
|
//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
|
#endif
|
||||||
|
|
|
@ -39,7 +39,7 @@ typedef unsigned long long NDIS_802_11_KEY_RSC;
|
||||||
typedef struct _NDIS_802_11_SSID
|
typedef struct _NDIS_802_11_SSID
|
||||||
{
|
{
|
||||||
ULONG SsidLength;
|
ULONG SsidLength;
|
||||||
UCHAR Ssid[32];
|
u8 Ssid[32];
|
||||||
} NDIS_802_11_SSID, *PNDIS_802_11_SSID;
|
} NDIS_802_11_SSID, *PNDIS_802_11_SSID;
|
||||||
|
|
||||||
typedef enum _NDIS_802_11_NETWORK_TYPE
|
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
|
typedef struct _NDIS_802_11_FIXED_IEs
|
||||||
{
|
{
|
||||||
UCHAR Timestamp[8];
|
u8 Timestamp[8];
|
||||||
USHORT BeaconInterval;
|
u16 BeaconInterval;
|
||||||
USHORT Capabilities;
|
u16 Capabilities;
|
||||||
} NDIS_802_11_FIXED_IEs, *PNDIS_802_11_FIXED_IEs;
|
} NDIS_802_11_FIXED_IEs, *PNDIS_802_11_FIXED_IEs;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
typedef struct _NDIS_802_11_VARIABLE_IEs
|
typedef struct _NDIS_802_11_VARIABLE_IEs
|
||||||
{
|
{
|
||||||
UCHAR ElementID;
|
u8 ElementID;
|
||||||
UCHAR Length;
|
u8 Length;
|
||||||
UCHAR data[1];
|
u8 data[1];
|
||||||
} NDIS_802_11_VARIABLE_IEs, *PNDIS_802_11_VARIABLE_IEs;
|
} 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
|
typedef struct _NDIS_802_11_AI_REQFI
|
||||||
{
|
{
|
||||||
USHORT Capabilities;
|
u16 Capabilities;
|
||||||
USHORT ListenInterval;
|
u16 ListenInterval;
|
||||||
NDIS_802_11_MAC_ADDRESS CurrentAPAddress;
|
NDIS_802_11_MAC_ADDRESS CurrentAPAddress;
|
||||||
} NDIS_802_11_AI_REQFI, *PNDIS_802_11_AI_REQFI;
|
} NDIS_802_11_AI_REQFI, *PNDIS_802_11_AI_REQFI;
|
||||||
|
|
||||||
typedef struct _NDIS_802_11_AI_RESFI
|
typedef struct _NDIS_802_11_AI_RESFI
|
||||||
{
|
{
|
||||||
USHORT Capabilities;
|
u16 Capabilities;
|
||||||
USHORT StatusCode;
|
u16 StatusCode;
|
||||||
USHORT AssociationId;
|
u16 AssociationId;
|
||||||
} NDIS_802_11_AI_RESFI, *PNDIS_802_11_AI_RESFI;
|
} NDIS_802_11_AI_RESFI, *PNDIS_802_11_AI_RESFI;
|
||||||
|
|
||||||
typedef struct _NDIS_802_11_ASSOCIATION_INFORMATION
|
typedef struct _NDIS_802_11_ASSOCIATION_INFORMATION
|
||||||
{
|
{
|
||||||
ULONG Length;
|
ULONG Length;
|
||||||
USHORT AvailableRequestFixedIEs;
|
u16 AvailableRequestFixedIEs;
|
||||||
NDIS_802_11_AI_REQFI RequestFixedIEs;
|
NDIS_802_11_AI_REQFI RequestFixedIEs;
|
||||||
ULONG RequestIELength;
|
ULONG RequestIELength;
|
||||||
ULONG OffsetRequestIEs;
|
ULONG OffsetRequestIEs;
|
||||||
USHORT AvailableResponseFixedIEs;
|
u16 AvailableResponseFixedIEs;
|
||||||
NDIS_802_11_AI_RESFI ResponseFixedIEs;
|
NDIS_802_11_AI_RESFI ResponseFixedIEs;
|
||||||
ULONG ResponseIELength;
|
ULONG ResponseIELength;
|
||||||
ULONG OffsetResponseIEs;
|
ULONG OffsetResponseIEs;
|
||||||
|
@ -200,7 +200,7 @@ typedef struct _NDIS_802_11_KEY
|
||||||
ULONG KeyLength; // length of key in bytes
|
ULONG KeyLength; // length of key in bytes
|
||||||
NDIS_802_11_MAC_ADDRESS BSSID;
|
NDIS_802_11_MAC_ADDRESS BSSID;
|
||||||
NDIS_802_11_KEY_RSC KeyRSC;
|
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;
|
} NDIS_802_11_KEY, *PNDIS_802_11_KEY;
|
||||||
|
|
||||||
typedef struct _NDIS_802_11_REMOVE_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 Length; // Length of this structure
|
||||||
ULONG KeyIndex; // 0 is the per-client key, 1-N are the global keys
|
ULONG KeyIndex; // 0 is the per-client key, 1-N are the global keys
|
||||||
ULONG KeyLength; // length of key in bytes
|
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;
|
} NDIS_802_11_WEP, *PNDIS_802_11_WEP;
|
||||||
|
|
||||||
typedef struct _NDIS_802_11_AUTHENTICATION_REQUEST
|
typedef struct _NDIS_802_11_AUTHENTICATION_REQUEST
|
||||||
|
@ -298,7 +298,7 @@ typedef struct _WLAN_BSSID_EX
|
||||||
{
|
{
|
||||||
ULONG Length;
|
ULONG Length;
|
||||||
NDIS_802_11_MAC_ADDRESS MacAddress;
|
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;
|
NDIS_802_11_SSID Ssid;
|
||||||
ULONG Privacy;
|
ULONG Privacy;
|
||||||
NDIS_802_11_RSSI Rssi;//(in dBM,raw data ,get from PHY)
|
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;
|
NDIS_802_11_RATES_EX SupportedRates;
|
||||||
WLAN_PHY_INFO PhyInfo;
|
WLAN_PHY_INFO PhyInfo;
|
||||||
ULONG IELength;
|
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))
|
__attribute__((packed))
|
||||||
WLAN_BSSID_EX, *PWLAN_BSSID_EX;
|
WLAN_BSSID_EX, *PWLAN_BSSID_EX;
|
||||||
|
|
Loading…
Reference in a new issue