renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-14 00:24:15 +08:00
Code

Staging: vt6655: remove custom ULONG typedef

Browse Source 
Signed-off-by: Charles Clément <caratorn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Charles Clément 2010-06-02 09:52:02 -07:00 committed by Greg Kroah-Hartman
parent b6e95cd52a
commit e3fd16d081
19 changed files with 67 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/staging/vt6655/baseband.c
View File

@ -1719,7 +1719,7 @@ const WORD awcFrameTime[MAX_RATE] =
/*--------------------- Static Functions --------------------------*/
static
ULONG
unsigned long
s_ulGetRatio(PSDevice pDevice);
static
@ -2651,12 +2651,12 @@ BBvExitDeepSleep (DWORD_PTR dwIoBase, BYTE byLocalID)
static
ULONG
unsigned long
s_ulGetRatio (PSDevice pDevice)
{
ULONG ulRatio = 0;
ULONG ulMaxPacket;
ULONG ulPacketNum;
unsigned long ulRatio = 0;
unsigned long ulMaxPacket;
unsigned long ulPacketNum;
//This is a thousand-ratio
ulMaxPacket = pDevice->uNumSQ3[RATE_54M];

6
drivers/staging/vt6655/bssdb.c
View File

@ -1680,9 +1680,9 @@ void s_uCalculateLinkQual(
)
{
PSDevice pDevice = (PSDevice)hDeviceContext;
ULONG TxOkRatio, TxCnt;
ULONG RxOkRatio,RxCnt;
ULONG RssiRatio;
unsigned long TxOkRatio, TxCnt;
unsigned long RxOkRatio,RxCnt;
unsigned long RssiRatio;
long ldBm;
TxCnt = pDevice->scStatistic.TxNoRetryOkCount +

2
drivers/staging/vt6655/bssdb.h
View File

@ -205,7 +205,7 @@ typedef struct tagKnownNodeDB {
BOOL bPSEnable;
BOOL bRxPSPoll;
BYTE byAuthSequence;
ULONG ulLastRxJiffer;
unsigned long ulLastRxJiffer;
BYTE bySuppRate;
DWORD dwFlags;
WORD wEnQueueCnt;

2
drivers/staging/vt6655/card.h
View File

@ -99,7 +99,7 @@ void CARDvUpdateNextTBTT(DWORD_PTR dwIoBase, QWORD qwTSF, WORD wBeaconInterval);
BOOL CARDbGetCurrentTSF(DWORD_PTR dwIoBase, PQWORD pqwCurrTSF);
QWORD CARDqGetNextTBTT(QWORD qwTSF, WORD wBeaconInterval);
QWORD CARDqGetTSFOffset(BYTE byRxRate, QWORD qwTSF1, QWORD qwTSF2);
BOOL CARDbSetTxPower(void *pDeviceHandler, ULONG ulTxPower);
BOOL CARDbSetTxPower(void *pDeviceHandler, unsigned long ulTxPower);
BYTE CARDbyGetPktType(void *pDeviceHandler);
void CARDvSafeResetTx(void *pDeviceHandler);
void CARDvSafeResetRx(void *pDeviceHandler);

28
drivers/staging/vt6655/device.h
View File

@ -250,7 +250,7 @@ typedef enum _NDIS_802_11_STATUS_TYPE
//Added new types for PMKID Candidate lists.
typedef struct _PMKID_CANDIDATE {
NDIS_802_11_MAC_ADDRESS BSSID;
ULONG Flags;
unsigned long Flags;
} PMKID_CANDIDATE, *PPMKID_CANDIDATE;
@ -261,15 +261,15 @@ typedef struct _BSSID_INFO
} BSSID_INFO, *PBSSID_INFO;
typedef struct tagSPMKID {
ULONG Length;
ULONG BSSIDInfoCount;
unsigned long Length;
unsigned long BSSIDInfoCount;
BSSID_INFO BSSIDInfo[MAX_BSSIDINFO_4_PMKID];
} SPMKID, *PSPMKID;
typedef struct tagSPMKIDCandidateEvent {
NDIS_802_11_STATUS_TYPE StatusType;
ULONG Version; // Version of the structure
ULONG NumCandidates; // No. of pmkid candidates
unsigned long Version; // Version of the structure
unsigned long NumCandidates; // No. of pmkid candidates
PMKID_CANDIDATE CandidateList[MAX_PMKIDLIST];
} SPMKIDCandidateEvent, *PSPMKIDCandidateEvent;
@ -618,7 +618,7 @@ typedef struct __device_info {
//WOW
BYTE abyIPAddr[4];
ULONG ulTxPower;
unsigned long ulTxPower;
NDIS_802_11_WEP_STATUS eEncryptionStatus;
BOOL bTransmitKey;
//2007-0925-01<Add>by MikeLiu
@ -712,7 +712,7 @@ typedef struct __device_info {
struct timer_list sTimerCommand;
#ifdef TxInSleep
struct timer_list sTimerTxData;
ULONG nTxDataTimeCout;
unsigned long nTxDataTimeCout;
BOOL fTxDataInSleep;
BOOL IsTxDataTrigger;
#endif
@ -728,18 +728,18 @@ typedef struct __device_info {
BOOL bDiversityRegCtlON;
BOOL bDiversityEnable;
ULONG ulDiversityNValue;
ULONG ulDiversityMValue;
unsigned long ulDiversityNValue;
unsigned long ulDiversityMValue;
BYTE byTMax;
BYTE byTMax2;
BYTE byTMax3;
ULONG ulSQ3TH;
unsigned long ulSQ3TH;
// ANT diversity
ULONG uDiversityCnt;
unsigned long uDiversityCnt;
BYTE byAntennaState;
ULONG ulRatio_State0;
ULONG ulRatio_State1;
unsigned long ulRatio_State0;
unsigned long ulRatio_State1;
//SQ3 functions for antenna diversity
struct timer_list TimerSQ3Tmax1;
@ -747,7 +747,7 @@ typedef struct __device_info {
struct timer_list TimerSQ3Tmax3;
ULONG uNumSQ3[MAX_RATE];
unsigned long uNumSQ3[MAX_RATE];
WORD wAntDiversityMaxRate;

13
drivers/staging/vt6655/device_main.c
View File

@ -588,7 +588,7 @@ static void device_init_registers(PSDevice pDevice, DEVICE_INIT_TYPE InitType)
pDevice->ulDiversityMValue = 100*16;//SROMbyReadEmbedded(pDevice->PortOffset, 0x52);
pDevice->byTMax = 1;//SROMbyReadEmbedded(pDevice->PortOffset, 0x53);
pDevice->byTMax2 = 4;//SROMbyReadEmbedded(pDevice->PortOffset, 0x54);
pDevice->ulSQ3TH = 0;//(ULONG) SROMbyReadEmbedded(pDevice->PortOffset, 0x55);
pDevice->ulSQ3TH = 0;//(unsigned long) SROMbyReadEmbedded(pDevice->PortOffset, 0x55);
pDevice->byTMax3 = 64;//SROMbyReadEmbedded(pDevice->PortOffset, 0x56);
if (byValue == (EEP_ANTENNA_AUX | EEP_ANTENNA_MAIN)) {
@ -851,17 +851,17 @@ else CARDbRadioPowerOn(pDevice);
static void device_init_diversity_timer(PSDevice pDevice) {
init_timer(&pDevice->TimerSQ3Tmax1);
pDevice->TimerSQ3Tmax1.data = (ULONG)pDevice;
pDevice->TimerSQ3Tmax1.data = (unsigned long) pDevice;
pDevice->TimerSQ3Tmax1.function = (TimerFunction)TimerSQ3CallBack;
pDevice->TimerSQ3Tmax1.expires = RUN_AT(HZ);
init_timer(&pDevice->TimerSQ3Tmax2);
pDevice->TimerSQ3Tmax2.data = (ULONG)pDevice;
pDevice->TimerSQ3Tmax2.data = (unsigned long) pDevice;
pDevice->TimerSQ3Tmax2.function = (TimerFunction)TimerSQ3CallBack;
pDevice->TimerSQ3Tmax2.expires = RUN_AT(HZ);
init_timer(&pDevice->TimerSQ3Tmax3);
pDevice->TimerSQ3Tmax3.data = (ULONG)pDevice;
pDevice->TimerSQ3Tmax3.data = (unsigned long) pDevice;
pDevice->TimerSQ3Tmax3.function = (TimerFunction)TimerState1CallBack;
pDevice->TimerSQ3Tmax3.expires = RUN_AT(HZ);
@ -1112,10 +1112,11 @@ static void device_print_info(PSDevice pDevice)
DBG_PRT(MSG_LEVEL_INFO, KERN_INFO "%s: %s\n",dev->name, get_chip_name(pDevice->chip_id));
DBG_PRT(MSG_LEVEL_INFO, KERN_INFO "%s: MAC=%pM", dev->name, dev->dev_addr);
#ifdef IO_MAP
DBG_PRT(MSG_LEVEL_INFO, KERN_INFO" IO=0x%lx ",(ULONG) pDevice->ioaddr);
DBG_PRT(MSG_LEVEL_INFO, KERN_INFO" IO=0x%lx ",(unsigned long) pDevice->ioaddr);
DBG_PRT(MSG_LEVEL_INFO, KERN_INFO" IRQ=%d \n", pDevice->dev->irq);
#else
DBG_PRT(MSG_LEVEL_INFO, KERN_INFO" IO=0x%lx Mem=0x%lx ",(ULONG) pDevice->ioaddr,(ULONG) pDevice->PortOffset);
DBG_PRT(MSG_LEVEL_INFO, KERN_INFO" IO=0x%lx Mem=0x%lx ",
(unsigned long) pDevice->ioaddr,(unsigned long) pDevice->PortOffset);
DBG_PRT(MSG_LEVEL_INFO, KERN_INFO" IRQ=%d \n", pDevice->dev->irq);
#endif

2
drivers/staging/vt6655/ioctl.c
View File

@ -719,7 +719,7 @@ vConfigWEPKey (
PSDevice pDevice,
DWORD dwKeyIndex,
PBYTE pbyKey,
ULONG uKeyLength
unsigned long uKeyLength
)
{
int ii;

2
drivers/staging/vt6655/ioctl.h
View File

@ -47,7 +47,7 @@ void vConfigWEPKey (
PSDevice pDevice,
DWORD dwKeyIndex,
PBYTE pbyKey,
ULONG uKeyLength
unsigned long uKeyLength
);
*/

6
drivers/staging/vt6655/key.c
View File

@ -193,7 +193,7 @@ BOOL KeybSetKey (
PSKeyManagement pTable,
PBYTE pbyBSSID,
DWORD dwKeyIndex,
ULONG uKeyLength,
unsigned long uKeyLength,
PQWORD pKeyRSC,
PBYTE pbyKey,
BYTE byKeyDecMode,
@ -634,7 +634,7 @@ BOOL KeybCheckPairewiseKey (
BOOL KeybSetDefaultKey (
PSKeyManagement pTable,
DWORD dwKeyIndex,
ULONG uKeyLength,
unsigned long uKeyLength,
PQWORD pKeyRSC,
PBYTE pbyKey,
BYTE byKeyDecMode,
@ -741,7 +741,7 @@ BOOL KeybSetDefaultKey (
BOOL KeybSetAllGroupKey (
PSKeyManagement pTable,
DWORD dwKeyIndex,
ULONG uKeyLength,
unsigned long uKeyLength,
PQWORD pKeyRSC,
PBYTE pbyKey,
BYTE byKeyDecMode,

8
drivers/staging/vt6655/key.h
View File

@ -58,7 +58,7 @@
typedef struct tagSKeyItem
{
BOOL bKeyValid;
ULONG uKeyLength;
unsigned long uKeyLength;
BYTE abyKey[MAX_KEY_LEN];
QWORD KeyRSC;
DWORD dwTSC47_16;
@ -114,7 +114,7 @@ BOOL KeybSetKey(
PSKeyManagement pTable,
PBYTE pbyBSSID,
DWORD dwKeyIndex,
ULONG uKeyLength,
unsigned long uKeyLength,
PQWORD pKeyRSC,
PBYTE pbyKey,
BYTE byKeyDecMode,
@ -125,7 +125,7 @@ BOOL KeybSetKey(
BOOL KeybSetDefaultKey(
PSKeyManagement pTable,
DWORD dwKeyIndex,
ULONG uKeyLength,
unsigned long uKeyLength,
PQWORD pKeyRSC,
PBYTE pbyKey,
BYTE byKeyDecMode,
@ -172,7 +172,7 @@ void KeyvRemoveAllWEPKey(
BOOL KeybSetAllGroupKey (
PSKeyManagement pTable,
DWORD dwKeyIndex,
ULONG uKeyLength,
unsigned long uKeyLength,
PQWORD pKeyRSC,
PBYTE pbyKey,
BYTE byKeyDecMode,

20
drivers/staging/vt6655/mib.h
View File

@ -39,7 +39,7 @@
//
typedef struct tagSDot11Counters {
ULONG Length; // Length of structure
unsigned long Length; // Length of structure
ULONGLONG TransmittedFragmentCount;
ULONGLONG MulticastTransmittedFrameCount;
ULONGLONG FailedCount;
@ -138,7 +138,7 @@ typedef struct tagSRmonCounter {
// Custom counter
//
typedef struct tagSCustomCounters {
ULONG Length;
unsigned long Length;
ULONGLONG ullTsrAllOK;
@ -177,7 +177,7 @@ typedef struct tagSCustomCounters {
// Custom counter
//
typedef struct tagSISRCounters {
ULONG Length;
unsigned long Length;
DWORD dwIsrTx0OK;
DWORD dwIsrAC0TxOK;
@ -324,15 +324,15 @@ typedef struct tagSStatCounter {
#ifdef Calcu_LinkQual
//Tx count:
ULONG TxNoRetryOkCount; //success tx no retry !
ULONG TxRetryOkCount; //success tx but retry !
ULONG TxFailCount; //fail tx ?
unsigned long TxNoRetryOkCount; //success tx no retry !
unsigned long TxRetryOkCount; //success tx but retry !
unsigned long TxFailCount; //fail tx ?
//Rx count:
ULONG RxOkCnt; //success rx !
ULONG RxFcsErrCnt; //fail rx ?
unsigned long RxOkCnt; //success rx !
unsigned long RxFcsErrCnt; //fail rx ?
//statistic
ULONG SignalStren;
ULONG LinkQuality;
unsigned long SignalStren;
unsigned long LinkQuality;
#endif
} SStatCounter, *PSStatCounter;

1
drivers/staging/vt6655/ttype.h
View File

@ -68,7 +68,6 @@ typedef int BOOL;
* but it doesn't matter if they're signed or unsigned.
*/
typedef unsigned long ULONG;
typedef unsigned long long ULONGLONG; //64 bit

2
drivers/staging/vt6655/upc.h
View File

@ -141,7 +141,7 @@
#define PCAvDelayByIO(uDelayUnit) { \
BYTE byData; \
ULONG ii; \
unsigned long ii; \
\
if (uDelayUnit <= 50) { \
udelay(uDelayUnit); \

2
drivers/staging/vt6655/vntwifi.c
View File

@ -665,7 +665,7 @@ VNTWIFIbInit(
BOOL
VNTWIFIbSetPMKIDCache (
void *pMgmtObject,
ULONG ulCount,
unsigned long ulCount,
void *pPMKIDInfo
)
{

2
drivers/staging/vt6655/vntwifi.h
View File

@ -265,7 +265,7 @@ VNTWIFIbyGetKeyCypher(
BOOL
VNTWIFIbSetPMKIDCache (
void *pMgmtObject,
ULONG ulCount,
unsigned long ulCount,
void *pPMKIDInfo
);

6
drivers/staging/vt6655/wcmd.c
View File

@ -326,7 +326,7 @@ vCommandTimerWait(
PSDevice pDevice = (PSDevice)hDeviceContext;
init_timer(&pDevice->sTimerCommand);
pDevice->sTimerCommand.data = (ULONG)pDevice;
pDevice->sTimerCommand.data = (unsigned long) pDevice;
pDevice->sTimerCommand.function = (TimerFunction)vCommandTimer;
// RUN_AT :1 msec ~= (HZ/1024)
pDevice->sTimerCommand.expires = (unsigned int)RUN_AT((MSecond * HZ) >> 10);
@ -723,7 +723,7 @@ printk("chester-abyDesireSSID=%s\n",((PWLAN_IE_SSID)pMgmt->abyDesireSSID)->abySS
// printk("Re-initial TxDataTimer****\n");
del_timer(&pDevice->sTimerTxData);
init_timer(&pDevice->sTimerTxData);
pDevice->sTimerTxData.data = (ULONG)pDevice;
pDevice->sTimerTxData.data = (unsigned long) pDevice;
pDevice->sTimerTxData.function = (TimerFunction)BSSvSecondTxData;
pDevice->sTimerTxData.expires = RUN_AT(10*HZ); //10s callback
pDevice->fTxDataInSleep = FALSE;
@ -1092,7 +1092,7 @@ vResetCommandTimer(
del_timer(&pDevice->sTimerCommand);
//init timer
init_timer(&pDevice->sTimerCommand);
pDevice->sTimerCommand.data = (ULONG)pDevice;
pDevice->sTimerCommand.data = (unsigned long) pDevice;
pDevice->sTimerCommand.function = (TimerFunction)vCommandTimer;
pDevice->sTimerCommand.expires = RUN_AT(HZ);
pDevice->cbFreeCmdQueue = CMD_Q_SIZE;

6
drivers/staging/vt6655/wmgr.c
View File

@ -393,18 +393,18 @@ vMgrTimerInit(
init_timer(&pMgmt->sTimerSecondCallback);
pMgmt->sTimerSecondCallback.data = (ULONG)pDevice;
pMgmt->sTimerSecondCallback.data = (unsigned long) pDevice;
pMgmt->sTimerSecondCallback.function = (TimerFunction)BSSvSecondCallBack;
pMgmt->sTimerSecondCallback.expires = RUN_AT(HZ);
init_timer(&pDevice->sTimerCommand);
pDevice->sTimerCommand.data = (ULONG)pDevice;
pDevice->sTimerCommand.data = (unsigned long) pDevice;
pDevice->sTimerCommand.function = (TimerFunction)vCommandTimer;
pDevice->sTimerCommand.expires = RUN_AT(HZ);
#ifdef TxInSleep
init_timer(&pDevice->sTimerTxData);
pDevice->sTimerTxData.data = (ULONG)pDevice;
pDevice->sTimerTxData.data = (unsigned long) pDevice;
pDevice->sTimerTxData.function = (TimerFunction)BSSvSecondTxData;
pDevice->sTimerTxData.expires = RUN_AT(10*HZ); //10s callback
pDevice->fTxDataInSleep = FALSE;

14
drivers/staging/vt6655/wmgr.h
View File

@ -83,7 +83,7 @@
/*--------------------- Export Types ------------------------------*/
#define timer_expire(timer,next_tick) mod_timer(&timer, RUN_AT(next_tick))
typedef void (*TimerFunction)(ULONG);
typedef void (*TimerFunction)(unsigned long);
//+++ NDIS related
@ -105,15 +105,15 @@ typedef struct _NDIS_802_11_AI_RESFI
typedef struct _NDIS_802_11_ASSOCIATION_INFORMATION
{
ULONG Length;
unsigned long Length;
unsigned short AvailableRequestFixedIEs;
NDIS_802_11_AI_REQFI RequestFixedIEs;
ULONG RequestIELength;
ULONG OffsetRequestIEs;
unsigned long RequestIELength;
unsigned long OffsetRequestIEs;
unsigned short AvailableResponseFixedIEs;
NDIS_802_11_AI_RESFI ResponseFixedIEs;
ULONG ResponseIELength;
ULONG OffsetResponseIEs;
unsigned long ResponseIELength;
unsigned long OffsetResponseIEs;
} NDIS_802_11_ASSOCIATION_INFORMATION, *PNDIS_802_11_ASSOCIATION_INFORMATION;
@ -122,7 +122,7 @@ typedef struct tagSAssocInfo {
NDIS_802_11_ASSOCIATION_INFORMATION AssocInfo;
BYTE abyIEs[WLAN_BEACON_FR_MAXLEN+WLAN_BEACON_FR_MAXLEN];
// store ReqIEs set by OID_802_11_ASSOCIATION_INFORMATION
ULONG RequestIELength;
unsigned long RequestIELength;
BYTE abyReqIEs[WLAN_BEACON_FR_MAXLEN];
} SAssocInfo, *PSAssocInfo;
//---

2
drivers/staging/vt6655/wpa2.h
View File

@ -45,7 +45,7 @@ typedef struct tagsPMKIDInfo {
} PMKIDInfo, *PPMKIDInfo;
typedef struct tagSPMKIDCache {
ULONG BSSIDInfoCount;
unsigned long BSSIDInfoCount;
PMKIDInfo BSSIDInfo[MAX_PMKID_CACHE];
} SPMKIDCache, *PSPMKIDCache;