Staging: vt6656: removed custom CHAR/SHORT/INT/LONG typedefs

Cleared all checkpatch warnings but one 'do not add new typedefs'

Signed-off-by: Andres More <more.andres@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Andres More 2010-05-17 21:34:00 -03:00 committed by Greg Kroah-Hartman
parent 0263869760
commit 213d2e9322
10 changed files with 77 additions and 56 deletions

View File

@ -608,7 +608,7 @@ BOOL BSSbUpdateToBSSList(void *hDeviceContext,
PSDevice pDevice = (PSDevice)hDeviceContext; PSDevice pDevice = (PSDevice)hDeviceContext;
PSMgmtObject pMgmt = &(pDevice->sMgmtObj); PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
PSRxMgmtPacket pRxPacket = (PSRxMgmtPacket)pRxPacketContext; PSRxMgmtPacket pRxPacket = (PSRxMgmtPacket)pRxPacketContext;
LONG ldBm, ldBmSum; signed long ldBm, ldBmSum;
BOOL bParsingQuiet = FALSE; BOOL bParsingQuiet = FALSE;
// BYTE abyTmpSSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1]; // BYTE abyTmpSSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1];
@ -1550,9 +1550,9 @@ void s_vCheckSensitivity(void *hDeviceContext)
((pMgmt->eCurrMode == WMAC_MODE_IBSS_STA) && (pMgmt->eCurrState == WMAC_STATE_JOINTED))) { ((pMgmt->eCurrMode == WMAC_MODE_IBSS_STA) && (pMgmt->eCurrState == WMAC_STATE_JOINTED))) {
pBSSList = BSSpAddrIsInBSSList(pDevice, pMgmt->abyCurrBSSID, (PWLAN_IE_SSID)pMgmt->abyCurrSSID); pBSSList = BSSpAddrIsInBSSList(pDevice, pMgmt->abyCurrBSSID, (PWLAN_IE_SSID)pMgmt->abyCurrSSID);
if (pBSSList != NULL) { if (pBSSList != NULL) {
// Updata BB Reg if RSSI is too strong. /* Update BB register if RSSI is too strong */
LONG LocalldBmAverage = 0; signed long LocalldBmAverage = 0;
LONG uNumofdBm = 0; signed long uNumofdBm = 0;
for (ii = 0; ii < RSSI_STAT_COUNT; ii++) { for (ii = 0; ii < RSSI_STAT_COUNT; ii++) {
if (pBSSList->ldBmAverage[ii] != 0) { if (pBSSList->ldBmAverage[ii] != 0) {
uNumofdBm ++; uNumofdBm ++;

View File

@ -109,9 +109,9 @@ typedef struct tagKnownBSS {
// WORD wATIMWindow; // WORD wATIMWindow;
BYTE byRSSIStatCnt; BYTE byRSSIStatCnt;
LONG ldBmMAX; signed long ldBmMAX;
LONG ldBmAverage[RSSI_STAT_COUNT]; signed long ldBmAverage[RSSI_STAT_COUNT];
LONG ldBmAverRange; signed long ldBmAverRange;
//For any BSSID selection improvment //For any BSSID selection improvment
BOOL bSelected; BOOL bSelected;

View File

@ -116,7 +116,7 @@ static SChannelTblElement sChannelTbl[CB_MAX_CHANNEL+1] =
static struct static struct
{ {
BYTE byChannelCountryCode; /* The country code */ BYTE byChannelCountryCode; /* The country code */
CHAR chCountryCode[2]; char chCountryCode[2];
BYTE bChannelIdxList[CB_MAX_CHANNEL]; /* Available channels Index */ BYTE bChannelIdxList[CB_MAX_CHANNEL]; /* Available channels Index */
BYTE byPower[CB_MAX_CHANNEL]; BYTE byPower[CB_MAX_CHANNEL];
} ChannelRuleTab[] = } ChannelRuleTab[] =

View File

@ -210,7 +210,7 @@ typedef enum _CONTEXT_TYPE {
typedef struct _RCB typedef struct _RCB
{ {
void *Next; void *Next;
LONG Ref; signed long Ref;
void *pDevice; void *pDevice;
struct urb *pUrb; struct urb *pUrb;
SRxMgmtPacket sMngPacket; SRxMgmtPacket sMngPacket;
@ -234,16 +234,15 @@ typedef struct _USB_SEND_CONTEXT {
} USB_SEND_CONTEXT, *PUSB_SEND_CONTEXT; } USB_SEND_CONTEXT, *PUSB_SEND_CONTEXT;
//structure got from configuration file as user desired default setting. /* structure got from configuration file as user-desired default settings */
typedef struct _DEFAULT_CONFIG{ typedef struct _DEFAULT_CONFIG {
INT ZoneType; signed int ZoneType;
INT eConfigMode; signed int eConfigMode;
INT eAuthenMode; //open/wep/wpa signed int eAuthenMode; /* open/wep/wpa */
INT bShareKeyAlgorithm; //open-open/open-sharekey/wep-sharekey signed int bShareKeyAlgorithm; /* open-open/{open,wep}-sharekey */
INT keyidx; //wepkey index signed int keyidx; /* wepkey index */
INT eEncryptionStatus; signed int eEncryptionStatus;
} DEFAULT_CONFIG, *PDEFAULT_CONFIG;
}DEFAULT_CONFIG,*PDEFAULT_CONFIG;
// //
// Structure to keep track of usb interrupt packets // Structure to keep track of usb interrupt packets
@ -785,7 +784,7 @@ typedef struct __device_info {
BYTE byBBVGANew; BYTE byBBVGANew;
BYTE byBBVGACurrent; BYTE byBBVGACurrent;
BYTE abyBBVGA[BB_VGA_LEVEL]; BYTE abyBBVGA[BB_VGA_LEVEL];
LONG ldBmThreshold[BB_VGA_LEVEL]; signed long ldBmThreshold[BB_VGA_LEVEL];
BYTE byBBPreEDRSSI; BYTE byBBPreEDRSSI;
BYTE byBBPreEDIndex; BYTE byBBPreEDIndex;

View File

@ -98,7 +98,7 @@ s_vProcessRxMACHeader (
static BOOL s_bAPModeRxCtl( static BOOL s_bAPModeRxCtl(
PSDevice pDevice, PSDevice pDevice,
PBYTE pbyFrame, PBYTE pbyFrame,
INT iSANodeIndex signed int iSANodeIndex
); );
@ -108,8 +108,8 @@ static BOOL s_bAPModeRxData (
struct sk_buff *skb, struct sk_buff *skb,
UINT FrameSize, UINT FrameSize,
UINT cbHeaderOffset, UINT cbHeaderOffset,
INT iSANodeIndex, signed int iSANodeIndex,
INT iDANodeIndex signed int iDANodeIndex
); );
@ -336,8 +336,8 @@ RXbBulkInProcessData (
UINT cbHeaderOffset; UINT cbHeaderOffset;
UINT FrameSize; UINT FrameSize;
WORD wEtherType = 0; WORD wEtherType = 0;
INT iSANodeIndex = -1; signed int iSANodeIndex = -1;
INT iDANodeIndex = -1; signed int iDANodeIndex = -1;
UINT ii; UINT ii;
UINT cbIVOffset; UINT cbIVOffset;
PBYTE pbyRxSts; PBYTE pbyRxSts;
@ -352,7 +352,7 @@ RXbBulkInProcessData (
DWORD dwRxTSC47_16 = 0; DWORD dwRxTSC47_16 = 0;
SKeyItem STempKey; SKeyItem STempKey;
// 802.11h RPI // 802.11h RPI
//LONG ldBm = 0; /* signed long ldBm = 0; */
BOOL bIsWEP = FALSE; BOOL bIsWEP = FALSE;
BOOL bExtIV = FALSE; BOOL bExtIV = FALSE;
DWORD dwWbkStatus; DWORD dwWbkStatus;
@ -1023,7 +1023,7 @@ RXbBulkInProcessData (
static BOOL s_bAPModeRxCtl ( static BOOL s_bAPModeRxCtl (
PSDevice pDevice, PSDevice pDevice,
PBYTE pbyFrame, PBYTE pbyFrame,
INT iSANodeIndex signed int iSANodeIndex
) )
{ {
PS802_11Header p802_11Header; PS802_11Header p802_11Header;
@ -1431,8 +1431,8 @@ static BOOL s_bAPModeRxData (
struct sk_buff *skb, struct sk_buff *skb,
UINT FrameSize, UINT FrameSize,
UINT cbHeaderOffset, UINT cbHeaderOffset,
INT iSANodeIndex, signed int iSANodeIndex,
INT iDANodeIndex signed int iDANodeIndex
) )
{ {

View File

@ -81,7 +81,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) {
BYTE abyNullAddr[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; BYTE abyNullAddr[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
DWORD dwKeyIndex= 0; DWORD dwKeyIndex= 0;
BYTE abyScanSSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1]; BYTE abyScanSSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1];
LONG ldBm; signed long ldBm;
pReq->wResult = 0; pReq->wResult = 0;

View File

@ -187,87 +187,114 @@ void STAvUpdateRDStatCounter (PSStatCounter pStatistic,
if(byRSR & RSR_CRCOK) { if(byRSR & RSR_CRCOK) {
pStatistic->CustomStat.ullRsr11MCRCOk++; pStatistic->CustomStat.ullRsr11MCRCOk++;
} }
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"11M: ALL[%d], OK[%d]:[%02x]\n", (INT)pStatistic->CustomStat.ullRsr11M, (INT)pStatistic->CustomStat.ullRsr11MCRCOk, byRSR); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "11M: ALL[%d], OK[%d]:[%02x]\n",
(signed int) pStatistic->CustomStat.ullRsr11M,
(signed int) pStatistic->CustomStat.ullRsr11MCRCOk, byRSR);
} }
else if(byRxRate==11) { else if(byRxRate==11) {
pStatistic->CustomStat.ullRsr5M++; pStatistic->CustomStat.ullRsr5M++;
if(byRSR & RSR_CRCOK) { if(byRSR & RSR_CRCOK) {
pStatistic->CustomStat.ullRsr5MCRCOk++; pStatistic->CustomStat.ullRsr5MCRCOk++;
} }
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" 5M: ALL[%d], OK[%d]:[%02x]\n", (INT)pStatistic->CustomStat.ullRsr5M, (INT)pStatistic->CustomStat.ullRsr5MCRCOk, byRSR); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " 5M: ALL[%d], OK[%d]:[%02x]\n",
(signed int) pStatistic->CustomStat.ullRsr5M,
(signed int) pStatistic->CustomStat.ullRsr5MCRCOk, byRSR);
} }
else if(byRxRate==4) { else if(byRxRate==4) {
pStatistic->CustomStat.ullRsr2M++; pStatistic->CustomStat.ullRsr2M++;
if(byRSR & RSR_CRCOK) { if(byRSR & RSR_CRCOK) {
pStatistic->CustomStat.ullRsr2MCRCOk++; pStatistic->CustomStat.ullRsr2MCRCOk++;
} }
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" 2M: ALL[%d], OK[%d]:[%02x]\n", (INT)pStatistic->CustomStat.ullRsr2M, (INT)pStatistic->CustomStat.ullRsr2MCRCOk, byRSR); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " 2M: ALL[%d], OK[%d]:[%02x]\n",
(signed int) pStatistic->CustomStat.ullRsr2M,
(signed int) pStatistic->CustomStat.ullRsr2MCRCOk, byRSR);
} }
else if(byRxRate==2){ else if(byRxRate==2){
pStatistic->CustomStat.ullRsr1M++; pStatistic->CustomStat.ullRsr1M++;
if(byRSR & RSR_CRCOK) { if(byRSR & RSR_CRCOK) {
pStatistic->CustomStat.ullRsr1MCRCOk++; pStatistic->CustomStat.ullRsr1MCRCOk++;
} }
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" 1M: ALL[%d], OK[%d]:[%02x]\n", (INT)pStatistic->CustomStat.ullRsr1M, (INT)pStatistic->CustomStat.ullRsr1MCRCOk, byRSR); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " 1M: ALL[%d], OK[%d]:[%02x]\n",
(signed int) pStatistic->CustomStat.ullRsr1M,
(signed int) pStatistic->CustomStat.ullRsr1MCRCOk, byRSR);
} }
else if(byRxRate==12){ else if(byRxRate==12){
pStatistic->CustomStat.ullRsr6M++; pStatistic->CustomStat.ullRsr6M++;
if(byRSR & RSR_CRCOK) { if(byRSR & RSR_CRCOK) {
pStatistic->CustomStat.ullRsr6MCRCOk++; pStatistic->CustomStat.ullRsr6MCRCOk++;
} }
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" 6M: ALL[%d], OK[%d]\n", (INT)pStatistic->CustomStat.ullRsr6M, (INT)pStatistic->CustomStat.ullRsr6MCRCOk); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " 6M: ALL[%d], OK[%d]\n",
(signed int) pStatistic->CustomStat.ullRsr6M,
(signed int) pStatistic->CustomStat.ullRsr6MCRCOk);
} }
else if(byRxRate==18){ else if(byRxRate==18){
pStatistic->CustomStat.ullRsr9M++; pStatistic->CustomStat.ullRsr9M++;
if(byRSR & RSR_CRCOK) { if(byRSR & RSR_CRCOK) {
pStatistic->CustomStat.ullRsr9MCRCOk++; pStatistic->CustomStat.ullRsr9MCRCOk++;
} }
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" 9M: ALL[%d], OK[%d]\n", (INT)pStatistic->CustomStat.ullRsr9M, (INT)pStatistic->CustomStat.ullRsr9MCRCOk); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " 9M: ALL[%d], OK[%d]\n",
(signed int) pStatistic->CustomStat.ullRsr9M,
(signed int) pStatistic->CustomStat.ullRsr9MCRCOk);
} }
else if(byRxRate==24){ else if(byRxRate==24){
pStatistic->CustomStat.ullRsr12M++; pStatistic->CustomStat.ullRsr12M++;
if(byRSR & RSR_CRCOK) { if(byRSR & RSR_CRCOK) {
pStatistic->CustomStat.ullRsr12MCRCOk++; pStatistic->CustomStat.ullRsr12MCRCOk++;
} }
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"12M: ALL[%d], OK[%d]\n", (INT)pStatistic->CustomStat.ullRsr12M, (INT)pStatistic->CustomStat.ullRsr12MCRCOk); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "12M: ALL[%d], OK[%d]\n",
(signed int) pStatistic->CustomStat.ullRsr12M,
(signed int) pStatistic->CustomStat.ullRsr12MCRCOk);
} }
else if(byRxRate==36){ else if(byRxRate==36){
pStatistic->CustomStat.ullRsr18M++; pStatistic->CustomStat.ullRsr18M++;
if(byRSR & RSR_CRCOK) { if(byRSR & RSR_CRCOK) {
pStatistic->CustomStat.ullRsr18MCRCOk++; pStatistic->CustomStat.ullRsr18MCRCOk++;
} }
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"18M: ALL[%d], OK[%d]\n", (INT)pStatistic->CustomStat.ullRsr18M, (INT)pStatistic->CustomStat.ullRsr18MCRCOk); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "18M: ALL[%d], OK[%d]\n",
(signed int) pStatistic->CustomStat.ullRsr18M,
(signed int) pStatistic->CustomStat.ullRsr18MCRCOk);
} }
else if(byRxRate==48){ else if(byRxRate==48){
pStatistic->CustomStat.ullRsr24M++; pStatistic->CustomStat.ullRsr24M++;
if(byRSR & RSR_CRCOK) { if(byRSR & RSR_CRCOK) {
pStatistic->CustomStat.ullRsr24MCRCOk++; pStatistic->CustomStat.ullRsr24MCRCOk++;
} }
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"24M: ALL[%d], OK[%d]\n", (INT)pStatistic->CustomStat.ullRsr24M, (INT)pStatistic->CustomStat.ullRsr24MCRCOk); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "24M: ALL[%d], OK[%d]\n",
(signed int) pStatistic->CustomStat.ullRsr24M,
(signed int) pStatistic->CustomStat.ullRsr24MCRCOk);
} }
else if(byRxRate==72){ else if(byRxRate==72){
pStatistic->CustomStat.ullRsr36M++; pStatistic->CustomStat.ullRsr36M++;
if(byRSR & RSR_CRCOK) { if(byRSR & RSR_CRCOK) {
pStatistic->CustomStat.ullRsr36MCRCOk++; pStatistic->CustomStat.ullRsr36MCRCOk++;
} }
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"36M: ALL[%d], OK[%d]\n", (INT)pStatistic->CustomStat.ullRsr36M, (INT)pStatistic->CustomStat.ullRsr36MCRCOk); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "36M: ALL[%d], OK[%d]\n",
(signed int) pStatistic->CustomStat.ullRsr36M,
(signed int) pStatistic->CustomStat.ullRsr36MCRCOk);
} }
else if(byRxRate==96){ else if(byRxRate==96){
pStatistic->CustomStat.ullRsr48M++; pStatistic->CustomStat.ullRsr48M++;
if(byRSR & RSR_CRCOK) { if(byRSR & RSR_CRCOK) {
pStatistic->CustomStat.ullRsr48MCRCOk++; pStatistic->CustomStat.ullRsr48MCRCOk++;
} }
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"48M: ALL[%d], OK[%d]\n", (INT)pStatistic->CustomStat.ullRsr48M, (INT)pStatistic->CustomStat.ullRsr48MCRCOk); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "48M: ALL[%d], OK[%d]\n",
(signed int) pStatistic->CustomStat.ullRsr48M,
(signed int) pStatistic->CustomStat.ullRsr48MCRCOk);
} }
else if(byRxRate==108){ else if(byRxRate==108){
pStatistic->CustomStat.ullRsr54M++; pStatistic->CustomStat.ullRsr54M++;
if(byRSR & RSR_CRCOK) { if(byRSR & RSR_CRCOK) {
pStatistic->CustomStat.ullRsr54MCRCOk++; pStatistic->CustomStat.ullRsr54MCRCOk++;
} }
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"54M: ALL[%d], OK[%d]\n", (INT)pStatistic->CustomStat.ullRsr54M, (INT)pStatistic->CustomStat.ullRsr54MCRCOk); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "54M: ALL[%d], OK[%d]\n",
(signed int) pStatistic->CustomStat.ullRsr54M,
(signed int) pStatistic->CustomStat.ullRsr54MCRCOk);
} }
else { else {
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Unknown: Total[%d], CRCOK[%d]\n", (INT)pStatistic->dwRsrRxPacket+1, (INT)pStatistic->dwRsrCRCOk); DBG_PRT(MSG_LEVEL_DEBUG,
KERN_INFO "Unknown: Total[%d], CRCOK[%d]\n",
(signed int) pStatistic->dwRsrRxPacket+1,
(signed int)pStatistic->dwRsrCRCOk);
} }
if (byRSR & RSR_BSSIDOK) if (byRSR & RSR_BSSIDOK)

View File

@ -85,15 +85,15 @@ typedef struct tagSDot11Counters {
// MIB2 counter // MIB2 counter
// //
typedef struct tagSMib2Counter { typedef struct tagSMib2Counter {
LONG ifIndex; signed long ifIndex;
char ifDescr[256]; // max size 255 plus zero ending char ifDescr[256]; // max size 255 plus zero ending
// e.g. "interface 1" // e.g. "interface 1"
LONG ifType; signed long ifType;
LONG ifMtu; signed long ifMtu;
DWORD ifSpeed; DWORD ifSpeed;
BYTE ifPhysAddress[ETH_ALEN]; BYTE ifPhysAddress[ETH_ALEN];
LONG ifAdminStatus; signed long ifAdminStatus;
LONG ifOperStatus; signed long ifOperStatus;
DWORD ifLastChange; DWORD ifLastChange;
DWORD ifInOctets; DWORD ifInOctets;
DWORD ifInUcastPkts; DWORD ifInUcastPkts;
@ -124,7 +124,7 @@ typedef struct tagSMib2Counter {
// RMON counter // RMON counter
// //
typedef struct tagSRmonCounter { typedef struct tagSRmonCounter {
LONG etherStatsIndex; signed long etherStatsIndex;
DWORD etherStatsDataSource; DWORD etherStatsDataSource;
DWORD etherStatsDropEvents; DWORD etherStatsDropEvents;
DWORD etherStatsOctets; DWORD etherStatsOctets;

View File

@ -962,8 +962,8 @@ RFvRSSITodBm (
) )
{ {
BYTE byIdx = (((byCurrRSSI & 0xC0) >> 6) & 0x03); BYTE byIdx = (((byCurrRSSI & 0xC0) >> 6) & 0x03);
LONG b = (byCurrRSSI & 0x3F); signed long b = (byCurrRSSI & 0x3F);
LONG a = 0; signed long a = 0;
BYTE abyAIROHARF[4] = {0, 18, 0, 40}; BYTE abyAIROHARF[4] = {0, 18, 0, 40};
switch (pDevice->byRFType) { switch (pDevice->byRFType) {

View File

@ -72,11 +72,6 @@ typedef int BOOL;
/****** Simple typedefs ***************************************************/ /****** Simple typedefs ***************************************************/
typedef char CHAR;
typedef signed short SHORT;
typedef signed int INT;
typedef signed long LONG;
typedef unsigned char UCHAR; typedef unsigned char UCHAR;
typedef unsigned short USHORT; typedef unsigned short USHORT;
typedef unsigned int UINT; typedef unsigned int UINT;