Commit b83cc2ed authored by Charles Clément's avatar Charles Clément Committed by Greg Kroah-Hartman

Staging: vt6655: remove custom LONG typedef

Signed-off-by: default avatarCharles Clément <caratorn@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 7ca30195
...@@ -609,7 +609,7 @@ BSSbUpdateToBSSList ( ...@@ -609,7 +609,7 @@ BSSbUpdateToBSSList (
PSDevice pDevice = (PSDevice)hDeviceContext; PSDevice pDevice = (PSDevice)hDeviceContext;
PSMgmtObject pMgmt = pDevice->pMgmt; PSMgmtObject pMgmt = pDevice->pMgmt;
PSRxMgmtPacket pRxPacket = (PSRxMgmtPacket)pRxPacketContext; PSRxMgmtPacket pRxPacket = (PSRxMgmtPacket)pRxPacketContext;
LONG ldBm; long ldBm;
BOOL bParsingQuiet = FALSE; BOOL bParsingQuiet = FALSE;
PWLAN_IE_QUIET pQuiet = NULL; PWLAN_IE_QUIET pQuiet = NULL;
...@@ -1629,8 +1629,8 @@ void s_vCheckSensitivity( ...@@ -1629,8 +1629,8 @@ void s_vCheckSensitivity(
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. // Updata BB Reg if RSSI is too strong.
LONG LocalldBmAverage = 0; long LocalldBmAverage = 0;
LONG uNumofdBm = 0; 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 ++;
......
...@@ -118,9 +118,9 @@ typedef struct tagKnownBSS { ...@@ -118,9 +118,9 @@ typedef struct tagKnownBSS {
// WORD wATIMWindow; // WORD wATIMWindow;
BYTE byRSSIStatCnt; BYTE byRSSIStatCnt;
LONG ldBmMAX; long ldBmMAX;
LONG ldBmAverage[RSSI_STAT_COUNT]; long ldBmAverage[RSSI_STAT_COUNT];
LONG ldBmAverRange; long ldBmAverRange;
//For any BSSID selection improvment //For any BSSID selection improvment
BOOL bSelected; BOOL bSelected;
......
...@@ -666,7 +666,7 @@ typedef struct __device_info { ...@@ -666,7 +666,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]; long ldBmThreshold[BB_VGA_LEVEL];
BYTE byBBPreEDRSSI; BYTE byBBPreEDRSSI;
BYTE byBBPreEDIndex; BYTE byBBPreEDIndex;
...@@ -684,7 +684,7 @@ typedef struct __device_info { ...@@ -684,7 +684,7 @@ typedef struct __device_info {
short sPSetPointCCK; short sPSetPointCCK;
short sPSetPointOFDMG; short sPSetPointOFDMG;
short sPSetPointOFDMA; short sPSetPointOFDMA;
LONG lPFormulaOffset; long lPFormulaOffset;
short sPThreshold; short sPThreshold;
char cAdjustStep; char cAdjustStep;
char cMinTxAGC; char cMinTxAGC;
......
...@@ -2830,7 +2830,7 @@ static irqreturn_t device_intr(int irq, void *dev_instance) { ...@@ -2830,7 +2830,7 @@ static irqreturn_t device_intr(int irq, void *dev_instance) {
//pDevice->bBeaconSent = FALSE; //pDevice->bBeaconSent = FALSE;
} else { } else {
if ((pDevice->bUpdateBBVGA) && (pDevice->bLinkPass == TRUE) && (pDevice->uCurrRSSI != 0)) { if ((pDevice->bUpdateBBVGA) && (pDevice->bLinkPass == TRUE) && (pDevice->uCurrRSSI != 0)) {
LONG ldBm; long ldBm;
RFvRSSITodBm(pDevice, (BYTE) pDevice->uCurrRSSI, &ldBm); RFvRSSITodBm(pDevice, (BYTE) pDevice->uCurrRSSI, &ldBm);
for (ii=0;ii<BB_VGA_LEVEL;ii++) { for (ii=0;ii<BB_VGA_LEVEL;ii++) {
......
...@@ -375,8 +375,8 @@ device_receive_frame ( ...@@ -375,8 +375,8 @@ device_receive_frame (
SKeyItem STempKey; SKeyItem STempKey;
// 802.11h RPI // 802.11h RPI
DWORD dwDuration = 0; DWORD dwDuration = 0;
LONG ldBm = 0; long ldBm = 0;
LONG ldBmThreshold = 0; long ldBmThreshold = 0;
PS802_11Header pMACHeader; PS802_11Header pMACHeader;
BOOL bRxeapol_key = FALSE; BOOL bRxeapol_key = FALSE;
......
...@@ -79,7 +79,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) { ...@@ -79,7 +79,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; long ldBm;
pReq->wResult = 0; pReq->wResult = 0;
......
...@@ -72,15 +72,15 @@ typedef struct tagSDot11Counters { ...@@ -72,15 +72,15 @@ typedef struct tagSDot11Counters {
// MIB2 counter // MIB2 counter
// //
typedef struct tagSMib2Counter { typedef struct tagSMib2Counter {
LONG ifIndex; 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; long ifType;
LONG ifMtu; long ifMtu;
DWORD ifSpeed; DWORD ifSpeed;
BYTE ifPhysAddress[ETH_ALEN]; BYTE ifPhysAddress[ETH_ALEN];
LONG ifAdminStatus; long ifAdminStatus;
LONG ifOperStatus; long ifOperStatus;
DWORD ifLastChange; DWORD ifLastChange;
DWORD ifInOctets; DWORD ifInOctets;
DWORD ifInUcastPkts; DWORD ifInUcastPkts;
...@@ -111,7 +111,7 @@ typedef struct tagSMib2Counter { ...@@ -111,7 +111,7 @@ typedef struct tagSMib2Counter {
// RMON counter // RMON counter
// //
typedef struct tagSRmonCounter { typedef struct tagSRmonCounter {
LONG etherStatsIndex; long etherStatsIndex;
DWORD etherStatsDataSource; DWORD etherStatsDataSource;
DWORD etherStatsDropEvents; DWORD etherStatsDropEvents;
DWORD etherStatsOctets; DWORD etherStatsOctets;
......
...@@ -1209,8 +1209,8 @@ RFvRSSITodBm ( ...@@ -1209,8 +1209,8 @@ RFvRSSITodBm (
) )
{ {
BYTE byIdx = (((byCurrRSSI & 0xC0) >> 6) & 0x03); BYTE byIdx = (((byCurrRSSI & 0xC0) >> 6) & 0x03);
LONG b = (byCurrRSSI & 0x3F); long b = (byCurrRSSI & 0x3F);
LONG a = 0; long a = 0;
BYTE abyAIROHARF[4] = {0, 18, 0, 40}; BYTE abyAIROHARF[4] = {0, 18, 0, 40};
switch (pDevice->byRFType) { switch (pDevice->byRFType) {
......
...@@ -68,8 +68,6 @@ typedef int BOOL; ...@@ -68,8 +68,6 @@ typedef int BOOL;
* but it doesn't matter if they're signed or unsigned. * but it doesn't matter if they're signed or unsigned.
*/ */
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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment