skyfall/rtl8188eu
1
0
Fork 0
mirror of https://github.com/lwfinger/rtl8188eu.git synced 2024-11-14 17:09:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rtl8188eu: Remove typdef UCHAR

Browse source 
This is just u8.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2018-11-30 16:02:39 -06:00
parent e05a68ee1a
commit 7b97e72004
6 changed files with 38 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
core/rtw_mp.c
View file

@ -1819,11 +1819,11 @@ static inline void dump_buf(u8 *buf, u32 len)
} }
void ByteToBit( void ByteToBit(
UCHAR *out, u8 *out,
bool *in, bool *in,
UCHAR in_size) u8 in_size)
{ {
UCHAR i = 0, j = 0; u8 i = 0, j = 0;
for (i = 0; i < in_size; i++) { for (i = 0; i < in_size; i++) {
for (j = 0; j < 8; j++) { for (j = 0; j < 8; j++) {
@ -1837,10 +1837,10 @@ void ByteToBit(
void CRC16_generator( void CRC16_generator(
bool *out, bool *out,
bool *in, bool *in,
UCHAR in_size u8 in_size
) )
{ {
UCHAR i = 0; u8 i = 0;
bool temp = 0, reg[] = {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}; bool temp = 0, reg[] = {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};
for (i = 0; i < in_size; i++) {/* take one's complement and bit reverse*/ for (i = 0; i < in_size; i++) {/* take one's complement and bit reverse*/
@ -1885,7 +1885,7 @@ void CCK_generator(
bool LengthExtBit; bool LengthExtBit;
double LengthExact; double LengthExact;
double LengthPSDU; double LengthPSDU;
UCHAR i; u8 i;
UINT PacketLength = pPMacTxInfo->PacketLength; UINT PacketLength = pPMacTxInfo->PacketLength;
if (pPMacTxInfo->bSPreamble) if (pPMacTxInfo->bSPreamble)
@ -1957,8 +1957,8 @@ void PMAC_Get_Pkt_Param(
PRT_PMAC_PKT_INFO pPMacPktInfo) PRT_PMAC_PKT_INFO pPMacPktInfo)
{ {
UCHAR TX_RATE_HEX = 0, MCS = 0; u8 TX_RATE_HEX = 0, MCS = 0;
UCHAR TX_RATE = pPMacTxInfo->TX_RATE; u8 TX_RATE = pPMacTxInfo->TX_RATE;
/* TX_RATE & Nss */ /* TX_RATE & Nss */
if (MPT_IS_2SS_RATE(TX_RATE)) if (MPT_IS_2SS_RATE(TX_RATE))
@ -2109,7 +2109,7 @@ void PMAC_Nsym_generator(
PRT_PMAC_PKT_INFO pPMacPktInfo) PRT_PMAC_PKT_INFO pPMacPktInfo)
{ {
UINT SIGA2B3 = 0; UINT SIGA2B3 = 0;
UCHAR TX_RATE = pPMacTxInfo->TX_RATE; u8 TX_RATE = pPMacTxInfo->TX_RATE;
UINT R, R_list[10] = {0, 0, 2, 0, 2, 1, 2, 3, 2, 3}; UINT R, R_list[10] = {0, 0, 2, 0, 2, 1, 2, 3, 2, 3};
double CR = 0; double CR = 0;
@ -2127,7 +2127,7 @@ void PMAC_Nsym_generator(
N_SD = 234; N_SD = 234;
if (MPT_IS_HT_RATE(TX_RATE)) { if (MPT_IS_HT_RATE(TX_RATE)) {
UCHAR MCS_temp; u8 MCS_temp;
if (pPMacPktInfo->MCS > 23) if (pPMacPktInfo->MCS > 23)
MCS_temp = pPMacPktInfo->MCS - 24; MCS_temp = pPMacPktInfo->MCS - 24;
@ -2268,7 +2268,7 @@ void L_SIG_generator(
mode = pPMacPktInfo->MCS; mode = pPMacPktInfo->MCS;
LENGTH = pPMacTxInfo->PacketLength; LENGTH = pPMacTxInfo->PacketLength;
} else { } else {
UCHAR N_LTF; u8 N_LTF;
double T_data; double T_data;
UINT OFDM_symbol; UINT OFDM_symbol;
@ -2374,10 +2374,10 @@ void L_SIG_generator(
void CRC8_generator( void CRC8_generator(
bool *out, bool *out,
bool *in, bool *in,
UCHAR in_size u8 in_size
) )
{ {
UCHAR i = 0; u8 i = 0;
bool temp = 0, reg[] = {1, 1, 1, 1, 1, 1, 1, 1}; bool temp = 0, reg[] = {1, 1, 1, 1, 1, 1, 1, 1};
for (i = 0; i < in_size; i++) { /* take one's complement and bit reverse*/ for (i = 0; i < in_size; i++) { /* take one's complement and bit reverse*/

2
include/basic_types.h
View file

@ -47,7 +47,7 @@
typedef signed int sint; typedef signed int sint;
#define UCHAR u8 #define u8 u8
#define USHORT u16 #define USHORT u16
#define UINT u32 #define UINT u32
#define ULONG u32 #define ULONG u32

14
include/ethernet.h
View file

@ -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 */

8
include/rtw_bt_mp.h
View file

@ -201,16 +201,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; USHORT 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; USHORT status;
USHORT paraLength; USHORT paraLength;
UCHAR pParamStart[100]; u8 pParamStart[100];
} BT_RSP_CMD, *PBT_RSP_CMD; } BT_RSP_CMD, *PBT_RSP_CMD;

9
include/rtw_mp.h
View file

@ -106,18 +106,17 @@ struct mp_tx {
#define s8Byte s64 #define s8Byte s64
#define ps8Byte s64* #define ps8Byte s64*
#define UCHAR u8
#define USHORT u16 #define USHORT u16
#define UINT u32 #define UINT u32
#define ULONG u32 #define ULONG u32
#define PULONG u32* #define PULONG u32*
typedef struct _RT_PMAC_PKT_INFO { typedef struct _RT_PMAC_PKT_INFO {
UCHAR MCS; u8 MCS;
UCHAR Nss; u8 Nss;
UCHAR Nsts; u8 Nsts;
UINT N_sym; UINT N_sym;
UCHAR SIGA2B3; u8 SIGA2B3;
} RT_PMAC_PKT_INFO, *PRT_PMAC_PKT_INFO; } RT_PMAC_PKT_INFO, *PRT_PMAC_PKT_INFO;
typedef struct _RT_PMAC_TX_INFO { typedef struct _RT_PMAC_TX_INFO {

18
include/wlan_bssdef.h
View file

@ -37,7 +37,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 {
@ -77,15 +77,15 @@ typedef enum _NDIS_802_11_NETWORK_INFRASTRUCTURE {
} NDIS_802_11_NETWORK_INFRASTRUCTURE, *PNDIS_802_11_NETWORK_INFRASTRUCTURE; } NDIS_802_11_NETWORK_INFRASTRUCTURE, *PNDIS_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; USHORT BeaconInterval;
USHORT Capabilities; USHORT 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;
/* /*
@ -171,7 +171,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 {
@ -184,7 +184,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 {
@ -258,7 +258,7 @@ typedef struct _WLAN_BCN_INFO {
typedef struct _WLAN_BSSID_EX { 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) */
@ -268,7 +268,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;