hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Staging: vt6655: remove custom UINT typedef 

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:01 -07:00 committed by Greg Kroah-Hartman
parent 800acdbdf8
commit b6e95cd52a
47 changed files with 544 additions and 537 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
drivers/staging/vt6655/80211mgr.h
View File

@ -495,8 +495,8 @@ typedef struct _WLAN_IE_IBSS_DFS {
// prototype structure, all mgmt frame types will start with these members // prototype structure, all mgmt frame types will start with these members
typedef struct tagWLAN_FR_MGMT { typedef struct tagWLAN_FR_MGMT {
UINT uType; unsigned int uType;
UINT len; unsigned int len;
PBYTE pBuf; PBYTE pBuf;
PUWLAN_80211HDR pHdr; PUWLAN_80211HDR pHdr;
@ -505,8 +505,8 @@ typedef struct tagWLAN_FR_MGMT {
// Beacon frame // Beacon frame
typedef struct tagWLAN_FR_BEACON { typedef struct tagWLAN_FR_BEACON {
UINT uType; unsigned int uType;
UINT len; unsigned int len;
PBYTE pBuf; PBYTE pBuf;
PUWLAN_80211HDR pHdr; PUWLAN_80211HDR pHdr;
// fixed fields // fixed fields
@ -537,8 +537,8 @@ typedef struct tagWLAN_FR_BEACON {
// IBSS ATIM frame // IBSS ATIM frame
typedef struct tagWLAN_FR_IBSSATIM { typedef struct tagWLAN_FR_IBSSATIM {
UINT uType; unsigned int uType;
UINT len; unsigned int len;
PBYTE pBuf; PBYTE pBuf;
PUWLAN_80211HDR pHdr; PUWLAN_80211HDR pHdr;
@ -551,8 +551,8 @@ typedef struct tagWLAN_FR_IBSSATIM {
// Disassociation // Disassociation
typedef struct tagWLAN_FR_DISASSOC { typedef struct tagWLAN_FR_DISASSOC {
UINT uType; unsigned int uType;
UINT len; unsigned int len;
PBYTE pBuf; PBYTE pBuf;
PUWLAN_80211HDR pHdr; PUWLAN_80211HDR pHdr;
/*-- fixed fields -----------*/ /*-- fixed fields -----------*/
@ -564,8 +564,8 @@ typedef struct tagWLAN_FR_DISASSOC {
// Association Request // Association Request
typedef struct tagWLAN_FR_ASSOCREQ { typedef struct tagWLAN_FR_ASSOCREQ {
UINT uType; unsigned int uType;
UINT len; unsigned int len;
PBYTE pBuf; PBYTE pBuf;
PUWLAN_80211HDR pHdr; PUWLAN_80211HDR pHdr;
/*-- fixed fields -----------*/ /*-- fixed fields -----------*/
@ -585,8 +585,8 @@ typedef struct tagWLAN_FR_ASSOCREQ {
// Association Response // Association Response
typedef struct tagWLAN_FR_ASSOCRESP { typedef struct tagWLAN_FR_ASSOCRESP {
UINT uType; unsigned int uType;
UINT len; unsigned int len;
PBYTE pBuf; PBYTE pBuf;
PUWLAN_80211HDR pHdr; PUWLAN_80211HDR pHdr;
/*-- fixed fields -----------*/ /*-- fixed fields -----------*/
@ -602,8 +602,8 @@ typedef struct tagWLAN_FR_ASSOCRESP {
// Reassociation Request // Reassociation Request
typedef struct tagWLAN_FR_REASSOCREQ { typedef struct tagWLAN_FR_REASSOCREQ {
UINT uType; unsigned int uType;
UINT len; unsigned int len;
PBYTE pBuf; PBYTE pBuf;
PUWLAN_80211HDR pHdr; PUWLAN_80211HDR pHdr;
@ -624,8 +624,8 @@ typedef struct tagWLAN_FR_REASSOCREQ {
// Reassociation Response // Reassociation Response
typedef struct tagWLAN_FR_REASSOCRESP { typedef struct tagWLAN_FR_REASSOCRESP {
UINT uType; unsigned int uType;
UINT len; unsigned int len;
PBYTE pBuf; PBYTE pBuf;
PUWLAN_80211HDR pHdr; PUWLAN_80211HDR pHdr;
/*-- fixed fields -----------*/ /*-- fixed fields -----------*/
@ -641,8 +641,8 @@ typedef struct tagWLAN_FR_REASSOCRESP {
// Probe Request // Probe Request
typedef struct tagWLAN_FR_PROBEREQ { typedef struct tagWLAN_FR_PROBEREQ {
UINT uType; unsigned int uType;
UINT len; unsigned int len;
PBYTE pBuf; PBYTE pBuf;
PUWLAN_80211HDR pHdr; PUWLAN_80211HDR pHdr;
/*-- fixed fields -----------*/ /*-- fixed fields -----------*/
@ -656,8 +656,8 @@ typedef struct tagWLAN_FR_PROBEREQ {
// Probe Response // Probe Response
typedef struct tagWLAN_FR_PROBERESP { typedef struct tagWLAN_FR_PROBERESP {
UINT uType; unsigned int uType;
UINT len; unsigned int len;
PBYTE pBuf; PBYTE pBuf;
PUWLAN_80211HDR pHdr; PUWLAN_80211HDR pHdr;
/*-- fixed fields -----------*/ /*-- fixed fields -----------*/
@ -685,8 +685,8 @@ typedef struct tagWLAN_FR_PROBERESP {
// Authentication // Authentication
typedef struct tagWLAN_FR_AUTHEN { typedef struct tagWLAN_FR_AUTHEN {
UINT uType; unsigned int uType;
UINT len; unsigned int len;
PBYTE pBuf; PBYTE pBuf;
PUWLAN_80211HDR pHdr; PUWLAN_80211HDR pHdr;
/*-- fixed fields -----------*/ /*-- fixed fields -----------*/
@ -701,8 +701,8 @@ typedef struct tagWLAN_FR_AUTHEN {
// Deauthenication // Deauthenication
typedef struct tagWLAN_FR_DEAUTHEN { typedef struct tagWLAN_FR_DEAUTHEN {
UINT uType; unsigned int uType;
UINT len; unsigned int len;
PBYTE pBuf; PBYTE pBuf;
PUWLAN_80211HDR pHdr; PUWLAN_80211HDR pHdr;
/*-- fixed fields -----------*/ /*-- fixed fields -----------*/

5
drivers/staging/vt6655/IEEE11h.c
View File

@ -97,7 +97,8 @@ typedef struct _WLAN_FRAME_TPCREP {
/*--------------------- Static Variables --------------------------*/ /*--------------------- Static Variables --------------------------*/
/*--------------------- Static Functions --------------------------*/ /*--------------------- Static Functions --------------------------*/
static BOOL s_bRxMSRReq(PSMgmtObject pMgmt, PWLAN_FRAME_MSRREQ pMSRReq, UINT uLength) static BOOL s_bRxMSRReq(PSMgmtObject pMgmt, PWLAN_FRAME_MSRREQ pMSRReq,
unsigned int uLength)
{ {
size_t uNumOfEIDs = 0; size_t uNumOfEIDs = 0;
BOOL bResult = TRUE; BOOL bResult = TRUE;
@ -209,7 +210,7 @@ IEEE11hbMgrRxAction (
{ {
PSMgmtObject pMgmt = (PSMgmtObject) pMgmtHandle; PSMgmtObject pMgmt = (PSMgmtObject) pMgmtHandle;
PWLAN_FRAME_ACTION pAction = NULL; PWLAN_FRAME_ACTION pAction = NULL;
UINT uLength = 0; unsigned int uLength = 0;
PWLAN_IE_CH_SW pChannelSwitch = NULL; PWLAN_IE_CH_SW pChannelSwitch = NULL;

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

@ -1776,19 +1776,19 @@ s_vChangeAntenna (
* Return Value: FrameTime * Return Value: FrameTime
* *
*/ */
UINT unsigned int
BBuGetFrameTime ( BBuGetFrameTime (
BYTE byPreambleType, BYTE byPreambleType,
BYTE byPktType, BYTE byPktType,
UINT cbFrameLength, unsigned int cbFrameLength,
WORD wRate WORD wRate
) )
{ {
UINT uFrameTime; unsigned int uFrameTime;
UINT uPreamble; unsigned int uPreamble;
UINT uTmp; unsigned int uTmp;
UINT uRateIdx = (UINT)wRate; unsigned int uRateIdx = (unsigned int) wRate;
UINT uRate = 0; unsigned int uRate = 0;
if (uRateIdx > RATE_54M) { if (uRateIdx > RATE_54M) {
@ -1796,7 +1796,7 @@ BBuGetFrameTime (
return 0; return 0;
} }
uRate = (UINT)awcFrameTime[uRateIdx]; uRate = (unsigned int) awcFrameTime[uRateIdx];
if (uRateIdx <= 3) { //CCK mode if (uRateIdx <= 3) { //CCK mode
@ -1846,7 +1846,7 @@ BBuGetFrameTime (
void void
BBvCaculateParameter ( BBvCaculateParameter (
PSDevice pDevice, PSDevice pDevice,
UINT cbFrameLength, unsigned int cbFrameLength,
WORD wRate, WORD wRate,
BYTE byPacketType, BYTE byPacketType,
PWORD pwPhyLen, PWORD pwPhyLen,
@ -1854,9 +1854,9 @@ BBvCaculateParameter (
PBYTE pbyPhySgn PBYTE pbyPhySgn
) )
{ {
UINT cbBitCount; unsigned int cbBitCount;
UINT cbUsCount = 0; unsigned int cbUsCount = 0;
UINT cbTmp; unsigned int cbTmp;
BOOL bExtBit; BOOL bExtBit;
BYTE byPreambleType = pDevice->byPreambleType; BYTE byPreambleType = pDevice->byPreambleType;
BOOL bCCK = pDevice->bCCK; BOOL bCCK = pDevice->bCCK;
@ -2762,7 +2762,7 @@ ULONG ulPacketNum;
void void
BBvClearAntDivSQ3Value (PSDevice pDevice) BBvClearAntDivSQ3Value (PSDevice pDevice)
{ {
UINT ii; unsigned int ii;
pDevice->uDiversityCnt = 0; pDevice->uDiversityCnt = 0;
for (ii = 0; ii < MAX_RATE; ii++) { for (ii = 0; ii < MAX_RATE; ii++) {

6
drivers/staging/vt6655/baseband.h
View File

@ -118,18 +118,18 @@
/*--------------------- Export Functions --------------------------*/ /*--------------------- Export Functions --------------------------*/
UINT unsigned int
BBuGetFrameTime( BBuGetFrameTime(
BYTE byPreambleType, BYTE byPreambleType,
BYTE byPktType, BYTE byPktType,
UINT cbFrameLength, unsigned int cbFrameLength,
WORD wRate WORD wRate
); );
void void
BBvCaculateParameter ( BBvCaculateParameter (
PSDevice pDevice, PSDevice pDevice,
UINT cbFrameLength, unsigned int cbFrameLength,
WORD wRate, WORD wRate,
BYTE byPacketType, BYTE byPacketType,
PWORD pwPhyLen, PWORD pwPhyLen,

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

@ -138,8 +138,8 @@ BSSpSearchBSSList(
PKnownBSS pCurrBSS = NULL; PKnownBSS pCurrBSS = NULL;
PKnownBSS pSelect = NULL; PKnownBSS pSelect = NULL;
BYTE ZeroBSSID[WLAN_BSSID_LEN]={0x00,0x00,0x00,0x00,0x00,0x00}; BYTE ZeroBSSID[WLAN_BSSID_LEN]={0x00,0x00,0x00,0x00,0x00,0x00};
UINT ii = 0; unsigned int ii = 0;
// UINT jj = 0; //DavidWang
if (pbyDesireBSSID != NULL) { if (pbyDesireBSSID != NULL) {
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"BSSpSearchBSSList BSSID[%02X %02X %02X-%02X %02X %02X]\n", DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"BSSpSearchBSSList BSSID[%02X %02X %02X-%02X %02X %02X]\n",
*pbyDesireBSSID,*(pbyDesireBSSID+1),*(pbyDesireBSSID+2), *pbyDesireBSSID,*(pbyDesireBSSID+1),*(pbyDesireBSSID+2),
@ -288,7 +288,7 @@ BSSvClearBSSList(
{ {
PSDevice pDevice = (PSDevice)hDeviceContext; PSDevice pDevice = (PSDevice)hDeviceContext;
PSMgmtObject pMgmt = pDevice->pMgmt; PSMgmtObject pMgmt = pDevice->pMgmt;
UINT ii; unsigned int ii;
for (ii = 0; ii < MAX_BSS_NUM; ii++) { for (ii = 0; ii < MAX_BSS_NUM; ii++) {
if (bKeepCurrBSSID) { if (bKeepCurrBSSID) {
@ -333,7 +333,7 @@ BSSpAddrIsInBSSList(
PSDevice pDevice = (PSDevice)hDeviceContext; PSDevice pDevice = (PSDevice)hDeviceContext;
PSMgmtObject pMgmt = pDevice->pMgmt; PSMgmtObject pMgmt = pDevice->pMgmt;
PKnownBSS pBSSList = NULL; PKnownBSS pBSSList = NULL;
UINT ii; unsigned int ii;
for (ii = 0; ii < MAX_BSS_NUM; ii++) { for (ii = 0; ii < MAX_BSS_NUM; ii++) {
pBSSList = &(pMgmt->sBSSList[ii]); pBSSList = &(pMgmt->sBSSList[ii]);
@ -382,7 +382,7 @@ BSSbInsertToBSSList (
PWLAN_IE_RSN_EXT pRSNWPA, PWLAN_IE_RSN_EXT pRSNWPA,
PWLAN_IE_COUNTRY pIE_Country, PWLAN_IE_COUNTRY pIE_Country,
PWLAN_IE_QUIET pIE_Quiet, PWLAN_IE_QUIET pIE_Quiet,
UINT uIELength, unsigned int uIELength,
PBYTE pbyIEs, PBYTE pbyIEs,
void *pRxPacketContext void *pRxPacketContext
) )
@ -392,7 +392,7 @@ BSSbInsertToBSSList (
PSMgmtObject pMgmt = pDevice->pMgmt; PSMgmtObject pMgmt = pDevice->pMgmt;
PSRxMgmtPacket pRxPacket = (PSRxMgmtPacket)pRxPacketContext; PSRxMgmtPacket pRxPacket = (PSRxMgmtPacket)pRxPacketContext;
PKnownBSS pBSSList = NULL; PKnownBSS pBSSList = NULL;
UINT ii; unsigned int ii;
BOOL bParsingQuiet = FALSE; BOOL bParsingQuiet = FALSE;
PWLAN_IE_QUIET pQuiet = NULL; PWLAN_IE_QUIET pQuiet = NULL;
@ -468,9 +468,9 @@ BSSbInsertToBSSList (
WPA_ClearRSN(pBSSList); WPA_ClearRSN(pBSSList);
if (pRSNWPA != NULL) { if (pRSNWPA != NULL) {
UINT uLen = pRSNWPA->len + 2; unsigned int uLen = pRSNWPA->len + 2;
if (uLen <= (uIELength - (UINT)(ULONG_PTR)((PBYTE)pRSNWPA - pbyIEs))) { if (uLen <= (uIELength - (unsigned int)(ULONG_PTR)((PBYTE)pRSNWPA - pbyIEs))) {
pBSSList->wWPALen = uLen; pBSSList->wWPALen = uLen;
memcpy(pBSSList->byWPAIE, pRSNWPA, uLen); memcpy(pBSSList->byWPAIE, pRSNWPA, uLen);
WPA_ParseRSN(pBSSList, pRSNWPA); WPA_ParseRSN(pBSSList, pRSNWPA);
@ -480,8 +480,8 @@ BSSbInsertToBSSList (
WPA2_ClearRSN(pBSSList); WPA2_ClearRSN(pBSSList);
if (pRSN != NULL) { if (pRSN != NULL) {
UINT uLen = pRSN->len + 2; unsigned int uLen = pRSN->len + 2;
if (uLen <= (uIELength - (UINT)(ULONG_PTR)((PBYTE)pRSN - pbyIEs))) { if (uLen <= (uIELength - (unsigned int)(ULONG_PTR)((PBYTE)pRSN - pbyIEs))) {
pBSSList->wRSNLen = uLen; pBSSList->wRSNLen = uLen;
memcpy(pBSSList->byRSNIE, pRSN, uLen); memcpy(pBSSList->byRSNIE, pRSN, uLen);
WPA2vParseRSN(pBSSList, pRSN); WPA2vParseRSN(pBSSList, pRSN);
@ -600,7 +600,7 @@ BSSbUpdateToBSSList (
PWLAN_IE_COUNTRY pIE_Country, PWLAN_IE_COUNTRY pIE_Country,
PWLAN_IE_QUIET pIE_Quiet, PWLAN_IE_QUIET pIE_Quiet,
PKnownBSS pBSSList, PKnownBSS pBSSList,
UINT uIELength, unsigned int uIELength,
PBYTE pbyIEs, PBYTE pbyIEs,
void *pRxPacketContext void *pRxPacketContext
) )
@ -670,8 +670,8 @@ BSSbUpdateToBSSList (
WPA_ClearRSN(pBSSList); //mike update WPA_ClearRSN(pBSSList); //mike update
if (pRSNWPA != NULL) { if (pRSNWPA != NULL) {
UINT uLen = pRSNWPA->len + 2; unsigned int uLen = pRSNWPA->len + 2;
if (uLen <= (uIELength - (UINT)(ULONG_PTR)((PBYTE)pRSNWPA - pbyIEs))) { if (uLen <= (uIELength - (unsigned int)(ULONG_PTR)((PBYTE)pRSNWPA - pbyIEs))) {
pBSSList->wWPALen = uLen; pBSSList->wWPALen = uLen;
memcpy(pBSSList->byWPAIE, pRSNWPA, uLen); memcpy(pBSSList->byWPAIE, pRSNWPA, uLen);
WPA_ParseRSN(pBSSList, pRSNWPA); WPA_ParseRSN(pBSSList, pRSNWPA);
@ -681,8 +681,8 @@ BSSbUpdateToBSSList (
WPA2_ClearRSN(pBSSList); //mike update WPA2_ClearRSN(pBSSList); //mike update
if (pRSN != NULL) { if (pRSN != NULL) {
UINT uLen = pRSN->len + 2; unsigned int uLen = pRSN->len + 2;
if (uLen <= (uIELength - (UINT)(ULONG_PTR)((PBYTE)pRSN - pbyIEs))) { if (uLen <= (uIELength - (unsigned int)(ULONG_PTR)((PBYTE)pRSN - pbyIEs))) {
pBSSList->wRSNLen = uLen; pBSSList->wRSNLen = uLen;
memcpy(pBSSList->byRSNIE, pRSN, uLen); memcpy(pBSSList->byRSNIE, pRSN, uLen);
WPA2vParseRSN(pBSSList, pRSN); WPA2vParseRSN(pBSSList, pRSN);
@ -770,7 +770,7 @@ BSSDBbIsSTAInNodeDB(
) )
{ {
PSMgmtObject pMgmt = (PSMgmtObject) pMgmtObject; PSMgmtObject pMgmt = (PSMgmtObject) pMgmtObject;
UINT ii; unsigned int ii;
// Index = 0 reserved for AP Node // Index = 0 reserved for AP Node
for (ii = 1; ii < (MAX_NODE_NUM + 1); ii++) { for (ii = 1; ii < (MAX_NODE_NUM + 1); ii++) {
@ -806,9 +806,9 @@ BSSvCreateOneNode(
PSDevice pDevice = (PSDevice)hDeviceContext; PSDevice pDevice = (PSDevice)hDeviceContext;
PSMgmtObject pMgmt = pDevice->pMgmt; PSMgmtObject pMgmt = pDevice->pMgmt;
UINT ii; unsigned int ii;
UINT BigestCount = 0; unsigned int BigestCount = 0;
UINT SelectIndex; unsigned int SelectIndex;
struct sk_buff *skb; struct sk_buff *skb;
// Index = 0 reserved for AP Node (In STA mode) // Index = 0 reserved for AP Node (In STA mode)
// Index = 0 reserved for Broadcast/MultiCast (In AP mode) // Index = 0 reserved for Broadcast/MultiCast (In AP mode)
@ -865,7 +865,7 @@ BSSvCreateOneNode(
void void
BSSvRemoveOneNode( BSSvRemoveOneNode(
void *hDeviceContext, void *hDeviceContext,
UINT uNodeIndex unsigned int uNodeIndex
) )
{ {
@ -905,7 +905,7 @@ BSSvUpdateAPNode(
{ {
PSDevice pDevice = (PSDevice)hDeviceContext; PSDevice pDevice = (PSDevice)hDeviceContext;
PSMgmtObject pMgmt = pDevice->pMgmt; PSMgmtObject pMgmt = pDevice->pMgmt;
UINT uRateLen = WLAN_RATES_MAXLEN; unsigned int uRateLen = WLAN_RATES_MAXLEN;
memset(&pMgmt->sNodeDBTable[0], 0, sizeof(KnownNodeDB)); memset(&pMgmt->sNodeDBTable[0], 0, sizeof(KnownNodeDB));
@ -1009,7 +1009,7 @@ BSSvAddMulticastNode(
//2008-4-14 <add> by chester for led issue //2008-4-14 <add> by chester for led issue
#ifdef FOR_LED_ON_NOTEBOOK #ifdef FOR_LED_ON_NOTEBOOK
BOOL cc=FALSE; BOOL cc=FALSE;
UINT status; unsigned int status;
#endif #endif
void void
BSSvSecondCallBack( BSSvSecondCallBack(
@ -1018,11 +1018,11 @@ BSSvSecondCallBack(
{ {
PSDevice pDevice = (PSDevice)hDeviceContext; PSDevice pDevice = (PSDevice)hDeviceContext;
PSMgmtObject pMgmt = pDevice->pMgmt; PSMgmtObject pMgmt = pDevice->pMgmt;
UINT ii; unsigned int ii;
PWLAN_IE_SSID pItemSSID, pCurrSSID; PWLAN_IE_SSID pItemSSID, pCurrSSID;
UINT uSleepySTACnt = 0; unsigned int uSleepySTACnt = 0;
UINT uNonShortSlotSTACnt = 0; unsigned int uNonShortSlotSTACnt = 0;
UINT uLongPreambleSTACnt = 0; unsigned int uLongPreambleSTACnt = 0;
viawget_wpa_header* wpahdr; //DavidWang viawget_wpa_header* wpahdr; //DavidWang
spin_lock_irq(&pDevice->lock); spin_lock_irq(&pDevice->lock);
@ -1394,20 +1394,20 @@ BSSvUpdateNodeTxCounter(
BYTE byTsr0, BYTE byTsr0,
BYTE byTsr1, BYTE byTsr1,
PBYTE pbyBuffer, PBYTE pbyBuffer,
UINT uFIFOHeaderSize unsigned int uFIFOHeaderSize
) )
{ {
PSDevice pDevice = (PSDevice)hDeviceContext; PSDevice pDevice = (PSDevice)hDeviceContext;
PSMgmtObject pMgmt = pDevice->pMgmt; PSMgmtObject pMgmt = pDevice->pMgmt;
UINT uNodeIndex = 0; unsigned int uNodeIndex = 0;
BYTE byTxRetry = (byTsr0 & TSR0_NCR); BYTE byTxRetry = (byTsr0 & TSR0_NCR);
PSTxBufHead pTxBufHead; PSTxBufHead pTxBufHead;
PS802_11Header pMACHeader; PS802_11Header pMACHeader;
WORD wRate; WORD wRate;
WORD wFallBackRate = RATE_1M; WORD wFallBackRate = RATE_1M;
BYTE byFallBack; BYTE byFallBack;
UINT ii; unsigned int ii;
// UINT txRetryTemp; // unsigned int txRetryTemp;
//PLICE_DEBUG-> //PLICE_DEBUG->
//txRetryTemp = byTxRetry; //txRetryTemp = byTxRetry;
//if (txRetryTemp== 8) //if (txRetryTemp== 8)
@ -1584,14 +1584,14 @@ BSSvUpdateNodeTxCounter(
void void
BSSvClearNodeDBTable( BSSvClearNodeDBTable(
void *hDeviceContext, void *hDeviceContext,
UINT uStartIndex unsigned int uStartIndex
) )
{ {
PSDevice pDevice = (PSDevice)hDeviceContext; PSDevice pDevice = (PSDevice)hDeviceContext;
PSMgmtObject pMgmt = pDevice->pMgmt; PSMgmtObject pMgmt = pDevice->pMgmt;
struct sk_buff *skb; struct sk_buff *skb;
UINT ii; unsigned int ii;
for (ii = uStartIndex; ii < (MAX_NODE_NUM + 1); ii++) { for (ii = uStartIndex; ii < (MAX_NODE_NUM + 1); ii++) {
if (pMgmt->sNodeDBTable[ii].bActive) { if (pMgmt->sNodeDBTable[ii].bActive) {
@ -1666,7 +1666,7 @@ BSSvClearAnyBSSJoinRecord (
{ {
PSDevice pDevice = (PSDevice)hDeviceContext; PSDevice pDevice = (PSDevice)hDeviceContext;
PSMgmtObject pMgmt = pDevice->pMgmt; PSMgmtObject pMgmt = pDevice->pMgmt;
UINT ii; unsigned int ii;
for (ii = 0; ii < MAX_BSS_NUM; ii++) { for (ii = 0; ii < MAX_BSS_NUM; ii++) {
pMgmt->sBSSList[ii].bSelected = FALSE; pMgmt->sBSSList[ii].bSelected = FALSE;

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

@ -106,10 +106,10 @@ typedef struct tagKnownBSS {
// BSS info // BSS info
BOOL bActive; BOOL bActive;
BYTE abyBSSID[WLAN_BSSID_LEN]; BYTE abyBSSID[WLAN_BSSID_LEN];
UINT uChannel; unsigned int uChannel;
BYTE abySuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN + 1]; BYTE abySuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN + 1];
BYTE abyExtSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN + 1]; BYTE abyExtSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN + 1];
UINT uRSSI; unsigned int uRSSI;
BYTE bySQ; BYTE bySQ;
WORD wBeaconInterval; WORD wBeaconInterval;
WORD wCapInfo; WORD wCapInfo;
@ -150,9 +150,9 @@ typedef struct tagKnownBSS {
WORD wRSNLen; WORD wRSNLen;
// Clear count // Clear count
UINT uClearCount; unsigned int uClearCount;
// BYTE abyIEs[WLAN_BEACON_FR_MAXLEN]; // BYTE abyIEs[WLAN_BEACON_FR_MAXLEN];
UINT uIELength; unsigned int uIELength;
QWORD qwBSSTimestamp; QWORD qwBSSTimestamp;
QWORD qwLocalTSF; // local TSF timer QWORD qwLocalTSF; // local TSF timer
@ -189,7 +189,7 @@ typedef struct tagKnownNodeDB {
BOOL bShortPreamble; BOOL bShortPreamble;
BOOL bERPExist; BOOL bERPExist;
BOOL bShortSlotTime; BOOL bShortSlotTime;
UINT uInActiveCount; unsigned int uInActiveCount;
WORD wMaxBasicRate; //Get from byTopOFDMBasicRate or byTopCCKBasicRate which depends on packetTyp. WORD wMaxBasicRate; //Get from byTopOFDMBasicRate or byTopCCKBasicRate which depends on packetTyp.
WORD wMaxSuppRate; //Records the highest supported rate getting from SuppRates IE and ExtSuppRates IE in Beacon. WORD wMaxSuppRate; //Records the highest supported rate getting from SuppRates IE and ExtSuppRates IE in Beacon.
WORD wSuppRate; WORD wSuppRate;
@ -217,23 +217,23 @@ typedef struct tagKnownNodeDB {
BYTE byCipherSuite; BYTE byCipherSuite;
DWORD dwTSC47_16; DWORD dwTSC47_16;
WORD wTSC15_0; WORD wTSC15_0;
UINT uWepKeyLength; unsigned int uWepKeyLength;
BYTE abyWepKey[WLAN_WEPMAX_KEYLEN]; BYTE abyWepKey[WLAN_WEPMAX_KEYLEN];
// //
// Auto rate fallback vars // Auto rate fallback vars
BOOL bIsInFallback; BOOL bIsInFallback;
UINT uAverageRSSI; unsigned int uAverageRSSI;
UINT uRateRecoveryTimeout; unsigned int uRateRecoveryTimeout;
UINT uRatePollTimeout; unsigned int uRatePollTimeout;
UINT uTxFailures; unsigned int uTxFailures;
UINT uTxAttempts; unsigned int uTxAttempts;
UINT uTxRetry; unsigned int uTxRetry;
UINT uFailureRatio; unsigned int uFailureRatio;
UINT uRetryRatio; unsigned int uRetryRatio;
UINT uTxOk[MAX_RATE+1]; unsigned int uTxOk[MAX_RATE+1];
UINT uTxFail[MAX_RATE+1]; unsigned int uTxFail[MAX_RATE+1];
UINT uTimeCount; unsigned int uTimeCount;
} KnownNodeDB, *PKnownNodeDB; } KnownNodeDB, *PKnownNodeDB;
@ -279,7 +279,7 @@ BSSbInsertToBSSList(
PWLAN_IE_RSN_EXT pRSNWPA, PWLAN_IE_RSN_EXT pRSNWPA,
PWLAN_IE_COUNTRY pIE_Country, PWLAN_IE_COUNTRY pIE_Country,
PWLAN_IE_QUIET pIE_Quiet, PWLAN_IE_QUIET pIE_Quiet,
UINT uIELength, unsigned int uIELength,
PBYTE pbyIEs, PBYTE pbyIEs,
void *pRxPacketContext void *pRxPacketContext
); );
@ -302,7 +302,7 @@ BSSbUpdateToBSSList(
PWLAN_IE_COUNTRY pIE_Country, PWLAN_IE_COUNTRY pIE_Country,
PWLAN_IE_QUIET pIE_Quiet, PWLAN_IE_QUIET pIE_Quiet,
PKnownBSS pBSSList, PKnownBSS pBSSList,
UINT uIELength, unsigned int uIELength,
PBYTE pbyIEs, PBYTE pbyIEs,
void *pRxPacketContext void *pRxPacketContext
); );
@ -342,13 +342,13 @@ BSSvUpdateNodeTxCounter(
BYTE byTsr0, BYTE byTsr0,
BYTE byTsr1, BYTE byTsr1,
PBYTE pbyBuffer, PBYTE pbyBuffer,
UINT uFIFOHeaderSize unsigned int uFIFOHeaderSize
); );
void void
BSSvRemoveOneNode( BSSvRemoveOneNode(
void *hDeviceContext, void *hDeviceContext,
UINT uNodeIndex unsigned int uNodeIndex
); );
void void
@ -360,7 +360,7 @@ BSSvAddMulticastNode(
void void
BSSvClearNodeDBTable( BSSvClearNodeDBTable(
void *hDeviceContext, void *hDeviceContext,
UINT uStartIndex unsigned int uStartIndex
); );
void void

71
drivers/staging/vt6655/card.c
View File

@ -82,7 +82,7 @@ static int msglevel =MSG_LEVEL_INFO;
typedef struct tagSChannelTblElement { typedef struct tagSChannelTblElement {
BYTE byChannelNumber; BYTE byChannelNumber;
UINT uFrequency; unsigned int uFrequency;
BOOL bValid; BOOL bValid;
BYTE byMAP; BYTE byMAP;
}SChannelTblElement, *PSChannelTblElement; }SChannelTblElement, *PSChannelTblElement;
@ -457,7 +457,7 @@ s_vCaculateOFDMRParameter(
************************************************************************/ ************************************************************************/
//2008-8-4 <add> by chester //2008-8-4 <add> by chester
BOOL BOOL
ChannelValid(UINT ChannelIndex) ChannelValid(unsigned int ChannelIndex)
{ {
BOOL bValid; BOOL bValid;
@ -729,7 +729,7 @@ s_vSetRSPINF (PSDevice pDevice, CARD_PHY_TYPE ePHYType, void *pvSupportRateIEs,
/*--------------------- Export Functions --------------------------*/ /*--------------------- Export Functions --------------------------*/
BYTE CARDbyGetChannelMapping (void *pDeviceHandler, BYTE byChannelNumber, CARD_PHY_TYPE ePhyType) BYTE CARDbyGetChannelMapping (void *pDeviceHandler, BYTE byChannelNumber, CARD_PHY_TYPE ePhyType)
{ {
UINT ii; unsigned int ii;
if ((ePhyType == PHY_TYPE_11B) || (ePhyType == PHY_TYPE_11G)) { if ((ePhyType == PHY_TYPE_11B) || (ePhyType == PHY_TYPE_11G)) {
return (byChannelNumber); return (byChannelNumber);
@ -764,7 +764,7 @@ BYTE CARDbyGetChannelNumber (void *pDeviceHandler, BYTE byChannelIndex)
* Return Value: TRUE if succeeded; FALSE if failed. * Return Value: TRUE if succeeded; FALSE if failed.
* *
*/ */
BOOL CARDbSetChannel (void *pDeviceHandler, UINT uConnectionChannel) BOOL CARDbSetChannel (void *pDeviceHandler, unsigned int uConnectionChannel)
{ {
PSDevice pDevice = (PSDevice) pDeviceHandler; PSDevice pDevice = (PSDevice) pDeviceHandler;
BOOL bResult = TRUE; BOOL bResult = TRUE;
@ -852,7 +852,7 @@ BOOL CARDbSetChannel (void *pDeviceHandler, UINT uConnectionChannel)
* *
*/ */
/* /*
BOOL CARDbSendPacket (void *pDeviceHandler, void *pPacket, CARD_PKT_TYPE ePktType, UINT uLength) BOOL CARDbSendPacket (void *pDeviceHandler, void *pPacket, CARD_PKT_TYPE ePktType, unsigned int uLength)
{ {
PSDevice pDevice = (PSDevice) pDeviceHandler; PSDevice pDevice = (PSDevice) pDeviceHandler;
if (ePktType == PKT_TYPE_802_11_MNG) { if (ePktType == PKT_TYPE_802_11_MNG) {
@ -1145,10 +1145,10 @@ BOOL CARDbUpdateTSF (void *pDeviceHandler, BYTE byRxRate, QWORD qwBSSTimestamp,
BOOL CARDbSetBeaconPeriod (void *pDeviceHandler, WORD wBeaconInterval) BOOL CARDbSetBeaconPeriod (void *pDeviceHandler, WORD wBeaconInterval)
{ {
PSDevice pDevice = (PSDevice) pDeviceHandler; PSDevice pDevice = (PSDevice) pDeviceHandler;
UINT uBeaconInterval = 0; unsigned int uBeaconInterval = 0;
UINT uLowNextTBTT = 0; unsigned int uLowNextTBTT = 0;
UINT uHighRemain = 0; unsigned int uHighRemain = 0;
UINT uLowRemain = 0; unsigned int uLowRemain = 0;
QWORD qwNextTBTT; QWORD qwNextTBTT;
HIDWORD(qwNextTBTT) = 0; HIDWORD(qwNextTBTT) = 0;
@ -1396,7 +1396,7 @@ CARDbPowerDown(
) )
{ {
PSDevice pDevice = (PSDevice)pDeviceHandler; PSDevice pDevice = (PSDevice)pDeviceHandler;
UINT uIdx; unsigned int uIdx;
// check if already in Doze mode // check if already in Doze mode
if (MACbIsRegBitsOn(pDevice->PortOffset, MAC_REG_PSCTL, PSCTL_PS)) if (MACbIsRegBitsOn(pDevice->PortOffset, MAC_REG_PSCTL, PSCTL_PS))
@ -1557,7 +1557,7 @@ CARDbAdd_PMKID_Candidate (
{ {
PSDevice pDevice = (PSDevice) pDeviceHandler; PSDevice pDevice = (PSDevice) pDeviceHandler;
PPMKID_CANDIDATE pCandidateList; PPMKID_CANDIDATE pCandidateList;
UINT ii = 0; unsigned int ii = 0;
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"bAdd_PMKID_Candidate START: (%d)\n", (int)pDevice->gsPMKIDCandidate.NumCandidates); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"bAdd_PMKID_Candidate START: (%d)\n", (int)pDevice->gsPMKIDCandidate.NumCandidates);
@ -1614,7 +1614,7 @@ void CARDvInitChannelTable (void *pDeviceHandler)
{ {
PSDevice pDevice = (PSDevice) pDeviceHandler; PSDevice pDevice = (PSDevice) pDeviceHandler;
BOOL bMultiBand = FALSE; BOOL bMultiBand = FALSE;
UINT ii; unsigned int ii;
for(ii=1;ii<=CARD_MAX_CHANNEL_TBL;ii++) { for(ii=1;ii<=CARD_MAX_CHANNEL_TBL;ii++) {
sChannelTbl[ii].bValid = FALSE; sChannelTbl[ii].bValid = FALSE;
@ -1709,7 +1709,7 @@ BOOL
CARDbStartMeasure ( CARDbStartMeasure (
void *pDeviceHandler, void *pDeviceHandler,
void *pvMeasureEIDs, void *pvMeasureEIDs,
UINT uNumOfMeasureEIDs unsigned int uNumOfMeasureEIDs
) )
{ {
PSDevice pDevice = (PSDevice) pDeviceHandler; PSDevice pDevice = (PSDevice) pDeviceHandler;
@ -1886,7 +1886,7 @@ CARDbSetQuiet (
) )
{ {
PSDevice pDevice = (PSDevice) pDeviceHandler; PSDevice pDevice = (PSDevice) pDeviceHandler;
UINT ii = 0; unsigned int ii = 0;
if (bResetQuiet == TRUE) { if (bResetQuiet == TRUE) {
MACvRegBitsOff(pDevice->PortOffset, MAC_REG_MSRCTL, (MSRCTL_QUIETTXCHK | MSRCTL_QUIETEN)); MACvRegBitsOff(pDevice->PortOffset, MAC_REG_MSRCTL, (MSRCTL_QUIETTXCHK | MSRCTL_QUIETEN));
@ -1937,9 +1937,9 @@ CARDbStartQuiet (
) )
{ {
PSDevice pDevice = (PSDevice) pDeviceHandler; PSDevice pDevice = (PSDevice) pDeviceHandler;
UINT ii = 0; unsigned int ii = 0;
DWORD dwStartTime = 0xFFFFFFFF; DWORD dwStartTime = 0xFFFFFFFF;
UINT uCurrentQuietIndex = 0; unsigned int uCurrentQuietIndex = 0;
DWORD dwNextTime = 0; DWORD dwNextTime = 0;
DWORD dwGap = 0; DWORD dwGap = 0;
DWORD dwDuration = 0; DWORD dwDuration = 0;
@ -2040,10 +2040,10 @@ CARDvSetCountryInfo (
) )
{ {
PSDevice pDevice = (PSDevice) pDeviceHandler; PSDevice pDevice = (PSDevice) pDeviceHandler;
UINT ii = 0; unsigned int ii = 0;
UINT uu = 0; unsigned int uu = 0;
UINT step = 0; unsigned int step = 0;
UINT uNumOfCountryInfo = 0; unsigned int uNumOfCountryInfo = 0;
BYTE byCh = 0; BYTE byCh = 0;
PWLAN_IE_COUNTRY pIE_Country = (PWLAN_IE_COUNTRY) pIE; PWLAN_IE_COUNTRY pIE_Country = (PWLAN_IE_COUNTRY) pIE;
@ -2169,7 +2169,7 @@ CARDbySetSupportChannels (
) )
{ {
PSDevice pDevice = (PSDevice) pDeviceHandler; PSDevice pDevice = (PSDevice) pDeviceHandler;
UINT ii; unsigned int ii;
BYTE byCount; BYTE byCount;
PWLAN_IE_SUPP_CH pIE = (PWLAN_IE_SUPP_CH) pbyIEs; PWLAN_IE_SUPP_CH pIE = (PWLAN_IE_SUPP_CH) pbyIEs;
PBYTE pbyChTupple; PBYTE pbyChTupple;
@ -2266,7 +2266,7 @@ CARDbyGetTransmitPower (
BOOL BOOL
CARDbChannelGetList ( CARDbChannelGetList (
UINT uCountryCodeIdx, unsigned int uCountryCodeIdx,
PBYTE pbyChannelTable PBYTE pbyChannelTable
) )
{ {
@ -2285,7 +2285,7 @@ CARDvSetCountryIE(
) )
{ {
PSDevice pDevice = (PSDevice) pDeviceHandler; PSDevice pDevice = (PSDevice) pDeviceHandler;
UINT ii; unsigned int ii;
PWLAN_IE_COUNTRY pIECountry = (PWLAN_IE_COUNTRY) pIE; PWLAN_IE_COUNTRY pIECountry = (PWLAN_IE_COUNTRY) pIE;
pIECountry->byElementID = WLAN_EID_COUNTRY; pIECountry->byElementID = WLAN_EID_COUNTRY;
@ -2307,7 +2307,7 @@ CARDvSetCountryIE(
BOOL BOOL
CARDbGetChannelMapInfo( CARDbGetChannelMapInfo(
void *pDeviceHandler, void *pDeviceHandler,
UINT uChannelIndex, unsigned int uChannelIndex,
PBYTE pbyChannelNumber, PBYTE pbyChannelNumber,
PBYTE pbyMap PBYTE pbyMap
) )
@ -2326,7 +2326,7 @@ CARDbGetChannelMapInfo(
void void
CARDvSetChannelMapInfo( CARDvSetChannelMapInfo(
void *pDeviceHandler, void *pDeviceHandler,
UINT uChannelIndex, unsigned int uChannelIndex,
BYTE byMap BYTE byMap
) )
{ {
@ -2345,7 +2345,7 @@ CARDvClearChannelMapInfo(
) )
{ {
// PSDevice pDevice = (PSDevice) pDeviceHandler; // PSDevice pDevice = (PSDevice) pDeviceHandler;
UINT ii = 0; unsigned int ii = 0;
for (ii = 1; ii <= CB_MAX_CHANNEL; ii++) { for (ii = 1; ii <= CB_MAX_CHANNEL; ii++) {
sChannelTbl[ii].byMAP = 0; sChannelTbl[ii].byMAP = 0;
@ -2360,7 +2360,7 @@ CARDbyAutoChannelSelect(
) )
{ {
// PSDevice pDevice = (PSDevice) pDeviceHandler; // PSDevice pDevice = (PSDevice) pDeviceHandler;
UINT ii = 0; unsigned int ii = 0;
BYTE byOptionChannel = 0; BYTE byOptionChannel = 0;
int aiWeight[CB_MAX_CHANNEL_24G+1] = {-1000,0,0,0,0,0,0,0,0,0,0,0,0,0,0}; int aiWeight[CB_MAX_CHANNEL_24G+1] = {-1000,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
@ -2425,7 +2425,7 @@ CARDvSafeResetTx (
) )
{ {
PSDevice pDevice = (PSDevice) pDeviceHandler; PSDevice pDevice = (PSDevice) pDeviceHandler;
UINT uu; unsigned int uu;
PSTxDesc pCurrTD; PSTxDesc pCurrTD;
// initialize TD index // initialize TD index
@ -2481,7 +2481,7 @@ CARDvSafeResetRx (
) )
{ {
PSDevice pDevice = (PSDevice) pDeviceHandler; PSDevice pDevice = (PSDevice) pDeviceHandler;
UINT uu; unsigned int uu;
PSRxDesc pDesc; PSRxDesc pDesc;
@ -2539,7 +2539,7 @@ CARDvSafeResetRx (
WORD CARDwGetCCKControlRate(void *pDeviceHandler, WORD wRateIdx) WORD CARDwGetCCKControlRate(void *pDeviceHandler, WORD wRateIdx)
{ {
PSDevice pDevice = (PSDevice) pDeviceHandler; PSDevice pDevice = (PSDevice) pDeviceHandler;
UINT ui = (UINT)wRateIdx; unsigned int ui = (unsigned int) wRateIdx;
while (ui > RATE_1M) { while (ui > RATE_1M) {
if (pDevice->wBasicRate & ((WORD)1 << ui)) { if (pDevice->wBasicRate & ((WORD)1 << ui)) {
@ -2566,7 +2566,7 @@ WORD CARDwGetCCKControlRate(void *pDeviceHandler, WORD wRateIdx)
WORD CARDwGetOFDMControlRate (void *pDeviceHandler, WORD wRateIdx) WORD CARDwGetOFDMControlRate (void *pDeviceHandler, WORD wRateIdx)
{ {
PSDevice pDevice = (PSDevice) pDeviceHandler; PSDevice pDevice = (PSDevice) pDeviceHandler;
UINT ui = (UINT)wRateIdx; unsigned int ui = (unsigned int) wRateIdx;
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"BASIC RATE: %X\n", pDevice->wBasicRate); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"BASIC RATE: %X\n", pDevice->wBasicRate);
@ -3002,9 +3002,9 @@ BOOL CARDbGetCurrentTSF (DWORD_PTR dwIoBase, PQWORD pqwCurrTSF)
QWORD CARDqGetNextTBTT (QWORD qwTSF, WORD wBeaconInterval) QWORD CARDqGetNextTBTT (QWORD qwTSF, WORD wBeaconInterval)
{ {
UINT uLowNextTBTT; unsigned int uLowNextTBTT;
UINT uHighRemain, uLowRemain; unsigned int uHighRemain, uLowRemain;
UINT uBeaconInterval; unsigned int uBeaconInterval;
uBeaconInterval = wBeaconInterval * 1024; uBeaconInterval = wBeaconInterval * 1024;
// Next TBTT = ((local_current_TSF / beacon_interval) + 1 ) * beacon_interval // Next TBTT = ((local_current_TSF / beacon_interval) + 1 ) * beacon_interval
@ -3084,7 +3084,8 @@ void CARDvUpdateNextTBTT (DWORD_PTR dwIoBase, QWORD qwTSF, WORD wBeaconInterval)
VNSvOutPortD(dwIoBase + MAC_REG_NEXTTBTT, LODWORD(qwTSF)); VNSvOutPortD(dwIoBase + MAC_REG_NEXTTBTT, LODWORD(qwTSF));
VNSvOutPortD(dwIoBase + MAC_REG_NEXTTBTT + 4, HIDWORD(qwTSF)); VNSvOutPortD(dwIoBase + MAC_REG_NEXTTBTT + 4, HIDWORD(qwTSF));
MACvRegBitsOn(dwIoBase, MAC_REG_TFTCTL, TFTCTL_TBTTSYNCEN); MACvRegBitsOn(dwIoBase, MAC_REG_TFTCTL, TFTCTL_TBTTSYNCEN);
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Card:Update Next TBTT[%8xh:%8xh] \n",(UINT)HIDWORD(qwTSF), (UINT)LODWORD(qwTSF)); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Card:Update Next TBTT[%8xh:%8xh] \n",
(unsigned int) HIDWORD(qwTSF), (unsigned int) LODWORD(qwTSF));
return; return;
} }

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

@ -86,7 +86,7 @@ typedef enum _CARD_OP_MODE {
/*--------------------- Export Functions --------------------------*/ /*--------------------- Export Functions --------------------------*/
BOOL ChannelValid(UINT ChannelIndex); BOOL ChannelValid(unsigned int ChannelIndex);
void CARDvSetRSPINF(void *pDeviceHandler, CARD_PHY_TYPE ePHYType); void CARDvSetRSPINF(void *pDeviceHandler, CARD_PHY_TYPE ePHYType);
void vUpdateIFS(void *pDeviceHandler); void vUpdateIFS(void *pDeviceHandler);
void CARDvUpdateBasicTopRate(void *pDeviceHandler); void CARDvUpdateBasicTopRate(void *pDeviceHandler);
@ -107,8 +107,8 @@ void CARDvSafeResetRx(void *pDeviceHandler);
//xxx //xxx
BOOL CARDbRadioPowerOff(void *pDeviceHandler); BOOL CARDbRadioPowerOff(void *pDeviceHandler);
BOOL CARDbRadioPowerOn(void *pDeviceHandler); BOOL CARDbRadioPowerOn(void *pDeviceHandler);
BOOL CARDbSetChannel(void *pDeviceHandler, UINT uConnectionChannel); BOOL CARDbSetChannel(void *pDeviceHandler, unsigned int uConnectionChannel);
//BOOL CARDbSendPacket(void *pDeviceHandler, void *pPacket, CARD_PKT_TYPE ePktType, UINT uLength); //BOOL CARDbSendPacket(void *pDeviceHandler, void *pPacket, CARD_PKT_TYPE ePktType, unsigned int uLength);
BOOL CARDbIsShortPreamble(void *pDeviceHandler); BOOL CARDbIsShortPreamble(void *pDeviceHandler);
BOOL CARDbIsShorSlotTime(void *pDeviceHandler); BOOL CARDbIsShorSlotTime(void *pDeviceHandler);
BOOL CARDbSetPhyParameter(void *pDeviceHandler, CARD_PHY_TYPE ePHYType, WORD wCapInfo, BYTE byERPField, void *pvSupportRateIEs, void *pvExtSupportRateIEs); BOOL CARDbSetPhyParameter(void *pDeviceHandler, CARD_PHY_TYPE ePHYType, WORD wCapInfo, BYTE byERPField, void *pvSupportRateIEs, void *pvExtSupportRateIEs);
@ -152,7 +152,7 @@ BOOL
CARDbStartMeasure ( CARDbStartMeasure (
void *pDeviceHandler, void *pDeviceHandler,
void *pvMeasureEIDs, void *pvMeasureEIDs,
UINT uNumOfMeasureEIDs unsigned int uNumOfMeasureEIDs
); );
BOOL BOOL
@ -212,7 +212,7 @@ CARDbyGetTransmitPower (
BOOL BOOL
CARDbChannelGetList ( CARDbChannelGetList (
UINT uCountryCodeIdx, unsigned int uCountryCodeIdx,
PBYTE pbyChannelTable PBYTE pbyChannelTable
); );
@ -225,7 +225,7 @@ CARDvSetCountryIE(
BOOL BOOL
CARDbGetChannelMapInfo( CARDbGetChannelMapInfo(
void *pDeviceHandler, void *pDeviceHandler,
UINT uChannelIndex, unsigned int uChannelIndex,
PBYTE pbyChannelNumber, PBYTE pbyChannelNumber,
PBYTE pbyMap PBYTE pbyMap
); );
@ -233,7 +233,7 @@ CARDbGetChannelMapInfo(
void void
CARDvSetChannelMapInfo( CARDvSetChannelMapInfo(
void *pDeviceHandler, void *pDeviceHandler,
UINT uChannelIndex, unsigned int uChannelIndex,
BYTE byMap BYTE byMap
); );

12
drivers/staging/vt6655/datarate.c
View File

@ -208,11 +208,11 @@ RATEvParseMaxRate (
) )
{ {
PSDevice pDevice = (PSDevice) pDeviceHandler; PSDevice pDevice = (PSDevice) pDeviceHandler;
UINT ii; unsigned int ii;
BYTE byHighSuppRate = 0; BYTE byHighSuppRate = 0;
BYTE byRate = 0; BYTE byRate = 0;
WORD wOldBasicRate = pDevice->wBasicRate; WORD wOldBasicRate = pDevice->wBasicRate;
UINT uRateLen; unsigned int uRateLen;
if (pItemRates == NULL) if (pItemRates == NULL)
@ -248,7 +248,7 @@ UINT uRateLen;
if ((pItemExtRates != NULL) && (pItemExtRates->byElementID == WLAN_EID_EXTSUPP_RATES) && if ((pItemExtRates != NULL) && (pItemExtRates->byElementID == WLAN_EID_EXTSUPP_RATES) &&
(pDevice->eCurrentPHYType != PHY_TYPE_11B)) { (pDevice->eCurrentPHYType != PHY_TYPE_11B)) {
UINT uExtRateLen = pItemExtRates->len; unsigned int uExtRateLen = pItemExtRates->len;
if (uExtRateLen > WLAN_RATES_MAXLEN) if (uExtRateLen > WLAN_RATES_MAXLEN)
uExtRateLen = WLAN_RATES_MAXLEN; uExtRateLen = WLAN_RATES_MAXLEN;
@ -315,7 +315,7 @@ RATEvTxRateFallBack (
{ {
PSDevice pDevice = (PSDevice) pDeviceHandler; PSDevice pDevice = (PSDevice) pDeviceHandler;
WORD wIdxDownRate = 0; WORD wIdxDownRate = 0;
UINT ii; unsigned int ii;
//DWORD dwRateTable[MAX_RATE] = {1, 2, 5, 11, 6, 9, 12, 18, 24, 36, 48, 54}; //DWORD dwRateTable[MAX_RATE] = {1, 2, 5, 11, 6, 9, 12, 18, 24, 36, 48, 54};
BOOL bAutoRate[MAX_RATE] = {TRUE,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,TRUE,TRUE,TRUE,TRUE,TRUE}; BOOL bAutoRate[MAX_RATE] = {TRUE,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,TRUE,TRUE,TRUE,TRUE,TRUE};
DWORD dwThroughputTbl[MAX_RATE] = {10, 20, 55, 110, 60, 90, 120, 180, 240, 360, 480, 540}; DWORD dwThroughputTbl[MAX_RATE] = {10, 20, 55, 110, 60, 90, 120, 180, 240, 360, 480, 540};
@ -413,10 +413,10 @@ BYTE
RATEuSetIE ( RATEuSetIE (
PWLAN_IE_SUPP_RATES pSrcRates, PWLAN_IE_SUPP_RATES pSrcRates,
PWLAN_IE_SUPP_RATES pDstRates, PWLAN_IE_SUPP_RATES pDstRates,
UINT uRateLen unsigned int uRateLen
) )
{ {
UINT ii, uu, uRateCnt = 0; unsigned int ii, uu, uRateCnt = 0;
if ((pSrcRates == NULL) || (pDstRates == NULL)) if ((pSrcRates == NULL) || (pDstRates == NULL))
return 0; return 0;

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

@ -77,7 +77,7 @@ BYTE
RATEuSetIE( RATEuSetIE(
PWLAN_IE_SUPP_RATES pSrcRates, PWLAN_IE_SUPP_RATES pSrcRates,
PWLAN_IE_SUPP_RATES pDstRates, PWLAN_IE_SUPP_RATES pDstRates,
UINT uRateLen unsigned int uRateLen
); );
WORD WORD

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

@ -311,7 +311,7 @@ typedef struct tagSCache{
/* The receive cache is updated circularly. The next entry to be written is /* The receive cache is updated circularly. The next entry to be written is
* indexed by the "InPtr". * indexed by the "InPtr".
*/ */
UINT uInPtr; // Place to use next unsigned int uInPtr; // Place to use next
SCacheEntry asCacheEntry[DUPLICATE_RX_CACHE_LENGTH]; SCacheEntry asCacheEntry[DUPLICATE_RX_CACHE_LENGTH];
} SCache, *PSCache; } SCache, *PSCache;
@ -322,10 +322,10 @@ typedef struct tagSDeFragControlBlock
WORD wSequence; WORD wSequence;
WORD wFragNum; WORD wFragNum;
BYTE abyAddr2[ETH_ALEN]; BYTE abyAddr2[ETH_ALEN];
UINT uLifetime; unsigned int uLifetime;
struct sk_buff* skb; struct sk_buff* skb;
PBYTE pbyRxBuffer; PBYTE pbyRxBuffer;
UINT cbFrameLength; unsigned int cbFrameLength;
BOOL bInUse; BOOL bInUse;
} SDeFragControlBlock, *PSDeFragControlBlock; } SDeFragControlBlock, *PSDeFragControlBlock;
@ -448,9 +448,9 @@ typedef struct __device_info {
SCache sDupRxCache; SCache sDupRxCache;
SDeFragControlBlock sRxDFCB[CB_MAX_RX_FRAG]; SDeFragControlBlock sRxDFCB[CB_MAX_RX_FRAG];
UINT cbDFCB; unsigned int cbDFCB;
UINT cbFreeDFCB; unsigned int cbFreeDFCB;
UINT uCurrentDFCBIdx; unsigned int uCurrentDFCBIdx;
OPTIONS sOpts; OPTIONS sOpts;
@ -497,7 +497,7 @@ typedef struct __device_info {
SMgmtObject sMgmtObj; SMgmtObject sMgmtObj;
// 802.11 MAC specific // 802.11 MAC specific
UINT uCurrRSSI; unsigned int uCurrRSSI;
BYTE byCurrSQ; BYTE byCurrSQ;
DWORD dwTxAntennaSel; DWORD dwTxAntennaSel;
@ -508,12 +508,12 @@ typedef struct __device_info {
BOOL bTxRxAntInv; BOOL bTxRxAntInv;
PBYTE pbyTmpBuff; PBYTE pbyTmpBuff;
UINT uSIFS; //Current SIFS unsigned int uSIFS; //Current SIFS
UINT uDIFS; //Current DIFS unsigned int uDIFS; //Current DIFS
UINT uEIFS; //Current EIFS unsigned int uEIFS; //Current EIFS
UINT uSlot; //Current SlotTime unsigned int uSlot; //Current SlotTime
UINT uCwMin; //Current CwMin unsigned int uCwMin; //Current CwMin
UINT uCwMax; //CwMax is fixed on 1023. unsigned int uCwMax; //CwMax is fixed on 1023.
// PHY parameter // PHY parameter
BYTE bySIFS; BYTE bySIFS;
BYTE byDIFS; BYTE byDIFS;
@ -532,7 +532,7 @@ typedef struct __device_info {
BYTE byMinChannel; BYTE byMinChannel;
BYTE byMaxChannel; BYTE byMaxChannel;
UINT uConnectionRate; unsigned int uConnectionRate;
BYTE byPreambleType; BYTE byPreambleType;
BYTE byShortPreamble; BYTE byShortPreamble;
@ -588,10 +588,10 @@ typedef struct __device_info {
BOOL bBeaconBufReady; BOOL bBeaconBufReady;
BOOL bBeaconSent; BOOL bBeaconSent;
BOOL bIsBeaconBufReadySet; BOOL bIsBeaconBufReadySet;
UINT cbBeaconBufReadySetCnt; unsigned int cbBeaconBufReadySetCnt;
BOOL bFixRate; BOOL bFixRate;
BYTE byCurrentCh; BYTE byCurrentCh;
UINT uScanTime; unsigned int uScanTime;
CMD_STATE eCommandState; CMD_STATE eCommandState;
@ -601,14 +601,14 @@ typedef struct __device_info {
BOOL bStopBeacon; BOOL bStopBeacon;
BOOL bStopDataPkt; BOOL bStopDataPkt;
BOOL bStopTx0Pkt; BOOL bStopTx0Pkt;
UINT uAutoReConnectTime; unsigned int uAutoReConnectTime;
// 802.11 counter // 802.11 counter
CMD_ITEM eCmdQueue[CMD_Q_SIZE]; CMD_ITEM eCmdQueue[CMD_Q_SIZE];
UINT uCmdDequeueIdx; unsigned int uCmdDequeueIdx;
UINT uCmdEnqueueIdx; unsigned int uCmdEnqueueIdx;
UINT cbFreeCmdQueue; unsigned int cbFreeCmdQueue;
BOOL bCmdRunning; BOOL bCmdRunning;
BOOL bCmdClear; BOOL bCmdClear;
@ -629,19 +629,19 @@ typedef struct __device_info {
DWORD dwIVCounter; DWORD dwIVCounter;
QWORD qwPacketNumber; //For CCMP and TKIP as TSC(6 bytes) QWORD qwPacketNumber; //For CCMP and TKIP as TSC(6 bytes)
UINT uCurrentWEPMode; unsigned int uCurrentWEPMode;
RC4Ext SBox; RC4Ext SBox;
BYTE abyPRNG[WLAN_WEPMAX_KEYLEN+3]; BYTE abyPRNG[WLAN_WEPMAX_KEYLEN+3];
BYTE byKeyIndex; BYTE byKeyIndex;
UINT uKeyLength; unsigned int uKeyLength;
BYTE abyKey[WLAN_WEP232_KEYLEN]; BYTE abyKey[WLAN_WEP232_KEYLEN];
BOOL bAES; BOOL bAES;
BYTE byCntMeasure; BYTE byCntMeasure;
// for AP mode // for AP mode
UINT uAssocCount; unsigned int uAssocCount;
BOOL bMoreData; BOOL bMoreData;
// QoS // QoS
@ -657,12 +657,12 @@ typedef struct __device_info {
BOOL bRxMICFail; BOOL bRxMICFail;
UINT uRATEIdx; unsigned int uRATEIdx;
// For Update BaseBand VGA Gain Offset // For Update BaseBand VGA Gain Offset
BOOL bUpdateBBVGA; BOOL bUpdateBBVGA;
UINT uBBVGADiffCount; unsigned int uBBVGADiffCount;
BYTE byBBVGANew; BYTE byBBVGANew;
BYTE byBBVGACurrent; BYTE byBBVGACurrent;
BYTE abyBBVGA[BB_VGA_LEVEL]; BYTE abyBBVGA[BB_VGA_LEVEL];
@ -766,7 +766,7 @@ typedef struct __device_info {
BOOL b11hEnable; BOOL b11hEnable;
BYTE abyCountryCode[3]; BYTE abyCountryCode[3];
// for 802.11h DFS // for 802.11h DFS
UINT uNumOfMeasureEIDs; unsigned int uNumOfMeasureEIDs;
PWLAN_IE_MEASURE_REQ pCurrMeasureEID; PWLAN_IE_MEASURE_REQ pCurrMeasureEID;
BOOL bMeasureInProgress; BOOL bMeasureInProgress;
BYTE byOrgChannel; BYTE byOrgChannel;
@ -783,7 +783,7 @@ typedef struct __device_info {
BOOL bQuietEnable; BOOL bQuietEnable;
BOOL bEnableFirstQuiet; BOOL bEnableFirstQuiet;
BYTE byQuietStartCount; BYTE byQuietStartCount;
UINT uQuietEnqueue; unsigned int uQuietEnqueue;
DWORD dwCurrentQuietEndTime; DWORD dwCurrentQuietEndTime;
SQuietControl sQuiet[MAX_QUIET_COUNT]; SQuietControl sQuiet[MAX_QUIET_COUNT];
// for 802.11h TPC // for 802.11h TPC
@ -803,7 +803,7 @@ typedef struct __device_info {
BOOL bwextstep2; BOOL bwextstep2;
BOOL bwextstep3; BOOL bwextstep3;
*/ */
UINT bwextcount; unsigned int bwextcount;
BOOL bWPASuppWextEnabled; BOOL bWPASuppWextEnabled;
#endif #endif
@ -816,7 +816,7 @@ typedef struct __device_info {
struct net_device *apdev; struct net_device *apdev;
int (*tx_80211)(struct sk_buff *skb, struct net_device *dev); int (*tx_80211)(struct sk_buff *skb, struct net_device *dev);
#endif #endif
UINT uChannel; unsigned int uChannel;
BOOL bMACSuspend; BOOL bMACSuspend;
struct iw_statistics wstats; // wireless stats struct iw_statistics wstats; // wireless stats
@ -920,7 +920,7 @@ static inline PDEVICE_TD_INFO alloc_td_info(void) {
/*--------------------- Export Functions --------------------------*/ /*--------------------- Export Functions --------------------------*/
BOOL device_dma0_xmit(PSDevice pDevice, struct sk_buff *skb, UINT uNodeIndex); BOOL device_dma0_xmit(PSDevice pDevice, struct sk_buff *skb, unsigned int uNodeIndex);
BOOL device_alloc_frag_buf(PSDevice pDevice, PSDeFragControlBlock pDeF); BOOL device_alloc_frag_buf(PSDevice pDevice, PSDeFragControlBlock pDeF);
int Config_FileOperation(PSDevice pDevice,BOOL fwrite,unsigned char *Parameter); int Config_FileOperation(PSDevice pDevice,BOOL fwrite,unsigned char *Parameter);
#endif #endif

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

@ -329,8 +329,8 @@ static int device_dma0_tx_80211(struct sk_buff *skb, struct net_device *dev);
static BOOL device_release_WPADEV(PSDevice pDevice); static BOOL device_release_WPADEV(PSDevice pDevice);
static int ethtool_ioctl(struct net_device *dev, void *useraddr); static int ethtool_ioctl(struct net_device *dev, void *useraddr);
static int device_rx_srv(PSDevice pDevice, UINT uIdx); static int device_rx_srv(PSDevice pDevice, unsigned int uIdx);
static int device_tx_srv(PSDevice pDevice, UINT uIdx); static int device_tx_srv(PSDevice pDevice, unsigned int uIdx);
static BOOL device_alloc_rx_buf(PSDevice pDevice, PSRxDesc pDesc); static BOOL device_alloc_rx_buf(PSDevice pDevice, PSRxDesc pDesc);
static void device_init_registers(PSDevice pDevice, DEVICE_INIT_TYPE InitType); static void device_init_registers(PSDevice pDevice, DEVICE_INIT_TYPE InitType);
static void device_free_tx_buf(PSDevice pDevice, PSTxDesc pDesc); static void device_free_tx_buf(PSDevice pDevice, PSTxDesc pDesc);
@ -481,7 +481,7 @@ pDevice->bUpdateBBVGA = TRUE;
static void s_vCompleteCurrentMeasure (PSDevice pDevice, BYTE byResult) static void s_vCompleteCurrentMeasure (PSDevice pDevice, BYTE byResult)
{ {
UINT ii; unsigned int ii;
DWORD dwDuration = 0; DWORD dwDuration = 0;
BYTE byRPI0 = 0; BYTE byRPI0 = 0;
@ -526,7 +526,7 @@ static void s_vCompleteCurrentMeasure (PSDevice pDevice, BYTE byResult)
static void device_init_registers(PSDevice pDevice, DEVICE_INIT_TYPE InitType) static void device_init_registers(PSDevice pDevice, DEVICE_INIT_TYPE InitType)
{ {
UINT ii; unsigned int ii;
BYTE byValue; BYTE byValue;
BYTE byValue1; BYTE byValue1;
BYTE byCCKPwrdBm = 0; BYTE byCCKPwrdBm = 0;
@ -1153,7 +1153,7 @@ static BOOL device_get_pci_info(PSDevice pDevice, struct pci_dev* pcid) {
u16 pci_cmd; u16 pci_cmd;
u8 b; u8 b;
UINT cis_addr; unsigned int cis_addr;
#ifdef PLICE_DEBUG #ifdef PLICE_DEBUG
BYTE pci_config[256]; BYTE pci_config[256];
BYTE value =0x00; BYTE value =0x00;
@ -1594,7 +1594,7 @@ static void device_free_td1_ring(PSDevice pDevice) {
/*-----------------------------------------------------------------*/ /*-----------------------------------------------------------------*/
static int device_rx_srv(PSDevice pDevice, UINT uIdx) { static int device_rx_srv(PSDevice pDevice, unsigned int uIdx) {
PSRxDesc pRD; PSRxDesc pRD;
int works = 0; int works = 0;
@ -1662,17 +1662,17 @@ BOOL device_alloc_frag_buf(PSDevice pDevice, PSDeFragControlBlock pDeF) {
static int device_tx_srv(PSDevice pDevice, UINT uIdx) { static int device_tx_srv(PSDevice pDevice, unsigned int uIdx) {
PSTxDesc pTD; PSTxDesc pTD;
BOOL bFull=FALSE; BOOL bFull=FALSE;
int works = 0; int works = 0;
BYTE byTsr0; BYTE byTsr0;
BYTE byTsr1; BYTE byTsr1;
UINT uFrameSize, uFIFOHeaderSize; unsigned int uFrameSize, uFIFOHeaderSize;
PSTxBufHead pTxBufHead; PSTxBufHead pTxBufHead;
struct net_device_stats* pStats = &pDevice->stats; struct net_device_stats* pStats = &pDevice->stats;
struct sk_buff* skb; struct sk_buff* skb;
UINT uNodeIndex; unsigned int uNodeIndex;
PSMgmtObject pMgmt = pDevice->pMgmt; PSMgmtObject pMgmt = pDevice->pMgmt;
@ -2084,7 +2084,7 @@ device_release_WPADEV(pDevice);
static int device_dma0_tx_80211(struct sk_buff *skb, struct net_device *dev) { static int device_dma0_tx_80211(struct sk_buff *skb, struct net_device *dev) {
PSDevice pDevice=netdev_priv(dev); PSDevice pDevice=netdev_priv(dev);
PBYTE pbMPDU; PBYTE pbMPDU;
UINT cbMPDULen = 0; unsigned int cbMPDULen = 0;
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "device_dma0_tx_80211\n"); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "device_dma0_tx_80211\n");
@ -2116,16 +2116,16 @@ static int device_dma0_tx_80211(struct sk_buff *skb, struct net_device *dev) {
BOOL device_dma0_xmit(PSDevice pDevice, struct sk_buff *skb, UINT uNodeIndex) { BOOL device_dma0_xmit(PSDevice pDevice, struct sk_buff *skb, unsigned int uNodeIndex) {
PSMgmtObject pMgmt = pDevice->pMgmt; PSMgmtObject pMgmt = pDevice->pMgmt;
PSTxDesc pHeadTD, pLastTD; PSTxDesc pHeadTD, pLastTD;
UINT cbFrameBodySize; unsigned int cbFrameBodySize;
UINT uMACfragNum; unsigned int uMACfragNum;
BYTE byPktType; BYTE byPktType;
BOOL bNeedEncryption = FALSE; BOOL bNeedEncryption = FALSE;
PSKeyItem pTransmitKey = NULL; PSKeyItem pTransmitKey = NULL;
UINT cbHeaderSize; unsigned int cbHeaderSize;
UINT ii; unsigned int ii;
SKeyItem STempKey; SKeyItem STempKey;
// BYTE byKeyIndex = 0; // BYTE byKeyIndex = 0;
@ -2270,17 +2270,17 @@ static int device_xmit(struct sk_buff *skb, struct net_device *dev) {
PSMgmtObject pMgmt = pDevice->pMgmt; PSMgmtObject pMgmt = pDevice->pMgmt;
PSTxDesc pHeadTD, pLastTD; PSTxDesc pHeadTD, pLastTD;
UINT uNodeIndex = 0; unsigned int uNodeIndex = 0;
BYTE byMask[8] = {1, 2, 4, 8, 0x10, 0x20, 0x40, 0x80}; BYTE byMask[8] = {1, 2, 4, 8, 0x10, 0x20, 0x40, 0x80};
WORD wAID; WORD wAID;
UINT uMACfragNum = 1; unsigned int uMACfragNum = 1;
UINT cbFrameBodySize; unsigned int cbFrameBodySize;
BYTE byPktType; BYTE byPktType;
UINT cbHeaderSize; unsigned int cbHeaderSize;
BOOL bNeedEncryption = FALSE; BOOL bNeedEncryption = FALSE;
PSKeyItem pTransmitKey = NULL; PSKeyItem pTransmitKey = NULL;
SKeyItem STempKey; SKeyItem STempKey;
UINT ii; unsigned int ii;
BOOL bTKIP_UseGTK = FALSE; BOOL bTKIP_UseGTK = FALSE;
BOOL bNeedDeAuth = FALSE; BOOL bNeedDeAuth = FALSE;
PBYTE pbyBSSID; PBYTE pbyBSSID;

40
drivers/staging/vt6655/dpc.c
View File

@ -92,7 +92,7 @@ void
s_vProcessRxMACHeader ( s_vProcessRxMACHeader (
PSDevice pDevice, PSDevice pDevice,
PBYTE pbyRxBufferAddr, PBYTE pbyRxBufferAddr,
UINT cbPacketSize, unsigned int cbPacketSize,
BOOL bIsWEP, BOOL bIsWEP,
BOOL bExtIV, BOOL bExtIV,
PUINT pcbHeadSize PUINT pcbHeadSize
@ -109,8 +109,8 @@ static BOOL s_bAPModeRxCtl(
static BOOL s_bAPModeRxData ( static BOOL s_bAPModeRxData (
PSDevice pDevice, PSDevice pDevice,
struct sk_buff* skb, struct sk_buff* skb,
UINT FrameSize, unsigned int FrameSize,
UINT cbHeaderOffset, unsigned int cbHeaderOffset,
int iSANodeIndex, int iSANodeIndex,
int iDANodeIndex int iDANodeIndex
); );
@ -119,7 +119,7 @@ static BOOL s_bAPModeRxData (
static BOOL s_bHandleRxEncryption( static BOOL s_bHandleRxEncryption(
PSDevice pDevice, PSDevice pDevice,
PBYTE pbyFrame, PBYTE pbyFrame,
UINT FrameSize, unsigned int FrameSize,
PBYTE pbyRsr, PBYTE pbyRsr,
PBYTE pbyNewRsr, PBYTE pbyNewRsr,
PSKeyItem *pKeyOut, PSKeyItem *pKeyOut,
@ -132,7 +132,7 @@ static BOOL s_bHostWepRxEncryption(
PSDevice pDevice, PSDevice pDevice,
PBYTE pbyFrame, PBYTE pbyFrame,
UINT FrameSize, unsigned int FrameSize,
PBYTE pbyRsr, PBYTE pbyRsr,
BOOL bOnFly, BOOL bOnFly,
PSKeyItem pKey, PSKeyItem pKey,
@ -167,14 +167,14 @@ void
s_vProcessRxMACHeader ( s_vProcessRxMACHeader (
PSDevice pDevice, PSDevice pDevice,
PBYTE pbyRxBufferAddr, PBYTE pbyRxBufferAddr,
UINT cbPacketSize, unsigned int cbPacketSize,
BOOL bIsWEP, BOOL bIsWEP,
BOOL bExtIV, BOOL bExtIV,
PUINT pcbHeadSize PUINT pcbHeadSize
) )
{ {
PBYTE pbyRxBuffer; PBYTE pbyRxBuffer;
UINT cbHeaderSize = 0; unsigned int cbHeaderSize = 0;
PWORD pwType; PWORD pwType;
PS802_11Header pMACHeader; PS802_11Header pMACHeader;
int ii; int ii;
@ -269,7 +269,7 @@ s_vGetDASA (
PSEthernetHeader psEthHeader PSEthernetHeader psEthHeader
) )
{ {
UINT cbHeaderSize = 0; unsigned int cbHeaderSize = 0;
PS802_11Header pMACHeader; PS802_11Header pMACHeader;
int ii; int ii;
@ -357,18 +357,18 @@ device_receive_frame (
PBYTE pbyFrame; PBYTE pbyFrame;
BOOL bDeFragRx = FALSE; BOOL bDeFragRx = FALSE;
BOOL bIsWEP = FALSE; BOOL bIsWEP = FALSE;
UINT cbHeaderOffset; unsigned int cbHeaderOffset;
UINT FrameSize; unsigned int FrameSize;
WORD wEtherType = 0; WORD wEtherType = 0;
int iSANodeIndex = -1; int iSANodeIndex = -1;
int iDANodeIndex = -1; int iDANodeIndex = -1;
UINT ii; unsigned int ii;
UINT cbIVOffset; unsigned int cbIVOffset;
BOOL bExtIV = FALSE; BOOL bExtIV = FALSE;
PBYTE pbyRxSts; PBYTE pbyRxSts;
PBYTE pbyRxRate; PBYTE pbyRxRate;
PBYTE pbySQ; PBYTE pbySQ;
UINT cbHeaderSize; unsigned int cbHeaderSize;
PSKeyItem pKey = NULL; PSKeyItem pKey = NULL;
WORD wRxTSC15_0 = 0; WORD wRxTSC15_0 = 0;
DWORD dwRxTSC47_16 = 0; DWORD dwRxTSC47_16 = 0;
@ -1165,7 +1165,7 @@ static BOOL s_bAPModeRxCtl (
static BOOL s_bHandleRxEncryption ( static BOOL s_bHandleRxEncryption (
PSDevice pDevice, PSDevice pDevice,
PBYTE pbyFrame, PBYTE pbyFrame,
UINT FrameSize, unsigned int FrameSize,
PBYTE pbyRsr, PBYTE pbyRsr,
PBYTE pbyNewRsr, PBYTE pbyNewRsr,
PSKeyItem *pKeyOut, PSKeyItem *pKeyOut,
@ -1174,7 +1174,7 @@ static BOOL s_bHandleRxEncryption (
PDWORD pdwRxTSC47_16 PDWORD pdwRxTSC47_16
) )
{ {
UINT PayloadLen = FrameSize; unsigned int PayloadLen = FrameSize;
PBYTE pbyIV; PBYTE pbyIV;
BYTE byKeyIdx; BYTE byKeyIdx;
PSKeyItem pKey = NULL; PSKeyItem pKey = NULL;
@ -1311,7 +1311,7 @@ static BOOL s_bHandleRxEncryption (
static BOOL s_bHostWepRxEncryption ( static BOOL s_bHostWepRxEncryption (
PSDevice pDevice, PSDevice pDevice,
PBYTE pbyFrame, PBYTE pbyFrame,
UINT FrameSize, unsigned int FrameSize,
PBYTE pbyRsr, PBYTE pbyRsr,
BOOL bOnFly, BOOL bOnFly,
PSKeyItem pKey, PSKeyItem pKey,
@ -1321,7 +1321,7 @@ static BOOL s_bHostWepRxEncryption (
PDWORD pdwRxTSC47_16 PDWORD pdwRxTSC47_16
) )
{ {
UINT PayloadLen = FrameSize; unsigned int PayloadLen = FrameSize;
PBYTE pbyIV; PBYTE pbyIV;
BYTE byKeyIdx; BYTE byKeyIdx;
BYTE byDecMode = KEY_CTL_WEP; BYTE byDecMode = KEY_CTL_WEP;
@ -1442,8 +1442,8 @@ static BOOL s_bHostWepRxEncryption (
static BOOL s_bAPModeRxData ( static BOOL s_bAPModeRxData (
PSDevice pDevice, PSDevice pDevice,
struct sk_buff* skb, struct sk_buff* skb,
UINT FrameSize, unsigned int FrameSize,
UINT cbHeaderOffset, unsigned int cbHeaderOffset,
int iSANodeIndex, int iSANodeIndex,
int iDANodeIndex int iDANodeIndex
) )
@ -1515,7 +1515,7 @@ static BOOL s_bAPModeRxData (
iDANodeIndex = 0; iDANodeIndex = 0;
if ((pDevice->uAssocCount > 1) && (iDANodeIndex >= 0)) { if ((pDevice->uAssocCount > 1) && (iDANodeIndex >= 0)) {
ROUTEbRelay(pDevice, (PBYTE)(skb->data + cbHeaderOffset), FrameSize, (UINT)iDANodeIndex); ROUTEbRelay(pDevice, (PBYTE)(skb->data + cbHeaderOffset), FrameSize, (unsigned int)iDANodeIndex);
} }
if (bRelayOnly) if (bRelayOnly)

12
drivers/staging/vt6655/hostap.c
View File

@ -215,7 +215,7 @@ int vt6655_hostap_set_hostapd(PSDevice pDevice, int val, int rtnl_locked)
static int hostap_remove_sta(PSDevice pDevice, static int hostap_remove_sta(PSDevice pDevice,
struct viawget_hostapd_param *param) struct viawget_hostapd_param *param)
{ {
UINT uNodeIndex; unsigned int uNodeIndex;
if (BSSDBbIsSTAInNodeDB(pDevice->pMgmt, param->sta_addr, &uNodeIndex)) { if (BSSDBbIsSTAInNodeDB(pDevice->pMgmt, param->sta_addr, &uNodeIndex)) {
@ -244,7 +244,7 @@ static int hostap_add_sta(PSDevice pDevice,
struct viawget_hostapd_param *param) struct viawget_hostapd_param *param)
{ {
PSMgmtObject pMgmt = pDevice->pMgmt; PSMgmtObject pMgmt = pDevice->pMgmt;
UINT uNodeIndex; unsigned int uNodeIndex;
if (!BSSDBbIsSTAInNodeDB(pMgmt, param->sta_addr, &uNodeIndex)) { if (!BSSDBbIsSTAInNodeDB(pMgmt, param->sta_addr, &uNodeIndex)) {
@ -304,7 +304,7 @@ static int hostap_get_info_sta(PSDevice pDevice,
struct viawget_hostapd_param *param) struct viawget_hostapd_param *param)
{ {
PSMgmtObject pMgmt = pDevice->pMgmt; PSMgmtObject pMgmt = pDevice->pMgmt;
UINT uNodeIndex; unsigned int uNodeIndex;
if (BSSDBbIsSTAInNodeDB(pMgmt, param->sta_addr, &uNodeIndex)) { if (BSSDBbIsSTAInNodeDB(pMgmt, param->sta_addr, &uNodeIndex)) {
param->u.get_info_sta.inactive_sec = param->u.get_info_sta.inactive_sec =
@ -338,7 +338,7 @@ static int hostap_reset_txexc_sta(PSDevice pDevice,
struct viawget_hostapd_param *param) struct viawget_hostapd_param *param)
{ {
PSMgmtObject pMgmt = pDevice->pMgmt; PSMgmtObject pMgmt = pDevice->pMgmt;
UINT uNodeIndex; unsigned int uNodeIndex;
if (BSSDBbIsSTAInNodeDB(pMgmt, param->sta_addr, &uNodeIndex)) { if (BSSDBbIsSTAInNodeDB(pMgmt, param->sta_addr, &uNodeIndex)) {
pMgmt->sNodeDBTable[uNodeIndex].uTxAttempts = 0; pMgmt->sNodeDBTable[uNodeIndex].uTxAttempts = 0;
@ -368,13 +368,13 @@ static int hostap_set_flags_sta(PSDevice pDevice,
struct viawget_hostapd_param *param) struct viawget_hostapd_param *param)
{ {
PSMgmtObject pMgmt = pDevice->pMgmt; PSMgmtObject pMgmt = pDevice->pMgmt;
UINT uNodeIndex; unsigned int uNodeIndex;
if (BSSDBbIsSTAInNodeDB(pMgmt, param->sta_addr, &uNodeIndex)) { if (BSSDBbIsSTAInNodeDB(pMgmt, param->sta_addr, &uNodeIndex)) {
pMgmt->sNodeDBTable[uNodeIndex].dwFlags |= param->u.set_flags_sta.flags_or; pMgmt->sNodeDBTable[uNodeIndex].dwFlags |= param->u.set_flags_sta.flags_or;
pMgmt->sNodeDBTable[uNodeIndex].dwFlags &= param->u.set_flags_sta.flags_and; pMgmt->sNodeDBTable[uNodeIndex].dwFlags &= param->u.set_flags_sta.flags_and;
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " dwFlags = %x \n", DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " dwFlags = %x \n",
(UINT)pMgmt->sNodeDBTable[uNodeIndex].dwFlags); (unsigned int)pMgmt->sNodeDBTable[uNodeIndex].dwFlags);
} }
else { else {
return -ENOENT; return -ENOENT;

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

@ -70,10 +70,10 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) {
SNodeList sNodeList; SNodeList sNodeList;
PSBSSIDList pList; PSBSSIDList pList;
PSNodeList pNodeList; PSNodeList pNodeList;
UINT cbListCount; unsigned int cbListCount;
PKnownBSS pBSS; PKnownBSS pBSS;
PKnownNodeDB pNode; PKnownNodeDB pNode;
UINT ii, jj; unsigned int ii, jj;
SCmdLinkStatus sLinkStatus; SCmdLinkStatus sLinkStatus;
BYTE abySuppRates[] = {WLAN_EID_SUPP_RATES, 4, 0x02, 0x04, 0x0B, 0x16}; BYTE abySuppRates[] = {WLAN_EID_SUPP_RATES, 4, 0x02, 0x04, 0x0B, 0x16};
BYTE abyNullAddr[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; BYTE abyNullAddr[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
@ -341,7 +341,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) {
pList->sBSSIDList[ii].wCapInfo = pBSS->wCapInfo; pList->sBSSIDList[ii].wCapInfo = pBSS->wCapInfo;
// pList->sBSSIDList[ii].uRSSI = pBSS->uRSSI; // pList->sBSSIDList[ii].uRSSI = pBSS->uRSSI;
RFvRSSITodBm(pDevice, (BYTE)(pBSS->uRSSI), &ldBm); RFvRSSITodBm(pDevice, (BYTE)(pBSS->uRSSI), &ldBm);
pList->sBSSIDList[ii].uRSSI = (UINT)ldBm; pList->sBSSIDList[ii].uRSSI = (unsigned int)ldBm;
memcpy(pList->sBSSIDList[ii].abyBSSID, pBSS->abyBSSID, WLAN_BSSID_LEN); memcpy(pList->sBSSIDList[ii].abyBSSID, pBSS->abyBSSID, WLAN_BSSID_LEN);
pItemSSID = (PWLAN_IE_SSID)pBSS->abySSID; pItemSSID = (PWLAN_IE_SSID)pBSS->abySSID;
memset(pList->sBSSIDList[ii].abySSID, 0, WLAN_SSID_MAXLEN + 1); memset(pList->sBSSIDList[ii].abySSID, 0, WLAN_SSID_MAXLEN + 1);

8
drivers/staging/vt6655/iwctl.c
View File

@ -714,7 +714,7 @@ if (pMgmt->eScanState == WMAC_IS_SCANNING) {
//mike add: if desired AP is hidden ssid(there are two same BSSID in list), //mike add: if desired AP is hidden ssid(there are two same BSSID in list),
// then ignore,because you don't known which one to be connect with?? // then ignore,because you don't known which one to be connect with??
{ {
UINT ii , uSameBssidNum=0; unsigned int ii , uSameBssidNum=0;
for (ii = 0; ii < MAX_BSS_NUM; ii++) { for (ii = 0; ii < MAX_BSS_NUM; ii++) {
if (pMgmt->sBSSList[ii].bActive && if (pMgmt->sBSSList[ii].bActive &&
!compare_ether_addr(pMgmt->sBSSList[ii].abyBSSID, pMgmt->abyDesireBSSID)) { !compare_ether_addr(pMgmt->sBSSList[ii].abyBSSID, pMgmt->abyDesireBSSID)) {
@ -886,7 +886,7 @@ if (pMgmt->eScanState == WMAC_IS_SCANNING) {
{ {
PKnownBSS pCurr = NULL; PKnownBSS pCurr = NULL;
BYTE abyTmpDesireSSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1]; BYTE abyTmpDesireSSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1];
UINT ii , uSameBssidNum=0; unsigned int ii , uSameBssidNum=0;
memcpy(abyTmpDesireSSID,pMgmt->abyDesireSSID,sizeof(abyTmpDesireSSID)); memcpy(abyTmpDesireSSID,pMgmt->abyDesireSSID,sizeof(abyTmpDesireSSID));
pCurr = BSSpSearchBSSList(pDevice, pCurr = BSSpSearchBSSList(pDevice,
@ -1515,7 +1515,7 @@ int iwctl_giwencode(struct net_device *dev,
PSMgmtObject pMgmt = &(pDevice->sMgmtObj); PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
int rc = 0; int rc = 0;
char abyKey[WLAN_WEP232_KEYLEN]; char abyKey[WLAN_WEP232_KEYLEN];
UINT index = (UINT)(wrq->flags & IW_ENCODE_INDEX); unsigned int index = (unsigned int)(wrq->flags & IW_ENCODE_INDEX);
PSKeyItem pKey = NULL; PSKeyItem pKey = NULL;
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWENCODE\n"); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWENCODE\n");
@ -1584,7 +1584,7 @@ int iwctl_giwencode(struct net_device *dev,
PSMgmtObject pMgmt = &(pDevice->sMgmtObj); PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
char abyKey[WLAN_WEP232_KEYLEN]; char abyKey[WLAN_WEP232_KEYLEN];
UINT index = (UINT)(wrq->flags & IW_ENCODE_INDEX); unsigned int index = (unsigned int)(wrq->flags & IW_ENCODE_INDEX);
PSKeyItem pKey = NULL; PSKeyItem pKey = NULL;
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWENCODE\n"); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWENCODE\n");

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

@ -202,9 +202,9 @@ BOOL KeybSetKey (
) )
{ {
int i,j; int i,j;
UINT ii; unsigned int ii;
PSKeyItem pKey; PSKeyItem pKey;
UINT uKeyIdx; unsigned int uKeyIdx;
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Enter KeybSetKey: %lX\n", dwKeyIndex); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Enter KeybSetKey: %lX\n", dwKeyIndex);
@ -642,9 +642,9 @@ BOOL KeybSetDefaultKey (
BYTE byLocalID BYTE byLocalID
) )
{ {
UINT ii; unsigned int ii;
PSKeyItem pKey; PSKeyItem pKey;
UINT uKeyIdx; unsigned int uKeyIdx;
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Enter KeybSetDefaultKey: %1x, %d \n", (int)dwKeyIndex, (int)uKeyLength); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Enter KeybSetDefaultKey: %1x, %d \n", (int)dwKeyIndex, (int)uKeyLength);
@ -750,9 +750,9 @@ BOOL KeybSetAllGroupKey (
) )
{ {
int i; int i;
UINT ii; unsigned int ii;
PSKeyItem pKey; PSKeyItem pKey;
UINT uKeyIdx; unsigned int uKeyIdx;
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Enter KeybSetAllGroupKey: %lX\n", dwKeyIndex); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Enter KeybSetAllGroupKey: %lX\n", dwKeyIndex);

41
drivers/staging/vt6655/mac.c
View File

@ -209,7 +209,7 @@ BOOL MACbIsIntDisable (DWORD_PTR dwIoBase)
* Return Value: Mask Value read * Return Value: Mask Value read
* *
*/ */
BYTE MACbyReadMultiAddr (DWORD_PTR dwIoBase, UINT uByteIdx) BYTE MACbyReadMultiAddr (DWORD_PTR dwIoBase, unsigned int uByteIdx)
{ {
BYTE byData; BYTE byData;
@ -234,7 +234,7 @@ BYTE MACbyReadMultiAddr (DWORD_PTR dwIoBase, UINT uByteIdx)
* Return Value: none * Return Value: none
* *
*/ */
void MACvWriteMultiAddr (DWORD_PTR dwIoBase, UINT uByteIdx, BYTE byData) void MACvWriteMultiAddr (DWORD_PTR dwIoBase, unsigned int uByteIdx, BYTE byData)
{ {
MACvSelectPage1(dwIoBase); MACvSelectPage1(dwIoBase);
VNSvOutPortB(dwIoBase + MAC_REG_MAR0 + uByteIdx, byData); VNSvOutPortB(dwIoBase + MAC_REG_MAR0 + uByteIdx, byData);
@ -257,7 +257,7 @@ void MACvWriteMultiAddr (DWORD_PTR dwIoBase, UINT uByteIdx, BYTE byData)
*/ */
void MACvSetMultiAddrByHash (DWORD_PTR dwIoBase, BYTE byHashIdx) void MACvSetMultiAddrByHash (DWORD_PTR dwIoBase, BYTE byHashIdx)
{ {
UINT uByteIdx; unsigned int uByteIdx;
BYTE byBitMask; BYTE byBitMask;
BYTE byOrgValue; BYTE byOrgValue;
@ -288,7 +288,7 @@ void MACvSetMultiAddrByHash (DWORD_PTR dwIoBase, BYTE byHashIdx)
*/ */
void MACvResetMultiAddrByHash (DWORD_PTR dwIoBase, BYTE byHashIdx) void MACvResetMultiAddrByHash (DWORD_PTR dwIoBase, BYTE byHashIdx)
{ {
UINT uByteIdx; unsigned int uByteIdx;
BYTE byBitMask; BYTE byBitMask;
BYTE byOrgValue; BYTE byOrgValue;
@ -1244,10 +1244,10 @@ void MACvSetCurrTXDescAddr (int iTxType, DWORD_PTR dwIoBase, DWORD dwCurrDescAdd
* Return Value: none * Return Value: none
* *
*/ */
void MACvTimer0MicroSDelay (DWORD_PTR dwIoBase, UINT uDelay) void MACvTimer0MicroSDelay (DWORD_PTR dwIoBase, unsigned int uDelay)
{ {
BYTE byValue; BYTE byValue;
UINT uu,ii; unsigned int uu,ii;
VNSvOutPortB(dwIoBase + MAC_REG_TMCTL0, 0); VNSvOutPortB(dwIoBase + MAC_REG_TMCTL0, 0);
VNSvOutPortD(dwIoBase + MAC_REG_TMDATA0, uDelay); VNSvOutPortD(dwIoBase + MAC_REG_TMDATA0, uDelay);
@ -1280,7 +1280,7 @@ UINT uu,ii;
* Return Value: none * Return Value: none
* *
*/ */
void MACvOneShotTimer0MicroSec (DWORD_PTR dwIoBase, UINT uDelayTime) void MACvOneShotTimer0MicroSec (DWORD_PTR dwIoBase, unsigned int uDelayTime)
{ {
VNSvOutPortB(dwIoBase + MAC_REG_TMCTL0, 0); VNSvOutPortB(dwIoBase + MAC_REG_TMCTL0, 0);
VNSvOutPortD(dwIoBase + MAC_REG_TMDATA0, uDelayTime); VNSvOutPortD(dwIoBase + MAC_REG_TMDATA0, uDelayTime);
@ -1301,7 +1301,7 @@ void MACvOneShotTimer0MicroSec (DWORD_PTR dwIoBase, UINT uDelayTime)
* Return Value: none * Return Value: none
* *
*/ */
void MACvOneShotTimer1MicroSec (DWORD_PTR dwIoBase, UINT uDelayTime) void MACvOneShotTimer1MicroSec (DWORD_PTR dwIoBase, unsigned int uDelayTime)
{ {
VNSvOutPortB(dwIoBase + MAC_REG_TMCTL1, 0); VNSvOutPortB(dwIoBase + MAC_REG_TMCTL1, 0);
VNSvOutPortD(dwIoBase + MAC_REG_TMDATA1, uDelayTime); VNSvOutPortD(dwIoBase + MAC_REG_TMDATA1, uDelayTime);
@ -1319,10 +1319,10 @@ void MACvSetMISCFifo (DWORD_PTR dwIoBase, WORD wOffset, DWORD dwData)
} }
BOOL MACbTxDMAOff (DWORD_PTR dwIoBase, UINT idx) BOOL MACbTxDMAOff (DWORD_PTR dwIoBase, unsigned int idx)
{ {
BYTE byData; BYTE byData;
UINT ww = 0; unsigned int ww = 0;
if (idx == TYPE_TXDMA0) { if (idx == TYPE_TXDMA0) {
VNSvOutPortB(dwIoBase + MAC_REG_TXDMACTL0+2, DMACTL_RUN); VNSvOutPortB(dwIoBase + MAC_REG_TXDMACTL0+2, DMACTL_RUN);
@ -1350,7 +1350,7 @@ UINT ww = 0;
void MACvClearBusSusInd (DWORD_PTR dwIoBase) void MACvClearBusSusInd (DWORD_PTR dwIoBase)
{ {
DWORD dwOrgValue; DWORD dwOrgValue;
UINT ww; unsigned int ww;
// check if BcnSusInd enabled // check if BcnSusInd enabled
VNSvInPortD(dwIoBase + MAC_REG_ENCFG , &dwOrgValue); VNSvInPortD(dwIoBase + MAC_REG_ENCFG , &dwOrgValue);
if( !(dwOrgValue & EnCFG_BcnSusInd)) if( !(dwOrgValue & EnCFG_BcnSusInd))
@ -1373,7 +1373,7 @@ void MACvEnableBusSusEn (DWORD_PTR dwIoBase)
{ {
BYTE byOrgValue; BYTE byOrgValue;
DWORD dwOrgValue; DWORD dwOrgValue;
UINT ww; unsigned int ww;
// check if BcnSusInd enabled // check if BcnSusInd enabled
VNSvInPortB(dwIoBase + MAC_REG_CFG , &byOrgValue); VNSvInPortB(dwIoBase + MAC_REG_CFG , &byOrgValue);
@ -1394,7 +1394,7 @@ void MACvEnableBusSusEn (DWORD_PTR dwIoBase)
BOOL MACbFlushSYNCFifo (DWORD_PTR dwIoBase) BOOL MACbFlushSYNCFifo (DWORD_PTR dwIoBase)
{ {
BYTE byOrgValue; BYTE byOrgValue;
UINT ww; unsigned int ww;
// Read MACCR // Read MACCR
VNSvInPortB(dwIoBase + MAC_REG_MACCR , &byOrgValue); VNSvInPortB(dwIoBase + MAC_REG_MACCR , &byOrgValue);
@ -1418,7 +1418,7 @@ BOOL MACbFlushSYNCFifo (DWORD_PTR dwIoBase)
BOOL MACbPSWakeup (DWORD_PTR dwIoBase) BOOL MACbPSWakeup (DWORD_PTR dwIoBase)
{ {
BYTE byOrgValue; BYTE byOrgValue;
UINT ww; unsigned int ww;
// Read PSCTL // Read PSCTL
if (MACbIsRegBitsOff(dwIoBase, MAC_REG_PSCTL, PSCTL_PS)) { if (MACbIsRegBitsOff(dwIoBase, MAC_REG_PSCTL, PSCTL_PS)) {
return TRUE; return TRUE;
@ -1455,7 +1455,8 @@ BOOL MACbPSWakeup (DWORD_PTR dwIoBase)
* *
*/ */
void MACvSetKeyEntry (DWORD_PTR dwIoBase, WORD wKeyCtl, UINT uEntryIdx, UINT uKeyIdx, PBYTE pbyAddr, PDWORD pdwKey, BYTE byLocalID) void MACvSetKeyEntry (DWORD_PTR dwIoBase, WORD wKeyCtl, unsigned int uEntryIdx,
unsigned int uKeyIdx, PBYTE pbyAddr, PDWORD pdwKey, BYTE byLocalID)
{ {
WORD wOffset; WORD wOffset;
DWORD dwData; DWORD dwData;
@ -1521,7 +1522,7 @@ int ii;
* Return Value: none * Return Value: none
* *
*/ */
void MACvDisableKeyEntry (DWORD_PTR dwIoBase, UINT uEntryIdx) void MACvDisableKeyEntry (DWORD_PTR dwIoBase, unsigned int uEntryIdx)
{ {
WORD wOffset; WORD wOffset;
@ -1549,7 +1550,8 @@ WORD wOffset;
* *
*/ */
void MACvSetDefaultKeyEntry (DWORD_PTR dwIoBase, UINT uKeyLen, UINT uKeyIdx, PDWORD pdwKey, BYTE byLocalID) void MACvSetDefaultKeyEntry (DWORD_PTR dwIoBase, unsigned int uKeyLen,
unsigned int uKeyIdx, PDWORD pdwKey, BYTE byLocalID)
{ {
WORD wOffset; WORD wOffset;
DWORD dwData; DWORD dwData;
@ -1664,7 +1666,8 @@ DWORD dwData;
* Return Value: none * Return Value: none
* *
*/ */
void MACvSetDefaultTKIPKeyEntry (DWORD_PTR dwIoBase, UINT uKeyLen, UINT uKeyIdx, PDWORD pdwKey, BYTE byLocalID) void MACvSetDefaultTKIPKeyEntry (DWORD_PTR dwIoBase, unsigned int uKeyLen,
unsigned int uKeyIdx, PDWORD pdwKey, BYTE byLocalID)
{ {
WORD wOffset; WORD wOffset;
DWORD dwData; DWORD dwData;
@ -1720,7 +1723,7 @@ int ii;
* *
*/ */
void MACvSetDefaultKeyCtl (DWORD_PTR dwIoBase, WORD wKeyCtl, UINT uEntryIdx, BYTE byLocalID) void MACvSetDefaultKeyCtl (DWORD_PTR dwIoBase, WORD wKeyCtl, unsigned int uEntryIdx, BYTE byLocalID)
{ {
WORD wOffset; WORD wOffset;
DWORD dwData; DWORD dwData;

25
drivers/staging/vt6655/mac.h
View File

@ -1082,8 +1082,8 @@ BOOL MACbIsRegBitsOff(DWORD_PTR dwIoBase, BYTE byRegOfs, BYTE byTestBits);
BOOL MACbIsIntDisable(DWORD_PTR dwIoBase); BOOL MACbIsIntDisable(DWORD_PTR dwIoBase);
BYTE MACbyReadMultiAddr(DWORD_PTR dwIoBase, UINT uByteIdx); BYTE MACbyReadMultiAddr(DWORD_PTR dwIoBase, unsigned int uByteIdx);
void MACvWriteMultiAddr(DWORD_PTR dwIoBase, UINT uByteIdx, BYTE byData); void MACvWriteMultiAddr(DWORD_PTR dwIoBase, unsigned int uByteIdx, BYTE byData);
void MACvSetMultiAddrByHash(DWORD_PTR dwIoBase, BYTE byHashIdx); void MACvSetMultiAddrByHash(DWORD_PTR dwIoBase, BYTE byHashIdx);
void MACvResetMultiAddrByHash(DWORD_PTR dwIoBase, BYTE byHashIdx); void MACvResetMultiAddrByHash(DWORD_PTR dwIoBase, BYTE byHashIdx);
@ -1125,13 +1125,13 @@ void MACvSetCurrTx0DescAddrEx(DWORD_PTR dwIoBase, DWORD dwCurrDescAddr);
void MACvSetCurrAC0DescAddrEx(DWORD_PTR dwIoBase, DWORD dwCurrDescAddr); void MACvSetCurrAC0DescAddrEx(DWORD_PTR dwIoBase, DWORD dwCurrDescAddr);
void MACvSetCurrSyncDescAddrEx(DWORD_PTR dwIoBase, DWORD dwCurrDescAddr); void MACvSetCurrSyncDescAddrEx(DWORD_PTR dwIoBase, DWORD dwCurrDescAddr);
void MACvSetCurrATIMDescAddrEx(DWORD_PTR dwIoBase, DWORD dwCurrDescAddr); void MACvSetCurrATIMDescAddrEx(DWORD_PTR dwIoBase, DWORD dwCurrDescAddr);
void MACvTimer0MicroSDelay(DWORD_PTR dwIoBase, UINT uDelay); void MACvTimer0MicroSDelay(DWORD_PTR dwIoBase, unsigned int uDelay);
void MACvOneShotTimer0MicroSec(DWORD_PTR dwIoBase, UINT uDelayTime); void MACvOneShotTimer0MicroSec(DWORD_PTR dwIoBase, unsigned int uDelayTime);
void MACvOneShotTimer1MicroSec(DWORD_PTR dwIoBase, UINT uDelayTime); void MACvOneShotTimer1MicroSec(DWORD_PTR dwIoBase, unsigned int uDelayTime);
void MACvSetMISCFifo(DWORD_PTR dwIoBase, WORD wOffset, DWORD dwData); void MACvSetMISCFifo(DWORD_PTR dwIoBase, WORD wOffset, DWORD dwData);
BOOL MACbTxDMAOff (DWORD_PTR dwIoBase, UINT idx); BOOL MACbTxDMAOff (DWORD_PTR dwIoBase, unsigned int idx);
void MACvClearBusSusInd(DWORD_PTR dwIoBase); void MACvClearBusSusInd(DWORD_PTR dwIoBase);
void MACvEnableBusSusEn(DWORD_PTR dwIoBase); void MACvEnableBusSusEn(DWORD_PTR dwIoBase);
@ -1139,13 +1139,16 @@ void MACvEnableBusSusEn(DWORD_PTR dwIoBase);
BOOL MACbFlushSYNCFifo(DWORD_PTR dwIoBase); BOOL MACbFlushSYNCFifo(DWORD_PTR dwIoBase);
BOOL MACbPSWakeup(DWORD_PTR dwIoBase); BOOL MACbPSWakeup(DWORD_PTR dwIoBase);
void MACvSetKeyEntry(DWORD_PTR dwIoBase, WORD wKeyCtl, UINT uEntryIdx, UINT uKeyIdx, PBYTE pbyAddr, PDWORD pdwKey, BYTE byLocalID); void MACvSetKeyEntry(DWORD_PTR dwIoBase, WORD wKeyCtl, unsigned int uEntryIdx,
void MACvDisableKeyEntry(DWORD_PTR dwIoBase, UINT uEntryIdx); unsigned int uKeyIdx, PBYTE pbyAddr, PDWORD pdwKey, BYTE byLocalID);
void MACvSetDefaultKeyEntry(DWORD_PTR dwIoBase, UINT uKeyLen, UINT uKeyIdx, PDWORD pdwKey, BYTE byLocalID); void MACvDisableKeyEntry(DWORD_PTR dwIoBase, unsigned int uEntryIdx);
void MACvSetDefaultKeyEntry(DWORD_PTR dwIoBase, unsigned int uKeyLen,
unsigned int uKeyIdx, PDWORD pdwKey, BYTE byLocalID);
//void MACvEnableDefaultKey(DWORD_PTR dwIoBase, BYTE byLocalID); //void MACvEnableDefaultKey(DWORD_PTR dwIoBase, BYTE byLocalID);
void MACvDisableDefaultKey(DWORD_PTR dwIoBase); void MACvDisableDefaultKey(DWORD_PTR dwIoBase);
void MACvSetDefaultTKIPKeyEntry(DWORD_PTR dwIoBase, UINT uKeyLen, UINT uKeyIdx, PDWORD pdwKey, BYTE byLocalID); void MACvSetDefaultTKIPKeyEntry(DWORD_PTR dwIoBase, unsigned int uKeyLen,
void MACvSetDefaultKeyCtl(DWORD_PTR dwIoBase, WORD wKeyCtl, UINT uEntryIdx, BYTE byLocalID); unsigned int uKeyIdx, PDWORD pdwKey, BYTE byLocalID);
void MACvSetDefaultKeyCtl(DWORD_PTR dwIoBase, WORD wKeyCtl, unsigned int uEntryIdx, BYTE byLocalID);
#endif // __MAC_H__ #endif // __MAC_H__

12
drivers/staging/vt6655/mib.c
View File

@ -178,7 +178,7 @@ void STAvUpdateIsrStatCounter (PSStatCounter pStatistic, DWORD dwIsr)
*/ */
void STAvUpdateRDStatCounter (PSStatCounter pStatistic, void STAvUpdateRDStatCounter (PSStatCounter pStatistic,
BYTE byRSR, BYTE byNewRSR, BYTE byRxRate, BYTE byRSR, BYTE byNewRSR, BYTE byRxRate,
PBYTE pbyBuffer, UINT cbFrameLength) PBYTE pbyBuffer, unsigned int cbFrameLength)
{ {
//need change //need change
PS802_11Header pHeader = (PS802_11Header)pbyBuffer; PS802_11Header pHeader = (PS802_11Header)pbyBuffer;
@ -393,7 +393,7 @@ STAvUpdateRDStatCounterEx (
BYTE byNewRSR, BYTE byNewRSR,
BYTE byRxRate, BYTE byRxRate,
PBYTE pbyBuffer, PBYTE pbyBuffer,
UINT cbFrameLength unsigned int cbFrameLength
) )
{ {
STAvUpdateRDStatCounter( STAvUpdateRDStatCounter(
@ -435,8 +435,8 @@ STAvUpdateTDStatCounter (
BYTE byTSR0, BYTE byTSR0,
BYTE byTSR1, BYTE byTSR1,
PBYTE pbyBuffer, PBYTE pbyBuffer,
UINT cbFrameLength, unsigned int cbFrameLength,
UINT uIdx unsigned int uIdx
) )
{ {
PWLAN_80211HDR_A4 pHeader; PWLAN_80211HDR_A4 pHeader;
@ -526,9 +526,9 @@ STAvUpdateTDStatCounterEx (
DWORD cbFrameLength DWORD cbFrameLength
) )
{ {
UINT uPktLength; unsigned int uPktLength;
uPktLength = (UINT)cbFrameLength; uPktLength = (unsigned int)cbFrameLength;
// tx length // tx length
pStatistic->dwCntTxBufLength = uPktLength; pStatistic->dwCntTxBufLength = uPktLength;

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

@ -301,7 +301,7 @@ typedef struct tagSStatCounter {
DWORD dwCntRxDataErr; // rx buffer data software compare CRC err count DWORD dwCntRxDataErr; // rx buffer data software compare CRC err count
DWORD dwCntDecryptErr; // rx buffer data software compare CRC err count DWORD dwCntDecryptErr; // rx buffer data software compare CRC err count
DWORD dwCntRxICVErr; // rx buffer data software compare CRC err count DWORD dwCntRxICVErr; // rx buffer data software compare CRC err count
UINT idxRxErrorDesc[TYPE_MAXRD]; // index for rx data error RD unsigned int idxRxErrorDesc[TYPE_MAXRD]; // index for rx data error RD
// 64-bit OID // 64-bit OID
ULONGLONG ullTsrOK[TYPE_MAXTD]; ULONGLONG ullTsrOK[TYPE_MAXTD];
@ -348,15 +348,14 @@ void STAvUpdateIsrStatCounter(PSStatCounter pStatistic, DWORD dwIsr);
void STAvUpdateRDStatCounter(PSStatCounter pStatistic, void STAvUpdateRDStatCounter(PSStatCounter pStatistic,
BYTE byRSR, BYTE byNewRSR, BYTE byRxRate, BYTE byRSR, BYTE byNewRSR, BYTE byRxRate,
PBYTE pbyBuffer, UINT cbFrameLength); PBYTE pbyBuffer, unsigned int cbFrameLength);
void STAvUpdateRDStatCounterEx(PSStatCounter pStatistic, void STAvUpdateRDStatCounterEx(PSStatCounter pStatistic,
BYTE byRSR, BYTE byNewRsr, BYTE byRxRate, BYTE byRSR, BYTE byNewRsr, BYTE byRxRate,
PBYTE pbyBuffer, UINT cbFrameLength); PBYTE pbyBuffer, unsigned int cbFrameLength);
void STAvUpdateTDStatCounter(PSStatCounter pStatistic, void STAvUpdateTDStatCounter(PSStatCounter pStatistic, BYTE byTSR0, BYTE byTSR1,
BYTE byTSR0, BYTE byTSR1, PBYTE pbyBuffer, unsigned int cbFrameLength, unsigned int uIdx);
PBYTE pbyBuffer, UINT cbFrameLength, UINT uIdx );
void STAvUpdateTDStatCounterEx( void STAvUpdateTDStatCounterEx(
PSStatCounter pStatistic, PSStatCounter pStatistic,

8
drivers/staging/vt6655/michael.c
View File

@ -61,7 +61,7 @@ static DWORD L, R; // Current state
static DWORD K0, K1; // Key static DWORD K0, K1; // Key
static DWORD M; // Message accumulator (single word) static DWORD M; // Message accumulator (single word)
static UINT nBytesInM; // # bytes in M static unsigned int nBytesInM; // # bytes in M
/*--------------------- Export Functions --------------------------*/ /*--------------------- Export Functions --------------------------*/
@ -70,7 +70,7 @@ static DWORD s_dwGetUINT32 (BYTE * p)
// Convert from BYTE[] to DWORD in a portable way // Convert from BYTE[] to DWORD in a portable way
{ {
DWORD res = 0; DWORD res = 0;
UINT i; unsigned int i;
for(i=0; i<4; i++ ) for(i=0; i<4; i++ )
{ {
res |= (*p++) << (8*i); res |= (*p++) << (8*i);
@ -81,7 +81,7 @@ static DWORD s_dwGetUINT32 (BYTE * p)
static void s_vPutUINT32 (BYTE* p, DWORD val) static void s_vPutUINT32 (BYTE* p, DWORD val)
// Convert from DWORD to BYTE[] in a portable way // Convert from DWORD to BYTE[] in a portable way
{ {
UINT i; unsigned int i;
for(i=0; i<4; i++ ) for(i=0; i<4; i++ )
{ {
*p++ = (BYTE) (val & 0xff); *p++ = (BYTE) (val & 0xff);
@ -149,7 +149,7 @@ void MIC_vUnInit (void)
s_vClear(); s_vClear();
} }
void MIC_vAppend (PBYTE src, UINT nBytes) void MIC_vAppend (PBYTE src, unsigned int nBytes)
{ {
// This is simple // This is simple
while (nBytes > 0) while (nBytes > 0)

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

@ -40,7 +40,7 @@ void MIC_vInit(DWORD dwK0, DWORD dwK1);
void MIC_vUnInit(void); void MIC_vUnInit(void);
// Append bytes to the message to be MICed // Append bytes to the message to be MICed
void MIC_vAppend(PBYTE src, UINT nBytes); void MIC_vAppend(PBYTE src, unsigned int nBytes);
// Get the MIC result. Destination should accept 8 bytes of result. // Get the MIC result. Destination should accept 8 bytes of result.
// This also resets the message to empty. // This also resets the message to empty.

4
drivers/staging/vt6655/power.c
View File

@ -191,7 +191,7 @@ PSbConsiderPowerDown(
{ {
PSDevice pDevice = (PSDevice)hDeviceContext; PSDevice pDevice = (PSDevice)hDeviceContext;
PSMgmtObject pMgmt = pDevice->pMgmt; PSMgmtObject pMgmt = pDevice->pMgmt;
UINT uIdx; unsigned int uIdx;
// check if already in Doze mode // check if already in Doze mode
if (MACbIsRegBitsOn(pDevice->PortOffset, MAC_REG_PSCTL, PSCTL_PS)) if (MACbIsRegBitsOn(pDevice->PortOffset, MAC_REG_PSCTL, PSCTL_PS))
@ -304,7 +304,7 @@ PSbSendNullPacket(
PSDevice pDevice = (PSDevice)hDeviceContext; PSDevice pDevice = (PSDevice)hDeviceContext;
PSTxMgmtPacket pTxPacket = NULL; PSTxMgmtPacket pTxPacket = NULL;
PSMgmtObject pMgmt = pDevice->pMgmt; PSMgmtObject pMgmt = pDevice->pMgmt;
UINT uIdx; unsigned int uIdx;
if (pDevice->bLinkPass == FALSE) { if (pDevice->bLinkPass == FALSE) {

22
drivers/staging/vt6655/rc4.c
View File

@ -32,13 +32,13 @@
#include "rc4.h" #include "rc4.h"
void rc4_init(PRC4Ext pRC4, PBYTE pbyKey, UINT cbKey_len) void rc4_init(PRC4Ext pRC4, PBYTE pbyKey, unsigned int cbKey_len)
{ {
UINT ust1, ust2; unsigned int ust1, ust2;
UINT keyindex; unsigned int keyindex;
UINT stateindex; unsigned int stateindex;
PBYTE pbyst; PBYTE pbyst;
UINT idx; unsigned int idx;
pbyst = pRC4->abystate; pbyst = pRC4->abystate;
pRC4->ux = 0; pRC4->ux = 0;
@ -58,11 +58,11 @@ void rc4_init(PRC4Ext pRC4, PBYTE pbyKey, UINT cbKey_len)
} }
} }
UINT rc4_byte(PRC4Ext pRC4) unsigned int rc4_byte(PRC4Ext pRC4)
{ {
UINT ux; unsigned int ux;
UINT uy; unsigned int uy;
UINT ustx, usty; unsigned int ustx, usty;
PBYTE pbyst; PBYTE pbyst;
pbyst = pRC4->abystate; pbyst = pRC4->abystate;
@ -79,9 +79,9 @@ UINT rc4_byte(PRC4Ext pRC4)
} }
void rc4_encrypt(PRC4Ext pRC4, PBYTE pbyDest, void rc4_encrypt(PRC4Ext pRC4, PBYTE pbyDest,
PBYTE pbySrc, UINT cbData_len) PBYTE pbySrc, unsigned int cbData_len)
{ {
UINT ii; unsigned int ii;
for (ii = 0; ii < cbData_len; ii++) for (ii = 0; ii < cbData_len; ii++)
pbyDest[ii] = (BYTE)(pbySrc[ii] ^ rc4_byte(pRC4)); pbyDest[ii] = (BYTE)(pbySrc[ii] ^ rc4_byte(pRC4));
} }

10
drivers/staging/vt6655/rc4.h
View File

@ -35,13 +35,13 @@
/*--------------------- Export Definitions -------------------------*/ /*--------------------- Export Definitions -------------------------*/
/*--------------------- Export Types ------------------------------*/ /*--------------------- Export Types ------------------------------*/
typedef struct { typedef struct {
UINT ux; unsigned int ux;
UINT uy; unsigned int uy;
BYTE abystate[256]; BYTE abystate[256];
} RC4Ext, *PRC4Ext; } RC4Ext, *PRC4Ext;
void rc4_init(PRC4Ext pRC4, PBYTE pbyKey, UINT cbKey_len); void rc4_init(PRC4Ext pRC4, PBYTE pbyKey, unsigned int cbKey_len);
UINT rc4_byte(PRC4Ext pRC4); unsigned int rc4_byte(PRC4Ext pRC4);
void rc4_encrypt(PRC4Ext pRC4, PBYTE pbyDest, PBYTE pbySrc, UINT cbData_len); void rc4_encrypt(PRC4Ext pRC4, PBYTE pbyDest, PBYTE pbySrc, unsigned int cbData_len);
#endif //__RC4_H__ #endif //__RC4_H__

8
drivers/staging/vt6655/rf.c
View File

@ -911,7 +911,7 @@ BOOL bResult = TRUE;
* Return Value: None. * Return Value: None.
* *
*/ */
BOOL RFvWriteWakeProgSyn (DWORD_PTR dwIoBase, BYTE byRFType, UINT uChannel) BOOL RFvWriteWakeProgSyn (DWORD_PTR dwIoBase, BYTE byRFType, unsigned int uChannel)
{ {
int ii; int ii;
BYTE byInitCount = 0; BYTE byInitCount = 0;
@ -998,8 +998,8 @@ BOOL RFvWriteWakeProgSyn (DWORD_PTR dwIoBase, BYTE byRFType, UINT uChannel)
*/ */
BOOL RFbSetPower ( BOOL RFbSetPower (
PSDevice pDevice, PSDevice pDevice,
UINT uRATE, unsigned int uRATE,
UINT uCH unsigned int uCH
) )
{ {
BOOL bResult = TRUE; BOOL bResult = TRUE;
@ -1138,7 +1138,7 @@ BYTE byPwrdBm = 0;
BOOL RFbRawSetPower ( BOOL RFbRawSetPower (
PSDevice pDevice, PSDevice pDevice,
BYTE byPwr, BYTE byPwr,
UINT uRATE unsigned int uRATE
) )
{ {
BOOL bResult = TRUE; BOOL bResult = TRUE;

6
drivers/staging/vt6655/rf.h
View File

@ -81,12 +81,12 @@ BOOL RFbSelectChannel(DWORD_PTR dwIoBase, BYTE byRFType, BYTE byChannel);
BOOL RFbInit ( BOOL RFbInit (
PSDevice pDevice PSDevice pDevice
); );
BOOL RFvWriteWakeProgSyn(DWORD_PTR dwIoBase, BYTE byRFType, UINT uChannel); BOOL RFvWriteWakeProgSyn(DWORD_PTR dwIoBase, BYTE byRFType, unsigned int uChannel);
BOOL RFbSetPower(PSDevice pDevice, UINT uRATE, UINT uCH); BOOL RFbSetPower(PSDevice pDevice, unsigned int uRATE, unsigned int uCH);
BOOL RFbRawSetPower( BOOL RFbRawSetPower(
PSDevice pDevice, PSDevice pDevice,
BYTE byPwr, BYTE byPwr,
UINT uRATE unsigned int uRATE
); );
void void

248
drivers/staging/vt6655/rxtx.c
View File

@ -134,7 +134,7 @@ s_vFillRTSHead(
PSDevice pDevice, PSDevice pDevice,
BYTE byPktType, BYTE byPktType,
void * pvRTS, void * pvRTS,
UINT cbFrameLength, unsigned int cbFrameLength,
BOOL bNeedAck, BOOL bNeedAck,
BOOL bDisCRC, BOOL bDisCRC,
PSEthernetHeader psEthHeader, PSEthernetHeader psEthHeader,
@ -151,9 +151,9 @@ s_vGenerateTxParameter(
void * pvRrvTime, void * pvRrvTime,
void * pvRTS, void * pvRTS,
void * pvCTS, void * pvCTS,
UINT cbFrameSize, unsigned int cbFrameSize,
BOOL bNeedACK, BOOL bNeedACK,
UINT uDMAIdx, unsigned int uDMAIdx,
PSEthernetHeader psEthHeader, PSEthernetHeader psEthHeader,
WORD wCurrentRate WORD wCurrentRate
); );
@ -163,43 +163,43 @@ s_vGenerateTxParameter(
static void s_vFillFragParameter( static void s_vFillFragParameter(
PSDevice pDevice, PSDevice pDevice,
PBYTE pbyBuffer, PBYTE pbyBuffer,
UINT uTxType, unsigned int uTxType,
void * pvtdCurr, void * pvtdCurr,
WORD wFragType, WORD wFragType,
UINT cbReqCount unsigned int cbReqCount
); );
static static
UINT unsigned int
s_cbFillTxBufHead ( s_cbFillTxBufHead (
PSDevice pDevice, PSDevice pDevice,
BYTE byPktType, BYTE byPktType,
PBYTE pbyTxBufferAddr, PBYTE pbyTxBufferAddr,
UINT cbFrameBodySize, unsigned int cbFrameBodySize,
UINT uDMAIdx, unsigned int uDMAIdx,
PSTxDesc pHeadTD, PSTxDesc pHeadTD,
PSEthernetHeader psEthHeader, PSEthernetHeader psEthHeader,
PBYTE pPacket, PBYTE pPacket,
BOOL bNeedEncrypt, BOOL bNeedEncrypt,
PSKeyItem pTransmitKey, PSKeyItem pTransmitKey,
UINT uNodeIndex, unsigned int uNodeIndex,
PUINT puMACfragNum PUINT puMACfragNum
); );
static static
UINT unsigned int
s_uFillDataHead ( s_uFillDataHead (
PSDevice pDevice, PSDevice pDevice,
BYTE byPktType, BYTE byPktType,
void * pTxDataHead, void * pTxDataHead,
UINT cbFrameLength, unsigned int cbFrameLength,
UINT uDMAIdx, unsigned int uDMAIdx,
BOOL bNeedAck, BOOL bNeedAck,
UINT uFragIdx, unsigned int uFragIdx,
UINT cbLastFragmentSize, unsigned int cbLastFragmentSize,
UINT uMACfragNum, unsigned int uMACfragNum,
BYTE byFBOption, BYTE byFBOption,
WORD wCurrentRate WORD wCurrentRate
); );
@ -336,7 +336,7 @@ s_vSWencryption (
WORD wPayloadSize WORD wPayloadSize
) )
{ {
UINT cbICVlen = 4; unsigned int cbICVlen = 4;
DWORD dwICV = 0xFFFFFFFFL; DWORD dwICV = 0xFFFFFFFFL;
PDWORD pdwICV; PDWORD pdwICV;
@ -377,16 +377,16 @@ s_vSWencryption (
PK_TYPE_11GA 3 PK_TYPE_11GA 3
*/ */
static static
UINT unsigned int
s_uGetTxRsvTime ( s_uGetTxRsvTime (
PSDevice pDevice, PSDevice pDevice,
BYTE byPktType, BYTE byPktType,
UINT cbFrameLength, unsigned int cbFrameLength,
WORD wRate, WORD wRate,
BOOL bNeedAck BOOL bNeedAck
) )
{ {
UINT uDataTime, uAckTime; unsigned int uDataTime, uAckTime;
uDataTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, cbFrameLength, wRate); uDataTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, cbFrameLength, wRate);
#ifdef PLICE_DEBUG #ifdef PLICE_DEBUG
@ -408,16 +408,16 @@ s_uGetTxRsvTime (
//byFreqType: 0=>5GHZ 1=>2.4GHZ //byFreqType: 0=>5GHZ 1=>2.4GHZ
static static
UINT unsigned int
s_uGetRTSCTSRsvTime ( s_uGetRTSCTSRsvTime (
PSDevice pDevice, PSDevice pDevice,
BYTE byRTSRsvType, BYTE byRTSRsvType,
BYTE byPktType, BYTE byPktType,
UINT cbFrameLength, unsigned int cbFrameLength,
WORD wCurrentRate WORD wCurrentRate
) )
{ {
UINT uRrvTime , uRTSTime, uCTSTime, uAckTime, uDataTime; unsigned int uRrvTime , uRTSTime, uCTSTime, uAckTime, uDataTime;
uRrvTime = uRTSTime = uCTSTime = uAckTime = uDataTime = 0; uRrvTime = uRTSTime = uCTSTime = uAckTime = uDataTime = 0;
@ -450,22 +450,22 @@ s_uGetRTSCTSRsvTime (
//byFreqType 0: 5GHz, 1:2.4Ghz //byFreqType 0: 5GHz, 1:2.4Ghz
static static
UINT unsigned int
s_uGetDataDuration ( s_uGetDataDuration (
PSDevice pDevice, PSDevice pDevice,
BYTE byDurType, BYTE byDurType,
UINT cbFrameLength, unsigned int cbFrameLength,
BYTE byPktType, BYTE byPktType,
WORD wRate, WORD wRate,
BOOL bNeedAck, BOOL bNeedAck,
UINT uFragIdx, unsigned int uFragIdx,
UINT cbLastFragmentSize, unsigned int cbLastFragmentSize,
UINT uMACfragNum, unsigned int uMACfragNum,
BYTE byFBOption BYTE byFBOption
) )
{ {
BOOL bLastFrag = 0; BOOL bLastFrag = 0;
UINT uAckTime =0, uNextPktTime = 0; unsigned int uAckTime =0, uNextPktTime = 0;
@ -621,18 +621,18 @@ s_uGetDataDuration (
//byFreqType: 0=>5GHZ 1=>2.4GHZ //byFreqType: 0=>5GHZ 1=>2.4GHZ
static static
UINT unsigned int
s_uGetRTSCTSDuration ( s_uGetRTSCTSDuration (
PSDevice pDevice, PSDevice pDevice,
BYTE byDurType, BYTE byDurType,
UINT cbFrameLength, unsigned int cbFrameLength,
BYTE byPktType, BYTE byPktType,
WORD wRate, WORD wRate,
BOOL bNeedAck, BOOL bNeedAck,
BYTE byFBOption BYTE byFBOption
) )
{ {
UINT uCTSTime = 0, uDurTime = 0; unsigned int uCTSTime = 0, uDurTime = 0;
switch (byDurType) { switch (byDurType) {
@ -719,17 +719,17 @@ s_uGetRTSCTSDuration (
static static
UINT unsigned int
s_uFillDataHead ( s_uFillDataHead (
PSDevice pDevice, PSDevice pDevice,
BYTE byPktType, BYTE byPktType,
void * pTxDataHead, void * pTxDataHead,
UINT cbFrameLength, unsigned int cbFrameLength,
UINT uDMAIdx, unsigned int uDMAIdx,
BOOL bNeedAck, BOOL bNeedAck,
UINT uFragIdx, unsigned int uFragIdx,
UINT cbLastFragmentSize, unsigned int cbLastFragmentSize,
UINT uMACfragNum, unsigned int uMACfragNum,
BYTE byFBOption, BYTE byFBOption,
WORD wCurrentRate WORD wCurrentRate
) )
@ -856,7 +856,7 @@ s_vFillRTSHead (
PSDevice pDevice, PSDevice pDevice,
BYTE byPktType, BYTE byPktType,
void * pvRTS, void * pvRTS,
UINT cbFrameLength, unsigned int cbFrameLength,
BOOL bNeedAck, BOOL bNeedAck,
BOOL bDisCRC, BOOL bDisCRC,
PSEthernetHeader psEthHeader, PSEthernetHeader psEthHeader,
@ -864,7 +864,7 @@ s_vFillRTSHead (
BYTE byFBOption BYTE byFBOption
) )
{ {
UINT uRTSFrameLen = 20; unsigned int uRTSFrameLen = 20;
WORD wLen = 0x0000; WORD wLen = 0x0000;
if (pvRTS == NULL) if (pvRTS == NULL)
@ -1048,17 +1048,17 @@ static
void void
s_vFillCTSHead ( s_vFillCTSHead (
PSDevice pDevice, PSDevice pDevice,
UINT uDMAIdx, unsigned int uDMAIdx,
BYTE byPktType, BYTE byPktType,
void * pvCTS, void * pvCTS,
UINT cbFrameLength, unsigned int cbFrameLength,
BOOL bNeedAck, BOOL bNeedAck,
BOOL bDisCRC, BOOL bDisCRC,
WORD wCurrentRate, WORD wCurrentRate,
BYTE byFBOption BYTE byFBOption
) )
{ {
UINT uCTSFrameLen = 14; unsigned int uCTSFrameLen = 14;
WORD wLen = 0x0000; WORD wLen = 0x0000;
if (pvCTS == NULL) { if (pvCTS == NULL) {
@ -1148,7 +1148,7 @@ s_vFillCTSHead (
* Return Value: none * Return Value: none
* *
-*/ -*/
// UINT cbFrameSize,//Hdr+Payload+FCS // unsigned int cbFrameSize,//Hdr+Payload+FCS
static static
void void
s_vGenerateTxParameter ( s_vGenerateTxParameter (
@ -1158,14 +1158,14 @@ s_vGenerateTxParameter (
void * pvRrvTime, void * pvRrvTime,
void * pvRTS, void * pvRTS,
void * pvCTS, void * pvCTS,
UINT cbFrameSize, unsigned int cbFrameSize,
BOOL bNeedACK, BOOL bNeedACK,
UINT uDMAIdx, unsigned int uDMAIdx,
PSEthernetHeader psEthHeader, PSEthernetHeader psEthHeader,
WORD wCurrentRate WORD wCurrentRate
) )
{ {
UINT cbMACHdLen = WLAN_HDR_ADDR3_LEN; //24 unsigned int cbMACHdLen = WLAN_HDR_ADDR3_LEN; //24
WORD wFifoCtl; WORD wFifoCtl;
BOOL bDisCRC = FALSE; BOOL bDisCRC = FALSE;
BYTE byFBOption = AUTO_FB_NONE; BYTE byFBOption = AUTO_FB_NONE;
@ -1265,17 +1265,17 @@ s_vGenerateTxParameter (
/* /*
PBYTE pbyBuffer,//point to pTxBufHead PBYTE pbyBuffer,//point to pTxBufHead
WORD wFragType,//00:Non-Frag, 01:Start, 02:Mid, 03:Last WORD wFragType,//00:Non-Frag, 01:Start, 02:Mid, 03:Last
UINT cbFragmentSize,//Hdr+payoad+FCS unsigned int cbFragmentSize,//Hdr+payoad+FCS
*/ */
static static
void void
s_vFillFragParameter( s_vFillFragParameter(
PSDevice pDevice, PSDevice pDevice,
PBYTE pbyBuffer, PBYTE pbyBuffer,
UINT uTxType, unsigned int uTxType,
void * pvtdCurr, void * pvtdCurr,
WORD wFragType, WORD wFragType,
UINT cbReqCount unsigned int cbReqCount
) )
{ {
PSTxBufHead pTxBufHead = (PSTxBufHead) pbyBuffer; PSTxBufHead pTxBufHead = (PSTxBufHead) pbyBuffer;
@ -1316,57 +1316,57 @@ s_vFillFragParameter(
} }
static static
UINT unsigned int
s_cbFillTxBufHead ( s_cbFillTxBufHead (
PSDevice pDevice, PSDevice pDevice,
BYTE byPktType, BYTE byPktType,
PBYTE pbyTxBufferAddr, PBYTE pbyTxBufferAddr,
UINT cbFrameBodySize, unsigned int cbFrameBodySize,
UINT uDMAIdx, unsigned int uDMAIdx,
PSTxDesc pHeadTD, PSTxDesc pHeadTD,
PSEthernetHeader psEthHeader, PSEthernetHeader psEthHeader,
PBYTE pPacket, PBYTE pPacket,
BOOL bNeedEncrypt, BOOL bNeedEncrypt,
PSKeyItem pTransmitKey, PSKeyItem pTransmitKey,
UINT uNodeIndex, unsigned int uNodeIndex,
PUINT puMACfragNum PUINT puMACfragNum
) )
{ {
UINT cbMACHdLen; unsigned int cbMACHdLen;
UINT cbFrameSize; unsigned int cbFrameSize;
UINT cbFragmentSize; //Hdr+(IV)+payoad+(MIC)+(ICV)+FCS unsigned int cbFragmentSize; //Hdr+(IV)+payoad+(MIC)+(ICV)+FCS
UINT cbFragPayloadSize; unsigned int cbFragPayloadSize;
UINT cbLastFragmentSize; //Hdr+(IV)+payoad+(MIC)+(ICV)+FCS unsigned int cbLastFragmentSize; //Hdr+(IV)+payoad+(MIC)+(ICV)+FCS
UINT cbLastFragPayloadSize; unsigned int cbLastFragPayloadSize;
UINT uFragIdx; unsigned int uFragIdx;
PBYTE pbyPayloadHead; PBYTE pbyPayloadHead;
PBYTE pbyIVHead; PBYTE pbyIVHead;
PBYTE pbyMacHdr; PBYTE pbyMacHdr;
WORD wFragType; //00:Non-Frag, 01:Start, 10:Mid, 11:Last WORD wFragType; //00:Non-Frag, 01:Start, 10:Mid, 11:Last
UINT uDuration; unsigned int uDuration;
PBYTE pbyBuffer; PBYTE pbyBuffer;
// UINT uKeyEntryIdx = NUM_KEY_ENTRY+1; // unsigned int uKeyEntryIdx = NUM_KEY_ENTRY+1;
// BYTE byKeySel = 0xFF; // BYTE byKeySel = 0xFF;
UINT cbIVlen = 0; unsigned int cbIVlen = 0;
UINT cbICVlen = 0; unsigned int cbICVlen = 0;
UINT cbMIClen = 0; unsigned int cbMIClen = 0;
UINT cbFCSlen = 4; unsigned int cbFCSlen = 4;
UINT cb802_1_H_len = 0; unsigned int cb802_1_H_len = 0;
UINT uLength = 0; unsigned int uLength = 0;
UINT uTmpLen = 0; unsigned int uTmpLen = 0;
// BYTE abyTmp[8]; // BYTE abyTmp[8];
// DWORD dwCRC; // DWORD dwCRC;
UINT cbMICHDR = 0; unsigned int cbMICHDR = 0;
DWORD dwMICKey0, dwMICKey1; DWORD dwMICKey0, dwMICKey1;
DWORD dwMIC_Priority; DWORD dwMIC_Priority;
PDWORD pdwMIC_L; PDWORD pdwMIC_L;
PDWORD pdwMIC_R; PDWORD pdwMIC_R;
DWORD dwSafeMIC_L, dwSafeMIC_R; //Fix "Last Frag Size" < "MIC length". DWORD dwSafeMIC_L, dwSafeMIC_R; //Fix "Last Frag Size" < "MIC length".
BOOL bMIC2Frag = FALSE; BOOL bMIC2Frag = FALSE;
UINT uMICFragLen = 0; unsigned int uMICFragLen = 0;
UINT uMACfragNum = 1; unsigned int uMACfragNum = 1;
UINT uPadding = 0; unsigned int uPadding = 0;
UINT cbReqCount = 0; unsigned int cbReqCount = 0;
BOOL bNeedACK; BOOL bNeedACK;
BOOL bRTS; BOOL bRTS;
@ -1374,15 +1374,15 @@ s_cbFillTxBufHead (
PBYTE pbyType; PBYTE pbyType;
PSTxDesc ptdCurr; PSTxDesc ptdCurr;
PSTxBufHead psTxBufHd = (PSTxBufHead) pbyTxBufferAddr; PSTxBufHead psTxBufHd = (PSTxBufHead) pbyTxBufferAddr;
// UINT tmpDescIdx; // unsigned int tmpDescIdx;
UINT cbHeaderLength = 0; unsigned int cbHeaderLength = 0;
void * pvRrvTime; void * pvRrvTime;
PSMICHDRHead pMICHDR; PSMICHDRHead pMICHDR;
void * pvRTS; void * pvRTS;
void * pvCTS; void * pvCTS;
void * pvTxDataHd; void * pvTxDataHd;
WORD wTxBufSize; // FFinfo size WORD wTxBufSize; // FFinfo size
UINT uTotalCopyLength = 0; unsigned int uTotalCopyLength = 0;
BYTE byFBOption = AUTO_FB_NONE; BYTE byFBOption = AUTO_FB_NONE;
BOOL bIsWEP256 = FALSE; BOOL bIsWEP256 = FALSE;
PSMgmtObject pMgmt = pDevice->pMgmt; PSMgmtObject pMgmt = pDevice->pMgmt;
@ -2099,18 +2099,18 @@ vGenerateFIFOHeader (
BYTE byPktType, BYTE byPktType,
PBYTE pbyTxBufferAddr, PBYTE pbyTxBufferAddr,
BOOL bNeedEncrypt, BOOL bNeedEncrypt,
UINT cbPayloadSize, unsigned int cbPayloadSize,
UINT uDMAIdx, unsigned int uDMAIdx,
PSTxDesc pHeadTD, PSTxDesc pHeadTD,
PSEthernetHeader psEthHeader, PSEthernetHeader psEthHeader,
PBYTE pPacket, PBYTE pPacket,
PSKeyItem pTransmitKey, PSKeyItem pTransmitKey,
UINT uNodeIndex, unsigned int uNodeIndex,
PUINT puMACfragNum, PUINT puMACfragNum,
PUINT pcbHeaderSize PUINT pcbHeaderSize
) )
{ {
UINT wTxBufSize; // FFinfo size unsigned int wTxBufSize; // FFinfo size
BOOL bNeedACK; BOOL bNeedACK;
BOOL bIsAdhoc; BOOL bIsAdhoc;
WORD cbMacHdLen; WORD cbMacHdLen;
@ -2272,8 +2272,8 @@ vGenerateMACHeader (
PSEthernetHeader psEthHeader, PSEthernetHeader psEthHeader,
BOOL bNeedEncrypt, BOOL bNeedEncrypt,
WORD wFragType, WORD wFragType,
UINT uDMAIdx, unsigned int uDMAIdx,
UINT uFragIdx unsigned int uFragIdx
) )
{ {
PS802_11Header pMACHeader = (PS802_11Header)pbyBufferAddr; PS802_11Header pMACHeader = (PS802_11Header)pbyBufferAddr;
@ -2345,22 +2345,22 @@ CMD_STATUS csMgmt_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket) {
void * pvRTS; void * pvRTS;
PSCTS pCTS; PSCTS pCTS;
void * pvTxDataHd; void * pvTxDataHd;
UINT uDuration; unsigned int uDuration;
UINT cbReqCount; unsigned int cbReqCount;
PS802_11Header pMACHeader; PS802_11Header pMACHeader;
UINT cbHeaderSize; unsigned int cbHeaderSize;
UINT cbFrameBodySize; unsigned int cbFrameBodySize;
BOOL bNeedACK; BOOL bNeedACK;
BOOL bIsPSPOLL = FALSE; BOOL bIsPSPOLL = FALSE;
PSTxBufHead pTxBufHead; PSTxBufHead pTxBufHead;
UINT cbFrameSize; unsigned int cbFrameSize;
UINT cbIVlen = 0; unsigned int cbIVlen = 0;
UINT cbICVlen = 0; unsigned int cbICVlen = 0;
UINT cbMIClen = 0; unsigned int cbMIClen = 0;
UINT cbFCSlen = 4; unsigned int cbFCSlen = 4;
UINT uPadding = 0; unsigned int uPadding = 0;
WORD wTxBufSize; WORD wTxBufSize;
UINT cbMacHdLen; unsigned int cbMacHdLen;
SEthernetHeader sEthHeader; SEthernetHeader sEthHeader;
void * pvRrvTime; void * pvRrvTime;
void * pMICHDR; void * pMICHDR;
@ -2663,8 +2663,8 @@ CMD_STATUS csBeacon_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket) {
BYTE byPktType; BYTE byPktType;
PBYTE pbyBuffer = (PBYTE)pDevice->tx_beacon_bufs; PBYTE pbyBuffer = (PBYTE)pDevice->tx_beacon_bufs;
UINT cbFrameSize = pPacket->cbMPDULen + WLAN_FCS_LEN; unsigned int cbFrameSize = pPacket->cbMPDULen + WLAN_FCS_LEN;
UINT cbHeaderSize = 0; unsigned int cbHeaderSize = 0;
WORD wTxBufSize = sizeof(STxShortBufHead); WORD wTxBufSize = sizeof(STxShortBufHead);
PSTxShortBufHead pTxBufHead = (PSTxShortBufHead) pbyBuffer; PSTxShortBufHead pTxBufHead = (PSTxShortBufHead) pbyBuffer;
PSTxDataHead_ab pTxDataHead = (PSTxDataHead_ab) (pbyBuffer + wTxBufSize); PSTxDataHead_ab pTxDataHead = (PSTxDataHead_ab) (pbyBuffer + wTxBufSize);
@ -2736,24 +2736,24 @@ CMD_STATUS csBeacon_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket) {
UINT unsigned int
cbGetFragCount ( cbGetFragCount (
PSDevice pDevice, PSDevice pDevice,
PSKeyItem pTransmitKey, PSKeyItem pTransmitKey,
UINT cbFrameBodySize, unsigned int cbFrameBodySize,
PSEthernetHeader psEthHeader PSEthernetHeader psEthHeader
) )
{ {
UINT cbMACHdLen; unsigned int cbMACHdLen;
UINT cbFrameSize; unsigned int cbFrameSize;
UINT cbFragmentSize; //Hdr+(IV)+payoad+(MIC)+(ICV)+FCS unsigned int cbFragmentSize; //Hdr+(IV)+payoad+(MIC)+(ICV)+FCS
UINT cbFragPayloadSize; unsigned int cbFragPayloadSize;
UINT cbLastFragPayloadSize; unsigned int cbLastFragPayloadSize;
UINT cbIVlen = 0; unsigned int cbIVlen = 0;
UINT cbICVlen = 0; unsigned int cbICVlen = 0;
UINT cbMIClen = 0; unsigned int cbMIClen = 0;
UINT cbFCSlen = 4; unsigned int cbFCSlen = 4;
UINT uMACfragNum = 1; unsigned int uMACfragNum = 1;
BOOL bNeedACK; BOOL bNeedACK;
@ -2826,7 +2826,7 @@ cbGetFragCount (
void void
vDMA0_tx_80211(PSDevice pDevice, struct sk_buff *skb, PBYTE pbMPDU, UINT cbMPDULen) { vDMA0_tx_80211(PSDevice pDevice, struct sk_buff *skb, PBYTE pbMPDU, unsigned int cbMPDULen) {
PSTxDesc pFrstTD; PSTxDesc pFrstTD;
BYTE byPktType; BYTE byPktType;
@ -2834,35 +2834,35 @@ vDMA0_tx_80211(PSDevice pDevice, struct sk_buff *skb, PBYTE pbMPDU, UINT cbMPDU
void * pvRTS; void * pvRTS;
void * pvCTS; void * pvCTS;
void * pvTxDataHd; void * pvTxDataHd;
UINT uDuration; unsigned int uDuration;
UINT cbReqCount; unsigned int cbReqCount;
PS802_11Header pMACHeader; PS802_11Header pMACHeader;
UINT cbHeaderSize; unsigned int cbHeaderSize;
UINT cbFrameBodySize; unsigned int cbFrameBodySize;
BOOL bNeedACK; BOOL bNeedACK;
BOOL bIsPSPOLL = FALSE; BOOL bIsPSPOLL = FALSE;
PSTxBufHead pTxBufHead; PSTxBufHead pTxBufHead;
UINT cbFrameSize; unsigned int cbFrameSize;
UINT cbIVlen = 0; unsigned int cbIVlen = 0;
UINT cbICVlen = 0; unsigned int cbICVlen = 0;
UINT cbMIClen = 0; unsigned int cbMIClen = 0;
UINT cbFCSlen = 4; unsigned int cbFCSlen = 4;
UINT uPadding = 0; unsigned int uPadding = 0;
UINT cbMICHDR = 0; unsigned int cbMICHDR = 0;
UINT uLength = 0; unsigned int uLength = 0;
DWORD dwMICKey0, dwMICKey1; DWORD dwMICKey0, dwMICKey1;
DWORD dwMIC_Priority; DWORD dwMIC_Priority;
PDWORD pdwMIC_L; PDWORD pdwMIC_L;
PDWORD pdwMIC_R; PDWORD pdwMIC_R;
WORD wTxBufSize; WORD wTxBufSize;
UINT cbMacHdLen; unsigned int cbMacHdLen;
SEthernetHeader sEthHeader; SEthernetHeader sEthHeader;
void * pvRrvTime; void * pvRrvTime;
void * pMICHDR; void * pMICHDR;
PSMgmtObject pMgmt = pDevice->pMgmt; PSMgmtObject pMgmt = pDevice->pMgmt;
WORD wCurrentRate = RATE_1M; WORD wCurrentRate = RATE_1M;
PUWLAN_80211HDR p80211Header; PUWLAN_80211HDR p80211Header;
UINT uNodeIndex = 0; unsigned int uNodeIndex = 0;
BOOL bNodeExist = FALSE; BOOL bNodeExist = FALSE;
SKeyItem STempKey; SKeyItem STempKey;
PSKeyItem pTransmitKey = NULL; PSKeyItem pTransmitKey = NULL;
@ -2870,7 +2870,7 @@ vDMA0_tx_80211(PSDevice pDevice, struct sk_buff *skb, PBYTE pbMPDU, UINT cbMPDU
PBYTE pbyPayloadHead; PBYTE pbyPayloadHead;
PBYTE pbyMacHdr; PBYTE pbyMacHdr;
UINT cbExtSuppRate = 0; unsigned int cbExtSuppRate = 0;
// PWLAN_IE pItem; // PWLAN_IE pItem;

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

@ -44,7 +44,7 @@ void vGenerateMACHeader(
PSDevice pDevice, PSDevice pDevice,
DWORD dwTxBufferAddr, DWORD dwTxBufferAddr,
PBYTE pbySkbData, PBYTE pbySkbData,
UINT cbPacketSize, unsigned int cbPacketSize,
BOOL bDMA0Used, BOOL bDMA0Used,
PUINT pcbHeadSize, PUINT pcbHeadSize,
PUINT pcbAppendPayload PUINT pcbAppendPayload
@ -53,7 +53,7 @@ void vGenerateMACHeader(
void vProcessRxMACHeader ( void vProcessRxMACHeader (
PSDevice pDevice, PSDevice pDevice,
DWORD dwRxBufferAddr, DWORD dwRxBufferAddr,
UINT cbPacketSize, unsigned int cbPacketSize,
BOOL bIsWEP, BOOL bIsWEP,
PUINT pcbHeadSize PUINT pcbHeadSize
); );
@ -68,16 +68,16 @@ vGenerateMACHeader (
PSEthernetHeader psEthHeader, PSEthernetHeader psEthHeader,
BOOL bNeedEncrypt, BOOL bNeedEncrypt,
WORD wFragType, WORD wFragType,
UINT uDMAIdx, unsigned int uDMAIdx,
UINT uFragIdx unsigned int uFragIdx
); );
UINT unsigned int
cbGetFragCount( cbGetFragCount(
PSDevice pDevice, PSDevice pDevice,
PSKeyItem pTransmitKey, PSKeyItem pTransmitKey,
UINT cbFrameBodySize, unsigned int cbFrameBodySize,
PSEthernetHeader psEthHeader PSEthernetHeader psEthHeader
); );
@ -88,19 +88,19 @@ vGenerateFIFOHeader (
BYTE byPktTyp, BYTE byPktTyp,
PBYTE pbyTxBufferAddr, PBYTE pbyTxBufferAddr,
BOOL bNeedEncrypt, BOOL bNeedEncrypt,
UINT cbPayloadSize, unsigned int cbPayloadSize,
UINT uDMAIdx, unsigned int uDMAIdx,
PSTxDesc pHeadTD, PSTxDesc pHeadTD,
PSEthernetHeader psEthHeader, PSEthernetHeader psEthHeader,
PBYTE pPacket, PBYTE pPacket,
PSKeyItem pTransmitKey, PSKeyItem pTransmitKey,
UINT uNodeIndex, unsigned int uNodeIndex,
PUINT puMACfragNum, PUINT puMACfragNum,
PUINT pcbHeaderSize PUINT pcbHeaderSize
); );
void vDMA0_tx_80211(PSDevice pDevice, struct sk_buff *skb, PBYTE pbMPDU, UINT cbMPDULen); void vDMA0_tx_80211(PSDevice pDevice, struct sk_buff *skb, PBYTE pbMPDU, unsigned int cbMPDULen);
CMD_STATUS csMgmt_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket); CMD_STATUS csMgmt_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket);
CMD_STATUS csBeacon_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket); CMD_STATUS csBeacon_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket);

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

@ -132,7 +132,7 @@ static const DWORD s_adwCrc32Table[256] = {
* Return Value: CRC-32 * Return Value: CRC-32
* *
-*/ -*/
DWORD CRCdwCrc32 (PBYTE pbyData, UINT cbByte, DWORD dwCrcSeed) DWORD CRCdwCrc32 (PBYTE pbyData, unsigned int cbByte, DWORD dwCrcSeed)
{ {
DWORD dwCrc; DWORD dwCrc;
@ -164,7 +164,7 @@ DWORD CRCdwCrc32 (PBYTE pbyData, UINT cbByte, DWORD dwCrcSeed)
* Return Value: CRC-32 * Return Value: CRC-32
* *
-*/ -*/
DWORD CRCdwGetCrc32 (PBYTE pbyData, UINT cbByte) DWORD CRCdwGetCrc32 (PBYTE pbyData, unsigned int cbByte)
{ {
return ~CRCdwCrc32(pbyData, cbByte, 0xFFFFFFFFL); return ~CRCdwCrc32(pbyData, cbByte, 0xFFFFFFFFL);
} }
@ -190,7 +190,7 @@ DWORD CRCdwGetCrc32 (PBYTE pbyData, UINT cbByte)
* Return Value: CRC-32 * Return Value: CRC-32
* *
-*/ -*/
DWORD CRCdwGetCrc32Ex(PBYTE pbyData, UINT cbByte, DWORD dwPreCRC) DWORD CRCdwGetCrc32Ex(PBYTE pbyData, unsigned int cbByte, DWORD dwPreCRC)
{ {
return CRCdwCrc32(pbyData, cbByte, dwPreCRC); return CRCdwCrc32(pbyData, cbByte, dwPreCRC);
} }

6
drivers/staging/vt6655/tcrc.h
View File

@ -43,9 +43,9 @@
/*--------------------- Export Functions --------------------------*/ /*--------------------- Export Functions --------------------------*/
DWORD CRCdwCrc32(PBYTE pbyData, UINT cbByte, DWORD dwCrcSeed); DWORD CRCdwCrc32(PBYTE pbyData, unsigned int cbByte, DWORD dwCrcSeed);
DWORD CRCdwGetCrc32(PBYTE pbyData, UINT cbByte); DWORD CRCdwGetCrc32(PBYTE pbyData, unsigned int cbByte);
DWORD CRCdwGetCrc32Ex(PBYTE pbyData, UINT cbByte, DWORD dwPreCRC); DWORD CRCdwGetCrc32Ex(PBYTE pbyData, unsigned int cbByte, DWORD dwPreCRC);
#endif // __TCRC_H__ #endif // __TCRC_H__

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

@ -96,7 +96,7 @@ BYTE ETHbyGetHashIndexByCrc32 (PBYTE pbyMultiAddr)
* Return Value: TRUE if ok; FALSE if error. * Return Value: TRUE if ok; FALSE if error.
* *
*/ */
BOOL ETHbIsBufferCrc32Ok (PBYTE pbyBuffer, UINT cbFrameLength) BOOL ETHbIsBufferCrc32Ok (PBYTE pbyBuffer, unsigned int cbFrameLength)
{ {
DWORD dwCRC; DWORD dwCRC;

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

@ -195,7 +195,7 @@ S802_11Header, *PS802_11Header;
BYTE ETHbyGetHashIndexByCrc32(PBYTE pbyMultiAddr); BYTE ETHbyGetHashIndexByCrc32(PBYTE pbyMultiAddr);
//BYTE ETHbyGetHashIndexByCrc(PBYTE pbyMultiAddr); //BYTE ETHbyGetHashIndexByCrc(PBYTE pbyMultiAddr);
BOOL ETHbIsBufferCrc32Ok(PBYTE pbyBuffer, UINT cbFrameLength); BOOL ETHbIsBufferCrc32Ok(PBYTE pbyBuffer, unsigned int cbFrameLength);
#endif // __TETHER_H__ #endif // __TETHER_H__

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. * but it doesn't matter if they're signed or unsigned.
*/ */
typedef unsigned int UINT;
typedef unsigned long ULONG; typedef unsigned long ULONG;
typedef unsigned long long ULONGLONG; //64 bit typedef unsigned long long ULONGLONG; //64 bit

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

@ -103,7 +103,7 @@ VNTWIFIvSetIBSSParameter (
void *pMgmtHandle, void *pMgmtHandle,
WORD wBeaconPeriod, WORD wBeaconPeriod,
WORD wATIMWindow, WORD wATIMWindow,
UINT uChannel unsigned int uChannel
) )
{ {
PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle; PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle;
@ -150,7 +150,7 @@ VNTWIFIpGetCurrentSSID (
* Return Value: current Channel. * Return Value: current Channel.
* *
-*/ -*/
UINT unsigned int
VNTWIFIpGetCurrentChannel ( VNTWIFIpGetCurrentChannel (
void *pMgmtHandle void *pMgmtHandle
) )
@ -210,7 +210,7 @@ VNTWIFIbyGetMaxSupportRate (
{ {
BYTE byMaxSupportRate = RATE_1M; BYTE byMaxSupportRate = RATE_1M;
BYTE bySupportRate = RATE_1M; BYTE bySupportRate = RATE_1M;
UINT ii = 0; unsigned int ii = 0;
if (pSupportRateIEs) { if (pSupportRateIEs) {
for (ii = 0; ii < pSupportRateIEs->len; ii++) { for (ii = 0; ii < pSupportRateIEs->len; ii++) {
@ -257,7 +257,7 @@ VNTWIFIbyGetACKTxRate (
{ {
BYTE byMaxAckRate; BYTE byMaxAckRate;
BYTE byBasicRate; BYTE byBasicRate;
UINT ii; unsigned int ii;
if (byRxDataRate <= RATE_11M) { if (byRxDataRate <= RATE_11M) {
byMaxAckRate = RATE_1M; byMaxAckRate = RATE_1M;
@ -431,10 +431,10 @@ VNTWIFIvQueryBSSList (
void **pvFirstBSS void **pvFirstBSS
) )
{ {
UINT ii = 0; unsigned int ii = 0;
PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle; PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle;
PKnownBSS pBSS = NULL; PKnownBSS pBSS = NULL;
UINT uCount = 0; unsigned int uCount = 0;
*pvFirstBSS = NULL; *pvFirstBSS = NULL;
@ -504,8 +504,8 @@ VNTWIFIvUpdateNodeTxCounter(
) )
{ {
PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle; PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle;
UINT uNodeIndex = 0; unsigned int uNodeIndex = 0;
UINT ii; unsigned int ii;
if ((pMgmt->eCurrMode == WMAC_MODE_IBSS_STA) || if ((pMgmt->eCurrMode == WMAC_MODE_IBSS_STA) ||
(pMgmt->eCurrMode == WMAC_MODE_ESS_AP)) { (pMgmt->eCurrMode == WMAC_MODE_ESS_AP)) {
@ -540,7 +540,7 @@ VNTWIFIvGetTxRate(
) )
{ {
PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle; PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle;
UINT uNodeIndex = 0; unsigned int uNodeIndex = 0;
WORD wTxDataRate = RATE_1M; WORD wTxDataRate = RATE_1M;
BYTE byACKRate = RATE_1M; BYTE byACKRate = RATE_1M;
BYTE byCCKBasicRate = RATE_1M; BYTE byCCKBasicRate = RATE_1M;
@ -626,7 +626,7 @@ VNTWIFIbInit(
{ {
PSMgmtObject pMgmt = NULL; PSMgmtObject pMgmt = NULL;
UINT ii; unsigned int ii;
pMgmt = (PSMgmtObject)kmalloc(sizeof(SMgmtObject), (int)GFP_ATOMIC); pMgmt = (PSMgmtObject)kmalloc(sizeof(SMgmtObject), (int)GFP_ATOMIC);

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

@ -145,7 +145,7 @@ VNTWIFIvSetIBSSParameter (
void *pMgmtHandle, void *pMgmtHandle,
WORD wBeaconPeriod, WORD wBeaconPeriod,
WORD wATIMWindow, WORD wATIMWindow,
UINT uChannel unsigned int uChannel
); );
void void
@ -159,7 +159,7 @@ VNTWIFIpGetCurrentSSID(
void *pMgmtHandle void *pMgmtHandle
); );
UINT unsigned int
VNTWIFIpGetCurrentChannel( VNTWIFIpGetCurrentChannel(
void *pMgmtHandle void *pMgmtHandle
); );

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

@ -216,7 +216,7 @@ s_vProbeChannel(
PBYTE pbyRate; PBYTE pbyRate;
PSTxMgmtPacket pTxPacket; PSTxMgmtPacket pTxPacket;
PSMgmtObject pMgmt = pDevice->pMgmt; PSMgmtObject pMgmt = pDevice->pMgmt;
UINT ii; unsigned int ii;
if (pDevice->eCurrentPHYType == PHY_TYPE_11A) { if (pDevice->eCurrentPHYType == PHY_TYPE_11A) {
@ -320,7 +320,7 @@ s_MgrMakeProbeRequest(
void void
vCommandTimerWait( vCommandTimerWait(
void *hDeviceContext, void *hDeviceContext,
UINT MSecond unsigned int MSecond
) )
{ {
PSDevice pDevice = (PSDevice)hDeviceContext; PSDevice pDevice = (PSDevice)hDeviceContext;
@ -329,7 +329,7 @@ vCommandTimerWait(
pDevice->sTimerCommand.data = (ULONG)pDevice; pDevice->sTimerCommand.data = (ULONG)pDevice;
pDevice->sTimerCommand.function = (TimerFunction)vCommandTimer; pDevice->sTimerCommand.function = (TimerFunction)vCommandTimer;
// RUN_AT :1 msec ~= (HZ/1024) // RUN_AT :1 msec ~= (HZ/1024)
pDevice->sTimerCommand.expires = (UINT)RUN_AT((MSecond * HZ) >> 10); pDevice->sTimerCommand.expires = (unsigned int)RUN_AT((MSecond * HZ) >> 10);
add_timer(&pDevice->sTimerCommand); add_timer(&pDevice->sTimerCommand);
return; return;
} }
@ -347,7 +347,7 @@ vCommandTimer (
PWLAN_IE_SSID pItemSSID; PWLAN_IE_SSID pItemSSID;
PWLAN_IE_SSID pItemSSIDCurr; PWLAN_IE_SSID pItemSSIDCurr;
CMD_STATUS Status; CMD_STATUS Status;
UINT ii; unsigned int ii;
BYTE byMask[8] = {1, 2, 4, 8, 0x10, 0x20, 0x40, 0x80}; BYTE byMask[8] = {1, 2, 4, 8, 0x10, 0x20, 0x40, 0x80};
struct sk_buff *skb; struct sk_buff *skb;
@ -1065,8 +1065,8 @@ BOOL bClearBSSID_SCAN (
) )
{ {
PSDevice pDevice = (PSDevice)hDeviceContext; PSDevice pDevice = (PSDevice)hDeviceContext;
UINT uCmdDequeueIdx = pDevice->uCmdDequeueIdx; unsigned int uCmdDequeueIdx = pDevice->uCmdDequeueIdx;
UINT ii; unsigned int ii;
if ((pDevice->cbFreeCmdQueue < CMD_Q_SIZE) && (uCmdDequeueIdx != pDevice->uCmdEnqueueIdx)) { if ((pDevice->cbFreeCmdQueue < CMD_Q_SIZE) && (uCmdDequeueIdx != pDevice->uCmdEnqueueIdx)) {
for (ii = 0; ii < (CMD_Q_SIZE - pDevice->cbFreeCmdQueue); ii ++) { for (ii = 0; ii < (CMD_Q_SIZE - pDevice->cbFreeCmdQueue); ii ++) {

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

@ -133,7 +133,7 @@ bScheduleCommand(
void void
vCommandTimerWait( vCommandTimerWait(
void *hDeviceContext, void *hDeviceContext,
UINT MSecond unsigned int MSecond
); );
#ifdef TxInSleep #ifdef TxInSleep
void void

16
drivers/staging/vt6655/wctl.c
View File

@ -68,8 +68,8 @@
BOOL WCTLbIsDuplicate (PSCache pCache, PS802_11Header pMACHeader) BOOL WCTLbIsDuplicate (PSCache pCache, PS802_11Header pMACHeader)
{ {
UINT uIndex; unsigned int uIndex;
UINT ii; unsigned int ii;
PSCacheEntry pCacheEntry; PSCacheEntry pCacheEntry;
if (IS_FC_RETRY(pMACHeader)) { if (IS_FC_RETRY(pMACHeader)) {
@ -108,9 +108,9 @@ BOOL WCTLbIsDuplicate (PSCache pCache, PS802_11Header pMACHeader)
* Return Value: index number in Defragment Database * Return Value: index number in Defragment Database
* *
*/ */
UINT WCTLuSearchDFCB (PSDevice pDevice, PS802_11Header pMACHeader) unsigned int WCTLuSearchDFCB (PSDevice pDevice, PS802_11Header pMACHeader)
{ {
UINT ii; unsigned int ii;
for(ii=0;ii<pDevice->cbDFCB;ii++) { for(ii=0;ii<pDevice->cbDFCB;ii++) {
if ((pDevice->sRxDFCB[ii].bInUse == TRUE) && if ((pDevice->sRxDFCB[ii].bInUse == TRUE) &&
@ -138,9 +138,9 @@ UINT ii;
* Return Value: index number in Defragment Database * Return Value: index number in Defragment Database
* *
*/ */
UINT WCTLuInsertDFCB (PSDevice pDevice, PS802_11Header pMACHeader) unsigned int WCTLuInsertDFCB (PSDevice pDevice, PS802_11Header pMACHeader)
{ {
UINT ii; unsigned int ii;
if (pDevice->cbFreeDFCB == 0) if (pDevice->cbFreeDFCB == 0)
return(pDevice->cbDFCB); return(pDevice->cbDFCB);
@ -175,9 +175,9 @@ UINT ii;
* Return Value: TRUE if it is valid fragment packet and we have resource to defragment; otherwise FALSE * Return Value: TRUE if it is valid fragment packet and we have resource to defragment; otherwise FALSE
* *
*/ */
BOOL WCTLbHandleFragment (PSDevice pDevice, PS802_11Header pMACHeader, UINT cbFrameLength, BOOL bWEP, BOOL bExtIV) BOOL WCTLbHandleFragment (PSDevice pDevice, PS802_11Header pMACHeader, unsigned int cbFrameLength, BOOL bWEP, BOOL bExtIV)
{ {
UINT uHeaderSize; unsigned int uHeaderSize;
if (bWEP == TRUE) { if (bWEP == TRUE) {

7
drivers/staging/vt6655/wctl.h
View File

@ -98,9 +98,10 @@
/*--------------------- Export Functions --------------------------*/ /*--------------------- Export Functions --------------------------*/
BOOL WCTLbIsDuplicate(PSCache pCache, PS802_11Header pMACHeader); BOOL WCTLbIsDuplicate(PSCache pCache, PS802_11Header pMACHeader);
BOOL WCTLbHandleFragment(PSDevice pDevice, PS802_11Header pMACHeader, UINT cbFrameLength, BOOL bWEP, BOOL bExtIV); BOOL WCTLbHandleFragment(PSDevice pDevice, PS802_11Header pMACHeader,
UINT WCTLuSearchDFCB(PSDevice pDevice, PS802_11Header pMACHeader); unsigned int cbFrameLength, BOOL bWEP, BOOL bExtIV);
UINT WCTLuInsertDFCB(PSDevice pDevice, PS802_11Header pMACHeader); unsigned int WCTLuSearchDFCB(PSDevice pDevice, PS802_11Header pMACHeader);
unsigned int WCTLuInsertDFCB(PSDevice pDevice, PS802_11Header pMACHeader);
#endif // __WCTL_H__ #endif // __WCTL_H__

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

@ -118,7 +118,7 @@ s_vMgrRxAssocRequest(
PSDevice pDevice, PSDevice pDevice,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
PSRxMgmtPacket pRxPacket, PSRxMgmtPacket pRxPacket,
UINT uNodeIndex unsigned int uNodeIndex
); );
static static
@ -242,7 +242,7 @@ s_MgrMakeBeacon(
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
WORD wCurrCapInfo, WORD wCurrCapInfo,
WORD wCurrBeaconPeriod, WORD wCurrBeaconPeriod,
UINT uCurrChannel, unsigned int uCurrChannel,
WORD wCurrATIMWinodw, WORD wCurrATIMWinodw,
PWLAN_IE_SSID pCurrSSID, PWLAN_IE_SSID pCurrSSID,
PBYTE pCurrBSSID, PBYTE pCurrBSSID,
@ -287,7 +287,7 @@ s_MgrMakeProbeResponse(
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
WORD wCurrCapInfo, WORD wCurrCapInfo,
WORD wCurrBeaconPeriod, WORD wCurrBeaconPeriod,
UINT uCurrChannel, unsigned int uCurrChannel,
WORD wCurrATIMWinodw, WORD wCurrATIMWinodw,
PBYTE pDstAddr, PBYTE pDstAddr,
PWLAN_IE_SSID pCurrSSID, PWLAN_IE_SSID pCurrSSID,
@ -310,7 +310,7 @@ static
void void
s_vMgrSynchBSS ( s_vMgrSynchBSS (
PSDevice pDevice, PSDevice pDevice,
UINT uBSSMode, unsigned int uBSSMode,
PKnownBSS pCurr, PKnownBSS pCurr,
PCMD_STATUS pStatus PCMD_STATUS pStatus
); );
@ -683,7 +683,7 @@ s_vMgrRxAssocRequest(
PSDevice pDevice, PSDevice pDevice,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
PSRxMgmtPacket pRxPacket, PSRxMgmtPacket pRxPacket,
UINT uNodeIndex unsigned int uNodeIndex
) )
{ {
WLAN_FR_ASSOCREQ sFrame; WLAN_FR_ASSOCREQ sFrame;
@ -691,7 +691,7 @@ s_vMgrRxAssocRequest(
PSTxMgmtPacket pTxPacket; PSTxMgmtPacket pTxPacket;
WORD wAssocStatus = 0; WORD wAssocStatus = 0;
WORD wAssocAID = 0; WORD wAssocAID = 0;
UINT uRateLen = WLAN_RATES_MAXLEN; unsigned int uRateLen = WLAN_RATES_MAXLEN;
BYTE abyCurrSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN + 1]; BYTE abyCurrSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN + 1];
BYTE abyCurrExtSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN + 1]; BYTE abyCurrExtSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN + 1];
@ -845,7 +845,7 @@ s_vMgrRxReAssocRequest(
PSDevice pDevice, PSDevice pDevice,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
PSRxMgmtPacket pRxPacket, PSRxMgmtPacket pRxPacket,
UINT uNodeIndex unsigned int uNodeIndex
) )
{ {
WLAN_FR_REASSOCREQ sFrame; WLAN_FR_REASSOCREQ sFrame;
@ -853,7 +853,7 @@ s_vMgrRxReAssocRequest(
PSTxMgmtPacket pTxPacket; PSTxMgmtPacket pTxPacket;
WORD wAssocStatus = 0; WORD wAssocStatus = 0;
WORD wAssocAID = 0; WORD wAssocAID = 0;
UINT uRateLen = WLAN_RATES_MAXLEN; unsigned int uRateLen = WLAN_RATES_MAXLEN;
BYTE abyCurrSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN + 1]; BYTE abyCurrSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN + 1];
BYTE abyCurrExtSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN + 1]; BYTE abyCurrExtSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN + 1];
@ -1331,7 +1331,7 @@ s_vMgrRxAuthenSequence_1(
) )
{ {
PSTxMgmtPacket pTxPacket = NULL; PSTxMgmtPacket pTxPacket = NULL;
UINT uNodeIndex; unsigned int uNodeIndex;
WLAN_FR_AUTHEN sFrame; WLAN_FR_AUTHEN sFrame;
PSKeyItem pTransmitKey; PSKeyItem pTransmitKey;
@ -1539,8 +1539,8 @@ s_vMgrRxAuthenSequence_3(
) )
{ {
PSTxMgmtPacket pTxPacket = NULL; PSTxMgmtPacket pTxPacket = NULL;
UINT uStatusCode = 0 ; unsigned int uStatusCode = 0 ;
UINT uNodeIndex = 0; unsigned int uNodeIndex = 0;
WLAN_FR_AUTHEN sFrame; WLAN_FR_AUTHEN sFrame;
if (!WLAN_GET_FC_ISWEP(pFrame->pHdr->sA3.wFrameCtl)) { if (!WLAN_GET_FC_ISWEP(pFrame->pHdr->sA3.wFrameCtl)) {
@ -1666,7 +1666,7 @@ s_vMgrRxDisassociation(
) )
{ {
WLAN_FR_DISASSOC sFrame; WLAN_FR_DISASSOC sFrame;
UINT uNodeIndex = 0; unsigned int uNodeIndex = 0;
// CMD_STATUS CmdStatus; // CMD_STATUS CmdStatus;
viawget_wpa_header *wpahdr; viawget_wpa_header *wpahdr;
@ -1745,7 +1745,7 @@ s_vMgrRxDeauthentication(
) )
{ {
WLAN_FR_DEAUTHEN sFrame; WLAN_FR_DEAUTHEN sFrame;
UINT uNodeIndex = 0; unsigned int uNodeIndex = 0;
viawget_wpa_header *wpahdr; viawget_wpa_header *wpahdr;
@ -1882,17 +1882,17 @@ s_vMgrRxBeacon(
BOOL bUpdateTSF = FALSE; BOOL bUpdateTSF = FALSE;
BOOL bIsAPBeacon = FALSE; BOOL bIsAPBeacon = FALSE;
BOOL bIsChannelEqual = FALSE; BOOL bIsChannelEqual = FALSE;
UINT uLocateByteIndex; unsigned int uLocateByteIndex;
BYTE byTIMBitOn = 0; BYTE byTIMBitOn = 0;
WORD wAIDNumber = 0; WORD wAIDNumber = 0;
UINT uNodeIndex; unsigned int uNodeIndex;
QWORD qwTimestamp, qwLocalTSF; QWORD qwTimestamp, qwLocalTSF;
QWORD qwCurrTSF; QWORD qwCurrTSF;
WORD wStartIndex = 0; WORD wStartIndex = 0;
WORD wAIDIndex = 0; WORD wAIDIndex = 0;
BYTE byCurrChannel = pRxPacket->byRxChannel; BYTE byCurrChannel = pRxPacket->byRxChannel;
ERPObject sERP; ERPObject sERP;
UINT uRateLen = WLAN_RATES_MAXLEN; unsigned int uRateLen = WLAN_RATES_MAXLEN;
BOOL bChannelHit = FALSE; BOOL bChannelHit = FALSE;
BOOL bUpdatePhyParameter = FALSE; BOOL bUpdatePhyParameter = FALSE;
BYTE byIEChannel = 0; BYTE byIEChannel = 0;
@ -2397,7 +2397,7 @@ vMgrCreateOwnIBSS(
BYTE byTopCCKBasicRate; BYTE byTopCCKBasicRate;
BYTE byTopOFDMBasicRate; BYTE byTopOFDMBasicRate;
QWORD qwCurrTSF; QWORD qwCurrTSF;
UINT ii; unsigned int ii;
BYTE abyRATE[] = {0x82, 0x84, 0x8B, 0x96, 0x24, 0x30, 0x48, 0x6C, 0x0C, 0x12, 0x18, 0x60}; BYTE abyRATE[] = {0x82, 0x84, 0x8B, 0x96, 0x24, 0x30, 0x48, 0x6C, 0x0C, 0x12, 0x18, 0x60};
BYTE abyCCK_RATE[] = {0x82, 0x84, 0x8B, 0x96}; BYTE abyCCK_RATE[] = {0x82, 0x84, 0x8B, 0x96};
BYTE abyOFDM_RATE[] = {0x0C, 0x12, 0x18, 0x24, 0x30, 0x48, 0x60, 0x6C}; BYTE abyOFDM_RATE[] = {0x0C, 0x12, 0x18, 0x24, 0x30, 0x48, 0x60, 0x6C};
@ -2661,11 +2661,11 @@ vMgrJoinBSSBegin(
PSDevice pDevice = (PSDevice)hDeviceContext; PSDevice pDevice = (PSDevice)hDeviceContext;
PSMgmtObject pMgmt = pDevice->pMgmt; PSMgmtObject pMgmt = pDevice->pMgmt;
PKnownBSS pCurr = NULL; PKnownBSS pCurr = NULL;
UINT ii, uu; unsigned int ii, uu;
PWLAN_IE_SUPP_RATES pItemRates = NULL; PWLAN_IE_SUPP_RATES pItemRates = NULL;
PWLAN_IE_SUPP_RATES pItemExtRates = NULL; PWLAN_IE_SUPP_RATES pItemExtRates = NULL;
PWLAN_IE_SSID pItemSSID; PWLAN_IE_SSID pItemSSID;
UINT uRateLen = WLAN_RATES_MAXLEN; unsigned int uRateLen = WLAN_RATES_MAXLEN;
WORD wMaxBasicRate = RATE_1M; WORD wMaxBasicRate = RATE_1M;
WORD wMaxSuppRate = RATE_1M; WORD wMaxSuppRate = RATE_1M;
WORD wSuppRate; WORD wSuppRate;
@ -2764,7 +2764,7 @@ vMgrJoinBSSBegin(
uRateLen); uRateLen);
// Stuffing Rate IE // Stuffing Rate IE
if ((pItemExtRates->len > 0) && (pItemRates->len < 8)) { if ((pItemExtRates->len > 0) && (pItemRates->len < 8)) {
for (ii = 0; ii < (UINT)(8 - pItemRates->len); ) { for (ii = 0; ii < (unsigned int)(8 - pItemRates->len); ) {
pItemRates->abyRates[pItemRates->len + ii] = pItemExtRates->abyRates[ii]; pItemRates->abyRates[pItemRates->len + ii] = pItemExtRates->abyRates[ii];
ii ++; ii ++;
if (pItemExtRates->len <= ii) if (pItemExtRates->len <= ii)
@ -2923,7 +2923,7 @@ static
void void
s_vMgrSynchBSS ( s_vMgrSynchBSS (
PSDevice pDevice, PSDevice pDevice,
UINT uBSSMode, unsigned int uBSSMode,
PKnownBSS pCurr, PKnownBSS pCurr,
PCMD_STATUS pStatus PCMD_STATUS pStatus
) )
@ -3094,7 +3094,7 @@ s_vMgrSynchBSS (
) )
{ {
PSMgmtObject pMgmt = &(pDevice->sMgmtObj); PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
// UINT ii , uSameBssidNum=0; // unsigned int ii , uSameBssidNum=0;
// for (ii = 0; ii < MAX_BSS_NUM; ii++) { // for (ii = 0; ii < MAX_BSS_NUM; ii++) {
// if (pMgmt->sBSSList[ii].bActive && // if (pMgmt->sBSSList[ii].bActive &&
@ -3153,7 +3153,7 @@ s_vMgrFormatTIM(
{ {
BYTE byMask[8] = {1, 2, 4, 8, 0x10, 0x20, 0x40, 0x80}; BYTE byMask[8] = {1, 2, 4, 8, 0x10, 0x20, 0x40, 0x80};
BYTE byMap; BYTE byMap;
UINT ii, jj; unsigned int ii, jj;
BOOL bStartFound = FALSE; BOOL bStartFound = FALSE;
BOOL bMulticast = FALSE; BOOL bMulticast = FALSE;
WORD wStartIndex = 0; WORD wStartIndex = 0;
@ -3226,7 +3226,7 @@ s_MgrMakeBeacon(
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
WORD wCurrCapInfo, WORD wCurrCapInfo,
WORD wCurrBeaconPeriod, WORD wCurrBeaconPeriod,
UINT uCurrChannel, unsigned int uCurrChannel,
WORD wCurrATIMWinodw, WORD wCurrATIMWinodw,
PWLAN_IE_SSID pCurrSSID, PWLAN_IE_SSID pCurrSSID,
PBYTE pCurrBSSID, PBYTE pCurrBSSID,
@ -3238,9 +3238,9 @@ s_MgrMakeBeacon(
WLAN_FR_BEACON sFrame; WLAN_FR_BEACON sFrame;
BYTE abyBroadcastAddr[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; BYTE abyBroadcastAddr[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
PBYTE pbyBuffer; PBYTE pbyBuffer;
UINT uLength = 0; unsigned int uLength = 0;
PWLAN_IE_IBSS_DFS pIBSSDFS = NULL; PWLAN_IE_IBSS_DFS pIBSSDFS = NULL;
UINT ii; unsigned int ii;
// prepare beacon frame // prepare beacon frame
pTxPacket = (PSTxMgmtPacket)pMgmt->pbyMgmtPacketPool; pTxPacket = (PSTxMgmtPacket)pMgmt->pbyMgmtPacketPool;
@ -3455,7 +3455,7 @@ s_MgrMakeProbeResponse(
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
WORD wCurrCapInfo, WORD wCurrCapInfo,
WORD wCurrBeaconPeriod, WORD wCurrBeaconPeriod,
UINT uCurrChannel, unsigned int uCurrChannel,
WORD wCurrATIMWinodw, WORD wCurrATIMWinodw,
PBYTE pDstAddr, PBYTE pDstAddr,
PWLAN_IE_SSID pCurrSSID, PWLAN_IE_SSID pCurrSSID,
@ -3468,9 +3468,9 @@ s_MgrMakeProbeResponse(
PSTxMgmtPacket pTxPacket = NULL; PSTxMgmtPacket pTxPacket = NULL;
WLAN_FR_PROBERESP sFrame; WLAN_FR_PROBERESP sFrame;
PBYTE pbyBuffer; PBYTE pbyBuffer;
UINT uLength = 0; unsigned int uLength = 0;
PWLAN_IE_IBSS_DFS pIBSSDFS = NULL; PWLAN_IE_IBSS_DFS pIBSSDFS = NULL;
UINT ii; unsigned int ii;
pTxPacket = (PSTxMgmtPacket)pMgmt->pbyMgmtPacketPool; pTxPacket = (PSTxMgmtPacket)pMgmt->pbyMgmtPacketPool;
@ -3799,7 +3799,7 @@ s_MgrMakeAssocRequest(
} else if (((pMgmt->eAuthenMode == WMAC_AUTH_WPA2) || } else if (((pMgmt->eAuthenMode == WMAC_AUTH_WPA2) ||
(pMgmt->eAuthenMode == WMAC_AUTH_WPA2PSK)) && (pMgmt->eAuthenMode == WMAC_AUTH_WPA2PSK)) &&
(pMgmt->pCurrBSS != NULL)) { (pMgmt->pCurrBSS != NULL)) {
UINT ii; unsigned int ii;
PWORD pwPMKID; PWORD pwPMKID;
// WPA IE // WPA IE
@ -4055,7 +4055,7 @@ s_MgrMakeReAssocRequest(
} else if (((pMgmt->eAuthenMode == WMAC_AUTH_WPA2) || } else if (((pMgmt->eAuthenMode == WMAC_AUTH_WPA2) ||
(pMgmt->eAuthenMode == WMAC_AUTH_WPA2PSK)) && (pMgmt->eAuthenMode == WMAC_AUTH_WPA2PSK)) &&
(pMgmt->pCurrBSS != NULL)) { (pMgmt->pCurrBSS != NULL)) {
UINT ii; unsigned int ii;
PWORD pwPMKID; PWORD pwPMKID;
/* WPA IE */ /* WPA IE */
@ -4543,7 +4543,7 @@ vMgrRxManagePacket(
{ {
PSDevice pDevice = (PSDevice)hDeviceContext; PSDevice pDevice = (PSDevice)hDeviceContext;
BOOL bInScan = FALSE; BOOL bInScan = FALSE;
UINT uNodeIndex = 0; unsigned int uNodeIndex = 0;
NODE_STATE eNodeState = 0; NODE_STATE eNodeState = 0;
CMD_STATUS Status; CMD_STATUS Status;
@ -4816,7 +4816,7 @@ bAdd_PMKID_Candidate (
{ {
PSDevice pDevice = (PSDevice)hDeviceContext; PSDevice pDevice = (PSDevice)hDeviceContext;
PPMKID_CANDIDATE pCandidateList; PPMKID_CANDIDATE pCandidateList;
UINT ii = 0; unsigned int ii = 0;
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"bAdd_PMKID_Candidate START: (%d)\n", (int)pDevice->gsPMKIDCandidate.NumCandidates); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"bAdd_PMKID_Candidate START: (%d)\n", (int)pDevice->gsPMKIDCandidate.NumCandidates);

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

@ -224,8 +224,8 @@ typedef enum tagWMAC_POWER_MODE {
typedef struct tagSTxMgmtPacket { typedef struct tagSTxMgmtPacket {
PUWLAN_80211HDR p80211Header; PUWLAN_80211HDR p80211Header;
UINT cbMPDULen; unsigned int cbMPDULen;
UINT cbPayloadLen; unsigned int cbPayloadLen;
} STxMgmtPacket, *PSTxMgmtPacket; } STxMgmtPacket, *PSTxMgmtPacket;
@ -235,9 +235,9 @@ typedef struct tagSRxMgmtPacket {
PUWLAN_80211HDR p80211Header; PUWLAN_80211HDR p80211Header;
QWORD qwLocalTSF; QWORD qwLocalTSF;
UINT cbMPDULen; unsigned int cbMPDULen;
UINT cbPayloadLen; unsigned int cbPayloadLen;
UINT uRSSI; unsigned int uRSSI;
BYTE bySQ; BYTE bySQ;
BYTE byRxRate; BYTE byRxRate;
BYTE byRxChannel; BYTE byRxChannel;
@ -271,7 +271,7 @@ typedef struct tagSMgmtObject
// BYTE abyNewExtSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN]; // BYTE abyNewExtSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN];
// Current state vars // Current state vars
UINT uCurrChannel; unsigned int uCurrChannel;
BYTE abyCurrSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN + 1]; BYTE abyCurrSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN + 1];
BYTE abyCurrExtSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN + 1]; BYTE abyCurrExtSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN + 1];
BYTE abyCurrSSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1]; BYTE abyCurrSSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1];
@ -284,7 +284,7 @@ typedef struct tagSMgmtObject
BYTE byERPContext; BYTE byERPContext;
CMD_STATE eCommandState; CMD_STATE eCommandState;
UINT uScanChannel; unsigned int uScanChannel;
// Desire joinning BSS vars // Desire joinning BSS vars
BYTE abyDesireSSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1]; BYTE abyDesireSSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1];
@ -294,22 +294,22 @@ typedef struct tagSMgmtObject
//BYTE abyAdHocSSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1]; //BYTE abyAdHocSSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1];
WORD wIBSSBeaconPeriod; WORD wIBSSBeaconPeriod;
WORD wIBSSATIMWindow; WORD wIBSSATIMWindow;
UINT uIBSSChannel; unsigned int uIBSSChannel;
BYTE abyIBSSSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN + 1]; BYTE abyIBSSSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN + 1];
BYTE byAPBBType; BYTE byAPBBType;
BYTE abyWPAIE[MAX_WPA_IE_LEN]; BYTE abyWPAIE[MAX_WPA_IE_LEN];
WORD wWPAIELen; WORD wWPAIELen;
UINT uAssocCount; unsigned int uAssocCount;
BOOL bMoreData; BOOL bMoreData;
// Scan state vars // Scan state vars
WMAC_SCAN_STATE eScanState; WMAC_SCAN_STATE eScanState;
WMAC_SCAN_TYPE eScanType; WMAC_SCAN_TYPE eScanType;
UINT uScanStartCh; unsigned int uScanStartCh;
UINT uScanEndCh; unsigned int uScanEndCh;
WORD wScanSteps; WORD wScanSteps;
UINT uScanBSSType; unsigned int uScanBSSType;
// Desire scannig vars // Desire scannig vars
BYTE abyScanSSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1]; BYTE abyScanSSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1];
BYTE abyScanBSSID[WLAN_BSSID_LEN]; BYTE abyScanBSSID[WLAN_BSSID_LEN];
@ -338,8 +338,8 @@ typedef struct tagSMgmtObject
BYTE abyPSTxMap[MAX_NODE_NUM + 1]; BYTE abyPSTxMap[MAX_NODE_NUM + 1];
// management command related // management command related
UINT uCmdBusy; unsigned int uCmdBusy;
UINT uCmdHostAPBusy; unsigned int uCmdHostAPBusy;
// management packet pool // management packet pool
PBYTE pbyMgmtPacketPool; PBYTE pbyMgmtPacketPool;
@ -381,7 +381,7 @@ typedef struct tagSMgmtObject
BOOL bSwitchChannel; BOOL bSwitchChannel;
BYTE byNewChannel; BYTE byNewChannel;
PWLAN_IE_MEASURE_REP pCurrMeasureEIDRep; PWLAN_IE_MEASURE_REP pCurrMeasureEIDRep;
UINT uLengthOfRepEIDs; unsigned int uLengthOfRepEIDs;
BYTE abyCurrentMSRReq[sizeof(STxMgmtPacket) + WLAN_A3FR_MAXLEN]; BYTE abyCurrentMSRReq[sizeof(STxMgmtPacket) + WLAN_A3FR_MAXLEN];
BYTE abyCurrentMSRRep[sizeof(STxMgmtPacket) + WLAN_A3FR_MAXLEN]; BYTE abyCurrentMSRRep[sizeof(STxMgmtPacket) + WLAN_A3FR_MAXLEN];
BYTE abyIECountry[WLAN_A3FR_MAXLEN]; BYTE abyIECountry[WLAN_A3FR_MAXLEN];

4
drivers/staging/vt6655/wpa2.c
View File

@ -261,7 +261,7 @@ WPA2vParseRSN (
* Return Value: length of IEs. * Return Value: length of IEs.
* *
-*/ -*/
UINT unsigned int
WPA2uSetIEs( WPA2uSetIEs(
void *pMgmtHandle, void *pMgmtHandle,
PWLAN_IE_RSN pRSNIEs PWLAN_IE_RSN pRSNIEs
@ -269,7 +269,7 @@ WPA2uSetIEs(
{ {
PSMgmtObject pMgmt = (PSMgmtObject) pMgmtHandle; PSMgmtObject pMgmt = (PSMgmtObject) pMgmtHandle;
PBYTE pbyBuffer = NULL; PBYTE pbyBuffer = NULL;
UINT ii = 0; unsigned int ii = 0;
PWORD pwPMKID = NULL; PWORD pwPMKID = NULL;
if (pRSNIEs == NULL) { if (pRSNIEs == NULL) {

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

@ -69,7 +69,7 @@ WPA2vParseRSN (
PWLAN_IE_RSN pRSN PWLAN_IE_RSN pRSN
); );
UINT unsigned int
WPA2uSetIEs( WPA2uSetIEs(
void *pMgmtHandle, void *pMgmtHandle,
PWLAN_IE_RSN pRSNIEs PWLAN_IE_RSN pRSNIEs

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

@ -65,18 +65,18 @@ static int msglevel =MSG_LEVEL_INFO;
* Return Value: TRUE if packet duplicate; otherwise FALSE * Return Value: TRUE if packet duplicate; otherwise FALSE
* *
*/ */
BOOL ROUTEbRelay (PSDevice pDevice, PBYTE pbySkbData, UINT uDataLen, UINT uNodeIndex) BOOL ROUTEbRelay (PSDevice pDevice, PBYTE pbySkbData, unsigned int uDataLen, unsigned int uNodeIndex)
{ {
PSMgmtObject pMgmt = pDevice->pMgmt; PSMgmtObject pMgmt = pDevice->pMgmt;
PSTxDesc pHeadTD, pLastTD; PSTxDesc pHeadTD, pLastTD;
UINT cbFrameBodySize; unsigned int cbFrameBodySize;
UINT uMACfragNum; unsigned int uMACfragNum;
BYTE byPktType; BYTE byPktType;
BOOL bNeedEncryption = FALSE; BOOL bNeedEncryption = FALSE;
SKeyItem STempKey; SKeyItem STempKey;
PSKeyItem pTransmitKey = NULL; PSKeyItem pTransmitKey = NULL;
UINT cbHeaderSize; unsigned int cbHeaderSize;
UINT ii; unsigned int ii;
PBYTE pbyBSSID; PBYTE pbyBSSID;

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

@ -39,7 +39,7 @@
/*--------------------- Export Functions --------------------------*/ /*--------------------- Export Functions --------------------------*/
BOOL ROUTEbRelay (PSDevice pDevice, PBYTE pbySkbData, UINT uDataLen, UINT uNodeIndex); BOOL ROUTEbRelay (PSDevice pDevice, PBYTE pbySkbData, unsigned int uDataLen, unsigned int uNodeIndex);
#endif // __WROUTE_H__ #endif // __WROUTE_H__