Skip to content

Commit

Permalink
Staging: vt6656: removed custom CHAR/SHORT/INT/LONG typedefs
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Andres More authored and Greg Kroah-Hartman committed May 18, 2010
1 parent 0263869 commit 213d2e9
Show file tree
Hide file tree
Showing 10 changed files with 77 additions and 56 deletions.
8 changes: 4 additions & 4 deletions drivers/staging/vt6656/bssdb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -608,7 +608,7 @@ BOOL BSSbUpdateToBSSList(void *hDeviceContext,
PSDevice pDevice = (PSDevice)hDeviceContext;
PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
PSRxMgmtPacket pRxPacket = (PSRxMgmtPacket)pRxPacketContext;
LONG ldBm, ldBmSum;
signed long ldBm, ldBmSum;
BOOL bParsingQuiet = FALSE;
// BYTE abyTmpSSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1];

Expand Down Expand Up @@ -1550,9 +1550,9 @@ void s_vCheckSensitivity(void *hDeviceContext)
((pMgmt->eCurrMode == WMAC_MODE_IBSS_STA) && (pMgmt->eCurrState == WMAC_STATE_JOINTED))) {
pBSSList = BSSpAddrIsInBSSList(pDevice, pMgmt->abyCurrBSSID, (PWLAN_IE_SSID)pMgmt->abyCurrSSID);
if (pBSSList != NULL) {
// Updata BB Reg if RSSI is too strong.
LONG LocalldBmAverage = 0;
LONG uNumofdBm = 0;
/* Update BB register if RSSI is too strong */
signed long LocalldBmAverage = 0;
signed long uNumofdBm = 0;
for (ii = 0; ii < RSSI_STAT_COUNT; ii++) {
if (pBSSList->ldBmAverage[ii] != 0) {
uNumofdBm ++;
Expand Down
6 changes: 3 additions & 3 deletions drivers/staging/vt6656/bssdb.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,9 +109,9 @@ typedef struct tagKnownBSS {

// WORD wATIMWindow;
BYTE byRSSIStatCnt;
LONG ldBmMAX;
LONG ldBmAverage[RSSI_STAT_COUNT];
LONG ldBmAverRange;
signed long ldBmMAX;
signed long ldBmAverage[RSSI_STAT_COUNT];
signed long ldBmAverRange;
//For any BSSID selection improvment
BOOL bSelected;

Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/vt6656/channel.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ static SChannelTblElement sChannelTbl[CB_MAX_CHANNEL+1] =
static struct
{
BYTE byChannelCountryCode; /* The country code */
CHAR chCountryCode[2];
char chCountryCode[2];
BYTE bChannelIdxList[CB_MAX_CHANNEL]; /* Available channels Index */
BYTE byPower[CB_MAX_CHANNEL];
} ChannelRuleTab[] =
Expand Down
23 changes: 11 additions & 12 deletions drivers/staging/vt6656/device.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ typedef enum _CONTEXT_TYPE {
typedef struct _RCB
{
void *Next;
LONG Ref;
signed long Ref;
void *pDevice;
struct urb *pUrb;
SRxMgmtPacket sMngPacket;
Expand All @@ -234,16 +234,15 @@ typedef struct _USB_SEND_CONTEXT {
} USB_SEND_CONTEXT, *PUSB_SEND_CONTEXT;


//structure got from configuration file as user desired default setting.
typedef struct _DEFAULT_CONFIG{
INT ZoneType;
INT eConfigMode;
INT eAuthenMode; //open/wep/wpa
INT bShareKeyAlgorithm; //open-open/open-sharekey/wep-sharekey
INT keyidx; //wepkey index
INT eEncryptionStatus;

}DEFAULT_CONFIG,*PDEFAULT_CONFIG;
/* structure got from configuration file as user-desired default settings */
typedef struct _DEFAULT_CONFIG {
signed int ZoneType;
signed int eConfigMode;
signed int eAuthenMode; /* open/wep/wpa */
signed int bShareKeyAlgorithm; /* open-open/{open,wep}-sharekey */
signed int keyidx; /* wepkey index */
signed int eEncryptionStatus;
} DEFAULT_CONFIG, *PDEFAULT_CONFIG;

//
// Structure to keep track of usb interrupt packets
Expand Down Expand Up @@ -785,7 +784,7 @@ typedef struct __device_info {
BYTE byBBVGANew;
BYTE byBBVGACurrent;
BYTE abyBBVGA[BB_VGA_LEVEL];
LONG ldBmThreshold[BB_VGA_LEVEL];
signed long ldBmThreshold[BB_VGA_LEVEL];

BYTE byBBPreEDRSSI;
BYTE byBBPreEDIndex;
Expand Down
18 changes: 9 additions & 9 deletions drivers/staging/vt6656/dpc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ s_vProcessRxMACHeader (
static BOOL s_bAPModeRxCtl(
PSDevice pDevice,
PBYTE pbyFrame,
INT iSANodeIndex
signed int iSANodeIndex
);


Expand All @@ -108,8 +108,8 @@ static BOOL s_bAPModeRxData (
struct sk_buff *skb,
UINT FrameSize,
UINT cbHeaderOffset,
INT iSANodeIndex,
INT iDANodeIndex
signed int iSANodeIndex,
signed int iDANodeIndex
);


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

{
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/vt6656/ioctl.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) {
BYTE abyNullAddr[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
DWORD dwKeyIndex= 0;
BYTE abyScanSSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1];
LONG ldBm;
signed long ldBm;

pReq->wResult = 0;

Expand Down
53 changes: 40 additions & 13 deletions drivers/staging/vt6656/mib.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,87 +187,114 @@ void STAvUpdateRDStatCounter (PSStatCounter pStatistic,
if(byRSR & RSR_CRCOK) {
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) {
pStatistic->CustomStat.ullRsr5M++;
if(byRSR & RSR_CRCOK) {
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) {
pStatistic->CustomStat.ullRsr2M++;
if(byRSR & RSR_CRCOK) {
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){
pStatistic->CustomStat.ullRsr1M++;
if(byRSR & RSR_CRCOK) {
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){
pStatistic->CustomStat.ullRsr6M++;
if(byRSR & RSR_CRCOK) {
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){
pStatistic->CustomStat.ullRsr9M++;
if(byRSR & RSR_CRCOK) {
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){
pStatistic->CustomStat.ullRsr12M++;
if(byRSR & RSR_CRCOK) {
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){
pStatistic->CustomStat.ullRsr18M++;
if(byRSR & RSR_CRCOK) {
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){
pStatistic->CustomStat.ullRsr24M++;
if(byRSR & RSR_CRCOK) {
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){
pStatistic->CustomStat.ullRsr36M++;
if(byRSR & RSR_CRCOK) {
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){
pStatistic->CustomStat.ullRsr48M++;
if(byRSR & RSR_CRCOK) {
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){
pStatistic->CustomStat.ullRsr54M++;
if(byRSR & RSR_CRCOK) {
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 {
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)
Expand Down
12 changes: 6 additions & 6 deletions drivers/staging/vt6656/mib.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,15 +85,15 @@ typedef struct tagSDot11Counters {
// MIB2 counter
//
typedef struct tagSMib2Counter {
LONG ifIndex;
signed long ifIndex;
char ifDescr[256]; // max size 255 plus zero ending
// e.g. "interface 1"
LONG ifType;
LONG ifMtu;
signed long ifType;
signed long ifMtu;
DWORD ifSpeed;
BYTE ifPhysAddress[ETH_ALEN];
LONG ifAdminStatus;
LONG ifOperStatus;
signed long ifAdminStatus;
signed long ifOperStatus;
DWORD ifLastChange;
DWORD ifInOctets;
DWORD ifInUcastPkts;
Expand Down Expand Up @@ -124,7 +124,7 @@ typedef struct tagSMib2Counter {
// RMON counter
//
typedef struct tagSRmonCounter {
LONG etherStatsIndex;
signed long etherStatsIndex;
DWORD etherStatsDataSource;
DWORD etherStatsDropEvents;
DWORD etherStatsOctets;
Expand Down
4 changes: 2 additions & 2 deletions drivers/staging/vt6656/rf.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -962,8 +962,8 @@ RFvRSSITodBm (
)
{
BYTE byIdx = (((byCurrRSSI & 0xC0) >> 6) & 0x03);
LONG b = (byCurrRSSI & 0x3F);
LONG a = 0;
signed long b = (byCurrRSSI & 0x3F);
signed long a = 0;
BYTE abyAIROHARF[4] = {0, 18, 0, 40};

switch (pDevice->byRFType) {
Expand Down
5 changes: 0 additions & 5 deletions drivers/staging/vt6656/ttype.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,6 @@ typedef int BOOL;

/****** Simple typedefs ***************************************************/

typedef char CHAR;
typedef signed short SHORT;
typedef signed int INT;
typedef signed long LONG;

typedef unsigned char UCHAR;
typedef unsigned short USHORT;
typedef unsigned int UINT;
Expand Down

0 comments on commit 213d2e9

Please sign in to comment.