Staging: vt6655: remove custom INT typedef
Signed-off-by: Charles Clément <caratorn@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
0c93a98a0e
commit
7ca3019525
|
@ -2362,7 +2362,7 @@ CARDbyAutoChannelSelect(
|
|||
// PSDevice pDevice = (PSDevice) pDeviceHandler;
|
||||
UINT ii = 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};
|
||||
|
||||
if (ePHYType == PHY_TYPE_11A) {
|
||||
for(ii=CB_MAX_CHANNEL_24G+1;ii<=CB_MAX_CHANNEL;ii++) {
|
||||
|
|
|
@ -464,18 +464,18 @@ pDevice->bUpdateBBVGA = TRUE;
|
|||
pDevice->byPreambleType = 0;
|
||||
|
||||
|
||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" uChannel= %d\n",(INT)pDevice->uChannel);
|
||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" byOpMode= %d\n",(INT)pDevice->byOpMode);
|
||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" ePSMode= %d\n",(INT)pDevice->ePSMode);
|
||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" wRTSThreshold= %d\n",(INT)pDevice->wRTSThreshold);
|
||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" byShortRetryLimit= %d\n",(INT)pDevice->byShortRetryLimit);
|
||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" byLongRetryLimit= %d\n",(INT)pDevice->byLongRetryLimit);
|
||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" byPreambleType= %d\n",(INT)pDevice->byPreambleType);
|
||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" byShortPreamble= %d\n",(INT)pDevice->byShortPreamble);
|
||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" uConnectionRate= %d\n",(INT)pDevice->uConnectionRate);
|
||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" byBBType= %d\n",(INT)pDevice->byBBType);
|
||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" pDevice->b11hEnable= %d\n",(INT)pDevice->b11hEnable);
|
||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" pDevice->bDiversityRegCtlON= %d\n",(INT)pDevice->bDiversityRegCtlON);
|
||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" uChannel= %d\n",(int)pDevice->uChannel);
|
||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" byOpMode= %d\n",(int)pDevice->byOpMode);
|
||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" ePSMode= %d\n",(int)pDevice->ePSMode);
|
||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" wRTSThreshold= %d\n",(int)pDevice->wRTSThreshold);
|
||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" byShortRetryLimit= %d\n",(int)pDevice->byShortRetryLimit);
|
||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" byLongRetryLimit= %d\n",(int)pDevice->byLongRetryLimit);
|
||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" byPreambleType= %d\n",(int)pDevice->byPreambleType);
|
||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" byShortPreamble= %d\n",(int)pDevice->byShortPreamble);
|
||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" uConnectionRate= %d\n",(int)pDevice->uConnectionRate);
|
||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" byBBType= %d\n",(int)pDevice->byBBType);
|
||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" pDevice->b11hEnable= %d\n",(int)pDevice->b11hEnable);
|
||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" pDevice->bDiversityRegCtlON= %d\n",(int)pDevice->bDiversityRegCtlON);
|
||||
}
|
||||
|
||||
static void s_vCompleteCurrentMeasure (PSDevice pDevice, BYTE byResult)
|
||||
|
@ -530,7 +530,7 @@ static void device_init_registers(PSDevice pDevice, DEVICE_INIT_TYPE InitType)
|
|||
BYTE byValue1;
|
||||
BYTE byCCKPwrdBm = 0;
|
||||
BYTE byOFDMPwrdBm = 0;
|
||||
INT zonetype=0;
|
||||
int zonetype=0;
|
||||
PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
|
||||
MACbShutdown(pDevice->PortOffset);
|
||||
BBvSoftwareReset(pDevice->PortOffset);
|
||||
|
@ -1710,7 +1710,7 @@ static int device_tx_srv(PSDevice pDevice, UINT uIdx) {
|
|||
if ( !(byTsr1 & TSR1_TERR)) {
|
||||
if (byTsr0 != 0) {
|
||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" Tx[%d] OK but has error. tsr1[%02X] tsr0[%02X].\n",
|
||||
(INT)uIdx, byTsr1, byTsr0);
|
||||
(int)uIdx, byTsr1, byTsr0);
|
||||
}
|
||||
if ((pTxBufHead->wFragCtl & FRAGCTL_ENDFRAG) != FRAGCTL_NONFRAG) {
|
||||
pDevice->s802_11Counter.TransmittedFragmentCount ++;
|
||||
|
@ -1720,7 +1720,7 @@ static int device_tx_srv(PSDevice pDevice, UINT uIdx) {
|
|||
}
|
||||
else {
|
||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" Tx[%d] dropped & tsr1[%02X] tsr0[%02X].\n",
|
||||
(INT)uIdx, byTsr1, byTsr0);
|
||||
(int)uIdx, byTsr1, byTsr0);
|
||||
pStats->tx_errors++;
|
||||
pStats->tx_dropped++;
|
||||
}
|
||||
|
@ -1742,11 +1742,11 @@ static int device_tx_srv(PSDevice pDevice, UINT uIdx) {
|
|||
if (byTsr1 & TSR1_TERR) {
|
||||
if ((pTD->pTDInfo->byFlags & TD_FLAGS_PRIV_SKB) != 0) {
|
||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" Tx[%d] fail has error. tsr1[%02X] tsr0[%02X].\n",
|
||||
(INT)uIdx, byTsr1, byTsr0);
|
||||
(int)uIdx, byTsr1, byTsr0);
|
||||
}
|
||||
|
||||
// DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" Tx[%d] fail has error. tsr1[%02X] tsr0[%02X].\n",
|
||||
// (INT)uIdx, byTsr1, byTsr0);
|
||||
// (int)uIdx, byTsr1, byTsr0);
|
||||
|
||||
if ((pMgmt->eCurrMode == WMAC_MODE_ESS_AP) &&
|
||||
(pTD->pTDInfo->byFlags & TD_FLAGS_NETIF_SKB)) {
|
||||
|
@ -1763,7 +1763,7 @@ static int device_tx_srv(PSDevice pDevice, UINT uIdx) {
|
|||
pMgmt->abyPSTxMap[wAID >> 3] |= byMask[wAID & 7];
|
||||
pTD->pTDInfo->byFlags &= ~(TD_FLAGS_NETIF_SKB);
|
||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "tx_srv:tx fail re-queue sta index= %d, QueCnt= %d\n"
|
||||
,(INT)uNodeIndex, pMgmt->sNodeDBTable[uNodeIndex].wEnQueueCnt);
|
||||
,(int)uNodeIndex, pMgmt->sNodeDBTable[uNodeIndex].wEnQueueCnt);
|
||||
pStats->tx_errors--;
|
||||
pStats->tx_dropped--;
|
||||
}
|
||||
|
@ -1844,7 +1844,7 @@ void InitRxManagementQueue(PSDevice pDevice)
|
|||
|
||||
|
||||
//PLICE_DEBUG ->
|
||||
INT MlmeThread(
|
||||
int MlmeThread(
|
||||
void * Context)
|
||||
{
|
||||
PSDevice pDevice = (PSDevice) Context;
|
||||
|
|
|
@ -101,7 +101,7 @@ s_vProcessRxMACHeader (
|
|||
static BOOL s_bAPModeRxCtl(
|
||||
PSDevice pDevice,
|
||||
PBYTE pbyFrame,
|
||||
INT iSANodeIndex
|
||||
int iSANodeIndex
|
||||
);
|
||||
|
||||
|
||||
|
@ -111,8 +111,8 @@ static BOOL s_bAPModeRxData (
|
|||
struct sk_buff* skb,
|
||||
UINT FrameSize,
|
||||
UINT cbHeaderOffset,
|
||||
INT iSANodeIndex,
|
||||
INT iDANodeIndex
|
||||
int iSANodeIndex,
|
||||
int iDANodeIndex
|
||||
);
|
||||
|
||||
|
||||
|
@ -360,8 +360,8 @@ device_receive_frame (
|
|||
UINT cbHeaderOffset;
|
||||
UINT FrameSize;
|
||||
WORD wEtherType = 0;
|
||||
INT iSANodeIndex = -1;
|
||||
INT iDANodeIndex = -1;
|
||||
int iSANodeIndex = -1;
|
||||
int iDANodeIndex = -1;
|
||||
UINT ii;
|
||||
UINT cbIVOffset;
|
||||
BOOL bExtIV = FALSE;
|
||||
|
@ -1041,7 +1041,7 @@ device_receive_frame (
|
|||
static BOOL s_bAPModeRxCtl (
|
||||
PSDevice pDevice,
|
||||
PBYTE pbyFrame,
|
||||
INT iSANodeIndex
|
||||
int iSANodeIndex
|
||||
)
|
||||
{
|
||||
PS802_11Header p802_11Header;
|
||||
|
@ -1444,8 +1444,8 @@ static BOOL s_bAPModeRxData (
|
|||
struct sk_buff* skb,
|
||||
UINT FrameSize,
|
||||
UINT cbHeaderOffset,
|
||||
INT iSANodeIndex,
|
||||
INT iDANodeIndex
|
||||
int iSANodeIndex,
|
||||
int iDANodeIndex
|
||||
)
|
||||
{
|
||||
PSMgmtObject pMgmt = pDevice->pMgmt;
|
||||
|
|
|
@ -212,87 +212,87 @@ void STAvUpdateRDStatCounter (PSStatCounter pStatistic,
|
|||
if(byRSR & RSR_CRCOK) {
|
||||
pStatistic->CustomStat.ullRsr11MCRCOk++;
|
||||
}
|
||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"11M: ALL[%d], OK[%d]:[%02x]\n", (INT)pStatistic->CustomStat.ullRsr11M, (INT)pStatistic->CustomStat.ullRsr11MCRCOk, byRSR);
|
||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"11M: ALL[%d], OK[%d]:[%02x]\n", (int)pStatistic->CustomStat.ullRsr11M, (int)pStatistic->CustomStat.ullRsr11MCRCOk, byRSR);
|
||||
}
|
||||
else if(byRxRate==11) {
|
||||
pStatistic->CustomStat.ullRsr5M++;
|
||||
if(byRSR & RSR_CRCOK) {
|
||||
pStatistic->CustomStat.ullRsr5MCRCOk++;
|
||||
}
|
||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" 5M: ALL[%d], OK[%d]:[%02x]\n", (INT)pStatistic->CustomStat.ullRsr5M, (INT)pStatistic->CustomStat.ullRsr5MCRCOk, byRSR);
|
||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" 5M: ALL[%d], OK[%d]:[%02x]\n", (int)pStatistic->CustomStat.ullRsr5M, (int)pStatistic->CustomStat.ullRsr5MCRCOk, byRSR);
|
||||
}
|
||||
else if(byRxRate==4) {
|
||||
pStatistic->CustomStat.ullRsr2M++;
|
||||
if(byRSR & RSR_CRCOK) {
|
||||
pStatistic->CustomStat.ullRsr2MCRCOk++;
|
||||
}
|
||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" 2M: ALL[%d], OK[%d]:[%02x]\n", (INT)pStatistic->CustomStat.ullRsr2M, (INT)pStatistic->CustomStat.ullRsr2MCRCOk, byRSR);
|
||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" 2M: ALL[%d], OK[%d]:[%02x]\n", (int)pStatistic->CustomStat.ullRsr2M, (int)pStatistic->CustomStat.ullRsr2MCRCOk, byRSR);
|
||||
}
|
||||
else if(byRxRate==2){
|
||||
pStatistic->CustomStat.ullRsr1M++;
|
||||
if(byRSR & RSR_CRCOK) {
|
||||
pStatistic->CustomStat.ullRsr1MCRCOk++;
|
||||
}
|
||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" 1M: ALL[%d], OK[%d]:[%02x]\n", (INT)pStatistic->CustomStat.ullRsr1M, (INT)pStatistic->CustomStat.ullRsr1MCRCOk, byRSR);
|
||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" 1M: ALL[%d], OK[%d]:[%02x]\n", (int)pStatistic->CustomStat.ullRsr1M, (int)pStatistic->CustomStat.ullRsr1MCRCOk, byRSR);
|
||||
}
|
||||
else if(byRxRate==12){
|
||||
pStatistic->CustomStat.ullRsr6M++;
|
||||
if(byRSR & RSR_CRCOK) {
|
||||
pStatistic->CustomStat.ullRsr6MCRCOk++;
|
||||
}
|
||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" 6M: ALL[%d], OK[%d]\n", (INT)pStatistic->CustomStat.ullRsr6M, (INT)pStatistic->CustomStat.ullRsr6MCRCOk);
|
||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" 6M: ALL[%d], OK[%d]\n", (int)pStatistic->CustomStat.ullRsr6M, (int)pStatistic->CustomStat.ullRsr6MCRCOk);
|
||||
}
|
||||
else if(byRxRate==18){
|
||||
pStatistic->CustomStat.ullRsr9M++;
|
||||
if(byRSR & RSR_CRCOK) {
|
||||
pStatistic->CustomStat.ullRsr9MCRCOk++;
|
||||
}
|
||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" 9M: ALL[%d], OK[%d]\n", (INT)pStatistic->CustomStat.ullRsr9M, (INT)pStatistic->CustomStat.ullRsr9MCRCOk);
|
||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" 9M: ALL[%d], OK[%d]\n", (int)pStatistic->CustomStat.ullRsr9M, (int)pStatistic->CustomStat.ullRsr9MCRCOk);
|
||||
}
|
||||
else if(byRxRate==24){
|
||||
pStatistic->CustomStat.ullRsr12M++;
|
||||
if(byRSR & RSR_CRCOK) {
|
||||
pStatistic->CustomStat.ullRsr12MCRCOk++;
|
||||
}
|
||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"12M: ALL[%d], OK[%d]\n", (INT)pStatistic->CustomStat.ullRsr12M, (INT)pStatistic->CustomStat.ullRsr12MCRCOk);
|
||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"12M: ALL[%d], OK[%d]\n", (int)pStatistic->CustomStat.ullRsr12M, (int)pStatistic->CustomStat.ullRsr12MCRCOk);
|
||||
}
|
||||
else if(byRxRate==36){
|
||||
pStatistic->CustomStat.ullRsr18M++;
|
||||
if(byRSR & RSR_CRCOK) {
|
||||
pStatistic->CustomStat.ullRsr18MCRCOk++;
|
||||
}
|
||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"18M: ALL[%d], OK[%d]\n", (INT)pStatistic->CustomStat.ullRsr18M, (INT)pStatistic->CustomStat.ullRsr18MCRCOk);
|
||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"18M: ALL[%d], OK[%d]\n", (int)pStatistic->CustomStat.ullRsr18M, (int)pStatistic->CustomStat.ullRsr18MCRCOk);
|
||||
}
|
||||
else if(byRxRate==48){
|
||||
pStatistic->CustomStat.ullRsr24M++;
|
||||
if(byRSR & RSR_CRCOK) {
|
||||
pStatistic->CustomStat.ullRsr24MCRCOk++;
|
||||
}
|
||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"24M: ALL[%d], OK[%d]\n", (INT)pStatistic->CustomStat.ullRsr24M, (INT)pStatistic->CustomStat.ullRsr24MCRCOk);
|
||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"24M: ALL[%d], OK[%d]\n", (int)pStatistic->CustomStat.ullRsr24M, (int)pStatistic->CustomStat.ullRsr24MCRCOk);
|
||||
}
|
||||
else if(byRxRate==72){
|
||||
pStatistic->CustomStat.ullRsr36M++;
|
||||
if(byRSR & RSR_CRCOK) {
|
||||
pStatistic->CustomStat.ullRsr36MCRCOk++;
|
||||
}
|
||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"36M: ALL[%d], OK[%d]\n", (INT)pStatistic->CustomStat.ullRsr36M, (INT)pStatistic->CustomStat.ullRsr36MCRCOk);
|
||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"36M: ALL[%d], OK[%d]\n", (int)pStatistic->CustomStat.ullRsr36M, (int)pStatistic->CustomStat.ullRsr36MCRCOk);
|
||||
}
|
||||
else if(byRxRate==96){
|
||||
pStatistic->CustomStat.ullRsr48M++;
|
||||
if(byRSR & RSR_CRCOK) {
|
||||
pStatistic->CustomStat.ullRsr48MCRCOk++;
|
||||
}
|
||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"48M: ALL[%d], OK[%d]\n", (INT)pStatistic->CustomStat.ullRsr48M, (INT)pStatistic->CustomStat.ullRsr48MCRCOk);
|
||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"48M: ALL[%d], OK[%d]\n", (int)pStatistic->CustomStat.ullRsr48M, (int)pStatistic->CustomStat.ullRsr48MCRCOk);
|
||||
}
|
||||
else if(byRxRate==108){
|
||||
pStatistic->CustomStat.ullRsr54M++;
|
||||
if(byRSR & RSR_CRCOK) {
|
||||
pStatistic->CustomStat.ullRsr54MCRCOk++;
|
||||
}
|
||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"54M: ALL[%d], OK[%d]\n", (INT)pStatistic->CustomStat.ullRsr54M, (INT)pStatistic->CustomStat.ullRsr54MCRCOk);
|
||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"54M: ALL[%d], OK[%d]\n", (int)pStatistic->CustomStat.ullRsr54M, (int)pStatistic->CustomStat.ullRsr54MCRCOk);
|
||||
}
|
||||
else {
|
||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Unknown: Total[%d], CRCOK[%d]\n", (INT)pStatistic->dwRsrRxPacket+1, (INT)pStatistic->dwRsrCRCOk);
|
||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Unknown: Total[%d], CRCOK[%d]\n", (int)pStatistic->dwRsrRxPacket+1, (int)pStatistic->dwRsrCRCOk);
|
||||
}
|
||||
|
||||
if (byRSR & RSR_BSSIDOK)
|
||||
|
|
|
@ -68,7 +68,6 @@ typedef int BOOL;
|
|||
* but it doesn't matter if they're signed or unsigned.
|
||||
*/
|
||||
|
||||
typedef signed int INT;
|
||||
typedef signed long LONG;
|
||||
|
||||
typedef unsigned char UCHAR;
|
||||
|
|
|
@ -3077,7 +3077,7 @@ s_vMgrSynchBSS (
|
|||
pMgmt->uCurrChannel = pCurr->uChannel;
|
||||
pMgmt->eCurrentPHYMode = ePhyType;
|
||||
pMgmt->byERPContext = pCurr->sERP.byERP;
|
||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Sync:Set to channel = [%d]\n", (INT)pCurr->uChannel);
|
||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Sync:Set to channel = [%d]\n", (int)pCurr->uChannel);
|
||||
|
||||
|
||||
*pStatus = CMD_STATUS_SUCCESS;
|
||||
|
|
Loading…
Reference in a new issue