skyfall/rtl8188eu
1
0
Fork 0
mirror of https://github.com/lwfinger/rtl8188eu.git synced 2024-11-25 22:13:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove space before \n in formats

Browse source 
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2013-05-08 23:09:18 -05:00
parent a55f866a62
commit d25660e511
50 changed files with 529 additions and 529 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

108
core/rtw_bt_mp.c
View file

@ -30,7 +30,7 @@ void MPh2c_timeout_handle(void *FunctionContext)
_adapter *pAdapter = (_adapter *)FunctionContext; _adapter *pAdapter = (_adapter *)FunctionContext;
PMPT_CONTEXT pMptCtx=&pAdapter->mppriv.MptCtx; PMPT_CONTEXT pMptCtx=&pAdapter->mppriv.MptCtx;
DBG_8192C("[MPT], MPh2c_timeout_handle \n"); DBG_8192C("[MPT], MPh2c_timeout_handle\n");
pMptCtx->bMPh2c_timeout=_TRUE; pMptCtx->bMPh2c_timeout=_TRUE;
@ -69,7 +69,7 @@ mptbt_CheckC2hFrame(
{ {
BT_CTRL_STATUS c2hStatus = BT_STATUS_C2H_SUCCESS; BT_CTRL_STATUS c2hStatus = BT_STATUS_C2H_SUCCESS;
//DBG_8192C("[MPT], MPT rsp C2H hex: %x %x %x %x %x %x \n"), pExtC2h , pExtC2h+1 ,pExtC2h+2 ,pExtC2h+3 ,pExtC2h+4 ,pExtC2h+5); //DBG_8192C("[MPT], MPT rsp C2H hex: %x %x %x %x %x %x\n"), pExtC2h , pExtC2h+1 ,pExtC2h+2 ,pExtC2h+3 ,pExtC2h+4 ,pExtC2h+5);
DBG_8192C("[MPT], statusCode = 0x%x\n", pExtC2h->statusCode); DBG_8192C("[MPT], statusCode = 0x%x\n", pExtC2h->statusCode);
DBG_8192C("[MPT], retLen = %d\n", pExtC2h->retLen); DBG_8192C("[MPT], retLen = %d\n", pExtC2h->retLen);
@ -110,7 +110,7 @@ mptbt_SendH2c(
// if (OldIrql == PASSIVE_LEVEL) // if (OldIrql == PASSIVE_LEVEL)
// { // {
//RTPRINT_DATA(FMPBT, FMPBT_H2C_CONTENT, ("[MPT], MPT H2C hex: \n"), pH2c, h2cCmdLen); //RTPRINT_DATA(FMPBT, FMPBT_H2C_CONTENT, ("[MPT], MPT H2C hex:\n"), pH2c, h2cCmdLen);
for (i=0; i<BT_H2C_MAX_RETRY; i++) for (i=0; i<BT_H2C_MAX_RETRY; i++)
{ {
@ -219,10 +219,10 @@ mptbt_BtFwOpCodeProcess(
DBG_8192C("[MPT], h2c parameter length=%d\n", h2cParaLen); DBG_8192C("[MPT], h2c parameter length=%d\n", h2cParaLen);
if (h2cParaLen) if (h2cParaLen)
{ {
DBG_8192C("[MPT], parameters(hex): \n"); DBG_8192C("[MPT], parameters(hex):\n");
for (i=0;i<h2cParaLen;i++) for (i=0;i<h2cParaLen;i++)
{ {
DBG_8192C(" 0x%x \n", pH2c->buf[i]); DBG_8192C(" 0x%x\n", pH2c->buf[i]);
} }
} }
@ -302,7 +302,7 @@ mptbt_BtReady(
if (BT_STATUS_BT_OP_SUCCESS != retStatus) if (BT_STATUS_BT_OP_SUCCESS != retStatus)
{ {
pBtRsp->status = ((btOpcode<<8)|retStatus); pBtRsp->status = ((btOpcode<<8)|retStatus);
DBG_8192C("[MPT], Error!! status code=0x%x \n", pBtRsp->status); DBG_8192C("[MPT], Error!! status code=0x%x\n", pBtRsp->status);
return paraLen; return paraLen;
} }
else else
@ -322,7 +322,7 @@ mptbt_BtReady(
if (BT_STATUS_BT_OP_SUCCESS != retStatus) if (BT_STATUS_BT_OP_SUCCESS != retStatus)
{ {
pBtRsp->status = ((btOpcode<<8)|retStatus); pBtRsp->status = ((btOpcode<<8)|retStatus);
DBG_8192C("[MPT], Error!! status code=0x%x \n", pBtRsp->status); DBG_8192C("[MPT], Error!! status code=0x%x\n", pBtRsp->status);
return paraLen; return paraLen;
} }
else else
@ -340,7 +340,7 @@ mptbt_BtReady(
if (BT_STATUS_BT_OP_SUCCESS != retStatus) if (BT_STATUS_BT_OP_SUCCESS != retStatus)
{ {
pBtRsp->status = ((btOpcode<<8)|retStatus); pBtRsp->status = ((btOpcode<<8)|retStatus);
DBG_8192C("[MPT], Error!! status code=0x%x \n", pBtRsp->status); DBG_8192C("[MPT], Error!! status code=0x%x\n", pBtRsp->status);
return paraLen; return paraLen;
} }
else else
@ -440,7 +440,7 @@ mptbt_BtSetMode(
if (1 == pBtReq->paraLength) if (1 == pBtReq->paraLength)
{ {
btModeToSet = pBtReq->pParamStart[0]; btModeToSet = pBtReq->pParamStart[0];
DBG_8192C("[MPT], BtTestMode=%d \n", btModeToSet); DBG_8192C("[MPT], BtTestMode=%d\n", btModeToSet);
} }
else else
{ {
@ -479,7 +479,7 @@ mptbt_BtSetMode(
else else
{ {
pBtRsp->status = ((btOpcode<<8)|retStatus); pBtRsp->status = ((btOpcode<<8)|retStatus);
DBG_8192C("[MPT], Error!! status code=0x%x \n", pBtRsp->status); DBG_8192C("[MPT], Error!! status code=0x%x\n", pBtRsp->status);
} }
return paraLen; return paraLen;
@ -500,10 +500,10 @@ MPTBT_FwC2hBtMpCtrl(
//cancel_timeout for h2c handle //cancel_timeout for h2c handle
_cancel_timer_ex( &pMptCtx->MPh2c_timeout_timer); _cancel_timer_ex( &pMptCtx->MPh2c_timeout_timer);
DBG_8192C("[MPT], MPTBT_FwC2hBtMpCtrl(), hex: \n"); DBG_8192C("[MPT], MPTBT_FwC2hBtMpCtrl(), hex:\n");
for (i=0;i<=length;i++) for (i=0;i<=length;i++)
{ {
//DBG_8192C("[MPT], MPTBT_FwC2hBtMpCtrl(), hex: \n",tmpBuf[i], length); //DBG_8192C("[MPT], MPTBT_FwC2hBtMpCtrl(), hex:\n",tmpBuf[i], length);
DBG_8192C(" 0x%x ",tmpBuf[i]); DBG_8192C(" 0x%x ",tmpBuf[i]);
} }
DBG_8192C("\n [MPT], pExtC2h->extendId=0x%x\n", pExtC2h->extendId); DBG_8192C("\n [MPT], pExtC2h->extendId=0x%x\n", pExtC2h->extendId);
@ -512,7 +512,7 @@ MPTBT_FwC2hBtMpCtrl(
{ {
case EXT_C2H_WIFI_FW_ACTIVE_RSP: case EXT_C2H_WIFI_FW_ACTIVE_RSP:
DBG_8192C("[MPT], EXT_C2H_WIFI_FW_ACTIVE_RSP\n"); DBG_8192C("[MPT], EXT_C2H_WIFI_FW_ACTIVE_RSP\n");
DBG_8192C("[MPT], pExtC2h->buf hex: \n"); DBG_8192C("[MPT], pExtC2h->buf hex:\n");
for (i=0;i<=(length-3);i++) for (i=0;i<=(length-3);i++)
DBG_8192C(" 0x%x ",pExtC2h->buf[i]); DBG_8192C(" 0x%x ",pExtC2h->buf[i]);
//PlatformSetEvent(&pMptCtx->MptH2cRspEvent); //PlatformSetEvent(&pMptCtx->MptH2cRspEvent);
@ -527,7 +527,7 @@ MPTBT_FwC2hBtMpCtrl(
DBG_8192C("[MPT], pExtC2h->retLen=0x%x\n", pExtC2h->retLen); DBG_8192C("[MPT], pExtC2h->retLen=0x%x\n", pExtC2h->retLen);
DBG_8192C("[MPT], pExtC2h->opCodeVer=0x%x\n", pExtC2h->opCodeVer); DBG_8192C("[MPT], pExtC2h->opCodeVer=0x%x\n", pExtC2h->opCodeVer);
DBG_8192C("[MPT], pExtC2h->reqNum=0x%x\n", pExtC2h->reqNum); DBG_8192C("[MPT], pExtC2h->reqNum=0x%x\n", pExtC2h->reqNum);
DBG_8192C("[MPT], pExtC2h->buf hex: \n"); DBG_8192C("[MPT], pExtC2h->buf hex:\n");
for (i=0;i<=(length-3);i++) for (i=0;i<=(length-3);i++)
DBG_8192C(" 0x%x ",pExtC2h->buf[0]); DBG_8192C(" 0x%x ",pExtC2h->buf[0]);
//PlatformSetEvent(&pMptCtx->MptBtC2hEvent); //PlatformSetEvent(&pMptCtx->MptBtC2hEvent);
@ -674,7 +674,7 @@ mptbt_BtGetGeneral(
if (BT_STATUS_BT_OP_SUCCESS != retStatus) if (BT_STATUS_BT_OP_SUCCESS != retStatus)
{ {
pBtRsp->status = ((btOpcode<<8)|retStatus); pBtRsp->status = ((btOpcode<<8)|retStatus);
DBG_8192C("[MPT], Error!! status code=0x%x \n", pBtRsp->status); DBG_8192C("[MPT], Error!! status code=0x%x\n", pBtRsp->status);
return paraLen; return paraLen;
} }
@ -697,7 +697,7 @@ mptbt_BtGetGeneral(
if (BT_STATUS_BT_OP_SUCCESS != retStatus) if (BT_STATUS_BT_OP_SUCCESS != retStatus)
{ {
pBtRsp->status = ((btOpcode<<8)|retStatus); pBtRsp->status = ((btOpcode<<8)|retStatus);
DBG_8192C("[MPT], Error!! status code=0x%x \n", pBtRsp->status); DBG_8192C("[MPT], Error!! status code=0x%x\n", pBtRsp->status);
return paraLen; return paraLen;
} }
@ -722,7 +722,7 @@ mptbt_BtGetGeneral(
if (BT_STATUS_BT_OP_SUCCESS != retStatus) if (BT_STATUS_BT_OP_SUCCESS != retStatus)
{ {
pBtRsp->status = ((btOpcode<<8)|retStatus); pBtRsp->status = ((btOpcode<<8)|retStatus);
DBG_8192C("[MPT], Error!! status code=0x%x \n", pBtRsp->status); DBG_8192C("[MPT], Error!! status code=0x%x\n", pBtRsp->status);
return paraLen; return paraLen;
} }
pBtRsp->pParamStart[0] = pExtC2h->buf[0]; pBtRsp->pParamStart[0] = pExtC2h->buf[0];
@ -736,7 +736,7 @@ mptbt_BtGetGeneral(
if (BT_STATUS_BT_OP_SUCCESS != retStatus) if (BT_STATUS_BT_OP_SUCCESS != retStatus)
{ {
pBtRsp->status = ((btOpcode<<8)|retStatus); pBtRsp->status = ((btOpcode<<8)|retStatus);
DBG_8192C("[MPT], Error!! status code=0x%x \n", pBtRsp->status); DBG_8192C("[MPT], Error!! status code=0x%x\n", pBtRsp->status);
return paraLen; return paraLen;
} }
pBtRsp->pParamStart[2] = pExtC2h->buf[0]; pBtRsp->pParamStart[2] = pExtC2h->buf[0];
@ -755,7 +755,7 @@ mptbt_BtGetGeneral(
if (BT_STATUS_BT_OP_SUCCESS != retStatus) if (BT_STATUS_BT_OP_SUCCESS != retStatus)
{ {
pBtRsp->status = ((btOpcode<<8)|retStatus); pBtRsp->status = ((btOpcode<<8)|retStatus);
DBG_8192C("[MPT], Error!! status code=0x%x \n", pBtRsp->status); DBG_8192C("[MPT], Error!! status code=0x%x\n", pBtRsp->status);
return paraLen; return paraLen;
} }
pBtRsp->pParamStart[0] = pExtC2h->buf[0]; pBtRsp->pParamStart[0] = pExtC2h->buf[0];
@ -769,7 +769,7 @@ mptbt_BtGetGeneral(
if (BT_STATUS_BT_OP_SUCCESS != retStatus) if (BT_STATUS_BT_OP_SUCCESS != retStatus)
{ {
pBtRsp->status = ((btOpcode<<8)|retStatus); pBtRsp->status = ((btOpcode<<8)|retStatus);
DBG_8192C("[MPT], Error!! status code=0x%x \n", pBtRsp->status); DBG_8192C("[MPT], Error!! status code=0x%x\n", pBtRsp->status);
return paraLen; return paraLen;
} }
pBtRsp->pParamStart[2] = pExtC2h->buf[0]; pBtRsp->pParamStart[2] = pExtC2h->buf[0];
@ -788,7 +788,7 @@ mptbt_BtGetGeneral(
if (BT_STATUS_BT_OP_SUCCESS != retStatus) if (BT_STATUS_BT_OP_SUCCESS != retStatus)
{ {
pBtRsp->status = ((btOpcode<<8)|retStatus); pBtRsp->status = ((btOpcode<<8)|retStatus);
DBG_8192C("[MPT], Error!! status code=0x%x \n", pBtRsp->status); DBG_8192C("[MPT], Error!! status code=0x%x\n", pBtRsp->status);
return paraLen; return paraLen;
} }
pBtRsp->pParamStart[0] = pExtC2h->buf[0]; pBtRsp->pParamStart[0] = pExtC2h->buf[0];
@ -807,7 +807,7 @@ mptbt_BtGetGeneral(
if (BT_STATUS_BT_OP_SUCCESS != retStatus) if (BT_STATUS_BT_OP_SUCCESS != retStatus)
{ {
pBtRsp->status = ((btOpcode<<8)|retStatus); pBtRsp->status = ((btOpcode<<8)|retStatus);
DBG_8192C("[MPT], Error!! status code=0x%x \n", pBtRsp->status); DBG_8192C("[MPT], Error!! status code=0x%x\n", pBtRsp->status);
return paraLen; return paraLen;
} }
pBtRsp->pParamStart[0] = pExtC2h->buf[0]; pBtRsp->pParamStart[0] = pExtC2h->buf[0];
@ -821,7 +821,7 @@ mptbt_BtGetGeneral(
if (BT_STATUS_BT_OP_SUCCESS != retStatus) if (BT_STATUS_BT_OP_SUCCESS != retStatus)
{ {
pBtRsp->status = ((btOpcode<<8)|retStatus); pBtRsp->status = ((btOpcode<<8)|retStatus);
DBG_8192C("[MPT], Error!! status code=0x%x \n", pBtRsp->status); DBG_8192C("[MPT], Error!! status code=0x%x\n", pBtRsp->status);
return paraLen; return paraLen;
} }
pBtRsp->pParamStart[2] = pExtC2h->buf[0]; pBtRsp->pParamStart[2] = pExtC2h->buf[0];
@ -840,7 +840,7 @@ mptbt_BtGetGeneral(
if (BT_STATUS_BT_OP_SUCCESS != retStatus) if (BT_STATUS_BT_OP_SUCCESS != retStatus)
{ {
pBtRsp->status = ((btOpcode<<8)|retStatus); pBtRsp->status = ((btOpcode<<8)|retStatus);
DBG_8192C("[MPT], Error!! status code=0x%x \n", pBtRsp->status); DBG_8192C("[MPT], Error!! status code=0x%x\n", pBtRsp->status);
return paraLen; return paraLen;
} }
bdAddr[5] = pExtC2h->buf[0]; bdAddr[5] = pExtC2h->buf[0];
@ -855,7 +855,7 @@ mptbt_BtGetGeneral(
if (BT_STATUS_BT_OP_SUCCESS != retStatus) if (BT_STATUS_BT_OP_SUCCESS != retStatus)
{ {
pBtRsp->status = ((btOpcode<<8)|retStatus); pBtRsp->status = ((btOpcode<<8)|retStatus);
DBG_8192C("[MPT], Error!! status code=0x%x \n", pBtRsp->status); DBG_8192C("[MPT], Error!! status code=0x%x\n", pBtRsp->status);
return paraLen; return paraLen;
} }
bdAddr[2] = pExtC2h->buf[0]; bdAddr[2] = pExtC2h->buf[0];
@ -1073,7 +1073,7 @@ mptbt_BtSetGeneral(
if (BT_STATUS_BT_OP_SUCCESS != retStatus) if (BT_STATUS_BT_OP_SUCCESS != retStatus)
{ {
pBtRsp->status = ((btOpcode<<8)|retStatus); pBtRsp->status = ((btOpcode<<8)|retStatus);
DBG_8192C("[MPT], Error!! status code=0x%x \n", pBtRsp->status); DBG_8192C("[MPT], Error!! status code=0x%x\n", pBtRsp->status);
return paraLen; return paraLen;
} }
@ -1089,7 +1089,7 @@ mptbt_BtSetGeneral(
if (BT_STATUS_BT_OP_SUCCESS != retStatus) if (BT_STATUS_BT_OP_SUCCESS != retStatus)
{ {
pBtRsp->status = ((btOpcode<<8)|retStatus); pBtRsp->status = ((btOpcode<<8)|retStatus);
DBG_8192C("[MPT], Error!! status code=0x%x \n", pBtRsp->status); DBG_8192C("[MPT], Error!! status code=0x%x\n", pBtRsp->status);
return paraLen; return paraLen;
} }
} }
@ -1103,7 +1103,7 @@ mptbt_BtSetGeneral(
if (BT_STATUS_BT_OP_SUCCESS != retStatus) if (BT_STATUS_BT_OP_SUCCESS != retStatus)
{ {
pBtRsp->status = ((btOpcode<<8)|retStatus); pBtRsp->status = ((btOpcode<<8)|retStatus);
DBG_8192C("[MPT], Error!! status code=0x%x \n", pBtRsp->status); DBG_8192C("[MPT], Error!! status code=0x%x\n", pBtRsp->status);
return paraLen; return paraLen;
} }
} }
@ -1120,7 +1120,7 @@ mptbt_BtSetGeneral(
if (BT_STATUS_BT_OP_SUCCESS != retStatus) if (BT_STATUS_BT_OP_SUCCESS != retStatus)
{ {
pBtRsp->status = ((btOpcode<<8)|retStatus); pBtRsp->status = ((btOpcode<<8)|retStatus);
DBG_8192C ("[MPT], Error!! status code=0x%x \n", pBtRsp->status); DBG_8192C ("[MPT], Error!! status code=0x%x\n", pBtRsp->status);
return paraLen; return paraLen;
} }
@ -1134,7 +1134,7 @@ mptbt_BtSetGeneral(
if (BT_STATUS_BT_OP_SUCCESS != retStatus) if (BT_STATUS_BT_OP_SUCCESS != retStatus)
{ {
pBtRsp->status = ((btOpcode<<8)|retStatus); pBtRsp->status = ((btOpcode<<8)|retStatus);
DBG_8192C ("[MPT], Error!! status code=0x%x \n", pBtRsp->status); DBG_8192C ("[MPT], Error!! status code=0x%x\n", pBtRsp->status);
return paraLen; return paraLen;
} }
} }
@ -1149,7 +1149,7 @@ mptbt_BtSetGeneral(
if (BT_STATUS_BT_OP_SUCCESS != retStatus) if (BT_STATUS_BT_OP_SUCCESS != retStatus)
{ {
pBtRsp->status = ((btOpcode<<8)|retStatus); pBtRsp->status = ((btOpcode<<8)|retStatus);
DBG_8192C("[MPT], Error!! status code=0x%x \n", pBtRsp->status); DBG_8192C("[MPT], Error!! status code=0x%x\n", pBtRsp->status);
return paraLen; return paraLen;
} }
} }
@ -1192,14 +1192,14 @@ mptbt_BtSetTxRxPars(
// 2. check upper layer parameter length // 2. check upper layer parameter length
if (pBtReq->paraLength == sizeof(BT_TXRX_PARAMETERS)) if (pBtReq->paraLength == sizeof(BT_TXRX_PARAMETERS))
{ {
DBG_8192C ("[MPT], pTxRxPars->txrxChannel=0x%x \n", pTxRxPars->txrxChannel); DBG_8192C ("[MPT], pTxRxPars->txrxChannel=0x%x\n", pTxRxPars->txrxChannel);
DBG_8192C ("[MPT], pTxRxPars->txrxTxPktCnt=0x%8x \n", pTxRxPars->txrxTxPktCnt); DBG_8192C ("[MPT], pTxRxPars->txrxTxPktCnt=0x%8x\n", pTxRxPars->txrxTxPktCnt);
DBG_8192C ("[MPT], pTxRxPars->txrxTxPktInterval=0x%x \n", pTxRxPars->txrxTxPktInterval); DBG_8192C ("[MPT], pTxRxPars->txrxTxPktInterval=0x%x\n", pTxRxPars->txrxTxPktInterval);
DBG_8192C ("[MPT], pTxRxPars->txrxPayloadType=0x%x \n", pTxRxPars->txrxPayloadType); DBG_8192C ("[MPT], pTxRxPars->txrxPayloadType=0x%x\n", pTxRxPars->txrxPayloadType);
DBG_8192C ("[MPT], pTxRxPars->txrxPktType=0x%x \n", pTxRxPars->txrxPktType); DBG_8192C ("[MPT], pTxRxPars->txrxPktType=0x%x\n", pTxRxPars->txrxPktType);
DBG_8192C ("[MPT], pTxRxPars->txrxPayloadLen=0x%x \n", pTxRxPars->txrxPayloadLen); DBG_8192C ("[MPT], pTxRxPars->txrxPayloadLen=0x%x\n", pTxRxPars->txrxPayloadLen);
DBG_8192C ("[MPT], pTxRxPars->txrxPktHeader=0x%x \n", pTxRxPars->txrxPktHeader); DBG_8192C ("[MPT], pTxRxPars->txrxPktHeader=0x%x\n", pTxRxPars->txrxPktHeader);
DBG_8192C ("[MPT], pTxRxPars->txrxWhitenCoeff=0x%x \n", pTxRxPars->txrxWhitenCoeff); DBG_8192C ("[MPT], pTxRxPars->txrxWhitenCoeff=0x%x\n", pTxRxPars->txrxWhitenCoeff);
bdAddr[0] = pTxRxPars->txrxBdaddr[5]; bdAddr[0] = pTxRxPars->txrxBdaddr[5];
bdAddr[1] = pTxRxPars->txrxBdaddr[4]; bdAddr[1] = pTxRxPars->txrxBdaddr[4];
bdAddr[2] = pTxRxPars->txrxBdaddr[3]; bdAddr[2] = pTxRxPars->txrxBdaddr[3];
@ -1207,7 +1207,7 @@ mptbt_BtSetTxRxPars(
bdAddr[4] = pTxRxPars->txrxBdaddr[1]; bdAddr[4] = pTxRxPars->txrxBdaddr[1];
bdAddr[5] = pTxRxPars->txrxBdaddr[0]; bdAddr[5] = pTxRxPars->txrxBdaddr[0];
DBG_8192C ("[MPT], pTxRxPars->txrxBdaddr: %s", &bdAddr[0]); DBG_8192C ("[MPT], pTxRxPars->txrxBdaddr: %s", &bdAddr[0]);
DBG_8192C ("[MPT], pTxRxPars->txrxTxGainIndex=0x%x \n", pTxRxPars->txrxTxGainIndex); DBG_8192C ("[MPT], pTxRxPars->txrxTxGainIndex=0x%x\n", pTxRxPars->txrxTxGainIndex);
} }
else else
{ {
@ -1241,7 +1241,7 @@ mptbt_BtSetTxRxPars(
if (BT_STATUS_BT_OP_SUCCESS != retStatus) if (BT_STATUS_BT_OP_SUCCESS != retStatus)
{ {
pBtRsp->status = ((btOpcode<<8)|retStatus); pBtRsp->status = ((btOpcode<<8)|retStatus);
DBG_8192C ("[MPT], Error!! status code=0x%x \n", pBtRsp->status); DBG_8192C ("[MPT], Error!! status code=0x%x\n", pBtRsp->status);
return paraLen; return paraLen;
} }
@ -1309,7 +1309,7 @@ mptbt_BtSetTxRxPars(
if (BT_STATUS_BT_OP_SUCCESS != retStatus) if (BT_STATUS_BT_OP_SUCCESS != retStatus)
{ {
pBtRsp->status = ((btOpcode<<8)|retStatus); pBtRsp->status = ((btOpcode<<8)|retStatus);
DBG_8192C ("[MPT], Error!! status code=0x%x \n", pBtRsp->status); DBG_8192C ("[MPT], Error!! status code=0x%x\n", pBtRsp->status);
return paraLen; return paraLen;
} }
@ -1334,7 +1334,7 @@ mptbt_BtSetTxRxPars(
if (BT_STATUS_BT_OP_SUCCESS != retStatus) if (BT_STATUS_BT_OP_SUCCESS != retStatus)
{ {
pBtRsp->status = ((btOpcode<<8)|retStatus); pBtRsp->status = ((btOpcode<<8)|retStatus);
DBG_8192C ("[MPT], Error!! status code=0x%x \n", pBtRsp->status); DBG_8192C ("[MPT], Error!! status code=0x%x\n", pBtRsp->status);
return paraLen; return paraLen;
} }
@ -1359,7 +1359,7 @@ mptbt_BtSetTxRxPars(
if (BT_STATUS_BT_OP_SUCCESS != retStatus) if (BT_STATUS_BT_OP_SUCCESS != retStatus)
{ {
pBtRsp->status = ((btOpcode<<8)|retStatus); pBtRsp->status = ((btOpcode<<8)|retStatus);
DBG_8192C ("[MPT], Error!! status code=0x%x \n", pBtRsp->status); DBG_8192C ("[MPT], Error!! status code=0x%x\n", pBtRsp->status);
return paraLen; return paraLen;
} }
@ -1375,7 +1375,7 @@ mptbt_BtSetTxRxPars(
if (BT_STATUS_BT_OP_SUCCESS != retStatus) if (BT_STATUS_BT_OP_SUCCESS != retStatus)
{ {
pBtRsp->status = ((btOpcode<<8)|retStatus); pBtRsp->status = ((btOpcode<<8)|retStatus);
DBG_8192C ("[MPT], Error!! status code=0x%x \n", pBtRsp->status); DBG_8192C ("[MPT], Error!! status code=0x%x\n", pBtRsp->status);
return paraLen; return paraLen;
} }
@ -1402,7 +1402,7 @@ mptbt_BtSetTxRxPars(
if (BT_STATUS_BT_OP_SUCCESS != retStatus) if (BT_STATUS_BT_OP_SUCCESS != retStatus)
{ {
pBtRsp->status = ((btOpcode<<8)|retStatus); pBtRsp->status = ((btOpcode<<8)|retStatus);
DBG_8192C ("[MPT], Error!! status code=0x%x \n", pBtRsp->status); DBG_8192C ("[MPT], Error!! status code=0x%x\n", pBtRsp->status);
return paraLen; return paraLen;
} }
@ -1442,7 +1442,7 @@ mptbt_BtSetTxRxPars(
if (BT_STATUS_BT_OP_SUCCESS != retStatus) if (BT_STATUS_BT_OP_SUCCESS != retStatus)
{ {
pBtRsp->status = ((btOpcode<<8)|retStatus); pBtRsp->status = ((btOpcode<<8)|retStatus);
DBG_8192C ("[MPT], Error!! status code=0x%x \n", pBtRsp->status); DBG_8192C ("[MPT], Error!! status code=0x%x\n", pBtRsp->status);
return paraLen; return paraLen;
} }
@ -1458,7 +1458,7 @@ mptbt_BtSetTxRxPars(
if (BT_STATUS_BT_OP_SUCCESS != retStatus) if (BT_STATUS_BT_OP_SUCCESS != retStatus)
{ {
pBtRsp->status = ((btOpcode<<8)|retStatus); pBtRsp->status = ((btOpcode<<8)|retStatus);
DBG_8192C ("[MPT], Error!! status code=0x%x \n", pBtRsp->status); DBG_8192C ("[MPT], Error!! status code=0x%x\n", pBtRsp->status);
return paraLen; return paraLen;
} }
@ -1498,7 +1498,7 @@ mptbt_BtTestCtrl(
if (1 == pBtReq->paraLength) if (1 == pBtReq->paraLength)
{ {
testCtrl = pBtReq->pParamStart[0]; testCtrl = pBtReq->pParamStart[0];
DBG_8192C("[MPT], testCtrl=%d \n", testCtrl); DBG_8192C("[MPT], testCtrl=%d\n", testCtrl);
} }
else else
{ {
@ -1532,7 +1532,7 @@ mptbt_BtTestCtrl(
if (BT_STATUS_BT_OP_SUCCESS != retStatus) if (BT_STATUS_BT_OP_SUCCESS != retStatus)
{ {
pBtRsp->status = ((btOpcode<<8)|retStatus); pBtRsp->status = ((btOpcode<<8)|retStatus);
DBG_8192C("[MPT], Error!! status code=0x%x \n", pBtRsp->status); DBG_8192C("[MPT], Error!! status code=0x%x\n", pBtRsp->status);
return paraLen; return paraLen;
} }
@ -1573,7 +1573,7 @@ mptbt_TestBT(
if (BT_STATUS_BT_OP_SUCCESS != retStatus) if (BT_STATUS_BT_OP_SUCCESS != retStatus)
{ {
pBtRsp->status = ((btOpcode<<8)|retStatus); pBtRsp->status = ((btOpcode<<8)|retStatus);
DBG_8192C("[MPT], Error!! status code=0x%x \n", pBtRsp->status); DBG_8192C("[MPT], Error!! status code=0x%x\n", pBtRsp->status);
return paraLen; return paraLen;
} }
@ -1598,10 +1598,10 @@ mptbt_BtControlProcess(
DBG_8192C("[MPT], input opCodeVer=%d\n", pBtReq->opCodeVer); DBG_8192C("[MPT], input opCodeVer=%d\n", pBtReq->opCodeVer);
DBG_8192C("[MPT], input OpCode=%d\n", pBtReq->OpCode); DBG_8192C("[MPT], input OpCode=%d\n", pBtReq->OpCode);
DBG_8192C("[MPT], paraLength=%d \n", pBtReq->paraLength); DBG_8192C("[MPT], paraLength=%d\n", pBtReq->paraLength);
if (pBtReq->paraLength) if (pBtReq->paraLength)
{ {
//DBG_8192C("[MPT], parameters(hex):0x%x %d \n",&pBtReq->pParamStart[0], pBtReq->paraLength); //DBG_8192C("[MPT], parameters(hex):0x%x %d\n",&pBtReq->pParamStart[0], pBtReq->paraLength);
} }
// The following we should maintain the User OP codes sent by upper layer // The following we should maintain the User OP codes sent by upper layer
@ -1649,7 +1649,7 @@ mptbt_BtControlProcess(
break; break;
} }
DBG_8192C("pBtRsp->paraLength =%d \n",pBtRsp->paraLength); DBG_8192C("pBtRsp->paraLength =%d\n",pBtRsp->paraLength);
pMptCtx->mptOutLen += pBtRsp->paraLength; pMptCtx->mptOutLen += pBtRsp->paraLength;

24
core/rtw_cmd.c
View file

@ -159,7 +159,7 @@ void _rtw_free_evt_priv (struct evt_priv *pevtpriv)
{ {
_func_enter_; _func_enter_;
RT_TRACE(_module_rtl871x_cmd_c_,_drv_info_,("+_rtw_free_evt_priv \n")); RT_TRACE(_module_rtl871x_cmd_c_,_drv_info_,("+_rtw_free_evt_priv\n"));
#ifdef CONFIG_EVENT_THREAD_MODE #ifdef CONFIG_EVENT_THREAD_MODE
_rtw_free_sema(&(pevtpriv->evt_notify)); _rtw_free_sema(&(pevtpriv->evt_notify));
@ -184,7 +184,7 @@ _func_enter_;
} }
#endif #endif
RT_TRACE(_module_rtl871x_cmd_c_,_drv_info_,("-_rtw_free_evt_priv \n")); RT_TRACE(_module_rtl871x_cmd_c_,_drv_info_,("-_rtw_free_evt_priv\n"));
_func_exit_; _func_exit_;
@ -2085,7 +2085,7 @@ static void traffic_status_watchdog(_adapter *padapter)
if ( ((pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod + pmlmepriv->LinkDetectInfo.NumTxOkInPeriod) > 8 ) || if ( ((pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod + pmlmepriv->LinkDetectInfo.NumTxOkInPeriod) > 8 ) ||
(pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod > 2) ) (pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod > 2) )
{ {
//DBG_871X("Tx = %d, Rx = %d \n",pmlmepriv->LinkDetectInfo.NumTxOkInPeriod,pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod); //DBG_871X("Tx = %d, Rx = %d\n",pmlmepriv->LinkDetectInfo.NumTxOkInPeriod,pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod);
bEnterPS= _FALSE; bEnterPS= _FALSE;
} }
else else
@ -2182,7 +2182,7 @@ _func_enter_;
switch (lps_ctrl_type) switch (lps_ctrl_type)
{ {
case LPS_CTRL_SCAN: case LPS_CTRL_SCAN:
//DBG_871X("LPS_CTRL_SCAN \n"); //DBG_871X("LPS_CTRL_SCAN\n");
#ifdef CONFIG_BT_COEXIST #ifdef CONFIG_BT_COEXIST
BT_WifiScanNotify(padapter, _TRUE); BT_WifiScanNotify(padapter, _TRUE);
if (BT_1Ant(padapter) == _FALSE) if (BT_1Ant(padapter) == _FALSE)
@ -2195,11 +2195,11 @@ _func_enter_;
} }
break; break;
case LPS_CTRL_JOINBSS: case LPS_CTRL_JOINBSS:
//DBG_871X("LPS_CTRL_JOINBSS \n"); //DBG_871X("LPS_CTRL_JOINBSS\n");
LPS_Leave(padapter); LPS_Leave(padapter);
break; break;
case LPS_CTRL_CONNECT: case LPS_CTRL_CONNECT:
//DBG_871X("LPS_CTRL_CONNECT \n"); //DBG_871X("LPS_CTRL_CONNECT\n");
mstatus = 1;//connect mstatus = 1;//connect
// Reset LPS Setting // Reset LPS Setting
padapter->pwrctrlpriv.LpsIdleCount = 0; padapter->pwrctrlpriv.LpsIdleCount = 0;
@ -2209,7 +2209,7 @@ _func_enter_;
#endif #endif
break; break;
case LPS_CTRL_DISCONNECT: case LPS_CTRL_DISCONNECT:
//DBG_871X("LPS_CTRL_DISCONNECT \n"); //DBG_871X("LPS_CTRL_DISCONNECT\n");
mstatus = 0;//disconnect mstatus = 0;//disconnect
#ifdef CONFIG_BT_COEXIST #ifdef CONFIG_BT_COEXIST
BT_WifiMediaStatusNotify(padapter, mstatus); BT_WifiMediaStatusNotify(padapter, mstatus);
@ -2221,7 +2221,7 @@ _func_enter_;
rtw_hal_set_hwreg(padapter, HW_VAR_H2C_FW_JOINBSSRPT, (u8 *)(&mstatus)); rtw_hal_set_hwreg(padapter, HW_VAR_H2C_FW_JOINBSSRPT, (u8 *)(&mstatus));
break; break;
case LPS_CTRL_SPECIAL_PACKET: case LPS_CTRL_SPECIAL_PACKET:
//DBG_871X("LPS_CTRL_SPECIAL_PACKET \n"); //DBG_871X("LPS_CTRL_SPECIAL_PACKET\n");
pwrpriv->DelayLPSLastTimeStamp = rtw_get_current_time(); pwrpriv->DelayLPSLastTimeStamp = rtw_get_current_time();
#ifdef CONFIG_BT_COEXIST #ifdef CONFIG_BT_COEXIST
BT_SpecialPacketNotify(padapter); BT_SpecialPacketNotify(padapter);
@ -2232,7 +2232,7 @@ _func_enter_;
} }
break; break;
case LPS_CTRL_LEAVE: case LPS_CTRL_LEAVE:
//DBG_871X("LPS_CTRL_LEAVE \n"); //DBG_871X("LPS_CTRL_LEAVE\n");
#ifdef CONFIG_BT_COEXIST #ifdef CONFIG_BT_COEXIST
BT_LpsLeave(padapter); BT_LpsLeave(padapter);
if (BT_1Ant(padapter) == _FALSE) if (BT_1Ant(padapter) == _FALSE)
@ -2887,7 +2887,7 @@ _func_enter_;
pwlan = rtw_get_oldest_wlan_network(&pmlmepriv->scanned_queue); pwlan = rtw_get_oldest_wlan_network(&pmlmepriv->scanned_queue);
if ( pwlan == NULL) if ( pwlan == NULL)
{ {
RT_TRACE(_module_rtl871x_cmd_c_,_drv_err_,("\n Error: can't get pwlan in rtw_joinbss_event_callback \n")); RT_TRACE(_module_rtl871x_cmd_c_,_drv_err_,("\n Error: can't get pwlan in rtw_joinbss_event_callback\n"));
_exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); _exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL);
goto createbss_cmd_fail; goto createbss_cmd_fail;
} }
@ -2957,7 +2957,7 @@ _func_enter_;
if (psta==NULL) if (psta==NULL)
{ {
RT_TRACE(_module_rtl871x_cmd_c_,_drv_err_,("\nERROR: rtw_setstaKey_cmdrsp_callback => can't get sta_info \n\n")); RT_TRACE(_module_rtl871x_cmd_c_,_drv_err_,("\nERROR: rtw_setstaKey_cmdrsp_callback => can't get sta_info\n\n"));
goto exit; goto exit;
} }
@ -2983,7 +2983,7 @@ _func_enter_;
if (psta==NULL) if (psta==NULL)
{ {
RT_TRACE(_module_rtl871x_cmd_c_,_drv_err_,("\nERROR: setassocsta_cmdrsp_callbac => can't get sta_info \n\n")); RT_TRACE(_module_rtl871x_cmd_c_,_drv_err_,("\nERROR: setassocsta_cmdrsp_callbac => can't get sta_info\n\n"));
goto exit; goto exit;
} }

4
core/rtw_efuse.c
View file

@ -769,8 +769,8 @@ u8 rtw_efuse_map_write(PADAPTER padapter, u16 addr, u16 cnts, u8 *data)
if (word_en != 0xF) { if (word_en != 0xF) {
ret = Efuse_PgPacketWrite(padapter, offset, word_en, newdata, _FALSE); ret = Efuse_PgPacketWrite(padapter, offset, word_en, newdata, _FALSE);
DBG_871X("offset=%x \n",offset); DBG_871X("offset=%x\n",offset);
DBG_871X("word_en=%x \n",word_en); DBG_871X("word_en=%x\n",word_en);
for (i=0;i<PGPKT_DATA_SIZE;i++) for (i=0;i<PGPKT_DATA_SIZE;i++)
{ {

12
core/rtw_ioctl_query.c
View file

@ -119,7 +119,7 @@ u8 query_802_11_association_information( _adapter *padapter,PNDIS_802_11_ASSOCIA
supp_ie=&psecuritypriv->supplicant_ie[0]; supp_ie=&psecuritypriv->supplicant_ie[0];
for (i=0;i<supp_ie[0];i++) for (i=0;i<supp_ie[0];i++)
{ {
RT_TRACE(_module_rtl871x_ioctl_query_c_,_drv_info_,("IEs [%d] = 0x%x \n\n", i,supp_ie[i])); RT_TRACE(_module_rtl871x_ioctl_query_c_,_drv_info_,("IEs [%d] = 0x%x\n\n", i,supp_ie[i]));
} }
i=13; //0~11 is fixed information element i=13; //0~11 is fixed information element
@ -136,7 +136,7 @@ u8 query_802_11_association_information( _adapter *padapter,PNDIS_802_11_ASSOCIA
i=i+supp_ie[i+1]+2; i=i+supp_ie[i+1]+2;
if (supp_ie[1+i]==0) if (supp_ie[1+i]==0)
i=i+1; i=i+1;
RT_TRACE(_module_rtl871x_ioctl_query_c_,_drv_info_,("iteration i=%d IEs [%d] = 0x%x \n\n", i,i,supp_ie[i+1])); RT_TRACE(_module_rtl871x_ioctl_query_c_,_drv_info_,("iteration i=%d IEs [%d] = 0x%x\n\n", i,i,supp_ie[i+1]));
} }
@ -146,7 +146,7 @@ u8 query_802_11_association_information( _adapter *padapter,PNDIS_802_11_ASSOCIA
} }
RT_TRACE(_module_rtl871x_ioctl_query_c_,_drv_info_,("\n psecnetwork != NULL,fwstate==_FW_UNDER_LINKING \n")); RT_TRACE(_module_rtl871x_ioctl_query_c_,_drv_info_,("\n psecnetwork != NULL,fwstate==_FW_UNDER_LINKING\n"));
} }
@ -172,7 +172,7 @@ u8 query_802_11_association_information( _adapter *padapter,PNDIS_802_11_ASSOCIA
auth_ie=&psecuritypriv->authenticator_ie[0]; auth_ie=&psecuritypriv->authenticator_ie[0];
for (i=0;i<auth_ie[0];i++) for (i=0;i<auth_ie[0];i++)
RT_TRACE(_module_rtl871x_ioctl_query_c_,_drv_info_,("IEs [%d] = 0x%x \n\n", i,auth_ie[i])); RT_TRACE(_module_rtl871x_ioctl_query_c_,_drv_info_,("IEs [%d] = 0x%x\n\n", i,auth_ie[i]));
i=auth_ie[0]-12; i=auth_ie[0]-12;
if (i>0){ if (i>0){
@ -184,10 +184,10 @@ u8 query_802_11_association_information( _adapter *padapter,PNDIS_802_11_ASSOCIA
pAssocInfo->OffsetResponseIEs = sizeof(NDIS_802_11_ASSOCIATION_INFORMATION) + pAssocInfo->RequestIELength; pAssocInfo->OffsetResponseIEs = sizeof(NDIS_802_11_ASSOCIATION_INFORMATION) + pAssocInfo->RequestIELength;
RT_TRACE(_module_rtl871x_ioctl_query_c_,_drv_info_,("\n tgt_network != NULL,fwstate==_FW_LINKED \n")); RT_TRACE(_module_rtl871x_ioctl_query_c_,_drv_info_,("\n tgt_network != NULL,fwstate==_FW_LINKED\n"));
} }
} }
RT_TRACE(_module_rtl871x_ioctl_query_c_,_drv_info_,("\n exit query_802_11_association_information \n")); RT_TRACE(_module_rtl871x_ioctl_query_c_,_drv_info_,("\n exit query_802_11_association_information\n"));
_func_exit_; _func_exit_;
return _TRUE; return _TRUE;

8
core/rtw_ioctl_rtl.c
View file

@ -235,7 +235,7 @@ NDIS_STATUS oid_rt_get_signal_quality_hdl(struct oid_par_priv* poid_par_priv)
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context);
//DEBUG_ERR(("<**********************oid_rt_get_signal_quality_hdl \n")); //DEBUG_ERR(("<**********************oid_rt_get_signal_quality_hdl\n"));
if (poid_par_priv->type_of_oid != QUERY_OID) if (poid_par_priv->type_of_oid != QUERY_OID)
{ {
status = NDIS_STATUS_NOT_ACCEPTED; status = NDIS_STATUS_NOT_ACCEPTED;
@ -727,7 +727,7 @@ NDIS_STATUS oid_rt_supported_wireless_mode_hdl(struct oid_par_priv* poid_par_pri
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context);
ULONG ulInfo = 0 ; ULONG ulInfo = 0 ;
//DEBUG_ERR(("<**********************oid_rt_supported_wireless_mode_hdl \n")); //DEBUG_ERR(("<**********************oid_rt_supported_wireless_mode_hdl\n"));
if (poid_par_priv->type_of_oid != QUERY_OID) if (poid_par_priv->type_of_oid != QUERY_OID)
{ {
status = NDIS_STATUS_NOT_ACCEPTED; status = NDIS_STATUS_NOT_ACCEPTED;
@ -864,7 +864,7 @@ NDIS_STATUS oid_rt_pro_rf_write_registry_hdl(struct oid_par_priv* poid_par_priv)
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context);
_irqL oldirql; _irqL oldirql;
_func_enter_; _func_enter_;
//DEBUG_ERR(("<**********************oid_rt_pro_rf_write_registry_hdl \n")); //DEBUG_ERR(("<**********************oid_rt_pro_rf_write_registry_hdl\n"));
if (poid_par_priv->type_of_oid != SET_OID) //QUERY_OID if (poid_par_priv->type_of_oid != SET_OID) //QUERY_OID
{ {
status = NDIS_STATUS_NOT_ACCEPTED; status = NDIS_STATUS_NOT_ACCEPTED;
@ -906,7 +906,7 @@ NDIS_STATUS oid_rt_pro_rf_read_registry_hdl(struct oid_par_priv* poid_par_priv)
_irqL oldirql; _irqL oldirql;
_func_enter_; _func_enter_;
//DEBUG_ERR(("<**********************oid_rt_pro_rf_read_registry_hdl \n")); //DEBUG_ERR(("<**********************oid_rt_pro_rf_read_registry_hdl\n"));
if (poid_par_priv->type_of_oid != SET_OID) //QUERY_OID if (poid_par_priv->type_of_oid != SET_OID) //QUERY_OID
{ {
status = NDIS_STATUS_NOT_ACCEPTED; status = NDIS_STATUS_NOT_ACCEPTED;

16
core/rtw_ioctl_set.c
View file

@ -93,7 +93,7 @@ _func_enter_;
phead = get_list_head(queue); phead = get_list_head(queue);
plist = get_next(phead); plist = get_next(phead);
RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("\n rtw_do_join: phead = %p; plist = %p \n\n\n", phead, plist)); RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("\n rtw_do_join: phead = %p; plist = %p\n\n\n", phead, plist));
pmlmepriv->cur_network.join_res = -2; pmlmepriv->cur_network.join_res = -2;
@ -163,14 +163,14 @@ _func_enter_;
if (rtw_createbss_cmd(padapter)!=_SUCCESS) if (rtw_createbss_cmd(padapter)!=_SUCCESS)
{ {
RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("***Error=>do_goin: rtw_createbss_cmd status FAIL*** \n ")); RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("***Error=>do_goin: rtw_createbss_cmd status FAIL***\n "));
ret = _FALSE; ret = _FALSE;
goto exit; goto exit;
} }
pmlmepriv->to_join = _FALSE; pmlmepriv->to_join = _FALSE;
RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("***Error=> rtw_select_and_join_from_scanned_queue FAIL under STA_Mode*** \n ")); RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("***Error=> rtw_select_and_join_from_scanned_queue FAIL under STA_Mode***\n "));
} }
else else
@ -201,7 +201,7 @@ _func_enter_;
#endif #endif
) )
{ {
//DBG_871X("rtw_do_join() when no desired bss in scanning queue \n"); //DBG_871X("rtw_do_join() when no desired bss in scanning queue\n");
if ( _SUCCESS!=(ret=rtw_sitesurvey_cmd(padapter, &pmlmepriv->assoc_ssid, 1, NULL, 0)) ){ if ( _SUCCESS!=(ret=rtw_sitesurvey_cmd(padapter, &pmlmepriv->assoc_ssid, 1, NULL, 0)) ){
pmlmepriv->to_join = _FALSE; pmlmepriv->to_join = _FALSE;
RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("do_join(): site survey return error\n.")); RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("do_join(): site survey return error\n."));
@ -829,7 +829,7 @@ _func_enter_;
psecuritypriv->dot11PrivacyKeyIndex=keyid; psecuritypriv->dot11PrivacyKeyIndex=keyid;
RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("rtw_set_802_11_add_wep:security key material : %x %x %x %x %x %x %x %x %x %x %x %x %x \n", RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("rtw_set_802_11_add_wep:security key material : %x %x %x %x %x %x %x %x %x %x %x %x %x\n",
psecuritypriv->dot11DefKey[keyid].skey[0],psecuritypriv->dot11DefKey[keyid].skey[1],psecuritypriv->dot11DefKey[keyid].skey[2], psecuritypriv->dot11DefKey[keyid].skey[0],psecuritypriv->dot11DefKey[keyid].skey[1],psecuritypriv->dot11DefKey[keyid].skey[2],
psecuritypriv->dot11DefKey[keyid].skey[3],psecuritypriv->dot11DefKey[keyid].skey[4],psecuritypriv->dot11DefKey[keyid].skey[5], psecuritypriv->dot11DefKey[keyid].skey[3],psecuritypriv->dot11DefKey[keyid].skey[4],psecuritypriv->dot11DefKey[keyid].skey[5],
psecuritypriv->dot11DefKey[keyid].skey[6],psecuritypriv->dot11DefKey[keyid].skey[7],psecuritypriv->dot11DefKey[keyid].skey[8], psecuritypriv->dot11DefKey[keyid].skey[6],psecuritypriv->dot11DefKey[keyid].skey[7],psecuritypriv->dot11DefKey[keyid].skey[8],
@ -908,7 +908,7 @@ _func_enter_;
// it must fail the request and return NDIS_STATUS_INVALID_DATA. // it must fail the request and return NDIS_STATUS_INVALID_DATA.
RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("rtw_set_802_11_add_key: ((key->KeyIndex & 0x80000000) == 0)[=%d] ",(int)(key->KeyIndex & 0x80000000) == 0)); RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("rtw_set_802_11_add_key: ((key->KeyIndex & 0x80000000) == 0)[=%d] ",(int)(key->KeyIndex & 0x80000000) == 0));
RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("rtw_set_802_11_add_key:((key->KeyIndex & 0x40000000) > 0)[=%d]" , (int)(key->KeyIndex & 0x40000000) > 0)); RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("rtw_set_802_11_add_key:((key->KeyIndex & 0x40000000) > 0)[=%d]" , (int)(key->KeyIndex & 0x40000000) > 0));
RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("rtw_set_802_11_add_key: key->KeyIndex=%d \n" ,(int)key->KeyIndex)); RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("rtw_set_802_11_add_key: key->KeyIndex=%d\n" ,(int)key->KeyIndex));
ret= _FAIL; ret= _FAIL;
goto exit; goto exit;
} }
@ -1017,7 +1017,7 @@ _func_enter_;
break; break;
default: default:
padapter->securitypriv.dot11PrivacyAlgrthm=_NO_PRIVACY_; padapter->securitypriv.dot11PrivacyAlgrthm=_NO_PRIVACY_;
RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("Adapter->securitypriv.dot11PrivacyAlgrthm= %x key->KeyLength=%u \n", padapter->securitypriv.dot11PrivacyAlgrthm,key->KeyLength)); RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("Adapter->securitypriv.dot11PrivacyAlgrthm= %x key->KeyLength=%u\n", padapter->securitypriv.dot11PrivacyAlgrthm,key->KeyLength));
break; break;
} }
@ -1096,7 +1096,7 @@ _func_enter_;
wep->KeyIndex = keyindex ; wep->KeyIndex = keyindex ;
wep->KeyLength = key->KeyLength; wep->KeyLength = key->KeyLength;
RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("OID_802_11_ADD_KEY:Before memcpy \n")); RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("OID_802_11_ADD_KEY:Before memcpy\n"));
_rtw_memcpy(wep->KeyMaterial, key->KeyMaterial, key->KeyLength); _rtw_memcpy(wep->KeyMaterial, key->KeyMaterial, key->KeyLength);
_rtw_memcpy(&(padapter->securitypriv.dot11DefKey[keyindex].skey[0]), key->KeyMaterial, key->KeyLength); _rtw_memcpy(&(padapter->securitypriv.dot11DefKey[keyindex].skey[0]), key->KeyMaterial, key->KeyLength);

2
core/rtw_iol.c
View file

@ -274,7 +274,7 @@ void rtw_IOL_cmd_buf_dump(ADAPTER *Adapter,int buf_len,u8 *pbuf)
if (j%32 ==0) printk("\n");j++; if (j%32 ==0) printk("\n");j++;
} }
printk("\n"); printk("\n");
printk("============= ioreg_cmd len = %d =============== \n",buf_len); printk("============= ioreg_cmd len = %d ===============\n",buf_len);
} }

2
core/rtw_led.c
View file

@ -2341,7 +2341,7 @@ void BlinkHandler(PLED_871x pLed)
break; break;
default: default:
//RT_TRACE(COMP_LED, DBG_LOUD, ("BlinkWorkItemCallback 0x%x \n", pHalData->LedStrategy)); //RT_TRACE(COMP_LED, DBG_LOUD, ("BlinkWorkItemCallback 0x%x\n", pHalData->LedStrategy));
//SwLedBlink(pLed); //SwLedBlink(pLed);
break; break;
} }

36
core/rtw_mlme.c
View file

@ -561,7 +561,7 @@ void rtw_free_network(struct mlme_priv *pmlmepriv, struct wlan_network *pnetwork
void rtw_free_network(struct mlme_priv *pmlmepriv, struct wlan_network *pnetwork, u8 is_freeall)//(struct wlan_network *pnetwork, _queue *free_queue) void rtw_free_network(struct mlme_priv *pmlmepriv, struct wlan_network *pnetwork, u8 is_freeall)//(struct wlan_network *pnetwork, _queue *free_queue)
{ {
_func_enter_; _func_enter_;
RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("rtw_free_network==> ssid = %s \n\n" , pnetwork->network.Ssid.Ssid)); RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("rtw_free_network==> ssid = %s\n\n" , pnetwork->network.Ssid.Ssid));
_rtw_free_network(pmlmepriv, pnetwork, is_freeall); _rtw_free_network(pmlmepriv, pnetwork, is_freeall);
_func_exit_; _func_exit_;
} }
@ -570,7 +570,7 @@ void rtw_free_network_nolock(struct mlme_priv *pmlmepriv, struct wlan_network *p
void rtw_free_network_nolock(struct mlme_priv *pmlmepriv, struct wlan_network *pnetwork ) void rtw_free_network_nolock(struct mlme_priv *pmlmepriv, struct wlan_network *pnetwork )
{ {
_func_enter_; _func_enter_;
//RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("rtw_free_network==> ssid = %s \n\n" , pnetwork->network.Ssid.Ssid)); //RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("rtw_free_network==> ssid = %s\n\n" , pnetwork->network.Ssid.Ssid));
_rtw_free_network_nolock(pmlmepriv, pnetwork); _rtw_free_network_nolock(pmlmepriv, pnetwork);
_func_exit_; _func_exit_;
} }
@ -1102,7 +1102,7 @@ _func_enter_;
// update IBSS_network 's timestamp // update IBSS_network 's timestamp
if ((check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)) == _TRUE) if ((check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)) == _TRUE)
{ {
//RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,"rtw_survey_event_callback : WIFI_ADHOC_MASTER_STATE \n\n"); //RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,"rtw_survey_event_callback : WIFI_ADHOC_MASTER_STATE\n\n");
if (_rtw_memcmp(&(pmlmepriv->cur_network.network.MacAddress), pnetwork->MacAddress, ETH_ALEN)) if (_rtw_memcmp(&(pmlmepriv->cur_network.network.MacAddress), pnetwork->MacAddress, ETH_ALEN))
{ {
struct wlan_network* ibss_wlan = NULL; struct wlan_network* ibss_wlan = NULL;
@ -1413,7 +1413,7 @@ _func_enter_;
} }
else else
{ {
RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("rtw_free_assoc_resources : pwlan== NULL \n\n")); RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("rtw_free_assoc_resources : pwlan== NULL\n\n"));
} }
@ -1659,7 +1659,7 @@ static struct sta_info *rtw_joinbss_update_stainfo(_adapter *padapter, struct wl
preorder_ctrl->enable = _FALSE; preorder_ctrl->enable = _FALSE;
preorder_ctrl->indicate_seq = 0xffff; preorder_ctrl->indicate_seq = 0xffff;
#ifdef DBG_RX_SEQ #ifdef DBG_RX_SEQ
DBG_871X("DBG_RX_SEQ %s:%d indicate_seq:%u \n", __FUNCTION__, __LINE__, DBG_871X("DBG_RX_SEQ %s:%d indicate_seq:%u\n", __FUNCTION__, __LINE__,
preorder_ctrl->indicate_seq); preorder_ctrl->indicate_seq);
#endif #endif
preorder_ctrl->wend_b= 0xffff; preorder_ctrl->wend_b= 0xffff;
@ -1677,7 +1677,7 @@ static struct sta_info *rtw_joinbss_update_stainfo(_adapter *padapter, struct wl
preorder_ctrl->enable = _FALSE; preorder_ctrl->enable = _FALSE;
preorder_ctrl->indicate_seq = 0xffff; preorder_ctrl->indicate_seq = 0xffff;
#ifdef DBG_RX_SEQ #ifdef DBG_RX_SEQ
DBG_871X("DBG_RX_SEQ %s:%d indicate_seq:%u \n", __FUNCTION__, __LINE__, DBG_871X("DBG_RX_SEQ %s:%d indicate_seq:%u\n", __FUNCTION__, __LINE__,
preorder_ctrl->indicate_seq); preorder_ctrl->indicate_seq);
#endif #endif
preorder_ctrl->wend_b= 0xffff; preorder_ctrl->wend_b= 0xffff;
@ -1836,7 +1836,7 @@ _func_enter_;
_enter_critical_bh(&pmlmepriv->lock, &irqL); _enter_critical_bh(&pmlmepriv->lock, &irqL);
RT_TRACE(_module_rtl871x_mlme_c_,_drv_info_,("\n rtw_joinbss_event_callback !! _enter_critical \n")); RT_TRACE(_module_rtl871x_mlme_c_,_drv_info_,("\n rtw_joinbss_event_callback !! _enter_critical\n"));
if (pnetwork->join_res > 0) if (pnetwork->join_res > 0)
{ {
@ -1918,7 +1918,7 @@ _func_enter_;
//s5. Cancle assoc_timer //s5. Cancle assoc_timer
_cancel_timer(&pmlmepriv->assoc_timer, &timer_cancelled); _cancel_timer(&pmlmepriv->assoc_timer, &timer_cancelled);
RT_TRACE(_module_rtl871x_mlme_c_,_drv_info_,("Cancle assoc_timer \n")); RT_TRACE(_module_rtl871x_mlme_c_,_drv_info_,("Cancle assoc_timer\n"));
} }
else else
@ -1968,7 +1968,7 @@ _func_enter_;
} }
else else
{ {
RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("Set Assoc_Timer = 1; can't find match ssid in scanned_q \n")); RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("Set Assoc_Timer = 1; can't find match ssid in scanned_q\n"));
#endif #endif
_set_timer(&pmlmepriv->assoc_timer, 1); _set_timer(&pmlmepriv->assoc_timer, 1);
@ -2136,7 +2136,7 @@ _func_enter_;
{ {
//the sta have been in sta_info_queue => do nothing //the sta have been in sta_info_queue => do nothing
RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("Error: rtw_stassoc_event_callback: sta has been in sta_hash_queue \n")); RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("Error: rtw_stassoc_event_callback: sta has been in sta_hash_queue\n"));
goto exit; //(between drv has received this event before and fw have not yet to set key to CAM_ENTRY) goto exit; //(between drv has received this event before and fw have not yet to set key to CAM_ENTRY)
} }
@ -2317,7 +2317,7 @@ _func_enter_;
if (rtw_createbss_cmd(adapter)!=_SUCCESS) if (rtw_createbss_cmd(adapter)!=_SUCCESS)
{ {
RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("***Error=>stadel_event_callback: rtw_createbss_cmd status FAIL*** \n ")); RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("***Error=>stadel_event_callback: rtw_createbss_cmd status FAIL***\n "));
} }
@ -2473,7 +2473,7 @@ static void rtw_auto_scan_handler(_adapter *padapter)
/* /*
if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY|_FW_UNDER_LINKING) == _TRUE) if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY|_FW_UNDER_LINKING) == _TRUE)
{ {
DBG_871X("exit %s when _FW_UNDER_SURVEY|_FW_UNDER_LINKING -> \n", __FUNCTION__); DBG_871X("exit %s when _FW_UNDER_SURVEY|_FW_UNDER_LINKING ->\n", __FUNCTION__);
return; return;
} }
@ -2978,7 +2978,7 @@ _func_enter_;
&&((_rtw_memcmp(dst_ssid, src_ssid, pmlmepriv->assoc_ssid.SsidLength)) == _TRUE) &&((_rtw_memcmp(dst_ssid, src_ssid, pmlmepriv->assoc_ssid.SsidLength)) == _TRUE)
) )
{ {
RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("dst_ssid=%s, src_ssid=%s \n", dst_ssid, src_ssid)); RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("dst_ssid=%s, src_ssid=%s\n", dst_ssid, src_ssid));
#ifdef CONFIG_ANTENNA_DIVERSITY #ifdef CONFIG_ANTENNA_DIVERSITY
rtw_hal_get_def_var(adapter, HAL_DEF_CURRENT_ANTENNA, &(CurrentAntenna)); rtw_hal_get_def_var(adapter, HAL_DEF_CURRENT_ANTENNA, &(CurrentAntenna));
DBG_871X("#### dst_ssid=(%s) Opt_Ant_(%s) , cur_Ant(%s)\n", dst_ssid, DBG_871X("#### dst_ssid=(%s) Opt_Ant_(%s) , cur_Ant(%s)\n", dst_ssid,
@ -3141,11 +3141,11 @@ _func_enter_;
if (psecuritypriv->dot11AuthAlgrthm ==dot11AuthAlgrthm_8021X){ if (psecuritypriv->dot11AuthAlgrthm ==dot11AuthAlgrthm_8021X){
psetkeyparm->algorithm=(unsigned char)psecuritypriv->dot118021XGrpPrivacy; psetkeyparm->algorithm=(unsigned char)psecuritypriv->dot118021XGrpPrivacy;
RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("\n rtw_set_key: psetkeyparm->algorithm=(unsigned char)psecuritypriv->dot118021XGrpPrivacy=%d \n", psetkeyparm->algorithm)); RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("\n rtw_set_key: psetkeyparm->algorithm=(unsigned char)psecuritypriv->dot118021XGrpPrivacy=%d\n", psetkeyparm->algorithm));
} }
else{ else{
psetkeyparm->algorithm=(u8)psecuritypriv->dot11PrivacyAlgrthm; psetkeyparm->algorithm=(u8)psecuritypriv->dot11PrivacyAlgrthm;
RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("\n rtw_set_key: psetkeyparm->algorithm=(u8)psecuritypriv->dot11PrivacyAlgrthm=%d \n", psetkeyparm->algorithm)); RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("\n rtw_set_key: psetkeyparm->algorithm=(u8)psecuritypriv->dot11PrivacyAlgrthm=%d\n", psetkeyparm->algorithm));
} }
psetkeyparm->keyid = (u8)keyid;//0~3 psetkeyparm->keyid = (u8)keyid;//0~3
@ -3159,7 +3159,7 @@ _func_enter_;
} }
#endif #endif
DBG_871X("==> rtw_set_key algorithm(%x),keyid(%x),key_mask(%x)\n",psetkeyparm->algorithm,psetkeyparm->keyid,pmlmepriv->key_mask); DBG_871X("==> rtw_set_key algorithm(%x),keyid(%x),key_mask(%x)\n",psetkeyparm->algorithm,psetkeyparm->keyid,pmlmepriv->key_mask);
RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("\n rtw_set_key: psetkeyparm->algorithm=%d psetkeyparm->keyid=(u8)keyid=%d \n",psetkeyparm->algorithm, keyid)); RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("\n rtw_set_key: psetkeyparm->algorithm=%d psetkeyparm->keyid=(u8)keyid=%d\n",psetkeyparm->algorithm, keyid));
switch (psetkeyparm->algorithm){ switch (psetkeyparm->algorithm){
@ -3794,7 +3794,7 @@ void rtw_update_ht_cap(_adapter *padapter, u8 *pie, uint ie_len)
preorder_ctrl->enable = _FALSE; preorder_ctrl->enable = _FALSE;
preorder_ctrl->indicate_seq = 0xffff; preorder_ctrl->indicate_seq = 0xffff;
#ifdef DBG_RX_SEQ #ifdef DBG_RX_SEQ
DBG_871X("DBG_RX_SEQ %s:%d indicate_seq:%u \n", __FUNCTION__, __LINE__, DBG_871X("DBG_RX_SEQ %s:%d indicate_seq:%u\n", __FUNCTION__, __LINE__,
preorder_ctrl->indicate_seq); preorder_ctrl->indicate_seq);
#endif #endif
preorder_ctrl->wend_b= 0xffff; preorder_ctrl->wend_b= 0xffff;
@ -3812,7 +3812,7 @@ void rtw_update_ht_cap(_adapter *padapter, u8 *pie, uint ie_len)
preorder_ctrl->enable = _FALSE; preorder_ctrl->enable = _FALSE;
preorder_ctrl->indicate_seq = 0xffff; preorder_ctrl->indicate_seq = 0xffff;
#ifdef DBG_RX_SEQ #ifdef DBG_RX_SEQ
DBG_871X("DBG_RX_SEQ %s:%d indicate_seq:%u \n", __FUNCTION__, __LINE__, DBG_871X("DBG_RX_SEQ %s:%d indicate_seq:%u\n", __FUNCTION__, __LINE__,
preorder_ctrl->indicate_seq); preorder_ctrl->indicate_seq);
#endif #endif
preorder_ctrl->wend_b= 0xffff; preorder_ctrl->wend_b= 0xffff;

6
core/rtw_mlme_ext.c
View file

@ -2659,7 +2659,7 @@ unsigned int OnAction_back(_adapter *padapter, union recv_frame *precv_frame)
preorder_ctrl->enable = _FALSE; preorder_ctrl->enable = _FALSE;
preorder_ctrl->indicate_seq = 0xffff; preorder_ctrl->indicate_seq = 0xffff;
#ifdef DBG_RX_SEQ #ifdef DBG_RX_SEQ
DBG_871X("DBG_RX_SEQ %s:%d indicate_seq:%u \n", __FUNCTION__, __LINE__, DBG_871X("DBG_RX_SEQ %s:%d indicate_seq:%u\n", __FUNCTION__, __LINE__,
preorder_ctrl->indicate_seq); preorder_ctrl->indicate_seq);
#endif #endif
} }
@ -8506,7 +8506,7 @@ unsigned int send_delba(_adapter *padapter, u8 initiator, u8 *addr)
psta->recvreorder_ctrl[tid].enable = _FALSE; psta->recvreorder_ctrl[tid].enable = _FALSE;
psta->recvreorder_ctrl[tid].indicate_seq = 0xffff; psta->recvreorder_ctrl[tid].indicate_seq = 0xffff;
#ifdef DBG_RX_SEQ #ifdef DBG_RX_SEQ
DBG_871X("DBG_RX_SEQ %s:%d indicate_seq:%u \n", __FUNCTION__, __LINE__, DBG_871X("DBG_RX_SEQ %s:%d indicate_seq:%u\n", __FUNCTION__, __LINE__,
psta->recvreorder_ctrl[tid].indicate_seq); psta->recvreorder_ctrl[tid].indicate_seq);
#endif #endif
} }
@ -10293,7 +10293,7 @@ void _linked_rx_signal_strehgth_display(_adapter *padapter)
DBG_871X("UndecoratedSmoothedPWDB:%d\n",UndecoratedSmoothedPWDB); DBG_871X("UndecoratedSmoothedPWDB:%d\n",UndecoratedSmoothedPWDB);
DBG_871X("Rx RSSI:%d\n",padapter->recvpriv.rssi); DBG_871X("Rx RSSI:%d\n",padapter->recvpriv.rssi);
DBG_871X("Rx Signal_strength:%d\n",padapter->recvpriv.signal_strength); DBG_871X("Rx Signal_strength:%d\n",padapter->recvpriv.signal_strength);
DBG_871X("Rx Signal_qual:%d \n",padapter->recvpriv.signal_qual); DBG_871X("Rx Signal_qual:%d\n",padapter->recvpriv.signal_qual);
if ( check_fwstate( &padapter->mlmepriv, _FW_LINKED ) ) if ( check_fwstate( &padapter->mlmepriv, _FW_LINKED ) )
{ {
DBG_871X("bw mode: %d, channel: %d\n", padapter->mlmeextpriv.cur_bwmode, padapter->mlmeextpriv.cur_channel ); DBG_871X("bw mode: %d, channel: %d\n", padapter->mlmeextpriv.cur_bwmode, padapter->mlmeextpriv.cur_channel );

36
core/rtw_mp_ioctl.c
View file

@ -541,7 +541,7 @@ _func_enter_;
if (poid_par_priv->information_buf_len == sizeof(ULONG)) { if (poid_par_priv->information_buf_len == sizeof(ULONG)) {
*(ULONG*)poid_par_priv->information_buf = Adapter->mppriv.rx_pktcount; *(ULONG*)poid_par_priv->information_buf = Adapter->mppriv.rx_pktcount;
*poid_par_priv->bytes_rw = poid_par_priv->information_buf_len; *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
RT_TRACE(_module_mp_, _drv_alert_, ("recv_ok:%d \n",Adapter->mppriv.rx_pktcount)); RT_TRACE(_module_mp_, _drv_alert_, ("recv_ok:%d\n",Adapter->mppriv.rx_pktcount));
} else { } else {
status = NDIS_STATUS_INVALID_LENGTH; status = NDIS_STATUS_INVALID_LENGTH;
} }
@ -566,7 +566,7 @@ _func_enter_;
if (poid_par_priv->information_buf_len == sizeof(ULONG)) { if (poid_par_priv->information_buf_len == sizeof(ULONG)) {
*(ULONG*)poid_par_priv->information_buf = Adapter->mppriv.rx_crcerrpktcount; *(ULONG*)poid_par_priv->information_buf = Adapter->mppriv.rx_crcerrpktcount;
*poid_par_priv->bytes_rw = poid_par_priv->information_buf_len; *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
RT_TRACE(_module_mp_, _drv_alert_, ("recv_err:%d \n",Adapter->mppriv.rx_crcerrpktcount)); RT_TRACE(_module_mp_, _drv_alert_, ("recv_err:%d\n",Adapter->mppriv.rx_crcerrpktcount));
} else { } else {
status = NDIS_STATUS_INVALID_LENGTH; status = NDIS_STATUS_INVALID_LENGTH;
} }
@ -1957,7 +1957,7 @@ NDIS_STATUS oid_rt_pro_add_sta_info_hdl(struct oid_par_priv *poid_par_priv)
} }
} else { //(between drv has received this event before and fw have not yet to set key to CAM_ENTRY) } else { //(between drv has received this event before and fw have not yet to set key to CAM_ENTRY)
RT_TRACE(_module_rtl871x_ioctl_c_, _drv_err_, RT_TRACE(_module_rtl871x_ioctl_c_, _drv_err_,
("Error: OID_RT_PRO_ADD_STA_INFO: sta has been in sta_hash_queue \n")); ("Error: OID_RT_PRO_ADD_STA_INFO: sta has been in sta_hash_queue\n"));
} }
_irqlevel_changed_(&oldirql, RAISE); _irqlevel_changed_(&oldirql, RAISE);
@ -2025,7 +2025,7 @@ static u32 mp_query_drv_var(_adapter *padapter, u8 offset, u32 var)
#if 0 #if 0
if (offset <=100){ //For setting data rate and query data rate if (offset <=100){ //For setting data rate and query data rate
if (offset==100){ //For query data rate if (offset==100){ //For query data rate
RT_TRACE(_module_mp_, _drv_emerg_, ("\n mp_query_drv_var: offset(%d): query rate=0x%.2x \n",offset,padapter->registrypriv.tx_rate)); RT_TRACE(_module_mp_, _drv_emerg_, ("\n mp_query_drv_var: offset(%d): query rate=0x%.2x\n",offset,padapter->registrypriv.tx_rate));
var=padapter->registrypriv.tx_rate; var=padapter->registrypriv.tx_rate;
} }
@ -2033,7 +2033,7 @@ static u32 mp_query_drv_var(_adapter *padapter, u8 offset, u32 var)
padapter->registrypriv.tx_rate=offset; padapter->registrypriv.tx_rate=offset;
var=padapter->registrypriv.tx_rate; var=padapter->registrypriv.tx_rate;
padapter->registrypriv.use_rate=_TRUE; padapter->registrypriv.use_rate=_TRUE;
RT_TRACE(_module_mp_, _drv_emerg_, ("\n mp_query_drv_var: offset(%d): set rate=0x%.2x \n",offset,padapter->registrypriv.tx_rate)); RT_TRACE(_module_mp_, _drv_emerg_, ("\n mp_query_drv_var: offset(%d): set rate=0x%.2x\n",offset,padapter->registrypriv.tx_rate));
} }
else{ //not use the data rate else{ //not use the data rate
padapter->registrypriv.use_rate=_FALSE; padapter->registrypriv.use_rate=_FALSE;
@ -2043,22 +2043,22 @@ static u32 mp_query_drv_var(_adapter *padapter, u8 offset, u32 var)
else if (offset<=110){ //for setting debug level else if (offset<=110){ //for setting debug level
RT_TRACE(_module_mp_, _drv_emerg_, (" mp_query_drv_var: offset(%d) for set debug level\n",offset)); RT_TRACE(_module_mp_, _drv_emerg_, (" mp_query_drv_var: offset(%d) for set debug level\n",offset));
if (offset==110){ //For query data rate if (offset==110){ //For query data rate
RT_TRACE(_module_mp_, _drv_emerg_, (" mp_query_drv_var: offset(%d): query dbg level=0x%.2x \n",offset,padapter->registrypriv.dbg_level)); RT_TRACE(_module_mp_, _drv_emerg_, (" mp_query_drv_var: offset(%d): query dbg level=0x%.2x\n",offset,padapter->registrypriv.dbg_level));
padapter->registrypriv.dbg_level=GlobalDebugLevel; padapter->registrypriv.dbg_level=GlobalDebugLevel;
var=padapter->registrypriv.dbg_level; var=padapter->registrypriv.dbg_level;
} }
else if (offset<110 && offset>100){ else if (offset<110 && offset>100){
RT_TRACE(_module_mp_, _drv_emerg_, (" mp_query_drv_var: offset(%d): set dbg level=0x%.2x \n",offset,offset-100)); RT_TRACE(_module_mp_, _drv_emerg_, (" mp_query_drv_var: offset(%d): set dbg level=0x%.2x\n",offset,offset-100));
padapter->registrypriv.dbg_level=GlobalDebugLevel=offset-100; padapter->registrypriv.dbg_level=GlobalDebugLevel=offset-100;
var=padapter->registrypriv.dbg_level; var=padapter->registrypriv.dbg_level;
RT_TRACE(_module_mp_, _drv_emerg_, (" mp_query_drv_var(_drv_emerg_): offset(%d): set dbg level=0x%.2x \n",offset,GlobalDebugLevel)); RT_TRACE(_module_mp_, _drv_emerg_, (" mp_query_drv_var(_drv_emerg_): offset(%d): set dbg level=0x%.2x\n",offset,GlobalDebugLevel));
RT_TRACE(_module_mp_, _drv_alert_, (" mp_query_drv_var(_drv_alert_): offset(%d): set dbg level=0x%.2x \n",offset,GlobalDebugLevel)); RT_TRACE(_module_mp_, _drv_alert_, (" mp_query_drv_var(_drv_alert_): offset(%d): set dbg level=0x%.2x\n",offset,GlobalDebugLevel));
RT_TRACE(_module_mp_, _drv_crit_, (" mp_query_drv_var(_drv_crit_): offset(%d): set dbg level=0x%.2x \n",offset,GlobalDebugLevel)); RT_TRACE(_module_mp_, _drv_crit_, (" mp_query_drv_var(_drv_crit_): offset(%d): set dbg level=0x%.2x\n",offset,GlobalDebugLevel));
RT_TRACE(_module_mp_, _drv_err_, (" mp_query_drv_var(_drv_err_): offset(%d): set dbg level=0x%.2x \n",offset,GlobalDebugLevel)); RT_TRACE(_module_mp_, _drv_err_, (" mp_query_drv_var(_drv_err_): offset(%d): set dbg level=0x%.2x\n",offset,GlobalDebugLevel));
RT_TRACE(_module_mp_, _drv_warning_, (" mp_query_drv_var(_drv_warning_): offset(%d): set dbg level=0x%.2x \n",offset,GlobalDebugLevel)); RT_TRACE(_module_mp_, _drv_warning_, (" mp_query_drv_var(_drv_warning_): offset(%d): set dbg level=0x%.2x\n",offset,GlobalDebugLevel));
RT_TRACE(_module_mp_, _drv_notice_, (" mp_query_drv_var(_drv_notice_): offset(%d): set dbg level=0x%.2x \n",offset,GlobalDebugLevel)); RT_TRACE(_module_mp_, _drv_notice_, (" mp_query_drv_var(_drv_notice_): offset(%d): set dbg level=0x%.2x\n",offset,GlobalDebugLevel));
RT_TRACE(_module_mp_, _drv_info_, (" mp_query_drv_var(_drv_info_): offset(%d): set dbg level=0x%.2x \n",offset,GlobalDebugLevel)); RT_TRACE(_module_mp_, _drv_info_, (" mp_query_drv_var(_drv_info_): offset(%d): set dbg level=0x%.2x\n",offset,GlobalDebugLevel));
RT_TRACE(_module_mp_, _drv_debug_, (" mp_query_drv_var(_drv_debug_): offset(%d): set dbg level=0x%.2x \n",offset,GlobalDebugLevel)); RT_TRACE(_module_mp_, _drv_debug_, (" mp_query_drv_var(_drv_debug_): offset(%d): set dbg level=0x%.2x\n",offset,GlobalDebugLevel));
} }
} }
@ -2116,7 +2116,7 @@ static u32 mp_query_drv_var(_adapter *padapter, u8 offset, u32 var)
if (offset==127){ if (offset==127){
// prnt_dbg_comp=padapter->registrypriv.dbg_component= GlobalDebugComponents; // prnt_dbg_comp=padapter->registrypriv.dbg_component= GlobalDebugComponents;
var=(u32)(padapter->registrypriv.dbg_component); var=(u32)(padapter->registrypriv.dbg_component);
RT_TRACE(0xffffffff, _drv_emerg_, ("2: mp_query_drv_var: offset(%d;0x%x):for query dbg conpoment=0x%x(l) 0x%x(h) GlobalDebugComponents=0x%x(l) 0x%x(h) \n",offset,offset,padapter->registrypriv.dbg_component,prnt_dbg_comp)); RT_TRACE(0xffffffff, _drv_emerg_, ("2: mp_query_drv_var: offset(%d;0x%x):for query dbg conpoment=0x%x(l) 0x%x(h) GlobalDebugComponents=0x%x(l) 0x%x(h)\n",offset,offset,padapter->registrypriv.dbg_component,prnt_dbg_comp));
prnt_dbg_comp=GlobalDebugComponents; prnt_dbg_comp=GlobalDebugComponents;
RT_TRACE(0xffffffff, _drv_emerg_, ("2-1: mp_query_drv_var: offset(%d;0x%x):for query dbg conpoment=0x%x(l) 0x%x(h) GlobalDebugComponents=0x%x(l) 0x%x(h)\n",offset,offset,padapter->registrypriv.dbg_component,prnt_dbg_comp)); RT_TRACE(0xffffffff, _drv_emerg_, ("2-1: mp_query_drv_var: offset(%d;0x%x):for query dbg conpoment=0x%x(l) 0x%x(h) GlobalDebugComponents=0x%x(l) 0x%x(h)\n",offset,offset,padapter->registrypriv.dbg_component,prnt_dbg_comp));
prnt_dbg_comp=GlobalDebugComponents=padapter->registrypriv.dbg_component; prnt_dbg_comp=GlobalDebugComponents=padapter->registrypriv.dbg_component;
@ -2240,7 +2240,7 @@ NDIS_STATUS oid_rt_pro_rx_packet_type_hdl(struct oid_par_priv *poid_par_priv)
if (poid_par_priv->type_of_oid == SET_OID) { if (poid_par_priv->type_of_oid == SET_OID) {
Adapter->mppriv.rx_with_status = *(UCHAR *) poid_par_priv->information_buf; Adapter->mppriv.rx_with_status = *(UCHAR *) poid_par_priv->information_buf;
RT_TRACE(_module_rtl871x_ioctl_c_,_drv_err_, ("Query Information, OID_RT_PRO_RX_PACKET_TYPE:%d \n",\ RT_TRACE(_module_rtl871x_ioctl_c_,_drv_err_, ("Query Information, OID_RT_PRO_RX_PACKET_TYPE:%d\n",\
Adapter->mppriv.rx_with_status)); Adapter->mppriv.rx_with_status));
//*(u32 *)&Adapter->eeprompriv.mac_addr[0]=rtw_read32(Adapter, 0x10250050); //*(u32 *)&Adapter->eeprompriv.mac_addr[0]=rtw_read32(Adapter, 0x10250050);
@ -2254,7 +2254,7 @@ NDIS_STATUS oid_rt_pro_rx_packet_type_hdl(struct oid_par_priv *poid_par_priv)
*(UCHAR *) poid_par_priv->information_buf = Adapter->mppriv.rx_with_status; *(UCHAR *) poid_par_priv->information_buf = Adapter->mppriv.rx_with_status;
*poid_par_priv->bytes_rw = poid_par_priv->information_buf_len; *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
RT_TRACE(_module_rtl871x_ioctl_c_,_drv_err_, ("Query Information, OID_RT_PRO_RX_PACKET_TYPE:%d \n", \ RT_TRACE(_module_rtl871x_ioctl_c_,_drv_err_, ("Query Information, OID_RT_PRO_RX_PACKET_TYPE:%d\n", \
Adapter->mppriv.rx_with_status)); Adapter->mppriv.rx_with_status));
//*(u32 *)&Adapter->eeprompriv.mac_addr[0]=rtw_read32(Adapter, 0x10250050); //*(u32 *)&Adapter->eeprompriv.mac_addr[0]=rtw_read32(Adapter, 0x10250050);

2
core/rtw_p2p.c
View file

@ -3576,7 +3576,7 @@ static void ro_ch_timer_process (void *FunctionContext)
_adapter *adapter = (_adapter *)FunctionContext; _adapter *adapter = (_adapter *)FunctionContext;
struct rtw_wdev_priv *pwdev_priv = wdev_to_priv(adapter->rtw_wdev); struct rtw_wdev_priv *pwdev_priv = wdev_to_priv(adapter->rtw_wdev);
//printk("%s \n", __FUNCTION__); //printk("%s\n", __FUNCTION__);
#ifdef CONFIG_CONCURRENT_MODE #ifdef CONFIG_CONCURRENT_MODE
ATOMIC_SET(&pwdev_priv->ro_ch_to, 1); ATOMIC_SET(&pwdev_priv->ro_ch_to, 1);

6
core/rtw_pwrctrl.c
View file

@ -229,7 +229,7 @@ void rtw_ps_processor(_adapter*padapter)
pwrpriv->ps_flag = _TRUE; pwrpriv->ps_flag = _TRUE;
rfpwrstate = RfOnOffDetect(padapter); rfpwrstate = RfOnOffDetect(padapter);
DBG_871X("@@@@- #1 %s==> rfstate:%s \n",__FUNCTION__,(rfpwrstate==rf_on)?"rf_on":"rf_off"); DBG_871X("@@@@- #1 %s==> rfstate:%s\n",__FUNCTION__,(rfpwrstate==rf_on)?"rf_on":"rf_off");
if (rfpwrstate!= pwrpriv->rf_pwrstate) if (rfpwrstate!= pwrpriv->rf_pwrstate)
{ {
if (rfpwrstate == rf_off) if (rfpwrstate == rf_off)
@ -248,7 +248,7 @@ void rtw_ps_processor(_adapter*padapter)
#endif //CONFIG_AUTOSUSPEND #endif //CONFIG_AUTOSUSPEND
{ {
rfpwrstate = RfOnOffDetect(padapter); rfpwrstate = RfOnOffDetect(padapter);
DBG_871X("@@@@- #2 %s==> rfstate:%s \n",__FUNCTION__,(rfpwrstate==rf_on)?"rf_on":"rf_off"); DBG_871X("@@@@- #2 %s==> rfstate:%s\n",__FUNCTION__,(rfpwrstate==rf_on)?"rf_on":"rf_off");
if (rfpwrstate!= pwrpriv->rf_pwrstate) if (rfpwrstate!= pwrpriv->rf_pwrstate)
{ {
@ -1651,7 +1651,7 @@ int _rtw_pwr_wakeup(_adapter *padapter, u32 ips_deffer_ms, const char *caller)
#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,33)) #if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,33))
if (usb_autopm_get_interface(adapter_to_dvobj(padapter)->pusbintf) < 0) if (usb_autopm_get_interface(adapter_to_dvobj(padapter)->pusbintf) < 0)
{ {
DBG_871X( "can't get autopm: \n"); DBG_871X( "can't get autopm:\n");
} }
#elif (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,20)) #elif (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,20))
usb_autopm_disable(adapter_to_dvobj(padapter)->pusbintf); usb_autopm_disable(adapter_to_dvobj(padapter)->pusbintf);

42
core/rtw_recv.c
View file

@ -517,7 +517,7 @@ _func_enter_;
//rxdata_key_idx =( ((iv[3])>>6)&0x3) ; //rxdata_key_idx =( ((iv[3])>>6)&0x3) ;
mickey=&psecuritypriv->dot118021XGrprxmickey[prxattrib->key_index].skey[0]; mickey=&psecuritypriv->dot118021XGrprxmickey[prxattrib->key_index].skey[0];
RT_TRACE(_module_rtl871x_recv_c_,_drv_info_,("\n recvframe_chkmic: bcmc key \n")); RT_TRACE(_module_rtl871x_recv_c_,_drv_info_,("\n recvframe_chkmic: bcmc key\n"));
//DBG_871X("\n recvframe_chkmic: bcmc key psecuritypriv->dot118021XGrpKeyid(%d),pmlmeinfo->key_index(%d) ,recv key_id(%d)\n", //DBG_871X("\n recvframe_chkmic: bcmc key psecuritypriv->dot118021XGrpKeyid(%d),pmlmeinfo->key_index(%d) ,recv key_id(%d)\n",
// psecuritypriv->dot118021XGrpKeyid,pmlmeinfo->key_index,rxdata_key_idx); // psecuritypriv->dot118021XGrpKeyid,pmlmeinfo->key_index,rxdata_key_idx);
@ -531,7 +531,7 @@ _func_enter_;
} }
else{ else{
mickey=&stainfo->dot11tkiprxmickey.skey[0]; mickey=&stainfo->dot11tkiprxmickey.skey[0];
RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("\n recvframe_chkmic: unicast key \n")); RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("\n recvframe_chkmic: unicast key\n"));
} }
datalen=precvframe->u.hdr.len-prxattrib->hdrlen-prxattrib->iv_len-prxattrib->icv_len-8;//icv_len included the mic code datalen=precvframe->u.hdr.len-prxattrib->hdrlen-prxattrib->iv_len-prxattrib->icv_len-8;//icv_len included the mic code
@ -574,7 +574,7 @@ _func_enter_;
*(precvframe->u.hdr.rx_data+i+6),*(precvframe->u.hdr.rx_data+i+7))); *(precvframe->u.hdr.rx_data+i+6),*(precvframe->u.hdr.rx_data+i+7)));
} }
RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("\n ======demp packet end [len=%d]======\n",precvframe->u.hdr.len)); RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("\n ======demp packet end [len=%d]======\n",precvframe->u.hdr.len));
RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("\n hrdlen=%d, \n",prxattrib->hdrlen)); RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("\n hrdlen=%d,\n",prxattrib->hdrlen));
} }
RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("ra=0x%.2x 0x%.2x 0x%.2x 0x%.2x 0x%.2x 0x%.2x psecuritypriv->binstallGrpkey=%d ", RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("ra=0x%.2x 0x%.2x 0x%.2x 0x%.2x 0x%.2x 0x%.2x psecuritypriv->binstallGrpkey=%d ",
@ -647,7 +647,7 @@ _func_enter_;
if (prxattrib->key_index > WEP_KEYS) if (prxattrib->key_index > WEP_KEYS)
{ {
DBG_871X("prxattrib->key_index(%d) > WEP_KEYS \n", prxattrib->key_index); DBG_871X("prxattrib->key_index(%d) > WEP_KEYS\n", prxattrib->key_index);
switch (prxattrib->encrypt){ switch (prxattrib->encrypt){
case _WEP40_: case _WEP40_:
@ -1152,7 +1152,7 @@ _func_enter_;
// filter packets that SA is myself or multicast or broadcast // filter packets that SA is myself or multicast or broadcast
if (_rtw_memcmp(myhwaddr, pattrib->src, ETH_ALEN)){ if (_rtw_memcmp(myhwaddr, pattrib->src, ETH_ALEN)){
RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,(" SA==myself \n")); RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,(" SA==myself\n"));
ret= _FAIL; ret= _FAIL;
goto exit; goto exit;
} }
@ -1366,7 +1366,7 @@ _func_enter_;
// filter packets that SA is myself or multicast or broadcast // filter packets that SA is myself or multicast or broadcast
if (_rtw_memcmp(myhwaddr, pattrib->src, ETH_ALEN)){ if (_rtw_memcmp(myhwaddr, pattrib->src, ETH_ALEN)){
RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,(" SA==myself \n")); RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,(" SA==myself\n"));
#ifdef DBG_RX_DROP_FRAME #ifdef DBG_RX_DROP_FRAME
DBG_871X("DBG_RX_DROP_FRAME %s SA="MAC_FMT", myhwaddr="MAC_FMT"\n", DBG_871X("DBG_RX_DROP_FRAME %s SA="MAC_FMT", myhwaddr="MAC_FMT"\n",
__FUNCTION__, MAC_ARG(pattrib->src), MAC_ARG(myhwaddr)); __FUNCTION__, MAC_ARG(pattrib->src), MAC_ARG(myhwaddr));
@ -1911,7 +1911,7 @@ _func_enter_;
if (psta==NULL){ if (psta==NULL){
RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,(" after to_fr_ds_chk; psta==NULL \n")); RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,(" after to_fr_ds_chk; psta==NULL\n"));
#ifdef DBG_RX_DROP_FRAME #ifdef DBG_RX_DROP_FRAME
DBG_871X("DBG_RX_DROP_FRAME %s psta == NULL\n", __func__); DBG_871X("DBG_RX_DROP_FRAME %s psta == NULL\n", __func__);
#endif #endif
@ -2095,33 +2095,33 @@ _func_enter_;
rtw_hal_get_def_var(adapter, HAL_DEF_DBG_DUMP_RXPKT, &(bDumpRxPkt)); rtw_hal_get_def_var(adapter, HAL_DEF_DBG_DUMP_RXPKT, &(bDumpRxPkt));
if (bDumpRxPkt ==1){//dump all rx packets if (bDumpRxPkt ==1){//dump all rx packets
int i; int i;
DBG_871X("############################# \n"); DBG_871X("#############################\n");
for (i=0; i<64;i=i+8) for (i=0; i<64;i=i+8)
DBG_871X("%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:\n", *(ptr+i), DBG_871X("%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:\n", *(ptr+i),
*(ptr+i+1), *(ptr+i+2) ,*(ptr+i+3) ,*(ptr+i+4),*(ptr+i+5), *(ptr+i+6), *(ptr+i+7)); *(ptr+i+1), *(ptr+i+2) ,*(ptr+i+3) ,*(ptr+i+4),*(ptr+i+5), *(ptr+i+6), *(ptr+i+7));
DBG_871X("############################# \n"); DBG_871X("#############################\n");
} }
else if (bDumpRxPkt ==2){ else if (bDumpRxPkt ==2){
if (type== WIFI_MGT_TYPE){ if (type== WIFI_MGT_TYPE){
int i; int i;
DBG_871X("############################# \n"); DBG_871X("#############################\n");
for (i=0; i<64;i=i+8) for (i=0; i<64;i=i+8)
DBG_871X("%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:\n", *(ptr+i), DBG_871X("%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:\n", *(ptr+i),
*(ptr+i+1), *(ptr+i+2) ,*(ptr+i+3) ,*(ptr+i+4),*(ptr+i+5), *(ptr+i+6), *(ptr+i+7)); *(ptr+i+1), *(ptr+i+2) ,*(ptr+i+3) ,*(ptr+i+4),*(ptr+i+5), *(ptr+i+6), *(ptr+i+7));
DBG_871X("############################# \n"); DBG_871X("#############################\n");
} }
} }
else if (bDumpRxPkt ==3){ else if (bDumpRxPkt ==3){
if (type== WIFI_DATA_TYPE){ if (type== WIFI_DATA_TYPE){
int i; int i;
DBG_871X("############################# \n"); DBG_871X("#############################\n");
for (i=0; i<64;i=i+8) for (i=0; i<64;i=i+8)
DBG_871X("%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:\n", *(ptr+i), DBG_871X("%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:\n", *(ptr+i),
*(ptr+i+1), *(ptr+i+2) ,*(ptr+i+3) ,*(ptr+i+4),*(ptr+i+5), *(ptr+i+6), *(ptr+i+7)); *(ptr+i+1), *(ptr+i+2) ,*(ptr+i+3) ,*(ptr+i+4),*(ptr+i+5), *(ptr+i+6), *(ptr+i+7));
DBG_871X("############################# \n"); DBG_871X("#############################\n");
} }
} }
} }
@ -2170,7 +2170,7 @@ _func_enter_;
if (rtw_wapi_drop_for_key_absent(adapter,GetAddr2Ptr(ptr))){ if (rtw_wapi_drop_for_key_absent(adapter,GetAddr2Ptr(ptr))){
retval=_FAIL; retval=_FAIL;
WAPI_TRACE(WAPI_RX,"drop for key absent for rx \n"); WAPI_TRACE(WAPI_RX,"drop for key absent for rx\n");
break; break;
} }
} }
@ -3469,7 +3469,7 @@ int recv_indicatepkts_in_order(_adapter *padapter, struct recv_reorder_ctrl *pre
// This protect buffer from overflow. // This protect buffer from overflow.
if (index >= REORDER_WIN_SIZE) if (index >= REORDER_WIN_SIZE)
{ {
RT_ASSERT(FALSE, ("IndicateRxReorderList(): Buffer overflow!! \n")); RT_ASSERT(FALSE, ("IndicateRxReorderList(): Buffer overflow!!\n"));
bPktInBuf = TRUE; bPktInBuf = TRUE;
break; break;
} }
@ -3505,7 +3505,7 @@ int recv_indicatepkts_in_order(_adapter *padapter, struct recv_reorder_ctrl *pre
//pTS->RxIndicateState = RXTS_INDICATE_PROCESSING; //pTS->RxIndicateState = RXTS_INDICATE_PROCESSING;
// Indicate packets // Indicate packets
//RT_ASSERT((index<=REORDER_WIN_SIZE), ("RxReorderIndicatePacket(): Rx Reorder buffer full!! \n")); //RT_ASSERT((index<=REORDER_WIN_SIZE), ("RxReorderIndicatePacket(): Rx Reorder buffer full!!\n"));
//indicate this recv_frame //indicate this recv_frame
@ -3815,7 +3815,7 @@ int process_recv_indicatepkts(_adapter *padapter, union recv_frame *prframe)
retval=wlanhdr_to_ethhdr (prframe); retval=wlanhdr_to_ethhdr (prframe);
if (retval != _SUCCESS) if (retval != _SUCCESS)
{ {
RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("wlanhdr_to_ethhdr: drop pkt \n")); RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("wlanhdr_to_ethhdr: drop pkt\n"));
#ifdef DBG_RX_DROP_FRAME #ifdef DBG_RX_DROP_FRAME
DBG_871X("DBG_RX_DROP_FRAME %s wlanhdr_to_ethhdr error!\n", __FUNCTION__); DBG_871X("DBG_RX_DROP_FRAME %s wlanhdr_to_ethhdr error!\n", __FUNCTION__);
#endif #endif
@ -3867,7 +3867,7 @@ int recv_func_prehandle(_adapter *padapter, union recv_frame *rframe)
padapter->mppriv.rx_pktcount++; padapter->mppriv.rx_pktcount++;
if (check_fwstate(pmlmepriv, WIFI_MP_LPBK_STATE) == _FALSE) { if (check_fwstate(pmlmepriv, WIFI_MP_LPBK_STATE) == _FALSE) {
RT_TRACE(_module_rtl871x_recv_c_, _drv_alert_, ("MP - Not in loopback mode , drop pkt \n")); RT_TRACE(_module_rtl871x_recv_c_, _drv_alert_, ("MP - Not in loopback mode , drop pkt\n"));
ret = _FAIL; ret = _FAIL;
rtw_free_recvframe(rframe, pfree_recv_queue);//free this recv_frame rtw_free_recvframe(rframe, pfree_recv_queue);//free this recv_frame
goto exit; goto exit;
@ -3957,7 +3957,7 @@ int recv_func_posthandle(_adapter *padapter, union recv_frame *prframe)
prframe=portctrl(padapter, prframe); prframe=portctrl(padapter, prframe);
if (prframe == NULL) { if (prframe == NULL) {
RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("portctrl: drop pkt \n")); RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("portctrl: drop pkt\n"));
#ifdef DBG_RX_DROP_FRAME #ifdef DBG_RX_DROP_FRAME
DBG_871X("DBG_RX_DROP_FRAME %s portctrl: drop pkt\n", __FUNCTION__); DBG_871X("DBG_RX_DROP_FRAME %s portctrl: drop pkt\n", __FUNCTION__);
#endif #endif
@ -3981,7 +3981,7 @@ int recv_func_posthandle(_adapter *padapter, union recv_frame *prframe)
ret = process_recv_indicatepkts(padapter, prframe); ret = process_recv_indicatepkts(padapter, prframe);
if (ret != _SUCCESS) if (ret != _SUCCESS)
{ {
RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("recv_func: process_recv_indicatepkts fail! \n")); RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("recv_func: process_recv_indicatepkts fail!\n"));
#ifdef DBG_RX_DROP_FRAME #ifdef DBG_RX_DROP_FRAME
DBG_871X("DBG_RX_DROP_FRAME %s process_recv_indicatepkts fail!\n", __FUNCTION__); DBG_871X("DBG_RX_DROP_FRAME %s process_recv_indicatepkts fail!\n", __FUNCTION__);
#endif #endif
@ -3994,7 +3994,7 @@ int recv_func_posthandle(_adapter *padapter, union recv_frame *prframe)
ret = wlanhdr_to_ethhdr (prframe); ret = wlanhdr_to_ethhdr (prframe);
if (ret != _SUCCESS) if (ret != _SUCCESS)
{ {
RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("wlanhdr_to_ethhdr: drop pkt \n")); RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("wlanhdr_to_ethhdr: drop pkt\n"));
#ifdef DBG_RX_DROP_FRAME #ifdef DBG_RX_DROP_FRAME
DBG_871X("DBG_RX_DROP_FRAME %s wlanhdr_to_ethhdr: drop pkt\n", __FUNCTION__); DBG_871X("DBG_RX_DROP_FRAME %s wlanhdr_to_ethhdr: drop pkt\n", __FUNCTION__);
#endif #endif

6
core/rtw_security.c
View file

@ -1872,9 +1872,9 @@ _func_enter_;
for (i=0;i<8;i++){ for (i=0;i<8;i++){
if (pframe[hdrlen+8+plen-8+i] != message[hdrlen+8+plen-8+i]) if (pframe[hdrlen+8+plen-8+i] != message[hdrlen+8+plen-8+i])
{ {
RT_TRACE(_module_rtl871x_security_c_,_drv_err_,("aes_decipher:mic check error mic[%d]: pframe(%x) != message(%x) \n", RT_TRACE(_module_rtl871x_security_c_,_drv_err_,("aes_decipher:mic check error mic[%d]: pframe(%x) != message(%x)\n",
i,pframe[hdrlen+8+plen-8+i],message[hdrlen+8+plen-8+i])); i,pframe[hdrlen+8+plen-8+i],message[hdrlen+8+plen-8+i]));
DBG_871X("aes_decipher:mic check error mic[%d]: pframe(%x) != message(%x) \n", DBG_871X("aes_decipher:mic check error mic[%d]: pframe(%x) != message(%x)\n",
i,pframe[hdrlen+8+plen-8+i],message[hdrlen+8+plen-8+i]); i,pframe[hdrlen+8+plen-8+i],message[hdrlen+8+plen-8+i]);
res = _FAIL; res = _FAIL;
} }
@ -1924,7 +1924,7 @@ _func_enter_;
prwskey = psecuritypriv->dot118021XGrpKey[prxattrib->key_index].skey; prwskey = psecuritypriv->dot118021XGrpKey[prxattrib->key_index].skey;
if (psecuritypriv->dot118021XGrpKeyid != prxattrib->key_index) if (psecuritypriv->dot118021XGrpKeyid != prxattrib->key_index)
{ {
DBG_871X("not match packet_index=%d, install_index=%d \n" DBG_871X("not match packet_index=%d, install_index=%d\n"
, prxattrib->key_index, psecuritypriv->dot118021XGrpKeyid); , prxattrib->key_index, psecuritypriv->dot118021XGrpKeyid);
res=_FAIL; res=_FAIL;
goto exit; goto exit;

2
core/rtw_sreset.c
View file

@ -66,7 +66,7 @@ u8 sreset_get_wifi_status(_adapter *padapter)
if (WIFI_STATUS_SUCCESS !=psrtpriv->Wifi_Error_Status) if (WIFI_STATUS_SUCCESS !=psrtpriv->Wifi_Error_Status)
{ {
DBG_8192C("==>%s error_status(0x%x) \n",__FUNCTION__,psrtpriv->Wifi_Error_Status); DBG_8192C("==>%s error_status(0x%x)\n",__FUNCTION__,psrtpriv->Wifi_Error_Status);
status = (psrtpriv->Wifi_Error_Status &( ~(USB_READ_PORT_FAIL|USB_WRITE_PORT_FAIL))); status = (psrtpriv->Wifi_Error_Status &( ~(USB_READ_PORT_FAIL|USB_WRITE_PORT_FAIL)));
} }
DBG_8192C("==> %s wifi_status(0x%x)\n",__FUNCTION__,status); DBG_8192C("==> %s wifi_status(0x%x)\n",__FUNCTION__,status);

6
core/rtw_tdls.c
View file

@ -441,7 +441,7 @@ void rtw_tdls_process_wfd_ie(struct tdls_info *ptdlsinfo, u8 *ptr, u8 length)
if ( attr_contentlen ) if ( attr_contentlen )
{ {
_rtw_memcpy(ptdlsinfo->wfd_info->peer_ip_address, ( attr_content + 1 ), 4); _rtw_memcpy(ptdlsinfo->wfd_info->peer_ip_address, ( attr_content + 1 ), 4);
DBG_871X( "[%s] Peer IP = %02u.%02u.%02u.%02u \n", __FUNCTION__, DBG_871X( "[%s] Peer IP = %02u.%02u.%02u.%02u\n", __FUNCTION__,
ptdlsinfo->wfd_info->peer_ip_address[0], ptdlsinfo->wfd_info->peer_ip_address[1], ptdlsinfo->wfd_info->peer_ip_address[0], ptdlsinfo->wfd_info->peer_ip_address[1],
ptdlsinfo->wfd_info->peer_ip_address[2], ptdlsinfo->wfd_info->peer_ip_address[3] ptdlsinfo->wfd_info->peer_ip_address[2], ptdlsinfo->wfd_info->peer_ip_address[3]
); );
@ -1865,7 +1865,7 @@ sint On_TDLS_Ch_Switch_Rsp(_adapter *adapter, union recv_frame *precv_frame)
ptdls_sta->option=7; ptdls_sta->option=7;
rtw_tdls_cmd(adapter, ptdls_sta->hwaddr, TDLS_OFF_CH); rtw_tdls_cmd(adapter, ptdls_sta->hwaddr, TDLS_OFF_CH);
}else{ }else{
DBG_871X("receive unsolicited channel switch response \n"); DBG_871X("receive unsolicited channel switch response\n");
rtw_tdls_cmd(adapter, ptdls_sta->hwaddr, TDLS_CS_OFF); rtw_tdls_cmd(adapter, ptdls_sta->hwaddr, TDLS_CS_OFF);
} }
return _FAIL; return _FAIL;
@ -2185,7 +2185,7 @@ void rtw_build_tdls_setup_rsp_ies(_adapter * padapter, struct xmit_frame * pxmit
if (ptdls_sta->stat_code!=0) //invalid setup request if (ptdls_sta->stat_code!=0) //invalid setup request
{ {
DBG_871X("ptdls_sta->stat_code:%04x \n", ptdls_sta->stat_code); DBG_871X("ptdls_sta->stat_code:%04x\n", ptdls_sta->stat_code);
return; return;
} }

62
core/rtw_wapi.c
View file

@ -390,7 +390,7 @@ u8 rtw_wapi_is_wai_packet(_adapter* padapter,u8 *pkt_data)
//YJ,add,091103. Data frame may also have skb->data[30]=0x88 and skb->data[31]=0xb4. //YJ,add,091103. Data frame may also have skb->data[30]=0x88 and skb->data[31]=0xb4.
if ((pkt_data[1]&0x40) !=0) if ((pkt_data[1]&0x40) !=0)
{ {
DBG_871X("data is privacy \n"); DBG_871X("data is privacy\n");
return 0; return 0;
} }
@ -499,14 +499,14 @@ u8 rtw_wapi_check_for_drop(
if (precv_hdr->bIsWaiPacket== 0x8) if (precv_hdr->bIsWaiPacket== 0x8)
{ {
DBG_871X("rtw_wapi_check_for_drop: dump packet \n"); DBG_871X("rtw_wapi_check_for_drop: dump packet\n");
for (i=0;i<50;i++) for (i=0;i<50;i++)
{ {
DBG_871X("%02X ",ptr[i]); DBG_871X("%02X ",ptr[i]);
if ((i+1) %8 ==0) if ((i+1) %8 ==0)
DBG_871X("\n"); DBG_871X("\n");
} }
DBG_871X("\n rtw_wapi_check_for_drop: dump packet \n"); DBG_871X("\n rtw_wapi_check_for_drop: dump packet\n");
for (i=0;i<16;i++) for (i=0;i<16;i++)
{ {
@ -516,7 +516,7 @@ u8 rtw_wapi_check_for_drop(
if (i== 16) if (i== 16)
{ {
WAPI_TRACE(WAPI_RX,"rtw_wapi_check_for_drop: drop with zero BKID \n"); WAPI_TRACE(WAPI_RX,"rtw_wapi_check_for_drop: drop with zero BKID\n");
return true; return true;
} }
else else
@ -544,12 +544,12 @@ u8 rtw_wapi_check_for_drop(
{ {
if (IS_MCAST(precv_hdr->attrib.ra)) if (IS_MCAST(precv_hdr->attrib.ra))
{ {
WAPI_TRACE(WAPI_RX,"rtw_wapi_check_for_drop: multicast case \n"); WAPI_TRACE(WAPI_RX,"rtw_wapi_check_for_drop: multicast case\n");
pLastRecvPN = pWapiSta->lastRxMulticastPN; pLastRecvPN = pWapiSta->lastRxMulticastPN;
} }
else else
{ {
WAPI_TRACE(WAPI_RX,"rtw_wapi_check_for_drop: unicast case \n"); WAPI_TRACE(WAPI_RX,"rtw_wapi_check_for_drop: unicast case\n");
switch (precv_hdr->UserPriority) switch (precv_hdr->UserPriority)
{ {
case 0: case 0:
@ -569,7 +569,7 @@ u8 rtw_wapi_check_for_drop(
pLastRecvPN = pWapiSta->lastRxUnicastPNVOQueue; pLastRecvPN = pWapiSta->lastRxUnicastPNVOQueue;
break; break;
default: default:
WAPI_TRACE(WAPI_ERR,"%s: Unknown TID \n",__FUNCTION__); WAPI_TRACE(WAPI_ERR,"%s: Unknown TID\n",__FUNCTION__);
break; break;
} }
} }
@ -738,41 +738,41 @@ void rtw_wapi_return_one_sta_info(_adapter *padapter, u8 *MacAddr)
} }
WAPI_TRACE(WAPI_API, " %s: after clear bkid \n", __FUNCTION__); WAPI_TRACE(WAPI_API, " %s: after clear bkid\n", __FUNCTION__);
//Remove STA info //Remove STA info
if (list_empty(&(pWapiInfo->wapiSTAUsedList))){ if (list_empty(&(pWapiInfo->wapiSTAUsedList))){
WAPI_TRACE(WAPI_API, " %s: wapiSTAUsedList is null \n", __FUNCTION__); WAPI_TRACE(WAPI_API, " %s: wapiSTAUsedList is null\n", __FUNCTION__);
return; return;
}else{ }else{
WAPI_TRACE(WAPI_API, " %s: wapiSTAUsedList is not null \n", __FUNCTION__); WAPI_TRACE(WAPI_API, " %s: wapiSTAUsedList is not null\n", __FUNCTION__);
#if 0 #if 0
pWapiStaInfo=(PRT_WAPI_STA_INFO)list_entry((pWapiInfo->wapiSTAUsedList.next),RT_WAPI_STA_INFO,list); pWapiStaInfo=(PRT_WAPI_STA_INFO)list_entry((pWapiInfo->wapiSTAUsedList.next),RT_WAPI_STA_INFO,list);
list_for_each_entry(pWapiStaInfo, &(pWapiInfo->wapiSTAUsedList), list) { list_for_each_entry(pWapiStaInfo, &(pWapiInfo->wapiSTAUsedList), list) {
DBG_871X("MAC Addr %02x-%02x-%02x-%02x-%02x-%02x \n",MacAddr[0],MacAddr[1],MacAddr[2],MacAddr[3],MacAddr[4],MacAddr[5]); DBG_871X("MAC Addr %02x-%02x-%02x-%02x-%02x-%02x\n",MacAddr[0],MacAddr[1],MacAddr[2],MacAddr[3],MacAddr[4],MacAddr[5]);
DBG_871X("peer Addr %02x-%02x-%02x-%02x-%02x-%02x \n",pWapiStaInfo->PeerMacAddr[0],pWapiStaInfo->PeerMacAddr[1],pWapiStaInfo->PeerMacAddr[2],pWapiStaInfo->PeerMacAddr[3],pWapiStaInfo->PeerMacAddr[4],pWapiStaInfo->PeerMacAddr[5]); DBG_871X("peer Addr %02x-%02x-%02x-%02x-%02x-%02x\n",pWapiStaInfo->PeerMacAddr[0],pWapiStaInfo->PeerMacAddr[1],pWapiStaInfo->PeerMacAddr[2],pWapiStaInfo->PeerMacAddr[3],pWapiStaInfo->PeerMacAddr[4],pWapiStaInfo->PeerMacAddr[5]);
if (pWapiStaInfo == NULL) if (pWapiStaInfo == NULL)
{ {
WAPI_TRACE(WAPI_API, " %s: pWapiStaInfo == NULL Case \n", __FUNCTION__); WAPI_TRACE(WAPI_API, " %s: pWapiStaInfo == NULL Case\n", __FUNCTION__);
return; return;
} }
if (pWapiStaInfo->PeerMacAddr == NULL) if (pWapiStaInfo->PeerMacAddr == NULL)
{ {
WAPI_TRACE(WAPI_API, " %s: pWapiStaInfo->PeerMacAddr == NULL Case \n", __FUNCTION__); WAPI_TRACE(WAPI_API, " %s: pWapiStaInfo->PeerMacAddr == NULL Case\n", __FUNCTION__);
return; return;
} }
if (MacAddr == NULL) if (MacAddr == NULL)
{ {
WAPI_TRACE(WAPI_API, " %s: MacAddr == NULL Case \n", __FUNCTION__); WAPI_TRACE(WAPI_API, " %s: MacAddr == NULL Case\n", __FUNCTION__);
return; return;
} }
@ -792,7 +792,7 @@ void rtw_wapi_return_one_sta_info(_adapter *padapter, u8 *MacAddr)
{ {
pWapiStaInfo = (PRT_WAPI_STA_INFO)list_entry(pWapiInfo->wapiSTAUsedList.next, RT_WAPI_STA_INFO, list); pWapiStaInfo = (PRT_WAPI_STA_INFO)list_entry(pWapiInfo->wapiSTAUsedList.next, RT_WAPI_STA_INFO, list);
DBG_871X("peer Addr %02x-%02x-%02x-%02x-%02x-%02x \n",pWapiStaInfo->PeerMacAddr[0],pWapiStaInfo->PeerMacAddr[1],pWapiStaInfo->PeerMacAddr[2],pWapiStaInfo->PeerMacAddr[3],pWapiStaInfo->PeerMacAddr[4],pWapiStaInfo->PeerMacAddr[5]); DBG_871X("peer Addr %02x-%02x-%02x-%02x-%02x-%02x\n",pWapiStaInfo->PeerMacAddr[0],pWapiStaInfo->PeerMacAddr[1],pWapiStaInfo->PeerMacAddr[2],pWapiStaInfo->PeerMacAddr[3],pWapiStaInfo->PeerMacAddr[4],pWapiStaInfo->PeerMacAddr[5]);
list_del_init(&pWapiStaInfo->list); list_del_init(&pWapiStaInfo->list);
memset(pWapiStaInfo->PeerMacAddr,0,ETH_ALEN); memset(pWapiStaInfo->PeerMacAddr,0,ETH_ALEN);
@ -1003,7 +1003,7 @@ void wapi_test_set_key(struct _adapter *padapter, u8* buf)
if (bAuthenticator){ //authenticator if (bAuthenticator){ //authenticator
memcpy(pWapiSta->lastTxUnicastPN,WapiAEPNInitialValueSrc,16); memcpy(pWapiSta->lastTxUnicastPN,WapiAEPNInitialValueSrc,16);
if (!bUpdate) { //first if (!bUpdate) { //first
WAPI_TRACE(WAPI_INIT,"AE fisrt set usk \n"); WAPI_TRACE(WAPI_INIT,"AE fisrt set usk\n");
pWapiSta->wapiUsk.bSet = true; pWapiSta->wapiUsk.bSet = true;
memcpy(pWapiSta->wapiUsk.dataKey,data+10,16); memcpy(pWapiSta->wapiUsk.dataKey,data+10,16);
memcpy(pWapiSta->wapiUsk.micKey,data+26,16); memcpy(pWapiSta->wapiUsk.micKey,data+26,16);
@ -1014,7 +1014,7 @@ void wapi_test_set_key(struct _adapter *padapter, u8* buf)
} }
else //update else //update
{ {
WAPI_TRACE(WAPI_INIT, "AE update usk \n"); WAPI_TRACE(WAPI_INIT, "AE update usk\n");
pWapiSta->wapiUskUpdate.bSet = true; pWapiSta->wapiUskUpdate.bSet = true;
pWapiSta->bAuthenticatorInUpdata = true; pWapiSta->bAuthenticatorInUpdata = true;
memcpy(pWapiSta->wapiUskUpdate.dataKey,data+10,16); memcpy(pWapiSta->wapiUskUpdate.dataKey,data+10,16);
@ -1030,7 +1030,7 @@ void wapi_test_set_key(struct _adapter *padapter, u8* buf)
} }
else{ else{
if (!bUpdate){ if (!bUpdate){
WAPI_TRACE(WAPI_INIT,"ASUE fisrt set usk \n"); WAPI_TRACE(WAPI_INIT,"ASUE fisrt set usk\n");
if (bTxEnable){ if (bTxEnable){
pWapiSta->wapiUsk.bTxEnable = true; pWapiSta->wapiUsk.bTxEnable = true;
memcpy(pWapiSta->lastTxUnicastPN,WapiASUEPNInitialValueSrc,16); memcpy(pWapiSta->lastTxUnicastPN,WapiASUEPNInitialValueSrc,16);
@ -1042,7 +1042,7 @@ void wapi_test_set_key(struct _adapter *padapter, u8* buf)
pWapiSta->wapiUsk.bTxEnable = false; pWapiSta->wapiUsk.bTxEnable = false;
} }
}else{ }else{
WAPI_TRACE(WAPI_INIT,"ASUE update usk \n"); WAPI_TRACE(WAPI_INIT,"ASUE update usk\n");
if (bTxEnable){ if (bTxEnable){
pWapiSta->wapiUskUpdate.bTxEnable = true; pWapiSta->wapiUskUpdate.bTxEnable = true;
if (pWapiSta->wapiUskUpdate.bSet){ if (pWapiSta->wapiUskUpdate.bSet){
@ -1078,12 +1078,12 @@ void wapi_test_set_key(struct _adapter *padapter, u8* buf)
memcpy(pWapiInfo->lastTxMulticastPN,WapiAEMultiCastPNInitialValueSrc,16); memcpy(pWapiInfo->lastTxMulticastPN,WapiAEMultiCastPNInitialValueSrc,16);
if (!bUpdate){ //first if (!bUpdate){ //first
WAPI_TRACE(WAPI_INIT, "AE fisrt set msk \n"); WAPI_TRACE(WAPI_INIT, "AE fisrt set msk\n");
if (!pWapiSta->bSetkeyOk) if (!pWapiSta->bSetkeyOk)
pWapiSta->bSetkeyOk = true; pWapiSta->bSetkeyOk = true;
pWapiInfo->bFirstAuthentiateInProgress= false; pWapiInfo->bFirstAuthentiateInProgress= false;
}else{ //update }else{ //update
WAPI_TRACE(WAPI_INIT,"AE update msk \n"); WAPI_TRACE(WAPI_INIT,"AE update msk\n");
} }
WAPI_DATA(WAPI_INIT, "SetKey - AE MSK Data Key", pWapiInfo->wapiTxMsk.dataKey, 16); WAPI_DATA(WAPI_INIT, "SetKey - AE MSK Data Key", pWapiInfo->wapiTxMsk.dataKey, 16);
@ -1091,7 +1091,7 @@ void wapi_test_set_key(struct _adapter *padapter, u8* buf)
} }
else{ else{
if (!bUpdate){ if (!bUpdate){
WAPI_TRACE(WAPI_INIT,"ASUE fisrt set msk \n"); WAPI_TRACE(WAPI_INIT,"ASUE fisrt set msk\n");
pWapiSta->wapiMsk.bSet = true; pWapiSta->wapiMsk.bSet = true;
memcpy(pWapiSta->wapiMsk.dataKey,data+10,16); memcpy(pWapiSta->wapiMsk.dataKey,data+10,16);
memcpy(pWapiSta->wapiMsk.micKey,data+26,16); memcpy(pWapiSta->wapiMsk.micKey,data+26,16);
@ -1103,7 +1103,7 @@ void wapi_test_set_key(struct _adapter *padapter, u8* buf)
WAPI_DATA(WAPI_INIT, "SetKey - ASUE MSK Data Key", pWapiSta->wapiMsk.dataKey, 16); WAPI_DATA(WAPI_INIT, "SetKey - ASUE MSK Data Key", pWapiSta->wapiMsk.dataKey, 16);
WAPI_DATA(WAPI_INIT, "SetKey - ASUE MSK Mic Key", pWapiSta->wapiMsk.micKey, 16); WAPI_DATA(WAPI_INIT, "SetKey - ASUE MSK Mic Key", pWapiSta->wapiMsk.micKey, 16);
}else{ }else{
WAPI_TRACE(WAPI_INIT,"ASUE update msk \n"); WAPI_TRACE(WAPI_INIT,"ASUE update msk\n");
pWapiSta->wapiMskUpdate.bSet = true; pWapiSta->wapiMskUpdate.bSet = true;
memcpy(pWapiSta->wapiMskUpdate.dataKey,data+10,16); memcpy(pWapiSta->wapiMskUpdate.dataKey,data+10,16);
memcpy(pWapiSta->wapiMskUpdate.micKey,data+26,16); memcpy(pWapiSta->wapiMskUpdate.micKey,data+26,16);
@ -1113,7 +1113,7 @@ void wapi_test_set_key(struct _adapter *padapter, u8* buf)
} }
break; break;
default: default:
WAPI_TRACE(WAPI_ERR,"Unknown Flag \n"); WAPI_TRACE(WAPI_ERR,"Unknown Flag\n");
break; break;
} }
} }
@ -1225,7 +1225,7 @@ void rtw_wapi_get_iv(_adapter *padapter,u8 *pRA, u8*IV)
else else
{ {
if (list_empty(&pWapiInfo->wapiSTAUsedList)){ if (list_empty(&pWapiInfo->wapiSTAUsedList)){
WAPI_TRACE(WAPI_RX,"rtw_wapi_get_iv: list is empty \n"); WAPI_TRACE(WAPI_RX,"rtw_wapi_get_iv: list is empty\n");
_rtw_memset(IV,10,18); _rtw_memset(IV,10,18);
return; return;
} }
@ -1238,7 +1238,7 @@ void rtw_wapi_get_iv(_adapter *padapter,u8 *pRA, u8*IV)
} }
} }
WAPI_TRACE(WAPI_RX,"bFindMatchPeer: %d \n",bFindMatchPeer); WAPI_TRACE(WAPI_RX,"bFindMatchPeer: %d\n",bFindMatchPeer);
WAPI_DATA(WAPI_RX,"Addr",pRA,6); WAPI_DATA(WAPI_RX,"Addr",pRA,6);
if (bFindMatchPeer){ if (bFindMatchPeer){
@ -1281,7 +1281,7 @@ bool rtw_wapi_drop_for_key_absent(_adapter *padapter,u8 *pRA)
if (IS_MCAST(pRA)){ if (IS_MCAST(pRA)){
if (!pWapiInfo->wapiTxMsk.bTxEnable){ if (!pWapiInfo->wapiTxMsk.bTxEnable){
bDrop = true; bDrop = true;
WAPI_TRACE(WAPI_RX,"rtw_wapi_drop_for_key_absent: multicast key is absent \n"); WAPI_TRACE(WAPI_RX,"rtw_wapi_drop_for_key_absent: multicast key is absent\n");
return bDrop; return bDrop;
} }
} }
@ -1297,20 +1297,20 @@ bool rtw_wapi_drop_for_key_absent(_adapter *padapter,u8 *pRA)
if (bFindMatchPeer) { if (bFindMatchPeer) {
if (!pWapiSta->wapiUsk.bTxEnable){ if (!pWapiSta->wapiUsk.bTxEnable){
bDrop = true; bDrop = true;
WAPI_TRACE(WAPI_RX,"rtw_wapi_drop_for_key_absent: unicast key is absent \n"); WAPI_TRACE(WAPI_RX,"rtw_wapi_drop_for_key_absent: unicast key is absent\n");
return bDrop; return bDrop;
} }
} }
else{ else{
bDrop = true; bDrop = true;
WAPI_TRACE(WAPI_RX,"rtw_wapi_drop_for_key_absent: no peer find \n"); WAPI_TRACE(WAPI_RX,"rtw_wapi_drop_for_key_absent: no peer find\n");
return bDrop; return bDrop;
} }
} }
else{ else{
bDrop = true; bDrop = true;
WAPI_TRACE(WAPI_RX,"rtw_wapi_drop_for_key_absent: no sta exist \n"); WAPI_TRACE(WAPI_RX,"rtw_wapi_drop_for_key_absent: no sta exist\n");
return bDrop; return bDrop;
} }
} }

6
core/rtw_wapi_sms4.c
View file

@ -399,7 +399,7 @@ void WapiGetLastRxUnicastPNForQoSData(
memcpy(PNOut,pWapiStaInfo->lastRxUnicastPNVOQueue,16); memcpy(PNOut,pWapiStaInfo->lastRxUnicastPNVOQueue,16);
break; break;
default: default:
WAPI_TRACE(WAPI_ERR, "%s: Unknown TID \n", __FUNCTION__); WAPI_TRACE(WAPI_ERR, "%s: Unknown TID\n", __FUNCTION__);
break; break;
} }
WAPI_TRACE(WAPI_RX, "<=========== %s\n", __FUNCTION__); WAPI_TRACE(WAPI_RX, "<=========== %s\n", __FUNCTION__);
@ -432,7 +432,7 @@ void WapiSetLastRxUnicastPNForQoSData(
memcpy(pWapiStaInfo->lastRxUnicastPNVOQueue,PNIn,16); memcpy(pWapiStaInfo->lastRxUnicastPNVOQueue,PNIn,16);
break; break;
default: default:
WAPI_TRACE(WAPI_ERR, "%s: Unknown TID \n", __FUNCTION__); WAPI_TRACE(WAPI_ERR, "%s: Unknown TID\n", __FUNCTION__);
break; break;
} }
WAPI_TRACE(WAPI_RX, "<=========== %s\n", __FUNCTION__); WAPI_TRACE(WAPI_RX, "<=========== %s\n", __FUNCTION__);
@ -591,7 +591,7 @@ void SecSWSMS4Encryption(
WAPI_TRACE(WAPI_TX, "=========>%s\n", __FUNCTION__); WAPI_TRACE(WAPI_TX, "=========>%s\n", __FUNCTION__);
WAPI_TRACE(WAPI_TX,"hdrlen: %d \n",pattrib->hdrlen); WAPI_TRACE(WAPI_TX,"hdrlen: %d\n",pattrib->hdrlen);
return; return;

4
core/rtw_wlan_util.c
View file

@ -758,7 +758,7 @@ void read_cam(_adapter *padapter ,u8 entry)
for (j = 0; j < 6; j++) for (j = 0; j < 6; j++)
{ {
cmd = _ReadCAM(padapter ,addr+j); cmd = _ReadCAM(padapter ,addr+j);
DBG_8192C("offset:0x%02x => 0x%08x \n",addr+j,cmd); DBG_8192C("offset:0x%02x => 0x%08x\n",addr+j,cmd);
} }
DBG_8192C("*********************************\n"); DBG_8192C("*********************************\n");
} }
@ -1572,7 +1572,7 @@ int rtw_check_bcn_info(ADAPTER *Adapter, u8 *pframe, u32 packet_len)
if (pht_info) { if (pht_info) {
bcn_channel = pht_info->primary_channel; bcn_channel = pht_info->primary_channel;
} else { /* we don't find channel IE, so don't check it */ } else { /* we don't find channel IE, so don't check it */
DBG_871X("Oops: %s we don't find channel IE, so don't check it \n", __func__); DBG_871X("Oops: %s we don't find channel IE, so don't check it\n", __func__);
bcn_channel = Adapter->mlmeextpriv.cur_channel; bcn_channel = Adapter->mlmeextpriv.cur_channel;
} }
} }

24
core/rtw_xmit.c
View file

@ -679,7 +679,7 @@ static s32 update_attrib(_adapter *padapter, _pkt *pkt, struct pkt_attrib *pattr
((tmp[21] == 67) && (tmp[23] == 68))) { ((tmp[21] == 67) && (tmp[23] == 68))) {
// 68 : UDP BOOTP client // 68 : UDP BOOTP client
// 67 : UDP BOOTP server // 67 : UDP BOOTP server
RT_TRACE(_module_rtl871x_xmit_c_,_drv_err_,("======================update_attrib: get DHCP Packet \n")); RT_TRACE(_module_rtl871x_xmit_c_,_drv_err_,("======================update_attrib: get DHCP Packet\n"));
// Use low rate to send DHCP packet. // Use low rate to send DHCP packet.
//if (pMgntInfo->IOTAction & HT_IOT_ACT_WA_IOT_Broadcom) //if (pMgntInfo->IOTAction & HT_IOT_ACT_WA_IOT_Broadcom)
//{ //{
@ -783,7 +783,7 @@ static s32 update_attrib(_adapter *padapter, _pkt *pkt, struct pkt_attrib *pattr
if (psta->ieee8021x_blocked == _TRUE) if (psta->ieee8021x_blocked == _TRUE)
{ {
RT_TRACE(_module_rtl871x_xmit_c_,_drv_err_,("\n psta->ieee8021x_blocked == _TRUE \n")); RT_TRACE(_module_rtl871x_xmit_c_,_drv_err_,("\n psta->ieee8021x_blocked == _TRUE\n"));
pattrib->encrypt = 0; pattrib->encrypt = 0;
@ -1019,7 +1019,7 @@ _func_enter_;
rtw_secgetmic(&micdata,&(mic[0])); rtw_secgetmic(&micdata,&(mic[0]));
RT_TRACE(_module_rtl871x_xmit_c_,_drv_err_,("xmitframe_addmic: before add mic code!!!\n")); RT_TRACE(_module_rtl871x_xmit_c_,_drv_err_,("xmitframe_addmic: before add mic code!!!\n"));
RT_TRACE(_module_rtl871x_xmit_c_,_drv_err_,("xmitframe_addmic: pattrib->last_txcmdsz=%d!!!\n",pattrib->last_txcmdsz)); RT_TRACE(_module_rtl871x_xmit_c_,_drv_err_,("xmitframe_addmic: pattrib->last_txcmdsz=%d!!!\n",pattrib->last_txcmdsz));
RT_TRACE(_module_rtl871x_xmit_c_,_drv_err_,("xmitframe_addmic: mic[0]=0x%.2x ,mic[1]=0x%.2x ,mic[2]=0x%.2x ,mic[3]=0x%.2x \n\ RT_TRACE(_module_rtl871x_xmit_c_,_drv_err_,("xmitframe_addmic: mic[0]=0x%.2x ,mic[1]=0x%.2x ,mic[2]=0x%.2x ,mic[3]=0x%.2x\n\
mic[4]=0x%.2x ,mic[5]=0x%.2x ,mic[6]=0x%.2x ,mic[7]=0x%.2x !!!!\n", mic[4]=0x%.2x ,mic[5]=0x%.2x ,mic[6]=0x%.2x ,mic[7]=0x%.2x !!!!\n",
mic[0],mic[1],mic[2],mic[3],mic[4],mic[5],mic[6],mic[7])); mic[0],mic[1],mic[2],mic[3],mic[4],mic[5],mic[6],mic[7]));
//add mic code and add the mic code length in last_txcmdsz //add mic code and add the mic code length in last_txcmdsz
@ -1668,7 +1668,7 @@ _func_enter_;
return _FAIL; return _FAIL;
if (pxmitframe->buf_addr == NULL){ if (pxmitframe->buf_addr == NULL){
DBG_8192C("==> %s buf_addr==NULL \n",__FUNCTION__); DBG_8192C("==> %s buf_addr==NULL\n",__FUNCTION__);
return _FAIL; return _FAIL;
} }
@ -2450,7 +2450,7 @@ _func_enter_;
case 2: case 2:
ptxservq = &(psta->sta_xmitpriv.bk_q); ptxservq = &(psta->sta_xmitpriv.bk_q);
*(ac) = 3; *(ac) = 3;
RT_TRACE(_module_rtl871x_xmit_c_,_drv_info_,("rtw_get_sta_pending : BK \n")); RT_TRACE(_module_rtl871x_xmit_c_,_drv_info_,("rtw_get_sta_pending : BK\n"));
break; break;
case 4: case 4:
@ -2464,7 +2464,7 @@ _func_enter_;
case 7: case 7:
ptxservq = &(psta->sta_xmitpriv.vo_q); ptxservq = &(psta->sta_xmitpriv.vo_q);
*(ac) = 0; *(ac) = 0;
RT_TRACE(_module_rtl871x_xmit_c_,_drv_info_,("rtw_get_sta_pending : VO \n")); RT_TRACE(_module_rtl871x_xmit_c_,_drv_info_,("rtw_get_sta_pending : VO\n"));
break; break;
case 0: case 0:
@ -2472,7 +2472,7 @@ _func_enter_;
default: default:
ptxservq = &(psta->sta_xmitpriv.be_q); ptxservq = &(psta->sta_xmitpriv.be_q);
*(ac) = 2; *(ac) = 2;
RT_TRACE(_module_rtl871x_xmit_c_,_drv_info_,("rtw_get_sta_pending : BE \n")); RT_TRACE(_module_rtl871x_xmit_c_,_drv_info_,("rtw_get_sta_pending : BE\n"));
break; break;
} }
@ -2507,7 +2507,7 @@ _func_enter_;
ptxservq = &(psta->sta_xmitpriv.bk_q); ptxservq = &(psta->sta_xmitpriv.bk_q);
*ppstapending = &padapter->xmitpriv.bk_pending; *ppstapending = &padapter->xmitpriv.bk_pending;
(phwxmits+3)->accnt++; (phwxmits+3)->accnt++;
RT_TRACE(_module_rtl871x_xmit_c_,_drv_info_,("rtw_get_sta_pending : BK \n")); RT_TRACE(_module_rtl871x_xmit_c_,_drv_info_,("rtw_get_sta_pending : BK\n"));
break; break;
case 4: case 4:
@ -2523,7 +2523,7 @@ _func_enter_;
ptxservq = &(psta->sta_xmitpriv.vo_q); ptxservq = &(psta->sta_xmitpriv.vo_q);
*ppstapending = &padapter->xmitpriv.vo_pending; *ppstapending = &padapter->xmitpriv.vo_pending;
(phwxmits+0)->accnt++; (phwxmits+0)->accnt++;
RT_TRACE(_module_rtl871x_xmit_c_,_drv_info_,("rtw_get_sta_pending : VO \n")); RT_TRACE(_module_rtl871x_xmit_c_,_drv_info_,("rtw_get_sta_pending : VO\n"));
break; break;
case 0: case 0:
@ -2532,7 +2532,7 @@ _func_enter_;
ptxservq = &(psta->sta_xmitpriv.be_q); ptxservq = &(psta->sta_xmitpriv.be_q);
*ppstapending = &padapter->xmitpriv.be_pending; *ppstapending = &padapter->xmitpriv.be_pending;
(phwxmits+2)->accnt++; (phwxmits+2)->accnt++;
RT_TRACE(_module_rtl871x_xmit_c_,_drv_info_,("rtw_get_sta_pending : BE \n")); RT_TRACE(_module_rtl871x_xmit_c_,_drv_info_,("rtw_get_sta_pending : BE\n"));
break; break;
} }
@ -2984,7 +2984,7 @@ s32 rtw_xmit(_adapter *padapter, _pkt **ppkt)
{ {
if (rtw_wapi_drop_for_key_absent(padapter, pxmitframe->attrib.ra)) if (rtw_wapi_drop_for_key_absent(padapter, pxmitframe->attrib.ra))
{ {
WAPI_TRACE(WAPI_RX,"drop for key absend when tx \n"); WAPI_TRACE(WAPI_RX,"drop for key absend when tx\n");
res = _FAIL; res = _FAIL;
} }
} }
@ -3701,7 +3701,7 @@ struct xmit_buf* dequeue_pending_xmitbuf_under_survey(
} }
else else
{ {
DBG_871X("%s, !!!ERROR!!! For USB, TODO ITEM \n", __FUNCTION__); DBG_871X("%s, !!!ERROR!!! For USB, TODO ITEM\n", __FUNCTION__);
} }
#else #else
type = GetFrameSubType(pxmitbuf->pbuf + TXDESC_OFFSET); type = GetFrameSubType(pxmitbuf->pbuf + TXDESC_OFFSET);

14
hal/Hal8188ERateAdaptive.c
View file

@ -258,7 +258,7 @@ RateDownFinish:
ODM_RT_TRACE(pDM_Odm,ODM_COMP_RATE_ADAPTIVE, ODM_DBG_LOUD, ("Rate down, RPT Timing default\n")); ODM_RT_TRACE(pDM_Odm,ODM_COMP_RATE_ADAPTIVE, ODM_DBG_LOUD, ("Rate down, RPT Timing default\n"));
ODM_RT_TRACE(pDM_Odm,ODM_COMP_RATE_ADAPTIVE, ODM_DBG_TRACE, ("RAWaitingCounter %d, RAPendingCounter %d",pRaInfo->RAWaitingCounter,pRaInfo->RAPendingCounter)); ODM_RT_TRACE(pDM_Odm,ODM_COMP_RATE_ADAPTIVE, ODM_DBG_TRACE, ("RAWaitingCounter %d, RAPendingCounter %d",pRaInfo->RAWaitingCounter,pRaInfo->RAPendingCounter));
ODM_RT_TRACE(pDM_Odm,ODM_COMP_RATE_ADAPTIVE, ODM_DBG_LOUD, ("Rate down to RateID %d RateSGI %d\n", RateID, pRaInfo->RateSGI)); ODM_RT_TRACE(pDM_Odm,ODM_COMP_RATE_ADAPTIVE, ODM_DBG_LOUD, ("Rate down to RateID %d RateSGI %d\n", RateID, pRaInfo->RateSGI));
ODM_RT_TRACE(pDM_Odm,ODM_COMP_RATE_ADAPTIVE, ODM_DBG_TRACE, ("<=====odm_RateDown_8188E() \n")); ODM_RT_TRACE(pDM_Odm,ODM_COMP_RATE_ADAPTIVE, ODM_DBG_TRACE, ("<=====odm_RateDown_8188E()\n"));
return 0; return 0;
} }
@ -271,7 +271,7 @@ odm_RateUp_8188E(
u1Byte RateID, HighestRate; u1Byte RateID, HighestRate;
u1Byte i; u1Byte i;
ODM_RT_TRACE(pDM_Odm,ODM_COMP_RATE_ADAPTIVE, ODM_DBG_TRACE, ("=====>odm_RateUp_8188E() \n")); ODM_RT_TRACE(pDM_Odm,ODM_COMP_RATE_ADAPTIVE, ODM_DBG_TRACE, ("=====>odm_RateUp_8188E()\n"));
if (NULL == pRaInfo) if (NULL == pRaInfo)
{ {
ODM_RT_TRACE(pDM_Odm,ODM_COMP_RATE_ADAPTIVE, ODM_DBG_LOUD, ("odm_RateUp_8188E(): pRaInfo is NULL\n")); ODM_RT_TRACE(pDM_Odm,ODM_COMP_RATE_ADAPTIVE, ODM_DBG_LOUD, ("odm_RateUp_8188E(): pRaInfo is NULL\n"));
@ -326,7 +326,7 @@ RateUpfinish:
pRaInfo->DecisionRate=RateID; pRaInfo->DecisionRate=RateID;
ODM_RT_TRACE(pDM_Odm,ODM_COMP_RATE_ADAPTIVE, ODM_DBG_LOUD, ("Rate up to RateID %d\n", RateID)); ODM_RT_TRACE(pDM_Odm,ODM_COMP_RATE_ADAPTIVE, ODM_DBG_LOUD, ("Rate up to RateID %d\n", RateID));
ODM_RT_TRACE(pDM_Odm,ODM_COMP_RATE_ADAPTIVE, ODM_DBG_TRACE, ("RAWaitingCounter %d, RAPendingCounter %d",pRaInfo->RAWaitingCounter,pRaInfo->RAPendingCounter)); ODM_RT_TRACE(pDM_Odm,ODM_COMP_RATE_ADAPTIVE, ODM_DBG_TRACE, ("RAWaitingCounter %d, RAPendingCounter %d",pRaInfo->RAWaitingCounter,pRaInfo->RAPendingCounter));
ODM_RT_TRACE(pDM_Odm,ODM_COMP_RATE_ADAPTIVE, ODM_DBG_TRACE, ("<=====odm_RateUp_8188E() \n")); ODM_RT_TRACE(pDM_Odm,ODM_COMP_RATE_ADAPTIVE, ODM_DBG_TRACE, ("<=====odm_RateUp_8188E()\n"));
return 0; return 0;
} }
@ -347,7 +347,7 @@ odm_RateDecision_8188E(
//u4Byte pool_retry; //u4Byte pool_retry;
static u1Byte DynamicTxRPTTimingCounter=0; static u1Byte DynamicTxRPTTimingCounter=0;
ODM_RT_TRACE(pDM_Odm,ODM_COMP_RATE_ADAPTIVE, ODM_DBG_TRACE, ("=====>odm_RateDecision_8188E() \n")); ODM_RT_TRACE(pDM_Odm,ODM_COMP_RATE_ADAPTIVE, ODM_DBG_TRACE, ("=====>odm_RateDecision_8188E()\n"));
if (pRaInfo->Active && (pRaInfo->TOTAL > 0)) // STA used and data packet exits if (pRaInfo->Active && (pRaInfo->TOTAL > 0)) // STA used and data packet exits
{ {
@ -426,7 +426,7 @@ odm_RateDecision_8188E(
odm_ResetRaCounter_8188E( pRaInfo); odm_ResetRaCounter_8188E( pRaInfo);
} }
ODM_RT_TRACE(pDM_Odm,ODM_COMP_RATE_ADAPTIVE, ODM_DBG_TRACE, ("<=====odm_RateDecision_8188E() \n")); ODM_RT_TRACE(pDM_Odm,ODM_COMP_RATE_ADAPTIVE, ODM_DBG_TRACE, ("<=====odm_RateDecision_8188E()\n"));
} }
static int static int
@ -527,7 +527,7 @@ odm_ARFBRefresh_8188E(
pRaInfo->DecisionRate = pRaInfo->HighestRate; pRaInfo->DecisionRate = pRaInfo->HighestRate;
ODM_RT_TRACE(pDM_Odm,ODM_COMP_RATE_ADAPTIVE, ODM_DBG_LOUD, ODM_RT_TRACE(pDM_Odm,ODM_COMP_RATE_ADAPTIVE, ODM_DBG_LOUD,
("ODM_ARFBRefresh_8188E(): RateID=%d RateMask=%8.8x RAUseRate=%8.8x HighestRate=%d,DecisionRate=%d \n", ("ODM_ARFBRefresh_8188E(): RateID=%d RateMask=%8.8x RAUseRate=%8.8x HighestRate=%d,DecisionRate=%d\n",
pRaInfo->RateID, pRaInfo->RateMask, pRaInfo->RAUseRate, pRaInfo->HighestRate,pRaInfo->DecisionRate)); pRaInfo->RateID, pRaInfo->RateMask, pRaInfo->RAUseRate, pRaInfo->HighestRate,pRaInfo->DecisionRate));
return 0; return 0;
} }
@ -699,7 +699,7 @@ ODM_RAInfo_Init(
//printk("%s ==>WirelessMode:0x%08x ,max_raid_idx:0x%02x\n ",__FUNCTION__,WirelessMode,max_rate_idx); //printk("%s ==>WirelessMode:0x%08x ,max_raid_idx:0x%02x\n ",__FUNCTION__,WirelessMode,max_rate_idx);
ODM_RT_TRACE(pDM_Odm,ODM_COMP_RATE_ADAPTIVE, ODM_DBG_LOUD, ODM_RT_TRACE(pDM_Odm,ODM_COMP_RATE_ADAPTIVE, ODM_DBG_LOUD,
("ODM_RAInfo_Init(): WirelessMode:0x%08x ,max_raid_idx:0x%02x \n", ("ODM_RAInfo_Init(): WirelessMode:0x%08x ,max_raid_idx:0x%02x\n",
WirelessMode,max_rate_idx)); WirelessMode,max_rate_idx));
pRaInfo->DecisionRate = max_rate_idx; pRaInfo->DecisionRate = max_rate_idx;

12
hal/HalHWImg8188E_BB.c
View file

@ -299,7 +299,7 @@ ODM_ReadAndConfig_AGC_TAB_1T_8188E(
if (rtw_IOL_exec_cmds_sync(pDM_Odm->Adapter, pxmit_frame, 1000, bndy_cnt)) if (rtw_IOL_exec_cmds_sync(pDM_Odm->Adapter, pxmit_frame, 1000, bndy_cnt))
{ {
#ifdef CONFIG_IOL_IOREG_CFG_DBG #ifdef CONFIG_IOL_IOREG_CFG_DBG
printk("~~~ %s Success !!! \n",__FUNCTION__); printk("~~~ %s Success !!!\n",__FUNCTION__);
{ {
//dump data from TX packet buffer //dump data from TX packet buffer
rtw_IOL_cmd_tx_pkt_buf_dump(pDM_Odm->Adapter,pxmit_frame->attrib.pktlen+32); rtw_IOL_cmd_tx_pkt_buf_dump(pDM_Odm->Adapter,pxmit_frame->attrib.pktlen+32);
@ -308,7 +308,7 @@ ODM_ReadAndConfig_AGC_TAB_1T_8188E(
} }
else{ else{
printk("~~~ %s IOL_exec_cmds Failed !!! \n",__FUNCTION__); printk("~~~ %s IOL_exec_cmds Failed !!!\n",__FUNCTION__);
#ifdef CONFIG_IOL_IOREG_CFG_DBG #ifdef CONFIG_IOL_IOREG_CFG_DBG
{ {
//dump data from TX packet buffer //dump data from TX packet buffer
@ -693,17 +693,17 @@ ODM_ReadAndConfig_PHY_REG_1T_8188E(
if (rtw_IOL_exec_cmds_sync(pDM_Odm->Adapter, pxmit_frame, 1000, bndy_cnt)) if (rtw_IOL_exec_cmds_sync(pDM_Odm->Adapter, pxmit_frame, 1000, bndy_cnt))
{ {
#ifdef CONFIG_IOL_IOREG_CFG_DBG #ifdef CONFIG_IOL_IOREG_CFG_DBG
printk("~~~ %s IOL_exec_cmds Success !!! \n",__FUNCTION__); printk("~~~ %s IOL_exec_cmds Success !!!\n",__FUNCTION__);
{ {
u4Byte idx; u4Byte idx;
u4Byte cdata; u4Byte cdata;
printk(" %s data compare => array_len:%d \n",__FUNCTION__,cmpdata_idx); printk(" %s data compare => array_len:%d\n",__FUNCTION__,cmpdata_idx);
printk("### %s data compared !!###\n",__FUNCTION__); printk("### %s data compared !!###\n",__FUNCTION__);
for (idx=0;idx< cmpdata_idx;idx++) for (idx=0;idx< cmpdata_idx;idx++)
{ {
cdata = ODM_Read4Byte(pDM_Odm, cmpdata[idx].addr); cdata = ODM_Read4Byte(pDM_Odm, cmpdata[idx].addr);
if (cdata != cmpdata[idx].value){ if (cdata != cmpdata[idx].value){
printk(" addr:0x%04x, data:(0x%02x : 0x%02x) \n", printk(" addr:0x%04x, data:(0x%02x : 0x%02x)\n",
cmpdata[idx].addr,cmpdata[idx].value,cdata); cmpdata[idx].addr,cmpdata[idx].value,cdata);
rst = HAL_STATUS_FAILURE; rst = HAL_STATUS_FAILURE;
} }
@ -720,7 +720,7 @@ ODM_ReadAndConfig_PHY_REG_1T_8188E(
} }
else{ else{
rst = HAL_STATUS_FAILURE; rst = HAL_STATUS_FAILURE;
printk("~~~ IOL Config %s Failed !!! \n",__FUNCTION__); printk("~~~ IOL Config %s Failed !!!\n",__FUNCTION__);
#ifdef CONFIG_IOL_IOREG_CFG_DBG #ifdef CONFIG_IOL_IOREG_CFG_DBG
{ {
//dump data from TX packet buffer //dump data from TX packet buffer

6
hal/HalHWImg8188E_MAC.c
View file

@ -281,13 +281,13 @@ ODM_ReadAndConfig_MAC_REG_8188E(
if (rtw_IOL_exec_cmds_sync(pDM_Odm->Adapter, pxmit_frame, 1000, bndy_cnt)) if (rtw_IOL_exec_cmds_sync(pDM_Odm->Adapter, pxmit_frame, 1000, bndy_cnt))
{ {
#ifdef CONFIG_IOL_IOREG_CFG_DBG #ifdef CONFIG_IOL_IOREG_CFG_DBG
printk("~~~ IOL Config MAC Success !!! \n"); printk("~~~ IOL Config MAC Success !!!\n");
//compare writed data //compare writed data
{ {
u4Byte idx; u4Byte idx;
u1Byte cdata; u1Byte cdata;
// HAL_STATUS_FAILURE; // HAL_STATUS_FAILURE;
printk(" MAC data compare => array_len:%d \n",cmpdata_idx); printk(" MAC data compare => array_len:%d\n",cmpdata_idx);
for (idx=0;idx< cmpdata_idx;idx++) for (idx=0;idx< cmpdata_idx;idx++)
{ {
cdata = ODM_Read1Byte(pDM_Odm, cmpdata[idx].addr); cdata = ODM_Read1Byte(pDM_Odm, cmpdata[idx].addr);
@ -310,7 +310,7 @@ ODM_ReadAndConfig_MAC_REG_8188E(
} }
else{ else{
printk("~~~ MAC IOL_exec_cmds Failed !!! \n"); printk("~~~ MAC IOL_exec_cmds Failed !!!\n");
#ifdef CONFIG_IOL_IOREG_CFG_DBG #ifdef CONFIG_IOL_IOREG_CFG_DBG
{ {
//dump data from TX packet buffer //dump data from TX packet buffer

8
hal/HalHWImg8188E_RF.c
View file

@ -332,17 +332,17 @@ ODM_ReadAndConfig_RadioA_1T_8188E(
if (rtw_IOL_exec_cmds_sync(pDM_Odm->Adapter, pxmit_frame, 1000, bndy_cnt)) if (rtw_IOL_exec_cmds_sync(pDM_Odm->Adapter, pxmit_frame, 1000, bndy_cnt))
{ {
#ifdef CONFIG_IOL_IOREG_CFG_DBG #ifdef CONFIG_IOL_IOREG_CFG_DBG
printk("~~~ %s Success !!! \n",__FUNCTION__); printk("~~~ %s Success !!!\n",__FUNCTION__);
{ {
u4Byte idx; u4Byte idx;
u4Byte cdata; u4Byte cdata;
printk(" %s data compare => array_len:%d \n",__FUNCTION__,cmpdata_idx); printk(" %s data compare => array_len:%d\n",__FUNCTION__,cmpdata_idx);
printk("### %s data compared !!###\n",__FUNCTION__); printk("### %s data compared !!###\n",__FUNCTION__);
for (idx=0;idx< cmpdata_idx;idx++) for (idx=0;idx< cmpdata_idx;idx++)
{ {
cdata = ODM_GetRFReg(pDM_Odm, ODM_RF_PATH_A,cmpdata[idx].addr,bRFRegOffsetMask); cdata = ODM_GetRFReg(pDM_Odm, ODM_RF_PATH_A,cmpdata[idx].addr,bRFRegOffsetMask);
if (cdata != cmpdata[idx].value){ if (cdata != cmpdata[idx].value){
printk("addr:0x%04x, data:(0x%02x : 0x%02x) \n", printk("addr:0x%04x, data:(0x%02x : 0x%02x)\n",
cmpdata[idx].addr,cmpdata[idx].value,cdata); cmpdata[idx].addr,cmpdata[idx].value,cdata);
rst = HAL_STATUS_FAILURE; rst = HAL_STATUS_FAILURE;
} }
@ -358,7 +358,7 @@ ODM_ReadAndConfig_RadioA_1T_8188E(
} }
else{ else{
rst = HAL_STATUS_FAILURE; rst = HAL_STATUS_FAILURE;
printk("~~~ IOL Config %s Failed !!! \n",__FUNCTION__); printk("~~~ IOL Config %s Failed !!!\n",__FUNCTION__);
#ifdef CONFIG_IOL_IOREG_CFG_DBG #ifdef CONFIG_IOL_IOREG_CFG_DBG
{ {
//dump data from TX packet buffer //dump data from TX packet buffer

6
hal/HalPhyRf.c
View file

@ -1252,9 +1252,9 @@ if (pAdapter->registrypriv.mp_mode == 1)
is13simular = FALSE; is13simular = FALSE;
RTPRINT(FINIT, INIT_IQK, ("IQK !!!interface %d currentband %d ishardwareD %d \n", pAdapter->interfaceIndex, pHalData->CurrentBandType92D, IS_HARDWARE_TYPE_8192D(pAdapter))); RTPRINT(FINIT, INIT_IQK, ("IQK !!!interface %d currentband %d ishardwareD %d\n", pAdapter->interfaceIndex, pHalData->CurrentBandType92D, IS_HARDWARE_TYPE_8192D(pAdapter)));
AcquireCCKAndRWPageAControl(pAdapter); AcquireCCKAndRWPageAControl(pAdapter);
// RT_TRACE(COMP_INIT,DBG_LOUD,("Acquire Mutex in IQCalibrate \n")); // RT_TRACE(COMP_INIT,DBG_LOUD,("Acquire Mutex in IQCalibrate\n"));
for (i=0; i<3; i++) for (i=0; i<3; i++)
{ {
// if (IS_HARDWARE_TYPE_8192C(pAdapter) || IS_HARDWARE_TYPE_8723A(pAdapter)) // if (IS_HARDWARE_TYPE_8192C(pAdapter) || IS_HARDWARE_TYPE_8723A(pAdapter))
@ -1319,7 +1319,7 @@ if (pAdapter->registrypriv.mp_mode == 1)
} }
} }
} }
// RT_TRACE(COMP_INIT,DBG_LOUD,("Release Mutex in IQCalibrate \n")); // RT_TRACE(COMP_INIT,DBG_LOUD,("Release Mutex in IQCalibrate\n"));
ReleaseCCKAndRWPageAControl(pAdapter); ReleaseCCKAndRWPageAControl(pAdapter);
for (i=0; i<4; i++) for (i=0; i<4; i++)

14
hal/HalPhyRf_8188e.c
View file

@ -337,7 +337,7 @@ odm_TXPowerTrackingCallback_ThermalMeter_8188E(
if (ThermalValue_AVG_count) if (ThermalValue_AVG_count)
{ {
ThermalValue = (u1Byte)(ThermalValue_AVG / ThermalValue_AVG_count); ThermalValue = (u1Byte)(ThermalValue_AVG / ThermalValue_AVG_count);
ODM_RT_TRACE(pDM_Odm,ODM_COMP_CALIBRATION, ODM_DBG_LOUD,("AVG Thermal Meter = 0x%x \n", ThermalValue)); ODM_RT_TRACE(pDM_Odm,ODM_COMP_CALIBRATION, ODM_DBG_LOUD,("AVG Thermal Meter = 0x%x\n", ThermalValue));
} }
} }
} }
@ -367,9 +367,9 @@ odm_TXPowerTrackingCallback_ThermalMeter_8188E(
delta_LCK = (ThermalValue > pDM_Odm->RFCalibrateInfo.ThermalValue_LCK)?(ThermalValue - pDM_Odm->RFCalibrateInfo.ThermalValue_LCK):(pDM_Odm->RFCalibrateInfo.ThermalValue_LCK - ThermalValue); delta_LCK = (ThermalValue > pDM_Odm->RFCalibrateInfo.ThermalValue_LCK)?(ThermalValue - pDM_Odm->RFCalibrateInfo.ThermalValue_LCK):(pDM_Odm->RFCalibrateInfo.ThermalValue_LCK - ThermalValue);
delta_IQK = (ThermalValue > pDM_Odm->RFCalibrateInfo.ThermalValue_IQK)?(ThermalValue - pDM_Odm->RFCalibrateInfo.ThermalValue_IQK):(pDM_Odm->RFCalibrateInfo.ThermalValue_IQK - ThermalValue); delta_IQK = (ThermalValue > pDM_Odm->RFCalibrateInfo.ThermalValue_IQK)?(ThermalValue - pDM_Odm->RFCalibrateInfo.ThermalValue_IQK):(pDM_Odm->RFCalibrateInfo.ThermalValue_IQK - ThermalValue);
#if (DM_ODM_SUPPORT_TYPE & (ODM_MP|ODM_CE)) #if (DM_ODM_SUPPORT_TYPE & (ODM_MP|ODM_CE))
ODM_RT_TRACE(pDM_Odm,ODM_COMP_CALIBRATION, ODM_DBG_LOUD,("Readback Thermal Meter = 0x%x pre thermal meter 0x%x EEPROMthermalmeter 0x%x delta 0x%x delta_LCK 0x%x delta_IQK 0x%x \n", ThermalValue, pDM_Odm->RFCalibrateInfo.ThermalValue, pHalData->EEPROMThermalMeter, delta, delta_LCK, delta_IQK)); ODM_RT_TRACE(pDM_Odm,ODM_COMP_CALIBRATION, ODM_DBG_LOUD,("Readback Thermal Meter = 0x%x pre thermal meter 0x%x EEPROMthermalmeter 0x%x delta 0x%x delta_LCK 0x%x delta_IQK 0x%x\n", ThermalValue, pDM_Odm->RFCalibrateInfo.ThermalValue, pHalData->EEPROMThermalMeter, delta, delta_LCK, delta_IQK));
#else #else
ODM_RT_TRACE(pDM_Odm,ODM_COMP_CALIBRATION, ODM_DBG_LOUD,("Readback Thermal Meter = 0x%x pre thermal meter 0x%x EEPROMthermalmeter 0x%x delta 0x%x delta_LCK 0x%x delta_IQK 0x%x \n", ThermalValue, pDM_Odm->RFCalibrateInfo.ThermalValue, pDM_Odm->priv->pmib->dot11RFEntry.ther, delta, delta_LCK, delta_IQK)); ODM_RT_TRACE(pDM_Odm,ODM_COMP_CALIBRATION, ODM_DBG_LOUD,("Readback Thermal Meter = 0x%x pre thermal meter 0x%x EEPROMthermalmeter 0x%x delta 0x%x delta_LCK 0x%x delta_IQK 0x%x\n", ThermalValue, pDM_Odm->RFCalibrateInfo.ThermalValue, pDM_Odm->priv->pmib->dot11RFEntry.ther, delta, delta_LCK, delta_IQK));
#endif #endif
ODM_RT_TRACE(pDM_Odm,ODM_COMP_CALIBRATION, ODM_DBG_LOUD,("pre thermal meter LCK 0x%x pre thermal meter IQK 0x%x delta_LCK_bound 0x%x delta_IQK_bound 0x%x\n", pDM_Odm->RFCalibrateInfo.ThermalValue_LCK, pDM_Odm->RFCalibrateInfo.ThermalValue_IQK, pDM_Odm->RFCalibrateInfo.Delta_LCK, pDM_Odm->RFCalibrateInfo.Delta_IQK)); ODM_RT_TRACE(pDM_Odm,ODM_COMP_CALIBRATION, ODM_DBG_LOUD,("pre thermal meter LCK 0x%x pre thermal meter IQK 0x%x delta_LCK_bound 0x%x delta_IQK_bound 0x%x\n", pDM_Odm->RFCalibrateInfo.ThermalValue_LCK, pDM_Odm->RFCalibrateInfo.ThermalValue_IQK, pDM_Odm->RFCalibrateInfo.Delta_LCK, pDM_Odm->RFCalibrateInfo.Delta_IQK));
@ -826,7 +826,7 @@ phy_PathA_RxIQK(
u4tmp = 0x80007C00 | (regE94&0x3FF0000) | ((regE9C&0x3FF0000) >> 16); u4tmp = 0x80007C00 | (regE94&0x3FF0000) | ((regE9C&0x3FF0000) >> 16);
ODM_SetBBReg(pDM_Odm, rTx_IQK, bMaskDWord, u4tmp); ODM_SetBBReg(pDM_Odm, rTx_IQK, bMaskDWord, u4tmp);
ODM_RT_TRACE(pDM_Odm,ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("0xe40 = 0x%x u4tmp = 0x%x \n", ODM_GetBBReg(pDM_Odm, rTx_IQK, bMaskDWord), u4tmp)); ODM_RT_TRACE(pDM_Odm,ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("0xe40 = 0x%x u4tmp = 0x%x\n", ODM_GetBBReg(pDM_Odm, rTx_IQK, bMaskDWord), u4tmp));
//1 RX IQK //1 RX IQK
@ -2536,8 +2536,8 @@ if (*(pDM_Odm->mp_mode) == 1)
is13simular = FALSE; is13simular = FALSE;
//ODM_RT_TRACE(pDM_Odm,ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("IQK !!!interface %d currentband %d ishardwareD %d \n", pDM_Odm->interfaceIndex, pHalData->CurrentBandType92D, IS_HARDWARE_TYPE_8192D(pAdapter))); //ODM_RT_TRACE(pDM_Odm,ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("IQK !!!interface %d currentband %d ishardwareD %d\n", pDM_Odm->interfaceIndex, pHalData->CurrentBandType92D, IS_HARDWARE_TYPE_8192D(pAdapter)));
// RT_TRACE(COMP_INIT,DBG_LOUD,("Acquire Mutex in IQCalibrate \n")); // RT_TRACE(COMP_INIT,DBG_LOUD,("Acquire Mutex in IQCalibrate\n"));
for (i=0; i<3; i++) for (i=0; i<3; i++)
{ {
@ -2602,7 +2602,7 @@ if (*(pDM_Odm->mp_mode) == 1)
} }
} }
} }
// RT_TRACE(COMP_INIT,DBG_LOUD,("Release Mutex in IQCalibrate \n")); // RT_TRACE(COMP_INIT,DBG_LOUD,("Release Mutex in IQCalibrate\n"));
for (i=0; i<4; i++) for (i=0; i<4; i++)
{ {

154
hal/odm.c
View file

@ -1664,7 +1664,7 @@ ODM_Write_DIG(
{ {
pDIG_T pDM_DigTable = &pDM_Odm->DM_DigTable; pDIG_T pDM_DigTable = &pDM_Odm->DM_DigTable;
ODM_RT_TRACE(pDM_Odm,ODM_COMP_DIG, ODM_DBG_LOUD, ("ODM_REG(IGI_A,pDM_Odm)=0x%x, ODM_BIT(IGI,pDM_Odm)=0x%x \n", ODM_RT_TRACE(pDM_Odm,ODM_COMP_DIG, ODM_DBG_LOUD, ("ODM_REG(IGI_A,pDM_Odm)=0x%x, ODM_BIT(IGI,pDM_Odm)=0x%x\n",
ODM_REG(IGI_A,pDM_Odm),ODM_BIT(IGI,pDM_Odm))); ODM_REG(IGI_A,pDM_Odm),ODM_BIT(IGI,pDM_Odm)));
if (pDM_DigTable->CurIGValue != CurrentIGI)//if (pDM_DigTable->PreIGValue != CurrentIGI) if (pDM_DigTable->CurIGValue != CurrentIGI)//if (pDM_DigTable->PreIGValue != CurrentIGI)
@ -1696,11 +1696,11 @@ ODM_Write_DIG(
break; break;
} }
} }
ODM_RT_TRACE(pDM_Odm,ODM_COMP_DIG, ODM_DBG_LOUD, ("CurrentIGI(0x%02x). \n",CurrentIGI)); ODM_RT_TRACE(pDM_Odm,ODM_COMP_DIG, ODM_DBG_LOUD, ("CurrentIGI(0x%02x).\n",CurrentIGI));
//pDM_DigTable->PreIGValue = pDM_DigTable->CurIGValue; //pDM_DigTable->PreIGValue = pDM_DigTable->CurIGValue;
pDM_DigTable->CurIGValue = CurrentIGI; pDM_DigTable->CurIGValue = CurrentIGI;
} }
ODM_RT_TRACE(pDM_Odm,ODM_COMP_DIG, ODM_DBG_LOUD, ("ODM_Write_DIG():CurrentIGI=0x%x \n",CurrentIGI)); ODM_RT_TRACE(pDM_Odm,ODM_COMP_DIG, ODM_DBG_LOUD, ("ODM_Write_DIG():CurrentIGI=0x%x\n",CurrentIGI));
// Add by Neil Chen to enable edcca to MP Platform // Add by Neil Chen to enable edcca to MP Platform
#if (DM_ODM_SUPPORT_TYPE == ODM_MP) #if (DM_ODM_SUPPORT_TYPE == ODM_MP)
@ -1853,7 +1853,7 @@ odm_DIG(
#if OS_WIN_FROM_WIN7(OS_VERSION) #if OS_WIN_FROM_WIN7(OS_VERSION)
if (IsAPModeExist( pAdapter) && pAdapter->bInHctTest) if (IsAPModeExist( pAdapter) && pAdapter->bInHctTest)
{ {
ODM_RT_TRACE(pDM_Odm,ODM_COMP_DIG, ODM_DBG_LOUD, ("odm_DIG() Return: Is AP mode or In HCT Test \n")); ODM_RT_TRACE(pDM_Odm,ODM_COMP_DIG, ODM_DBG_LOUD, ("odm_DIG() Return: Is AP mode or In HCT Test\n"));
return; return;
} }
#endif #endif
@ -1867,7 +1867,7 @@ odm_DIG(
if (pRX_HP_Table->RXHP_flag == 1) if (pRX_HP_Table->RXHP_flag == 1)
{ {
ODM_RT_TRACE(pDM_Odm,ODM_COMP_DIG, ODM_DBG_LOUD, ("odm_DIG() Return: In RXHP Operation \n")); ODM_RT_TRACE(pDM_Odm,ODM_COMP_DIG, ODM_DBG_LOUD, ("odm_DIG() Return: In RXHP Operation\n"));
return; return;
} }
#endif //end ODM_MP type #endif //end ODM_MP type
@ -1876,7 +1876,7 @@ odm_DIG(
#ifdef CONFIG_SPECIAL_SETTING_FOR_FUNAI_TV #ifdef CONFIG_SPECIAL_SETTING_FOR_FUNAI_TV
if ((pDM_Odm->bLinked) && (pDM_Odm->Adapter->registrypriv.force_igi !=0)) if ((pDM_Odm->bLinked) && (pDM_Odm->Adapter->registrypriv.force_igi !=0))
{ {
printk("pDM_Odm->RSSI_Min=%d \n",pDM_Odm->RSSI_Min); printk("pDM_Odm->RSSI_Min=%d\n",pDM_Odm->RSSI_Min);
ODM_Write_DIG(pDM_Odm,pDM_Odm->Adapter->registrypriv.force_igi); ODM_Write_DIG(pDM_Odm,pDM_Odm->Adapter->registrypriv.force_igi);
return; return;
} }
@ -1886,7 +1886,7 @@ odm_DIG(
prtl8192cd_priv priv = pDM_Odm->priv; prtl8192cd_priv priv = pDM_Odm->priv;
if (!((priv->up_time > 5) && (priv->up_time % 2)) ) if (!((priv->up_time > 5) && (priv->up_time % 2)) )
{ {
ODM_RT_TRACE(pDM_Odm,ODM_COMP_DIG, ODM_DBG_LOUD, ("odm_DIG() Return: Not In DIG Operation Period \n")); ODM_RT_TRACE(pDM_Odm,ODM_COMP_DIG, ODM_DBG_LOUD, ("odm_DIG() Return: Not In DIG Operation Period\n"));
return; return;
} }
#endif #endif
@ -1911,14 +1911,14 @@ odm_DIG(
if (*(pDM_Odm->pbScanInProcess)) if (*(pDM_Odm->pbScanInProcess))
{ {
ODM_RT_TRACE(pDM_Odm,ODM_COMP_DIG, ODM_DBG_LOUD, ("odm_DIG() Return: In Scan Progress \n")); ODM_RT_TRACE(pDM_Odm,ODM_COMP_DIG, ODM_DBG_LOUD, ("odm_DIG() Return: In Scan Progress\n"));
return; return;
} }
//add by Neil Chen to avoid PSD is processing //add by Neil Chen to avoid PSD is processing
if (pDM_Odm->bDMInitialGainEnable == FALSE) if (pDM_Odm->bDMInitialGainEnable == FALSE)
{ {
ODM_RT_TRACE(pDM_Odm,ODM_COMP_DIG, ODM_DBG_LOUD, ("odm_DIG() Return: PSD is Processing \n")); ODM_RT_TRACE(pDM_Odm,ODM_COMP_DIG, ODM_DBG_LOUD, ("odm_DIG() Return: PSD is Processing\n"));
return; return;
} }
@ -2087,7 +2087,7 @@ odm_DIG(
if (pDM_Odm->AntDivType == CG_TRX_HW_ANTDIV) if (pDM_Odm->AntDivType == CG_TRX_HW_ANTDIV)
{ {
DIG_Dynamic_MIN = (u1Byte) pDM_DigTable->AntDiv_RSSI_max; DIG_Dynamic_MIN = (u1Byte) pDM_DigTable->AntDiv_RSSI_max;
ODM_RT_TRACE(pDM_Odm,ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("odm_DIG(): pDM_DigTable->AntDiv_RSSI_max=%d \n",pDM_DigTable->AntDiv_RSSI_max)); ODM_RT_TRACE(pDM_Odm,ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("odm_DIG(): pDM_DigTable->AntDiv_RSSI_max=%d\n",pDM_DigTable->AntDiv_RSSI_max));
} }
} }
#endif #endif
@ -2107,7 +2107,7 @@ odm_DIG(
//1 Modify DIG lower bound, deal with abnormally large false alarm //1 Modify DIG lower bound, deal with abnormally large false alarm
if (pFalseAlmCnt->Cnt_all > 10000) if (pFalseAlmCnt->Cnt_all > 10000)
{ {
ODM_RT_TRACE(pDM_Odm,ODM_COMP_DIG, ODM_DBG_LOUD, ("dm_DIG(): Abnornally false alarm case. \n")); ODM_RT_TRACE(pDM_Odm,ODM_COMP_DIG, ODM_DBG_LOUD, ("dm_DIG(): Abnornally false alarm case.\n"));
if (pDM_DigTable->LargeFAHit != 3) if (pDM_DigTable->LargeFAHit != 3)
pDM_DigTable->LargeFAHit++; pDM_DigTable->LargeFAHit++;
@ -2211,7 +2211,7 @@ odm_DIG(
if (FirstDisConnect) if (FirstDisConnect)
{ {
CurrentIGI = pDM_DigTable->rx_gain_range_min; CurrentIGI = pDM_DigTable->rx_gain_range_min;
ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD, ("odm_DIG(): First DisConnect \n")); ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD, ("odm_DIG(): First DisConnect\n"));
} }
else else
{ {
@ -2222,7 +2222,7 @@ odm_DIG(
CurrentIGI = CurrentIGI + 1;//pDM_DigTable->CurIGValue = pDM_DigTable->PreIGValue+1; CurrentIGI = CurrentIGI + 1;//pDM_DigTable->CurIGValue = pDM_DigTable->PreIGValue+1;
else if (pFalseAlmCnt->Cnt_all < 500) else if (pFalseAlmCnt->Cnt_all < 500)
CurrentIGI = CurrentIGI - 1;//pDM_DigTable->CurIGValue =pDM_DigTable->PreIGValue-1; CurrentIGI = CurrentIGI - 1;//pDM_DigTable->CurIGValue =pDM_DigTable->PreIGValue-1;
ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD, ("odm_DIG(): England DIG \n")); ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD, ("odm_DIG(): England DIG\n"));
} }
} }
ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD, ("odm_DIG(): DIG End Adjust IGI\n")); ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD, ("odm_DIG(): DIG End Adjust IGI\n"));
@ -2903,8 +2903,8 @@ u4Byte ODM_Get_Rate_Bitmap(
} }
//printk("%s ==> rssi_level:0x%02x, WirelessMode:0x%02x, rate_bitmap:0x%08x \n",__FUNCTION__,rssi_level,WirelessMode,rate_bitmap); //printk("%s ==> rssi_level:0x%02x, WirelessMode:0x%02x, rate_bitmap:0x%08x\n",__FUNCTION__,rssi_level,WirelessMode,rate_bitmap);
ODM_RT_TRACE(pDM_Odm, ODM_COMP_RA_MASK, ODM_DBG_LOUD, (" ==> rssi_level:0x%02x, WirelessMode:0x%02x, rate_bitmap:0x%08x \n",rssi_level,WirelessMode,rate_bitmap)); ODM_RT_TRACE(pDM_Odm, ODM_COMP_RA_MASK, ODM_DBG_LOUD, (" ==> rssi_level:0x%02x, WirelessMode:0x%02x, rate_bitmap:0x%08x\n",rssi_level,WirelessMode,rate_bitmap));
return rate_bitmap; return rate_bitmap;
@ -3095,7 +3095,7 @@ odm_RefreshRateAdaptiveMaskCE(
return; return;
} }
//printk("==> %s \n",__FUNCTION__); //printk("==> %s\n",__FUNCTION__);
for (i=0; i<ODM_ASSOCIATE_ENTRY_NUM; i++){ for (i=0; i<ODM_ASSOCIATE_ENTRY_NUM; i++){
PSTA_INFO_T pstat = pDM_Odm->pODM_StaInfo[i]; PSTA_INFO_T pstat = pDM_Odm->pODM_StaInfo[i];
@ -3196,7 +3196,7 @@ ODM_RAStateCheck(
RATRState = DM_RATR_STA_MIDDLE; RATRState = DM_RATR_STA_MIDDLE;
else else
RATRState = DM_RATR_STA_LOW; RATRState = DM_RATR_STA_LOW;
//printk("==>%s,RATRState:0x%02x ,RSSI:%d \n",__FUNCTION__,RATRState,RSSI); //printk("==>%s,RATRState:0x%02x ,RSSI:%d\n",__FUNCTION__,RATRState,RSSI);
if ( *pRATRState!=RATRState || bForceUpdate) if ( *pRATRState!=RATRState || bForceUpdate)
{ {
@ -3464,7 +3464,7 @@ odm_DynamicTxPower_92C(
if ((!pMgntInfo->bMediaConnect) && if ((!pMgntInfo->bMediaConnect) &&
(pHalData->EntryMinUndecoratedSmoothedPWDB == 0)) (pHalData->EntryMinUndecoratedSmoothedPWDB == 0))
{ {
ODM_RT_TRACE(pDM_Odm,COMP_HIPWR, DBG_LOUD, ("Not connected to any \n")); ODM_RT_TRACE(pDM_Odm,COMP_HIPWR, DBG_LOUD, ("Not connected to any\n"));
pHalData->DynamicTxHighPowerLvl = TxHighPwrLevel_Normal; pHalData->DynamicTxHighPowerLvl = TxHighPwrLevel_Normal;
//the LastDTPlvl should reset when disconnect, //the LastDTPlvl should reset when disconnect,
@ -3521,18 +3521,18 @@ odm_DynamicTxPower_92C(
if (ACTING_AS_AP(Adapter) || ACTING_AS_IBSS(Adapter)) if (ACTING_AS_AP(Adapter) || ACTING_AS_IBSS(Adapter))
{ {
UndecoratedSmoothedPWDB = pHalData->EntryMinUndecoratedSmoothedPWDB; UndecoratedSmoothedPWDB = pHalData->EntryMinUndecoratedSmoothedPWDB;
ODM_RT_TRACE(pDM_Odm,COMP_HIPWR, DBG_LOUD, ("AP Client PWDB = 0x%x \n", UndecoratedSmoothedPWDB)); ODM_RT_TRACE(pDM_Odm,COMP_HIPWR, DBG_LOUD, ("AP Client PWDB = 0x%x\n", UndecoratedSmoothedPWDB));
} }
else else
{ {
UndecoratedSmoothedPWDB = pHalData->UndecoratedSmoothedPWDB; UndecoratedSmoothedPWDB = pHalData->UndecoratedSmoothedPWDB;
ODM_RT_TRACE(pDM_Odm,COMP_HIPWR, DBG_LOUD, ("STA Default Port PWDB = 0x%x \n", UndecoratedSmoothedPWDB)); ODM_RT_TRACE(pDM_Odm,COMP_HIPWR, DBG_LOUD, ("STA Default Port PWDB = 0x%x\n", UndecoratedSmoothedPWDB));
} }
} }
else // associated entry pwdb else // associated entry pwdb
{ {
UndecoratedSmoothedPWDB = pHalData->EntryMinUndecoratedSmoothedPWDB; UndecoratedSmoothedPWDB = pHalData->EntryMinUndecoratedSmoothedPWDB;
ODM_RT_TRACE(pDM_Odm,COMP_HIPWR, DBG_LOUD, ("AP Ext Port PWDB = 0x%x \n", UndecoratedSmoothedPWDB)); ODM_RT_TRACE(pDM_Odm,COMP_HIPWR, DBG_LOUD, ("AP Ext Port PWDB = 0x%x\n", UndecoratedSmoothedPWDB));
} }
if (UndecoratedSmoothedPWDB >= TX_POWER_NEAR_FIELD_THRESH_LVL2) if (UndecoratedSmoothedPWDB >= TX_POWER_NEAR_FIELD_THRESH_LVL2)
@ -3555,7 +3555,7 @@ odm_DynamicTxPower_92C(
} }
if ( pHalData->DynamicTxHighPowerLvl != pHalData->LastDTPLvl ) if ( pHalData->DynamicTxHighPowerLvl != pHalData->LastDTPLvl )
{ {
ODM_RT_TRACE(pDM_Odm,COMP_HIPWR, DBG_LOUD, ("PHY_SetTxPowerLevel8192C() Channel = %d \n" , pHalData->CurrentChannel)); ODM_RT_TRACE(pDM_Odm,COMP_HIPWR, DBG_LOUD, ("PHY_SetTxPowerLevel8192C() Channel = %d\n" , pHalData->CurrentChannel));
PHY_SetTxPowerLevel8192C(Adapter, pHalData->CurrentChannel); PHY_SetTxPowerLevel8192C(Adapter, pHalData->CurrentChannel);
if ( (pHalData->DynamicTxHighPowerLvl == TxHighPwrLevel_Normal) && if ( (pHalData->DynamicTxHighPowerLvl == TxHighPwrLevel_Normal) &&
(pHalData->LastDTPLvl == TxHighPwrLevel_Level1 || pHalData->LastDTPLvl == TxHighPwrLevel_Level2)) //TxHighPwrLevel_Normal (pHalData->LastDTPLvl == TxHighPwrLevel_Level1 || pHalData->LastDTPLvl == TxHighPwrLevel_Level2)) //TxHighPwrLevel_Normal
@ -3585,7 +3585,7 @@ odm_DynamicTxPower_92C(
if (Adapter->proximity.proxim_on== _TRUE){ if (Adapter->proximity.proxim_on== _TRUE){
struct proximity_priv *prox_priv=Adapter->proximity.proximity_priv; struct proximity_priv *prox_priv=Adapter->proximity.proximity_priv;
// Intel set fixed tx power // Intel set fixed tx power
printk("\n %s Adapter->proximity.proxim_on=%d prox_priv->proxim_modeinfo->power_output=%d \n",__FUNCTION__,Adapter->proximity.proxim_on,prox_priv->proxim_modeinfo->power_output); printk("\n %s Adapter->proximity.proxim_on=%d prox_priv->proxim_modeinfo->power_output=%d\n",__FUNCTION__,Adapter->proximity.proxim_on,prox_priv->proxim_modeinfo->power_output);
if (prox_priv!=NULL){ if (prox_priv!=NULL){
if (prox_priv->proxim_modeinfo->power_output> 0) if (prox_priv->proxim_modeinfo->power_output> 0)
{ {
@ -3626,7 +3626,7 @@ odm_DynamicTxPower_92C(
if ((check_fwstate(pmlmepriv, _FW_LINKED) != _TRUE) && if ((check_fwstate(pmlmepriv, _FW_LINKED) != _TRUE) &&
(pdmpriv->EntryMinUndecoratedSmoothedPWDB == 0)) (pdmpriv->EntryMinUndecoratedSmoothedPWDB == 0))
{ {
//ODM_RT_TRACE(pDM_Odm,COMP_HIPWR, DBG_LOUD, ("Not connected to any \n")); //ODM_RT_TRACE(pDM_Odm,COMP_HIPWR, DBG_LOUD, ("Not connected to any\n"));
pdmpriv->DynamicTxHighPowerLvl = TxHighPwrLevel_Normal; pdmpriv->DynamicTxHighPowerLvl = TxHighPwrLevel_Normal;
//the LastDTPlvl should reset when disconnect, //the LastDTPlvl should reset when disconnect,
@ -3644,12 +3644,12 @@ odm_DynamicTxPower_92C(
(check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) == _TRUE)) (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) == _TRUE))
{ {
UndecoratedSmoothedPWDB = pdmpriv->EntryMinUndecoratedSmoothedPWDB; UndecoratedSmoothedPWDB = pdmpriv->EntryMinUndecoratedSmoothedPWDB;
//ODM_RT_TRACE(pDM_Odm,COMP_HIPWR, DBG_LOUD, ("AP Client PWDB = 0x%x \n", UndecoratedSmoothedPWDB)); //ODM_RT_TRACE(pDM_Odm,COMP_HIPWR, DBG_LOUD, ("AP Client PWDB = 0x%x\n", UndecoratedSmoothedPWDB));
} }
else else
{ {
UndecoratedSmoothedPWDB = pdmpriv->UndecoratedSmoothedPWDB; UndecoratedSmoothedPWDB = pdmpriv->UndecoratedSmoothedPWDB;
//ODM_RT_TRACE(pDM_Odm,COMP_HIPWR, DBG_LOUD, ("STA Default Port PWDB = 0x%x \n", UndecoratedSmoothedPWDB)); //ODM_RT_TRACE(pDM_Odm,COMP_HIPWR, DBG_LOUD, ("STA Default Port PWDB = 0x%x\n", UndecoratedSmoothedPWDB));
} }
#else #else
UndecoratedSmoothedPWDB = pdmpriv->EntryMinUndecoratedSmoothedPWDB; UndecoratedSmoothedPWDB = pdmpriv->EntryMinUndecoratedSmoothedPWDB;
@ -3658,7 +3658,7 @@ odm_DynamicTxPower_92C(
else // associated entry pwdb else // associated entry pwdb
{ {
UndecoratedSmoothedPWDB = pdmpriv->EntryMinUndecoratedSmoothedPWDB; UndecoratedSmoothedPWDB = pdmpriv->EntryMinUndecoratedSmoothedPWDB;
//ODM_RT_TRACE(pDM_Odm,COMP_HIPWR, DBG_LOUD, ("AP Ext Port PWDB = 0x%x \n", UndecoratedSmoothedPWDB)); //ODM_RT_TRACE(pDM_Odm,COMP_HIPWR, DBG_LOUD, ("AP Ext Port PWDB = 0x%x\n", UndecoratedSmoothedPWDB));
} }
if (UndecoratedSmoothedPWDB >= TX_POWER_NEAR_FIELD_THRESH_LVL2) if (UndecoratedSmoothedPWDB >= TX_POWER_NEAR_FIELD_THRESH_LVL2)
@ -3724,7 +3724,7 @@ odm_DynamicTxPower_92D(
if ((!pMgntInfo->bMediaConnect) && if ((!pMgntInfo->bMediaConnect) &&
(pHalData->EntryMinUndecoratedSmoothedPWDB == 0)) (pHalData->EntryMinUndecoratedSmoothedPWDB == 0))
{ {
ODM_RT_TRACE(pDM_Odm,COMP_HIPWR, DBG_LOUD, ("Not connected to any \n")); ODM_RT_TRACE(pDM_Odm,COMP_HIPWR, DBG_LOUD, ("Not connected to any\n"));
pHalData->DynamicTxHighPowerLvl = TxHighPwrLevel_Normal; pHalData->DynamicTxHighPowerLvl = TxHighPwrLevel_Normal;
//the LastDTPlvl should reset when disconnect, //the LastDTPlvl should reset when disconnect,
@ -3739,18 +3739,18 @@ odm_DynamicTxPower_92D(
if (ACTING_AS_AP(Adapter) || pMgntInfo->mIbss) if (ACTING_AS_AP(Adapter) || pMgntInfo->mIbss)
{ {
UndecoratedSmoothedPWDB = pHalData->EntryMinUndecoratedSmoothedPWDB; UndecoratedSmoothedPWDB = pHalData->EntryMinUndecoratedSmoothedPWDB;
ODM_RT_TRACE(pDM_Odm,COMP_HIPWR, DBG_LOUD, ("AP Client PWDB = 0x%x \n", UndecoratedSmoothedPWDB)); ODM_RT_TRACE(pDM_Odm,COMP_HIPWR, DBG_LOUD, ("AP Client PWDB = 0x%x\n", UndecoratedSmoothedPWDB));
} }
else else
{ {
UndecoratedSmoothedPWDB = pHalData->UndecoratedSmoothedPWDB; UndecoratedSmoothedPWDB = pHalData->UndecoratedSmoothedPWDB;
ODM_RT_TRACE(pDM_Odm,COMP_HIPWR, DBG_LOUD, ("STA Default Port PWDB = 0x%x \n", UndecoratedSmoothedPWDB)); ODM_RT_TRACE(pDM_Odm,COMP_HIPWR, DBG_LOUD, ("STA Default Port PWDB = 0x%x\n", UndecoratedSmoothedPWDB));
} }
} }
else // associated entry pwdb else // associated entry pwdb
{ {
UndecoratedSmoothedPWDB = pHalData->EntryMinUndecoratedSmoothedPWDB; UndecoratedSmoothedPWDB = pHalData->EntryMinUndecoratedSmoothedPWDB;
ODM_RT_TRACE(pDM_Odm,COMP_HIPWR, DBG_LOUD, ("AP Ext Port PWDB = 0x%x \n", UndecoratedSmoothedPWDB)); ODM_RT_TRACE(pDM_Odm,COMP_HIPWR, DBG_LOUD, ("AP Ext Port PWDB = 0x%x\n", UndecoratedSmoothedPWDB));
} }
if (IS_HARDWARE_TYPE_8192D(Adapter) && GET_HAL_DATA(Adapter)->CurrentBandType92D == 1){ if (IS_HARDWARE_TYPE_8192D(Adapter) && GET_HAL_DATA(Adapter)->CurrentBandType92D == 1){
@ -3797,10 +3797,10 @@ odm_DynamicTxPower_92D(
//sherry delete flag 20110517 //sherry delete flag 20110517
if (bGetValueFromBuddyAdapter) if (bGetValueFromBuddyAdapter)
{ {
ODM_RT_TRACE(pDM_Odm,COMP_MLME,DBG_LOUD,("dm_DynamicTxPower() mac 0 for mac 1 \n")); ODM_RT_TRACE(pDM_Odm,COMP_MLME,DBG_LOUD,("dm_DynamicTxPower() mac 0 for mac 1\n"));
if (Adapter->DualMacDMSPControl.bChangeTxHighPowerLvlForAnotherMacOfDMSP) if (Adapter->DualMacDMSPControl.bChangeTxHighPowerLvlForAnotherMacOfDMSP)
{ {
ODM_RT_TRACE(pDM_Odm,COMP_MLME,DBG_LOUD,("dm_DynamicTxPower() change value \n")); ODM_RT_TRACE(pDM_Odm,COMP_MLME,DBG_LOUD,("dm_DynamicTxPower() change value\n"));
HighPowerLvlBackForMac0 = pHalData->DynamicTxHighPowerLvl; HighPowerLvlBackForMac0 = pHalData->DynamicTxHighPowerLvl;
pHalData->DynamicTxHighPowerLvl = Adapter->DualMacDMSPControl.CurTxHighLvlForAnotherMacOfDMSP; pHalData->DynamicTxHighPowerLvl = Adapter->DualMacDMSPControl.CurTxHighLvlForAnotherMacOfDMSP;
PHY_SetTxPowerLevel8192C(Adapter, pHalData->CurrentChannel); PHY_SetTxPowerLevel8192C(Adapter, pHalData->CurrentChannel);
@ -3811,12 +3811,12 @@ odm_DynamicTxPower_92D(
if ( (pHalData->DynamicTxHighPowerLvl != pHalData->LastDTPLvl) ) if ( (pHalData->DynamicTxHighPowerLvl != pHalData->LastDTPLvl) )
{ {
ODM_RT_TRACE(pDM_Odm,COMP_HIPWR, DBG_LOUD, ("PHY_SetTxPowerLevel8192S() Channel = %d \n" , pHalData->CurrentChannel)); ODM_RT_TRACE(pDM_Odm,COMP_HIPWR, DBG_LOUD, ("PHY_SetTxPowerLevel8192S() Channel = %d\n" , pHalData->CurrentChannel));
if (Adapter->DualMacSmartConcurrent == TRUE) if (Adapter->DualMacSmartConcurrent == TRUE)
{ {
if (BuddyAdapter == NULL) if (BuddyAdapter == NULL)
{ {
ODM_RT_TRACE(pDM_Odm,COMP_MLME,DBG_LOUD,("dm_DynamicTxPower() BuddyAdapter == NULL case \n")); ODM_RT_TRACE(pDM_Odm,COMP_MLME,DBG_LOUD,("dm_DynamicTxPower() BuddyAdapter == NULL case\n"));
if (!Adapter->bSlaveOfDMSP) if (!Adapter->bSlaveOfDMSP)
{ {
PHY_SetTxPowerLevel8192C(Adapter, pHalData->CurrentChannel); PHY_SetTxPowerLevel8192C(Adapter, pHalData->CurrentChannel);
@ -3826,7 +3826,7 @@ odm_DynamicTxPower_92D(
{ {
if (pHalData->MacPhyMode92D == DUALMAC_SINGLEPHY) if (pHalData->MacPhyMode92D == DUALMAC_SINGLEPHY)
{ {
ODM_RT_TRACE(pDM_Odm,COMP_MLME,DBG_LOUD,("dm_DynamicTxPower() BuddyAdapter DMSP \n")); ODM_RT_TRACE(pDM_Odm,COMP_MLME,DBG_LOUD,("dm_DynamicTxPower() BuddyAdapter DMSP\n"));
if (Adapter->bSlaveOfDMSP) if (Adapter->bSlaveOfDMSP)
{ {
ODM_RT_TRACE(pDM_Odm,COMP_MLME,DBG_LOUD,("dm_DynamicTxPower() bslave case \n")); ODM_RT_TRACE(pDM_Odm,COMP_MLME,DBG_LOUD,("dm_DynamicTxPower() bslave case \n"));
@ -3838,7 +3838,7 @@ odm_DynamicTxPower_92D(
ODM_RT_TRACE(pDM_Odm,COMP_MLME,DBG_LOUD,("dm_DynamicTxPower() master case \n")); ODM_RT_TRACE(pDM_Odm,COMP_MLME,DBG_LOUD,("dm_DynamicTxPower() master case \n"));
if (!bGetValueFromBuddyAdapter) if (!bGetValueFromBuddyAdapter)
{ {
ODM_RT_TRACE(pDM_Odm,COMP_MLME,DBG_LOUD,("dm_DynamicTxPower() mac 0 for mac 0 \n")); ODM_RT_TRACE(pDM_Odm,COMP_MLME,DBG_LOUD,("dm_DynamicTxPower() mac 0 for mac 0\n"));
PHY_SetTxPowerLevel8192C(Adapter, pHalData->CurrentChannel); PHY_SetTxPowerLevel8192C(Adapter, pHalData->CurrentChannel);
} }
} }
@ -3884,7 +3884,7 @@ odm_DynamicTxPower_92D(
if ((check_fwstate(pmlmepriv, _FW_LINKED) != _TRUE) && if ((check_fwstate(pmlmepriv, _FW_LINKED) != _TRUE) &&
(pdmpriv->EntryMinUndecoratedSmoothedPWDB == 0)) (pdmpriv->EntryMinUndecoratedSmoothedPWDB == 0))
{ {
//ODM_RT_TRACE(pDM_Odm,COMP_HIPWR, DBG_LOUD, ("Not connected to any \n")); //ODM_RT_TRACE(pDM_Odm,COMP_HIPWR, DBG_LOUD, ("Not connected to any\n"));
pdmpriv->DynamicTxHighPowerLvl = TxHighPwrLevel_Normal; pdmpriv->DynamicTxHighPowerLvl = TxHighPwrLevel_Normal;
//the LastDTPlvl should reset when disconnect, //the LastDTPlvl should reset when disconnect,
//otherwise the tx power level wouldn't change when disconnect and connect again. //otherwise the tx power level wouldn't change when disconnect and connect again.
@ -3901,12 +3901,12 @@ odm_DynamicTxPower_92D(
(check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) == _TRUE)) (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) == _TRUE))
{ {
UndecoratedSmoothedPWDB = pdmpriv->EntryMinUndecoratedSmoothedPWDB; UndecoratedSmoothedPWDB = pdmpriv->EntryMinUndecoratedSmoothedPWDB;
//ODM_RT_TRACE(pDM_Odm,COMP_HIPWR, DBG_LOUD, ("AP Client PWDB = 0x%x \n", UndecoratedSmoothedPWDB)); //ODM_RT_TRACE(pDM_Odm,COMP_HIPWR, DBG_LOUD, ("AP Client PWDB = 0x%x\n", UndecoratedSmoothedPWDB));
} }
else else
{ {
UndecoratedSmoothedPWDB = pdmpriv->UndecoratedSmoothedPWDB; UndecoratedSmoothedPWDB = pdmpriv->UndecoratedSmoothedPWDB;
//ODM_RT_TRACE(pDM_Odm,COMP_HIPWR, DBG_LOUD, ("STA Default Port PWDB = 0x%x \n", UndecoratedSmoothedPWDB)); //ODM_RT_TRACE(pDM_Odm,COMP_HIPWR, DBG_LOUD, ("STA Default Port PWDB = 0x%x\n", UndecoratedSmoothedPWDB));
} }
#else #else
UndecoratedSmoothedPWDB = pdmpriv->EntryMinUndecoratedSmoothedPWDB; UndecoratedSmoothedPWDB = pdmpriv->EntryMinUndecoratedSmoothedPWDB;
@ -3915,7 +3915,7 @@ odm_DynamicTxPower_92D(
else // associated entry pwdb else // associated entry pwdb
{ {
UndecoratedSmoothedPWDB = pdmpriv->EntryMinUndecoratedSmoothedPWDB; UndecoratedSmoothedPWDB = pdmpriv->EntryMinUndecoratedSmoothedPWDB;
//ODM_RT_TRACE(pDM_Odm,COMP_HIPWR, DBG_LOUD, ("AP Ext Port PWDB = 0x%x \n", UndecoratedSmoothedPWDB)); //ODM_RT_TRACE(pDM_Odm,COMP_HIPWR, DBG_LOUD, ("AP Ext Port PWDB = 0x%x\n", UndecoratedSmoothedPWDB));
} }
#if TX_POWER_FOR_5G_BAND == 1 #if TX_POWER_FOR_5G_BAND == 1
if (pHalData->CurrentBandType92D == BAND_ON_5G){ if (pHalData->CurrentBandType92D == BAND_ON_5G){
@ -3959,10 +3959,10 @@ odm_DynamicTxPower_92D(
#if (RTL8192D_EASY_SMART_CONCURRENT == 1) #if (RTL8192D_EASY_SMART_CONCURRENT == 1)
if (bGetValueFromBuddyAdapter) if (bGetValueFromBuddyAdapter)
{ {
//ODM_RT_TRACE(pDM_Odm,COMP_MLME,DBG_LOUD,("dm_DynamicTxPower() mac 0 for mac 1 \n")); //ODM_RT_TRACE(pDM_Odm,COMP_MLME,DBG_LOUD,("dm_DynamicTxPower() mac 0 for mac 1\n"));
if (Adapter->DualMacDMSPControl.bChangeTxHighPowerLvlForAnotherMacOfDMSP) if (Adapter->DualMacDMSPControl.bChangeTxHighPowerLvlForAnotherMacOfDMSP)
{ {
//ODM_RT_TRACE(pDM_Odm,COMP_MLME,DBG_LOUD,("dm_DynamicTxPower() change value \n")); //ODM_RT_TRACE(pDM_Odm,COMP_MLME,DBG_LOUD,("dm_DynamicTxPower() change value\n"));
HighPowerLvlBackForMac0 = pHalData->DynamicTxHighPowerLvl; HighPowerLvlBackForMac0 = pHalData->DynamicTxHighPowerLvl;
pHalData->DynamicTxHighPowerLvl = Adapter->DualMacDMSPControl.CurTxHighLvlForAnotherMacOfDMSP; pHalData->DynamicTxHighPowerLvl = Adapter->DualMacDMSPControl.CurTxHighLvlForAnotherMacOfDMSP;
PHY_SetTxPowerLevel8192D(Adapter, pHalData->CurrentChannel); PHY_SetTxPowerLevel8192D(Adapter, pHalData->CurrentChannel);
@ -3974,11 +3974,11 @@ odm_DynamicTxPower_92D(
if ( (pdmpriv->DynamicTxHighPowerLvl != pdmpriv->LastDTPLvl) ) if ( (pdmpriv->DynamicTxHighPowerLvl != pdmpriv->LastDTPLvl) )
{ {
//ODM_RT_TRACE(pDM_Odm,COMP_HIPWR, DBG_LOUD, ("PHY_SetTxPowerLevel8192S() Channel = %d \n" , pHalData->CurrentChannel)); //ODM_RT_TRACE(pDM_Odm,COMP_HIPWR, DBG_LOUD, ("PHY_SetTxPowerLevel8192S() Channel = %d\n" , pHalData->CurrentChannel));
#if (RTL8192D_EASY_SMART_CONCURRENT == 1) #if (RTL8192D_EASY_SMART_CONCURRENT == 1)
if (BuddyAdapter == NULL) if (BuddyAdapter == NULL)
{ {
//ODM_RT_TRACE(pDM_Odm,COMP_MLME,DBG_LOUD,("dm_DynamicTxPower() BuddyAdapter == NULL case \n")); //ODM_RT_TRACE(pDM_Odm,COMP_MLME,DBG_LOUD,("dm_DynamicTxPower() BuddyAdapter == NULL case\n"));
if (!Adapter->bSlaveOfDMSP) if (!Adapter->bSlaveOfDMSP)
{ {
PHY_SetTxPowerLevel8192D(Adapter, pHalData->CurrentChannel); PHY_SetTxPowerLevel8192D(Adapter, pHalData->CurrentChannel);
@ -3988,7 +3988,7 @@ odm_DynamicTxPower_92D(
{ {
if (pHalData->MacPhyMode92D == DUALMAC_SINGLEPHY) if (pHalData->MacPhyMode92D == DUALMAC_SINGLEPHY)
{ {
//ODM_RT_TRACE(pDM_Odm,COMP_MLME,DBG_LOUD,("dm_DynamicTxPower() BuddyAdapter DMSP \n")); //ODM_RT_TRACE(pDM_Odm,COMP_MLME,DBG_LOUD,("dm_DynamicTxPower() BuddyAdapter DMSP\n"));
if (Adapter->bSlaveOfDMSP) if (Adapter->bSlaveOfDMSP)
{ {
//ODM_RT_TRACE(pDM_Odm,COMP_MLME,DBG_LOUD,("dm_DynamicTxPower() bslave case \n")); //ODM_RT_TRACE(pDM_Odm,COMP_MLME,DBG_LOUD,("dm_DynamicTxPower() bslave case \n"));
@ -4000,7 +4000,7 @@ odm_DynamicTxPower_92D(
//ODM_RT_TRACE(pDM_Odm,COMP_MLME,DBG_LOUD,("dm_DynamicTxPower() master case \n")); //ODM_RT_TRACE(pDM_Odm,COMP_MLME,DBG_LOUD,("dm_DynamicTxPower() master case \n"));
if (!bGetValueFromBuddyAdapter) if (!bGetValueFromBuddyAdapter)
{ {
//ODM_RT_TRACE(pDM_Odm,COMP_MLME,DBG_LOUD,("dm_DynamicTxPower() mac 0 for mac 0 \n")); //ODM_RT_TRACE(pDM_Odm,COMP_MLME,DBG_LOUD,("dm_DynamicTxPower() mac 0 for mac 0\n"));
PHY_SetTxPowerLevel8192D(Adapter, pHalData->CurrentChannel); PHY_SetTxPowerLevel8192D(Adapter, pHalData->CurrentChannel);
} }
} }
@ -4263,7 +4263,7 @@ IN PADAPTER pAdapter
(pdmpriv->EntryMinUndecoratedSmoothedPWDB == 0)) (pdmpriv->EntryMinUndecoratedSmoothedPWDB == 0))
{ {
pdmpriv->MinUndecoratedPWDBForDM = 0; pdmpriv->MinUndecoratedPWDBForDM = 0;
//ODM_RT_TRACE(pDM_Odm,COMP_BB_POWERSAVING, DBG_LOUD, ("Not connected to any \n")); //ODM_RT_TRACE(pDM_Odm,COMP_BB_POWERSAVING, DBG_LOUD, ("Not connected to any\n"));
} }
if (check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) // Default port if (check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) // Default port
{ {
@ -4273,12 +4273,12 @@ IN PADAPTER pAdapter
(check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) == _TRUE)) (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) == _TRUE))
{ {
pdmpriv->MinUndecoratedPWDBForDM = pdmpriv->EntryMinUndecoratedSmoothedPWDB; pdmpriv->MinUndecoratedPWDBForDM = pdmpriv->EntryMinUndecoratedSmoothedPWDB;
//ODM_RT_TRACE(pDM_Odm,COMP_BB_POWERSAVING, DBG_LOUD, ("AP Client PWDB = 0x%x \n", pHalData->MinUndecoratedPWDBForDM)); //ODM_RT_TRACE(pDM_Odm,COMP_BB_POWERSAVING, DBG_LOUD, ("AP Client PWDB = 0x%x\n", pHalData->MinUndecoratedPWDBForDM));
} }
else//for STA mode else//for STA mode
{ {
pdmpriv->MinUndecoratedPWDBForDM = pdmpriv->UndecoratedSmoothedPWDB; pdmpriv->MinUndecoratedPWDBForDM = pdmpriv->UndecoratedSmoothedPWDB;
//ODM_RT_TRACE(pDM_Odm,COMP_BB_POWERSAVING, DBG_LOUD, ("STA Default Port PWDB = 0x%x \n", pHalData->MinUndecoratedPWDBForDM)); //ODM_RT_TRACE(pDM_Odm,COMP_BB_POWERSAVING, DBG_LOUD, ("STA Default Port PWDB = 0x%x\n", pHalData->MinUndecoratedPWDBForDM));
} }
#else #else
pdmpriv->MinUndecoratedPWDBForDM = pdmpriv->EntryMinUndecoratedSmoothedPWDB; pdmpriv->MinUndecoratedPWDBForDM = pdmpriv->EntryMinUndecoratedSmoothedPWDB;
@ -4287,7 +4287,7 @@ IN PADAPTER pAdapter
else // associated entry pwdb else // associated entry pwdb
{ {
pdmpriv->MinUndecoratedPWDBForDM = pdmpriv->EntryMinUndecoratedSmoothedPWDB; pdmpriv->MinUndecoratedPWDBForDM = pdmpriv->EntryMinUndecoratedSmoothedPWDB;
//ODM_RT_TRACE(pDM_Odm,COMP_BB_POWERSAVING, DBG_LOUD, ("AP Ext Port or disconnet PWDB = 0x%x \n", pHalData->MinUndecoratedPWDBForDM)); //ODM_RT_TRACE(pDM_Odm,COMP_BB_POWERSAVING, DBG_LOUD, ("AP Ext Port or disconnet PWDB = 0x%x\n", pHalData->MinUndecoratedPWDBForDM));
} }
#if (RTL8192D_SUPPORT==1) #if (RTL8192D_SUPPORT==1)
FindMinimumRSSI_Dmsp(pAdapter); FindMinimumRSSI_Dmsp(pAdapter);
@ -5282,7 +5282,7 @@ odm_SwAntDivChkAntSwitchNIC(
curRSSI = (pDM_SWAT_Table->CurAntenna == Antenna_A)? RSSI_A : RSSI_B; curRSSI = (pDM_SWAT_Table->CurAntenna == Antenna_A)? RSSI_A : RSSI_B;
pDM_SWAT_Table->PreRSSI = (pDM_SWAT_Table->CurAntenna == Antenna_A)? RSSI_B : RSSI_A; pDM_SWAT_Table->PreRSSI = (pDM_SWAT_Table->CurAntenna == Antenna_A)? RSSI_B : RSSI_A;
ODM_RT_TRACE(pDM_Odm, ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("Luke:PreRSSI = %d, CurRSSI = %d\n",pDM_SWAT_Table->PreRSSI, curRSSI)); ODM_RT_TRACE(pDM_Odm, ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("Luke:PreRSSI = %d, CurRSSI = %d\n",pDM_SWAT_Table->PreRSSI, curRSSI));
ODM_RT_TRACE(pDM_Odm, ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("SWAS: preAntenna= %s, curAntenna= %s \n", ODM_RT_TRACE(pDM_Odm, ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("SWAS: preAntenna= %s, curAntenna= %s\n",
(pDM_SWAT_Table->PreAntenna == Antenna_A?"A":"B"), (pDM_SWAT_Table->CurAntenna == Antenna_A?"A":"B"))); (pDM_SWAT_Table->PreAntenna == Antenna_A?"A":"B"), (pDM_SWAT_Table->CurAntenna == Antenna_A?"A":"B")));
ODM_RT_TRACE(pDM_Odm, ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("Luke:RSSI_A= %d, RSSI_cnt_A = %d, RSSI_B= %d, RSSI_cnt_B = %d\n", ODM_RT_TRACE(pDM_Odm, ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("Luke:RSSI_A= %d, RSSI_cnt_A = %d, RSSI_B= %d, RSSI_cnt_B = %d\n",
RSSI_A, pDM_SWAT_Table->RSSI_cnt_A, RSSI_B, pDM_SWAT_Table->RSSI_cnt_B)); RSSI_A, pDM_SWAT_Table->RSSI_cnt_A, RSSI_B, pDM_SWAT_Table->RSSI_cnt_B));
@ -5303,7 +5303,7 @@ odm_SwAntDivChkAntSwitchNIC(
curRSSI = (pDM_SWAT_Table->CurAntenna == Antenna_A)? RSSI_A : RSSI_B; curRSSI = (pDM_SWAT_Table->CurAntenna == Antenna_A)? RSSI_A : RSSI_B;
pDM_SWAT_Table->PreRSSI = (pDM_SWAT_Table->PreAntenna == Antenna_A)? RSSI_A : RSSI_B; pDM_SWAT_Table->PreRSSI = (pDM_SWAT_Table->PreAntenna == Antenna_A)? RSSI_A : RSSI_B;
ODM_RT_TRACE(pDM_Odm, ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("Ekul:PreRSSI = %d, CurRSSI = %d\n", pDM_SWAT_Table->PreRSSI, curRSSI)); ODM_RT_TRACE(pDM_Odm, ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("Ekul:PreRSSI = %d, CurRSSI = %d\n", pDM_SWAT_Table->PreRSSI, curRSSI));
ODM_RT_TRACE(pDM_Odm, ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("SWAS: preAntenna= %s, curAntenna= %s \n", ODM_RT_TRACE(pDM_Odm, ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("SWAS: preAntenna= %s, curAntenna= %s\n",
(pDM_SWAT_Table->PreAntenna == Antenna_A?"A":"B"), (pDM_SWAT_Table->CurAntenna == Antenna_A?"A":"B"))); (pDM_SWAT_Table->PreAntenna == Antenna_A?"A":"B"), (pDM_SWAT_Table->CurAntenna == Antenna_A?"A":"B")));
ODM_RT_TRACE(pDM_Odm, ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("Ekul:RSSI_A= %d, RSSI_cnt_A = %d, RSSI_B= %d, RSSI_cnt_B = %d\n", ODM_RT_TRACE(pDM_Odm, ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("Ekul:RSSI_A= %d, RSSI_cnt_A = %d, RSSI_B= %d, RSSI_cnt_B = %d\n",
@ -5354,7 +5354,7 @@ odm_SwAntDivChkAntSwitchNIC(
nextAntenna = (Score_B > Score_A)?Antenna_B:Antenna_A; nextAntenna = (Score_B > Score_A)?Antenna_B:Antenna_A;
} }
//RT_TRACE(COMP_SWAS, DBG_LOUD, ("nextAntenna=%s\n",(nextAntenna==Antenna_A)?"A":"B")); //RT_TRACE(COMP_SWAS, DBG_LOUD, ("nextAntenna=%s\n",(nextAntenna==Antenna_A)?"A":"B"));
//RT_TRACE(COMP_SWAS, DBG_LOUD, ("preAntenna= %s, curAntenna= %s \n", //RT_TRACE(COMP_SWAS, DBG_LOUD, ("preAntenna= %s, curAntenna= %s\n",
//(DM_SWAT_Table.PreAntenna == Antenna_A?"A":"B"), (DM_SWAT_Table.CurAntenna == Antenna_A?"A":"B"))); //(DM_SWAT_Table.PreAntenna == Antenna_A?"A":"B"), (DM_SWAT_Table.CurAntenna == Antenna_A?"A":"B")));
if (nextAntenna != pDM_SWAT_Table->CurAntenna) if (nextAntenna != pDM_SWAT_Table->CurAntenna)
@ -6898,8 +6898,8 @@ odm_EdcaTurboCheckMP(
if (bEdcaTurboOn) if (bEdcaTurboOn)
{ {
ODM_RT_TRACE(pDM_Odm,ODM_COMP_EDCA_TURBO,ODM_DBG_LOUD,("bEdcaTurboOn : 0x%x bBiasOnRx : 0x%x\n",bEdcaTurboOn,bBiasOnRx)); ODM_RT_TRACE(pDM_Odm,ODM_COMP_EDCA_TURBO,ODM_DBG_LOUD,("bEdcaTurboOn : 0x%x bBiasOnRx : 0x%x\n",bEdcaTurboOn,bBiasOnRx));
ODM_RT_TRACE(pDM_Odm,ODM_COMP_EDCA_TURBO,ODM_DBG_LOUD,("curTxOkCnt : 0x%lx \n",curTxOkCnt)); ODM_RT_TRACE(pDM_Odm,ODM_COMP_EDCA_TURBO,ODM_DBG_LOUD,("curTxOkCnt : 0x%lx\n",curTxOkCnt));
ODM_RT_TRACE(pDM_Odm,ODM_COMP_EDCA_TURBO,ODM_DBG_LOUD,("curRxOkCnt : 0x%lx \n",curRxOkCnt)); ODM_RT_TRACE(pDM_Odm,ODM_COMP_EDCA_TURBO,ODM_DBG_LOUD,("curRxOkCnt : 0x%lx\n",curRxOkCnt));
if (bBiasOnRx) if (bBiasOnRx)
odm_EdcaChooseTrafficIdx(pDM_Odm,curTxOkCnt, curRxOkCnt, TRUE, pbIsCurRDLState); odm_EdcaChooseTrafficIdx(pDM_Odm,curTxOkCnt, curRxOkCnt, TRUE, pbIsCurRDLState);
else else
@ -8801,7 +8801,7 @@ odm_PSD_Monitor(
PSD_skip_stop = 0; PSD_skip_stop = 0;
wlan_channel = CurrentChannel & 0x0f; wlan_channel = CurrentChannel & 0x0f;
ODM_RT_TRACE(pDM_Odm,COMP_PSD,DBG_LOUD,("PSD: current channel: %x, BW:%d \n", wlan_channel, Is40MHz)); ODM_RT_TRACE(pDM_Odm,COMP_PSD,DBG_LOUD,("PSD: current channel: %x, BW:%d\n", wlan_channel, Is40MHz));
if (pDM_Odm->SupportICType==ODM_RTL8723A) if (pDM_Odm->SupportICType==ODM_RTL8723A)
{ {
#if (BT_30_SUPPORT == 1) #if (BT_30_SUPPORT == 1)
@ -8863,7 +8863,7 @@ odm_PSD_Monitor(
} }
} }
ODM_RT_TRACE(pDM_Odm,COMP_PSD,DBG_LOUD,("PSD: Skip tone from %d to %d \n", PSD_skip_start, PSD_skip_stop)); ODM_RT_TRACE(pDM_Odm,COMP_PSD,DBG_LOUD,("PSD: Skip tone from %d to %d\n", PSD_skip_start, PSD_skip_stop));
for (n=0;n<80;n++) for (n=0;n<80;n++)
{ {
@ -8910,7 +8910,7 @@ odm_PSD_Monitor(
if ((n>=PSD_skip_start) && (n<PSD_skip_stop)) if ((n>=PSD_skip_start) && (n<PSD_skip_stop))
{ {
PSD_report[n] = SSBT; PSD_report[n] = SSBT;
ODM_RT_TRACE(pDM_Odm,COMP_PSD,DBG_LOUD,("PSD:Tone %d skipped \n", n)); ODM_RT_TRACE(pDM_Odm,COMP_PSD,DBG_LOUD,("PSD:Tone %d skipped\n", n));
} }
else else
{ {
@ -8972,15 +8972,15 @@ odm_PSD_Monitor(
ODM_SetBBReg(pDM_Odm, 0x818, BIT28, 1); ODM_SetBBReg(pDM_Odm, 0x818, BIT28, 1);
psd_cnt++; psd_cnt++;
ODM_RT_TRACE(pDM_Odm,COMP_PSD, DBG_LOUD,("PSD:psd_cnt = %d \n",psd_cnt)); ODM_RT_TRACE(pDM_Odm,COMP_PSD, DBG_LOUD,("PSD:psd_cnt = %d\n",psd_cnt));
if (psd_cnt < ReScan) if (psd_cnt < ReScan)
ODM_SetTimer(pDM_Odm, &pDM_Odm->PSDTimer, Interval); ODM_SetTimer(pDM_Odm, &pDM_Odm->PSDTimer, Interval);
else else
{ {
psd_cnt = 0; psd_cnt = 0;
for (i=0;i<80;i++) for (i=0;i<80;i++)
//DbgPrint("psd_report[%d]= %d \n", 2402+i, PSD_report[i]); //DbgPrint("psd_report[%d]= %d\n", 2402+i, PSD_report[i]);
RT_TRACE( COMP_PSD, DBG_LOUD,("psd_report[%d]= %d \n", 2402+i, PSD_report[i])); RT_TRACE( COMP_PSD, DBG_LOUD,("psd_report[%d]= %d\n", 2402+i, PSD_report[i]));
GoodChannelDecision(pDM_Odm, PSD_report, PSD_bitmap,RSSI_BT, PSD_bitmap_memory); GoodChannelDecision(pDM_Odm, PSD_report, PSD_bitmap,RSSI_BT, PSD_bitmap_memory);
@ -9017,7 +9017,7 @@ odm_PSD_Monitor(
if (H2C_PSD_DATA[i] !=H2C_PSD_DATA_last[i]) if (H2C_PSD_DATA[i] !=H2C_PSD_DATA_last[i])
{ {
FillH2CCmd(Adapter, H2C_92C_PSD_RESULT, 5, H2C_PSD_DATA); FillH2CCmd(Adapter, H2C_92C_PSD_RESULT, 5, H2C_PSD_DATA);
ODM_RT_TRACE(pDM_Odm, COMP_PSD, DBG_LOUD,("Need to Update the AFH Map \n")); ODM_RT_TRACE(pDM_Odm, COMP_PSD, DBG_LOUD,("Need to Update the AFH Map\n"));
break; break;
} }
else else
@ -9711,7 +9711,7 @@ odm_PSD_RXHP(
PSD_skip_stop = 0; PSD_skip_stop = 0;
wlan_channel = CurrentChannel & 0x0f; wlan_channel = CurrentChannel & 0x0f;
RT_TRACE(COMP_PSD,DBG_LOUD,("PSD: current channel: %x, BW:%d \n", wlan_channel, Is40MHz)); RT_TRACE(COMP_PSD,DBG_LOUD,("PSD: current channel: %x, BW:%d\n", wlan_channel, Is40MHz));
if ((curRxOkCnt+curTxOkCnt) > 1000) if ((curRxOkCnt+curTxOkCnt) > 1000)
{ {
@ -9719,7 +9719,7 @@ odm_PSD_RXHP(
PSD_skip_stop = PSD_skip_start + (1+Is40MHz)*20; PSD_skip_stop = PSD_skip_start + (1+Is40MHz)*20;
} }
RT_TRACE(COMP_PSD,DBG_LOUD,("PSD: Skip tone from %d to %d \n", PSD_skip_start, PSD_skip_stop)); RT_TRACE(COMP_PSD,DBG_LOUD,("PSD: Skip tone from %d to %d\n", PSD_skip_start, PSD_skip_stop));
for (n=0;n<80;n++) for (n=0;n<80;n++)
{ {
@ -9764,7 +9764,7 @@ odm_PSD_RXHP(
if ((n>=PSD_skip_start) && (n<PSD_skip_stop)) if ((n>=PSD_skip_start) && (n<PSD_skip_stop))
{ {
PSD_report[n] = initial_gain_psd;//SSBT; PSD_report[n] = initial_gain_psd;//SSBT;
ODM_RT_TRACE(pDM_Odm,COMP_PSD,DBG_LOUD,("PSD:Tone %d skipped \n", n)); ODM_RT_TRACE(pDM_Odm,COMP_PSD,DBG_LOUD,("PSD:Tone %d skipped\n", n));
} }
else else
{ {
@ -9824,7 +9824,7 @@ odm_PSD_RXHP(
psd_cnt++; psd_cnt++;
//gPrint("psd cnt=%d\n", psd_cnt); //gPrint("psd cnt=%d\n", psd_cnt);
ODM_RT_TRACE(pDM_Odm,COMP_PSD, DBG_LOUD,("PSD:psd_cnt = %d \n",psd_cnt)); ODM_RT_TRACE(pDM_Odm,COMP_PSD, DBG_LOUD,("PSD:psd_cnt = %d\n",psd_cnt));
if (psd_cnt < ReScan) if (psd_cnt < ReScan)
{ {
ODM_SetTimer(pDM_Odm, &pRX_HP_Table->PSDTimer, Interval); //ms ODM_SetTimer(pDM_Odm, &pRX_HP_Table->PSDTimer, Interval); //ms
@ -9833,8 +9833,8 @@ odm_PSD_RXHP(
{ {
psd_cnt = 0; psd_cnt = 0;
for (i=0;i<80;i++) for (i=0;i<80;i++)
RT_TRACE( COMP_PSD, DBG_LOUD,("psd_report[%d]= %d \n", 2402+i, PSD_report[i])); RT_TRACE( COMP_PSD, DBG_LOUD,("psd_report[%d]= %d\n", 2402+i, PSD_report[i]));
//DbgPrint("psd_report[%d]= %d \n", 2402+i, PSD_report[i]); //DbgPrint("psd_report[%d]= %d\n", 2402+i, PSD_report[i]);
GoodChannelDecision(pDM_Odm, PSD_report, PSD_bitmap,RSSI_BT, PSD_bitmap_memory); GoodChannelDecision(pDM_Odm, PSD_report, PSD_bitmap,RSSI_BT, PSD_bitmap_memory);
@ -10799,7 +10799,7 @@ odm_PathDivChkAntSwitch(
u1Byte PathDiv_Enable = pHalData->bPathDiv_Enable; u1Byte PathDiv_Enable = pHalData->bPathDiv_Enable;
//DbgPrint("Path Div PG Value:%x \n",PathDiv_Enable); //DbgPrint("Path Div PG Value:%x\n",PathDiv_Enable);
if ((BuddyAdapter==NULL)||(!PathDiv_Enable)||(PathDiv_Trigger)||(pHalData->CurrentBandType92D == BAND_ON_2_4G)) if ((BuddyAdapter==NULL)||(!PathDiv_Enable)||(PathDiv_Trigger)||(pHalData->CurrentBandType92D == BAND_ON_2_4G))
{ {
return; return;
@ -10945,7 +10945,7 @@ odm_PathDivChkAntSwitch(
curRSSI = (pDM_SWAT_Table->CurAntenna == Antenna_A)? RSSI_A : RSSI_B; curRSSI = (pDM_SWAT_Table->CurAntenna == Antenna_A)? RSSI_A : RSSI_B;
pDM_SWAT_Table->PreRSSI = (pDM_SWAT_Table->CurAntenna == Antenna_A)? RSSI_B : RSSI_A; pDM_SWAT_Table->PreRSSI = (pDM_SWAT_Table->CurAntenna == Antenna_A)? RSSI_B : RSSI_A;
ODM_RT_TRACE(pDM_Odm,ODM_COMP_PATH_DIV, ODM_DBG_LOUD, ("=PATH DIV=: PreRSSI = %d, CurRSSI = %d\n",pDM_SWAT_Table->PreRSSI, curRSSI)); ODM_RT_TRACE(pDM_Odm,ODM_COMP_PATH_DIV, ODM_DBG_LOUD, ("=PATH DIV=: PreRSSI = %d, CurRSSI = %d\n",pDM_SWAT_Table->PreRSSI, curRSSI));
ODM_RT_TRACE(pDM_Odm,ODM_COMP_PATH_DIV, ODM_DBG_LOUD, ("=PATH DIV=: preAntenna= %s, curAntenna= %s \n", ODM_RT_TRACE(pDM_Odm,ODM_COMP_PATH_DIV, ODM_DBG_LOUD, ("=PATH DIV=: preAntenna= %s, curAntenna= %s\n",
(pDM_SWAT_Table->PreAntenna == Antenna_A?"A":"B"), (pDM_SWAT_Table->CurAntenna == Antenna_A?"A":"B"))); (pDM_SWAT_Table->PreAntenna == Antenna_A?"A":"B"), (pDM_SWAT_Table->CurAntenna == Antenna_A?"A":"B")));
ODM_RT_TRACE(pDM_Odm,ODM_COMP_PATH_DIV, ODM_DBG_LOUD, ("=PATH DIV=: RSSI_A= %d, RSSI_cnt_A = %d, RSSI_B= %d, RSSI_cnt_B = %d\n", ODM_RT_TRACE(pDM_Odm,ODM_COMP_PATH_DIV, ODM_DBG_LOUD, ("=PATH DIV=: RSSI_A= %d, RSSI_cnt_A = %d, RSSI_B= %d, RSSI_cnt_B = %d\n",
RSSI_A, pHalData->RSSI_cnt_A, RSSI_B, pHalData->RSSI_cnt_B)); RSSI_A, pHalData->RSSI_cnt_A, RSSI_B, pHalData->RSSI_cnt_B));
@ -10966,7 +10966,7 @@ odm_PathDivChkAntSwitch(
curRSSI = (pDM_SWAT_Table->CurAntenna == Antenna_A)? RSSI_A : RSSI_B; curRSSI = (pDM_SWAT_Table->CurAntenna == Antenna_A)? RSSI_A : RSSI_B;
pDM_SWAT_Table->PreRSSI = (pDM_SWAT_Table->PreAntenna == Antenna_A)? RSSI_A : RSSI_B; pDM_SWAT_Table->PreRSSI = (pDM_SWAT_Table->PreAntenna == Antenna_A)? RSSI_A : RSSI_B;
ODM_RT_TRACE(pDM_Odm,ODM_COMP_PATH_DIV, ODM_DBG_LOUD, ("=PATH DIV=: PreRSSI = %d, CurRSSI = %d\n", pDM_SWAT_Table->PreRSSI, curRSSI)); ODM_RT_TRACE(pDM_Odm,ODM_COMP_PATH_DIV, ODM_DBG_LOUD, ("=PATH DIV=: PreRSSI = %d, CurRSSI = %d\n", pDM_SWAT_Table->PreRSSI, curRSSI));
ODM_RT_TRACE(pDM_Odm,ODM_COMP_PATH_DIV, ODM_DBG_LOUD, ("=PATH DIV=: preAntenna= %s, curAntenna= %s \n", ODM_RT_TRACE(pDM_Odm,ODM_COMP_PATH_DIV, ODM_DBG_LOUD, ("=PATH DIV=: preAntenna= %s, curAntenna= %s\n",
(pDM_SWAT_Table->PreAntenna == Antenna_A?"A":"B"), (pDM_SWAT_Table->CurAntenna == Antenna_A?"A":"B"))); (pDM_SWAT_Table->PreAntenna == Antenna_A?"A":"B"), (pDM_SWAT_Table->CurAntenna == Antenna_A?"A":"B")));
ODM_RT_TRACE(pDM_Odm,ODM_COMP_PATH_DIV, ODM_DBG_LOUD, ("=PATH DIV=: RSSI_A= %d, RSSI_cnt_A = %d, RSSI_B= %d, RSSI_cnt_B = %d\n", ODM_RT_TRACE(pDM_Odm,ODM_COMP_PATH_DIV, ODM_DBG_LOUD, ("=PATH DIV=: RSSI_A= %d, RSSI_cnt_A = %d, RSSI_B= %d, RSSI_cnt_B = %d\n",
@ -11017,7 +11017,7 @@ odm_PathDivChkAntSwitch(
nextAntenna = (Score_B >= Score_A)?Antenna_B:Antenna_A; nextAntenna = (Score_B >= Score_A)?Antenna_B:Antenna_A;
} }
ODM_RT_TRACE(pDM_Odm,ODM_COMP_PATH_DIV, ODM_DBG_LOUD, ("=PATH=: nextAntenna=%s\n",(nextAntenna==Antenna_A)?"A":"B")); ODM_RT_TRACE(pDM_Odm,ODM_COMP_PATH_DIV, ODM_DBG_LOUD, ("=PATH=: nextAntenna=%s\n",(nextAntenna==Antenna_A)?"A":"B"));
ODM_RT_TRACE(pDM_Odm,ODM_COMP_PATH_DIV, ODM_DBG_LOUD, ("=PATH=: preAntenna= %s, curAntenna= %s \n", ODM_RT_TRACE(pDM_Odm,ODM_COMP_PATH_DIV, ODM_DBG_LOUD, ("=PATH=: preAntenna= %s, curAntenna= %s\n",
(pDM_SWAT_Table->PreAntenna == Antenna_A?"A":"B"), (pDM_SWAT_Table->CurAntenna == Antenna_A?"A":"B"))); (pDM_SWAT_Table->PreAntenna == Antenna_A?"A":"B"), (pDM_SWAT_Table->CurAntenna == Antenna_A?"A":"B")));
if (nextAntenna != pDM_SWAT_Table->CurAntenna) if (nextAntenna != pDM_SWAT_Table->CurAntenna)
@ -11545,9 +11545,9 @@ ODM_SingleDualAntennaDetection(
//Reload AFE Registers //Reload AFE Registers
odm_PHY_ReloadAFERegisters(pDM_Odm, AFE_REG_8723A, AFE_Backup, 16); odm_PHY_ReloadAFERegisters(pDM_Odm, AFE_REG_8723A, AFE_Backup, 16);
ODM_RT_TRACE(pDM_Odm,ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("psd_report_A[%d]= %d \n", 2416, AntA_report)); ODM_RT_TRACE(pDM_Odm,ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("psd_report_A[%d]= %d\n", 2416, AntA_report));
ODM_RT_TRACE(pDM_Odm,ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("psd_report_B[%d]= %d \n", 2416, AntB_report)); ODM_RT_TRACE(pDM_Odm,ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("psd_report_B[%d]= %d\n", 2416, AntB_report));
ODM_RT_TRACE(pDM_Odm,ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("psd_report_O[%d]= %d \n", 2416, AntO_report)); ODM_RT_TRACE(pDM_Odm,ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("psd_report_O[%d]= %d\n", 2416, AntO_report));
if (pDM_Odm->SupportICType == ODM_RTL8723A) if (pDM_Odm->SupportICType == ODM_RTL8723A)
@ -11630,7 +11630,7 @@ ODM_SingleDualAntennaDetection(
{ {
pDM_SWAT_Table->ANTA_ON=TRUE; pDM_SWAT_Table->ANTA_ON=TRUE;
pDM_SWAT_Table->ANTB_ON=TRUE; pDM_SWAT_Table->ANTB_ON=TRUE;
RT_TRACE(COMP_ANTENNA, DBG_LOUD, ("ODM_SingleDualAntennaDetection(): Dual Antenna \n")); RT_TRACE(COMP_ANTENNA, DBG_LOUD, ("ODM_SingleDualAntennaDetection(): Dual Antenna\n"));
} }
} }
else else

4
hal/odm_HWConfig.c
View file

@ -359,7 +359,7 @@ odm_EVMdbToPercentage(
ret_val = Value; ret_val = Value;
//ret_val /= 2; //ret_val /= 2;
//ODM_RTPRINT(FRX, RX_PHY_SQ, ("EVMdbToPercentage92C Value=%d / %x \n", ret_val, ret_val)); //ODM_RTPRINT(FRX, RX_PHY_SQ, ("EVMdbToPercentage92C Value=%d / %x\n", ret_val, ret_val));
if (ret_val >= 0) if (ret_val >= 0)
ret_val = 0; ret_val = 0;
@ -850,7 +850,7 @@ odm_Process_RSSIForDM(
} }
else else
{ {
//DbgPrint("pRfd->Status.RxMIMOSignalStrength[0] = %d, pRfd->Status.RxMIMOSignalStrength[1] = %d \n", //DbgPrint("pRfd->Status.RxMIMOSignalStrength[0] = %d, pRfd->Status.RxMIMOSignalStrength[1] = %d\n",
//pRfd->Status.RxMIMOSignalStrength[0], pRfd->Status.RxMIMOSignalStrength[1]); //pRfd->Status.RxMIMOSignalStrength[0], pRfd->Status.RxMIMOSignalStrength[1]);

8
hal/odm_RTL8188E.c
View file

@ -36,7 +36,7 @@ ODM_DIG_LowerBound_88E(
if (pDM_Odm->AntDivType == CG_TRX_HW_ANTDIV) if (pDM_Odm->AntDivType == CG_TRX_HW_ANTDIV)
{ {
pDM_DigTable->rx_gain_range_min = (u1Byte) pDM_DigTable->AntDiv_RSSI_max; pDM_DigTable->rx_gain_range_min = (u1Byte) pDM_DigTable->AntDiv_RSSI_max;
ODM_RT_TRACE(pDM_Odm,ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("ODM_DIG_LowerBound_88E(): pDM_DigTable->AntDiv_RSSI_max=%d \n",pDM_DigTable->AntDiv_RSSI_max)); ODM_RT_TRACE(pDM_Odm,ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("ODM_DIG_LowerBound_88E(): pDM_DigTable->AntDiv_RSSI_max=%d\n",pDM_DigTable->AntDiv_RSSI_max));
} }
//If only one Entry connected //If only one Entry connected
@ -61,7 +61,7 @@ odm_RX_HWAntDivInit(
return; return;
} }
#endif #endif
ODM_RT_TRACE(pDM_Odm,ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("odm_RX_HWAntDivInit() \n")); ODM_RT_TRACE(pDM_Odm,ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("odm_RX_HWAntDivInit()\n"));
//MAC Setting //MAC Setting
value32 = ODM_GetMACReg(pDM_Odm, ODM_REG_ANTSEL_PIN_11N, bMaskDWord); value32 = ODM_GetMACReg(pDM_Odm, ODM_REG_ANTSEL_PIN_11N, bMaskDWord);
@ -102,7 +102,7 @@ odm_TRX_HWAntDivInit(
#endif #endif
ODM_RT_TRACE(pDM_Odm,ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("odm_TRX_HWAntDivInit() \n")); ODM_RT_TRACE(pDM_Odm,ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("odm_TRX_HWAntDivInit()\n"));
//MAC Setting //MAC Setting
value32 = ODM_GetMACReg(pDM_Odm, ODM_REG_ANTSEL_PIN_11N, bMaskDWord); value32 = ODM_GetMACReg(pDM_Odm, ODM_REG_ANTSEL_PIN_11N, bMaskDWord);
@ -143,7 +143,7 @@ odm_FastAntTrainingInit(
pFAT_T pDM_FatTable = &pDM_Odm->DM_FatTable; pFAT_T pDM_FatTable = &pDM_Odm->DM_FatTable;
u4Byte AntCombination = 2; u4Byte AntCombination = 2;
PADAPTER Adapter = pDM_Odm->Adapter; PADAPTER Adapter = pDM_Odm->Adapter;
ODM_RT_TRACE(pDM_Odm,ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("odm_FastAntTrainingInit() \n")); ODM_RT_TRACE(pDM_Odm,ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("odm_FastAntTrainingInit()\n"));
#if (MP_DRIVER == 1) #if (MP_DRIVER == 1)
if (*(pDM_Odm->mp_mode) == 1) if (*(pDM_Odm->mp_mode) == 1)

24
hal/rtl8188e_cmd.c
View file

@ -225,7 +225,7 @@ _func_enter_;
FillH2CCmd_88E(padapter, RSSI_SETTING_EID, 3, param); FillH2CCmd_88E(padapter, RSSI_SETTING_EID, 3, param);
#endif #endif
}else{ }else{
DBG_8192C("==>%s fw dont support RA \n",__FUNCTION__); DBG_8192C("==>%s fw dont support RA\n",__FUNCTION__);
res=_FAIL; res=_FAIL;
} }
@ -247,7 +247,7 @@ _func_enter_;
FillH2CCmd_88E(padapter, H2C_DM_MACID_CFG, 3, buf); FillH2CCmd_88E(padapter, H2C_DM_MACID_CFG, 3, buf);
}else{ }else{
DBG_8192C("==>%s fw dont support RA \n",__FUNCTION__); DBG_8192C("==>%s fw dont support RA\n",__FUNCTION__);
res=_FAIL; res=_FAIL;
} }
@ -381,7 +381,7 @@ void rtl8188e_set_FwMediaStatus_cmd(PADAPTER padapter, u16 mstatus_rpt )
opmode = (u8) mst_rpt; opmode = (u8) mst_rpt;
macid = (u8)(mst_rpt >> 8) ; macid = (u8)(mst_rpt >> 8) ;
DBG_871X("### %s: MStatus=%x MACID=%d \n", __FUNCTION__,opmode,macid); DBG_871X("### %s: MStatus=%x MACID=%d\n", __FUNCTION__,opmode,macid);
FillH2CCmd_88E(padapter, H2C_COM_MEDIA_STATUS_RPT, sizeof(mst_rpt), (u8 *)&mst_rpt); FillH2CCmd_88E(padapter, H2C_COM_MEDIA_STATUS_RPT, sizeof(mst_rpt), (u8 *)&mst_rpt);
} }
@ -977,11 +977,11 @@ _func_enter_;
switch (p2p_ps_state) switch (p2p_ps_state)
{ {
case P2P_PS_DISABLE: case P2P_PS_DISABLE:
DBG_8192C("P2P_PS_DISABLE \n"); DBG_8192C("P2P_PS_DISABLE\n");
_rtw_memset(p2p_ps_offload, 0 ,1); _rtw_memset(p2p_ps_offload, 0 ,1);
break; break;
case P2P_PS_ENABLE: case P2P_PS_ENABLE:
DBG_8192C("P2P_PS_ENABLE \n"); DBG_8192C("P2P_PS_ENABLE\n");
// update CTWindow value. // update CTWindow value.
if ( pwdinfo->ctwindow > 0 ) if ( pwdinfo->ctwindow > 0 )
{ {
@ -1034,11 +1034,11 @@ _func_enter_;
} }
break; break;
case P2P_PS_SCAN: case P2P_PS_SCAN:
DBG_8192C("P2P_PS_SCAN \n"); DBG_8192C("P2P_PS_SCAN\n");
p2p_ps_offload->discovery = 1; p2p_ps_offload->discovery = 1;
break; break;
case P2P_PS_SCAN_DONE: case P2P_PS_SCAN_DONE:
DBG_8192C("P2P_PS_SCAN_DONE \n"); DBG_8192C("P2P_PS_SCAN_DONE\n");
p2p_ps_offload->discovery = 0; p2p_ps_offload->discovery = 0;
pwdinfo->p2p_ps_state = P2P_PS_ENABLE; pwdinfo->p2p_ps_state = P2P_PS_ENABLE;
break; break;
@ -1129,15 +1129,15 @@ _func_enter_;
if (pwrpriv->wowlan_pattern ==_TRUE){ if (pwrpriv->wowlan_pattern ==_TRUE){
pwowlan_parm.mode |= FW_WOWLAN_PATTERN_MATCH; pwowlan_parm.mode |= FW_WOWLAN_PATTERN_MATCH;
DBG_871X_LEVEL(_drv_info_, "%s 2.pwowlan_parm.mode=0x%x \n",__FUNCTION__,pwowlan_parm.mode ); DBG_871X_LEVEL(_drv_info_, "%s 2.pwowlan_parm.mode=0x%x\n",__FUNCTION__,pwowlan_parm.mode );
} }
if (pwrpriv->wowlan_magic ==_TRUE){ if (pwrpriv->wowlan_magic ==_TRUE){
pwowlan_parm.mode |=FW_WOWLAN_MAGIC_PKT; pwowlan_parm.mode |=FW_WOWLAN_MAGIC_PKT;
DBG_871X_LEVEL(_drv_info_, "%s 3.pwowlan_parm.mode=0x%x \n",__FUNCTION__,pwowlan_parm.mode ); DBG_871X_LEVEL(_drv_info_, "%s 3.pwowlan_parm.mode=0x%x\n",__FUNCTION__,pwowlan_parm.mode );
} }
if (pwrpriv->wowlan_unicast ==_TRUE){ if (pwrpriv->wowlan_unicast ==_TRUE){
pwowlan_parm.mode |=FW_WOWLAN_UNICAST; pwowlan_parm.mode |=FW_WOWLAN_UNICAST;
DBG_871X_LEVEL(_drv_info_, "%s 4.pwowlan_parm.mode=0x%x \n",__FUNCTION__,pwowlan_parm.mode ); DBG_871X_LEVEL(_drv_info_, "%s 4.pwowlan_parm.mode=0x%x\n",__FUNCTION__,pwowlan_parm.mode );
} }
if (!(padapter->pwrctrlpriv.wowlan_wake_reason & FWDecisionDisconnect)) if (!(padapter->pwrctrlpriv.wowlan_wake_reason & FWDecisionDisconnect))
@ -1160,8 +1160,8 @@ _func_enter_;
pwowlan_parm.gpio_index=0x80; pwowlan_parm.gpio_index=0x80;
#endif //CONFIG_SDIO_HCI #endif //CONFIG_SDIO_HCI
DBG_871X_LEVEL(_drv_info_, "%s 5.pwowlan_parm.mode=0x%x \n",__FUNCTION__,pwowlan_parm.mode); DBG_871X_LEVEL(_drv_info_, "%s 5.pwowlan_parm.mode=0x%x\n",__FUNCTION__,pwowlan_parm.mode);
DBG_871X_LEVEL(_drv_info_, "%s 6.pwowlan_parm.index=0x%x \n",__FUNCTION__,pwowlan_parm.gpio_index); DBG_871X_LEVEL(_drv_info_, "%s 6.pwowlan_parm.index=0x%x\n",__FUNCTION__,pwowlan_parm.gpio_index);
res = FillH2CCmd_88E(padapter, H2C_COM_WWLAN, 2, (u8 *)&pwowlan_parm); res = FillH2CCmd_88E(padapter, H2C_COM_WWLAN, 2, (u8 *)&pwowlan_parm);
rtw_msleep_os(2); rtw_msleep_os(2);

20
hal/rtl8188e_hal_init.c
View file

@ -169,7 +169,7 @@ efuse_phymap_to_logical(u8 * phymap, u16 _offset, u16 _size_byte, u8 *pbuf)
u1temp =( (rtemp8 & 0xE0) >> 5); u1temp =( (rtemp8 & 0xE0) >> 5);
//RTPRINT(FEEPROM, EFUSE_READ_ALL, ("extended header u1temp=%x *rtemp&0xE0 0x%x\n", u1temp, *rtemp8 & 0xE0)); //RTPRINT(FEEPROM, EFUSE_READ_ALL, ("extended header u1temp=%x *rtemp&0xE0 0x%x\n", u1temp, *rtemp8 & 0xE0));
//RTPRINT(FEEPROM, EFUSE_READ_ALL, ("extended header u1temp=%x \n", u1temp)); //RTPRINT(FEEPROM, EFUSE_READ_ALL, ("extended header u1temp=%x\n", u1temp));
rtemp8 = *(phymap+eFuse_Addr); rtemp8 = *(phymap+eFuse_Addr);
@ -209,7 +209,7 @@ efuse_phymap_to_logical(u8 * phymap, u16 _offset, u16 _size_byte, u8 *pbuf)
// Check word enable condition in the section // Check word enable condition in the section
if (!(wren & 0x01)) if (!(wren & 0x01))
{ {
//RTPRINT(FEEPROM, EFUSE_READ_ALL, ("Addr=%d \n", eFuse_Addr)); //RTPRINT(FEEPROM, EFUSE_READ_ALL, ("Addr=%d\n", eFuse_Addr));
rtemp8 = *(phymap+eFuse_Addr); rtemp8 = *(phymap+eFuse_Addr);
eFuse_Addr++; eFuse_Addr++;
//RTPRINT(FEEPROM, EFUSE_READ_ALL, ("Data=0x%x\n", *rtemp8)); //RTPRINT(FEEPROM, EFUSE_READ_ALL, ("Data=0x%x\n", *rtemp8));
@ -448,7 +448,7 @@ static s32 iol_read_efuse(
s32 rtl8188e_iol_efuse_patch(PADAPTER padapter) s32 rtl8188e_iol_efuse_patch(PADAPTER padapter)
{ {
s32 result = _SUCCESS; s32 result = _SUCCESS;
printk("==> %s \n",__FUNCTION__); printk("==> %s\n",__FUNCTION__);
if (rtw_IOL_applied(padapter)){ if (rtw_IOL_applied(padapter)){
iol_mode_enable(padapter, 1); iol_mode_enable(padapter, 1);
@ -484,7 +484,7 @@ int rtl8188e_IOL_exec_cmds_sync(ADAPTER *adapter, struct xmit_frame *xmit_frame,
int ret = _FAIL; int ret = _FAIL;
u32 t1,t2; u32 t1,t2;
//printk("===> %s ,bndy_cnt = %d \n",__FUNCTION__,bndy_cnt); //printk("===> %s ,bndy_cnt = %d\n",__FUNCTION__,bndy_cnt);
if (rtw_IOL_append_END_cmd(xmit_frame) != _SUCCESS) if (rtw_IOL_append_END_cmd(xmit_frame) != _SUCCESS)
goto exit; goto exit;
#ifdef CONFIG_USB_HCI #ifdef CONFIG_USB_HCI
@ -509,7 +509,7 @@ int rtl8188e_IOL_exec_cmds_sync(ADAPTER *adapter, struct xmit_frame *xmit_frame,
for (i=0;i<bndy_cnt;i++){ for (i=0;i<bndy_cnt;i++){
u8 page_no = 0; u8 page_no = 0;
page_no = i*2 ; page_no = i*2 ;
//printk(" i = %d, page_no = %d \n",i,page_no); //printk(" i = %d, page_no = %d\n",i,page_no);
if ( (ret = iol_ioconfig(adapter, page_no)) != _SUCCESS) if ( (ret = iol_ioconfig(adapter, page_no)) != _SUCCESS)
{ {
break; break;
@ -767,7 +767,7 @@ _WriteFW(
#endif #endif
pageNums = size / MAX_PAGE_SIZE ; pageNums = size / MAX_PAGE_SIZE ;
//RT_ASSERT((pageNums <= 4), ("Page numbers should not greater then 4 \n")); //RT_ASSERT((pageNums <= 4), ("Page numbers should not greater then 4\n"));
remainSize = size % MAX_PAGE_SIZE; remainSize = size % MAX_PAGE_SIZE;
for (page = 0; page < pageNums; page++) { for (page = 0; page < pageNums; page++) {
@ -1314,7 +1314,7 @@ Hal_EfuseReadEFuse88E(
u1temp =( (*rtemp8 & 0xE0) >> 5); u1temp =( (*rtemp8 & 0xE0) >> 5);
//RTPRINT(FEEPROM, EFUSE_READ_ALL, ("extended header u1temp=%x *rtemp&0xE0 0x%x\n", u1temp, *rtemp8 & 0xE0)); //RTPRINT(FEEPROM, EFUSE_READ_ALL, ("extended header u1temp=%x *rtemp&0xE0 0x%x\n", u1temp, *rtemp8 & 0xE0));
//RTPRINT(FEEPROM, EFUSE_READ_ALL, ("extended header u1temp=%x \n", u1temp)); //RTPRINT(FEEPROM, EFUSE_READ_ALL, ("extended header u1temp=%x\n", u1temp));
ReadEFuseByte(Adapter, eFuse_Addr, rtemp8, bPseudoTest); ReadEFuseByte(Adapter, eFuse_Addr, rtemp8, bPseudoTest);
@ -1354,7 +1354,7 @@ Hal_EfuseReadEFuse88E(
// Check word enable condition in the section // Check word enable condition in the section
if (!(wren & 0x01)) if (!(wren & 0x01))
{ {
//RTPRINT(FEEPROM, EFUSE_READ_ALL, ("Addr=%d \n", eFuse_Addr)); //RTPRINT(FEEPROM, EFUSE_READ_ALL, ("Addr=%d\n", eFuse_Addr));
ReadEFuseByte(Adapter, eFuse_Addr, rtemp8, bPseudoTest); ReadEFuseByte(Adapter, eFuse_Addr, rtemp8, bPseudoTest);
eFuse_Addr++; eFuse_Addr++;
//RTPRINT(FEEPROM, EFUSE_READ_ALL, ("Data=0x%x\n", *rtemp8)); //RTPRINT(FEEPROM, EFUSE_READ_ALL, ("Data=0x%x\n", *rtemp8));
@ -3326,7 +3326,7 @@ Hal_GetChnlGroup88E(
*pGroup = 5; *pGroup = 5;
else else
{ {
//RT_TRACE(COMP_EFUSE,DBG_LOUD,("==>Hal_GetChnlGroup88E in 2.4 G, but Channel %d in Group not found \n",chnl)); //RT_TRACE(COMP_EFUSE,DBG_LOUD,("==>Hal_GetChnlGroup88E in 2.4 G, but Channel %d in Group not found\n",chnl));
} }
} }
else else
@ -3361,7 +3361,7 @@ Hal_GetChnlGroup88E(
*pGroup = 11; *pGroup = 11;
else else
{ {
//RT_TRACE(COMP_EFUSE,DBG_LOUD,("==>Hal_GetChnlGroup88E in 5G, but Channel %d in Group not found \n",chnl)); //RT_TRACE(COMP_EFUSE,DBG_LOUD,("==>Hal_GetChnlGroup88E in 5G, but Channel %d in Group not found\n",chnl));
} }
} }

2
hal/rtl8188e_mp.c
View file

@ -981,7 +981,7 @@ void Hal_SetCarrierSuppressionTx(PADAPTER pAdapter, u8 bStart)
write_bbreg(pAdapter, rFPGA0_XB_HSSIParameter1, bMaskDWord, 0x01000100); write_bbreg(pAdapter, rFPGA0_XB_HSSIParameter1, bMaskDWord, 0x01000100);
} }
//DbgPrint("\n MPT_ProSetCarrierSupp() is finished. \n"); //DbgPrint("\n MPT_ProSetCarrierSupp() is finished.\n");
} }
void Hal_SetCCKContinuousTx(PADAPTER pAdapter, u8 bStart) void Hal_SetCCKContinuousTx(PADAPTER pAdapter, u8 bStart)

24
hal/rtl8188e_phycfg.c
View file

@ -1188,7 +1188,7 @@ phy_ConfigBBWithHeaderFile(
podmpriv->RFCalibrateInfo.RegA24 = Rtl819XPHY_REGArray_Table[i+1]; podmpriv->RFCalibrateInfo.RegA24 = Rtl819XPHY_REGArray_Table[i+1];
rtw_IOL_append_WD_cmd(xmit_frame, Rtl819XPHY_REGArray_Table[i], tmp_value); rtw_IOL_append_WD_cmd(xmit_frame, Rtl819XPHY_REGArray_Table[i], tmp_value);
//RT_TRACE(COMP_INIT, DBG_TRACE, ("The Rtl819XPHY_REGArray_Table[0] is %lx Rtl819XPHY_REGArray[1] is %lx \n",Rtl819XPHY_REGArray_Table[i], Rtl819XPHY_REGArray_Table[i+1])); //RT_TRACE(COMP_INIT, DBG_TRACE, ("The Rtl819XPHY_REGArray_Table[0] is %lx Rtl819XPHY_REGArray[1] is %lx\n",Rtl819XPHY_REGArray_Table[i], Rtl819XPHY_REGArray_Table[i+1]));
} }
ret = rtw_IOL_exec_cmds_sync(Adapter, xmit_frame, 1000,0); ret = rtw_IOL_exec_cmds_sync(Adapter, xmit_frame, 1000,0);
@ -1221,7 +1221,7 @@ phy_ConfigBBWithHeaderFile(
// Add 1us delay between BB/RF register setting. // Add 1us delay between BB/RF register setting.
rtw_udelay_os(1); rtw_udelay_os(1);
//RT_TRACE(COMP_INIT, DBG_TRACE, ("The Rtl819XPHY_REGArray_Table[0] is %lx Rtl819XPHY_REGArray[1] is %lx \n",Rtl819XPHY_REGArray_Table[i], Rtl819XPHY_REGArray_Table[i+1])); //RT_TRACE(COMP_INIT, DBG_TRACE, ("The Rtl819XPHY_REGArray_Table[0] is %lx Rtl819XPHY_REGArray[1] is %lx\n",Rtl819XPHY_REGArray_Table[i], Rtl819XPHY_REGArray_Table[i+1]));
} }
#endif #endif
// for External PA // for External PA
@ -1241,7 +1241,7 @@ phy_ConfigBBWithHeaderFile(
for (i=0;i<AGCTAB_ArrayLen;i=i+2) for (i=0;i<AGCTAB_ArrayLen;i=i+2)
{ {
rtw_IOL_append_WD_cmd(xmit_frame, Rtl819XAGCTAB_Array_Table[i], Rtl819XAGCTAB_Array_Table[i+1]); rtw_IOL_append_WD_cmd(xmit_frame, Rtl819XAGCTAB_Array_Table[i], Rtl819XAGCTAB_Array_Table[i+1]);
//RT_TRACE(COMP_INIT, DBG_TRACE, ("The Rtl819XAGCTAB_Array_Table[0] is %lx Rtl819XPHY_REGArray[1] is %lx \n",Rtl819XAGCTAB_Array_Table[i], Rtl819XAGCTAB_Array_Table[i+1])); //RT_TRACE(COMP_INIT, DBG_TRACE, ("The Rtl819XAGCTAB_Array_Table[0] is %lx Rtl819XPHY_REGArray[1] is %lx\n",Rtl819XAGCTAB_Array_Table[i], Rtl819XAGCTAB_Array_Table[i+1]));
} }
ret = rtw_IOL_exec_cmds_sync(Adapter, xmit_frame, 1000,0); ret = rtw_IOL_exec_cmds_sync(Adapter, xmit_frame, 1000,0);
@ -1254,7 +1254,7 @@ phy_ConfigBBWithHeaderFile(
// Add 1us delay between BB/RF register setting. // Add 1us delay between BB/RF register setting.
rtw_udelay_os(1); rtw_udelay_os(1);
//RT_TRACE(COMP_INIT, DBG_TRACE, ("The Rtl819XAGCTAB_Array_Table[0] is %lx Rtl819XPHY_REGArray[1] is %lx \n",Rtl819XAGCTAB_Array_Table[i], Rtl819XAGCTAB_Array_Table[i+1])); //RT_TRACE(COMP_INIT, DBG_TRACE, ("The Rtl819XAGCTAB_Array_Table[0] is %lx Rtl819XPHY_REGArray[1] is %lx\n",Rtl819XAGCTAB_Array_Table[i], Rtl819XAGCTAB_Array_Table[i+1]));
} }
#endif #endif
} }
@ -1468,7 +1468,7 @@ phy_ConfigBBWithPgHeaderFile(
Rtl819XPHY_REGArray_Table_PG[i+1], Rtl819XPHY_REGArray_Table_PG[i+1],
Rtl819XPHY_REGArray_Table_PG[i+2]); Rtl819XPHY_REGArray_Table_PG[i+2]);
//PHY_SetBBReg(Adapter, Rtl819XPHY_REGArray_Table_PG[i], Rtl819XPHY_REGArray_Table_PG[i+1], Rtl819XPHY_REGArray_Table_PG[i+2]); //PHY_SetBBReg(Adapter, Rtl819XPHY_REGArray_Table_PG[i], Rtl819XPHY_REGArray_Table_PG[i+1], Rtl819XPHY_REGArray_Table_PG[i+2]);
//RT_TRACE(COMP_SEND, DBG_TRACE, ("The Rtl819XPHY_REGArray_Table_PG[0] is %lx Rtl819XPHY_REGArray_Table_PG[1] is %lx \n",Rtl819XPHY_REGArray_Table_PG[i], Rtl819XPHY_REGArray_Table_PG[i+1])); //RT_TRACE(COMP_SEND, DBG_TRACE, ("The Rtl819XPHY_REGArray_Table_PG[0] is %lx Rtl819XPHY_REGArray_Table_PG[1] is %lx\n",Rtl819XPHY_REGArray_Table_PG[i], Rtl819XPHY_REGArray_Table_PG[i+1]));
} }
} }
else else
@ -1525,7 +1525,7 @@ phy_BB8190_Config_HardCode(
IN PADAPTER Adapter IN PADAPTER Adapter
) )
{ {
//RT_ASSERT(FALSE, ("This function is not implement yet!! \n")); //RT_ASSERT(FALSE, ("This function is not implement yet!!\n"));
return _SUCCESS; return _SUCCESS;
} }
@ -2096,7 +2096,7 @@ PHY_CheckBBAndRFOK(
// //
if (ulRegRead != WriteData[i]) if (ulRegRead != WriteData[i])
{ {
//RT_TRACE(COMP_FPGA, DBG_LOUD, ("ulRegRead: %lx, WriteData: %lx \n", ulRegRead, WriteData[i])); //RT_TRACE(COMP_FPGA, DBG_LOUD, ("ulRegRead: %lx, WriteData: %lx\n", ulRegRead, WriteData[i]));
rtStatus = _FAIL; rtStatus = _FAIL;
break; break;
} }
@ -2119,14 +2119,14 @@ rtl8192c_PHY_GetHWRegOriginalValue(
pHalData->DefaultInitialGain[2] = (u8)PHY_QueryBBReg(Adapter, rOFDM0_XCAGCCore1, bMaskByte0); pHalData->DefaultInitialGain[2] = (u8)PHY_QueryBBReg(Adapter, rOFDM0_XCAGCCore1, bMaskByte0);
pHalData->DefaultInitialGain[3] = (u8)PHY_QueryBBReg(Adapter, rOFDM0_XDAGCCore1, bMaskByte0); pHalData->DefaultInitialGain[3] = (u8)PHY_QueryBBReg(Adapter, rOFDM0_XDAGCCore1, bMaskByte0);
//RT_TRACE(COMP_INIT, DBG_LOUD, //RT_TRACE(COMP_INIT, DBG_LOUD,
//("Default initial gain (c50=0x%x, c58=0x%x, c60=0x%x, c68=0x%x) \n", //("Default initial gain (c50=0x%x, c58=0x%x, c60=0x%x, c68=0x%x)\n",
//pHalData->DefaultInitialGain[0], pHalData->DefaultInitialGain[1], //pHalData->DefaultInitialGain[0], pHalData->DefaultInitialGain[1],
//pHalData->DefaultInitialGain[2], pHalData->DefaultInitialGain[3])); //pHalData->DefaultInitialGain[2], pHalData->DefaultInitialGain[3]));
// read framesync // read framesync
pHalData->framesync = (u8)PHY_QueryBBReg(Adapter, rOFDM0_RxDetector3, bMaskByte0); pHalData->framesync = (u8)PHY_QueryBBReg(Adapter, rOFDM0_RxDetector3, bMaskByte0);
pHalData->framesyncC34 = PHY_QueryBBReg(Adapter, rOFDM0_RxDetector2, bMaskDWord); pHalData->framesyncC34 = PHY_QueryBBReg(Adapter, rOFDM0_RxDetector2, bMaskDWord);
//RT_TRACE(COMP_INIT, DBG_LOUD, ("Default framesync (0x%x) = 0x%x \n", //RT_TRACE(COMP_INIT, DBG_LOUD, ("Default framesync (0x%x) = 0x%x\n",
// rOFDM0_RxDetector3, pHalData->framesync)); // rOFDM0_RxDetector3, pHalData->framesync));
} }
@ -2515,7 +2515,7 @@ void phy_PowerIndexCheck88E(
pHalData->CurrentBW2024GTxPwrIdx = BW20PowerLevel[0]; pHalData->CurrentBW2024GTxPwrIdx = BW20PowerLevel[0];
pHalData->CurrentBW4024GTxPwrIdx = BW40PowerLevel[0]; pHalData->CurrentBW4024GTxPwrIdx = BW40PowerLevel[0];
//DBG_871X("PHY_SetTxPowerLevel8188E(): CurrentCckTxPwrIdx : 0x%x,CurrentOfdm24GTxPwrIdx: 0x%x, CurrentBW2024GTxPwrIdx: 0x%dx, CurrentBW4024GTxPwrIdx: 0x%x \n", //DBG_871X("PHY_SetTxPowerLevel8188E(): CurrentCckTxPwrIdx : 0x%x,CurrentOfdm24GTxPwrIdx: 0x%x, CurrentBW2024GTxPwrIdx: 0x%dx, CurrentBW4024GTxPwrIdx: 0x%x\n",
// pHalData->CurrentCckTxPwrIdx, pHalData->CurrentOfdm24GTxPwrIdx, pHalData->CurrentBW2024GTxPwrIdx, pHalData->CurrentBW4024GTxPwrIdx); // pHalData->CurrentCckTxPwrIdx, pHalData->CurrentOfdm24GTxPwrIdx, pHalData->CurrentBW2024GTxPwrIdx, pHalData->CurrentBW4024GTxPwrIdx);
} }
/*----------------------------------------------------------------------------- /*-----------------------------------------------------------------------------
@ -2682,7 +2682,7 @@ PHY_ScanOperationBackup8188E(
break; break;
default: default:
RT_TRACE(COMP_SCAN, DBG_LOUD, ("Unknown Scan Backup Operation. \n")); RT_TRACE(COMP_SCAN, DBG_LOUD, ("Unknown Scan Backup Operation.\n"));
break; break;
} }
} }
@ -2849,7 +2849,7 @@ _PHY_SetBWMode92C(
//pHalData->SetBWModeInProgress= FALSE; //pHalData->SetBWModeInProgress= FALSE;
//RT_TRACE(COMP_SCAN, DBG_LOUD, ("<==PHY_SetBWModeCallback8192C() \n" )); //RT_TRACE(COMP_SCAN, DBG_LOUD, ("<==PHY_SetBWModeCallback8192C()\n" ));
} }

2
hal/rtl8188e_rf6052.c
View file

@ -818,7 +818,7 @@ rtl8188e_PHY_RF6052SetOFDMTxPower(
u8 index = 0; u8 index = 0;
//DBG_871X("PHY_RF6052SetOFDMTxPower, channel(%d) \n", Channel); //DBG_871X("PHY_RF6052SetOFDMTxPower, channel(%d)\n", Channel);
getPowerBase88E(Adapter, pPowerLevelOFDM,pPowerLevelBW20,pPowerLevelBW40, Channel, &powerBase0[0], &powerBase1[0]); getPowerBase88E(Adapter, pPowerLevelOFDM,pPowerLevelBW20,pPowerLevelBW40, Channel, &powerBase0[0], &powerBase1[0]);

4
hal/rtl8188e_sreset.c
View file

@ -55,7 +55,7 @@ static void _restore_security_setting(_adapter *padapter)
{ {
psta = rtw_get_stainfo(pstapriv, get_bssid(pmlmepriv)); psta = rtw_get_stainfo(pstapriv, get_bssid(pmlmepriv));
if (psta == NULL) { if (psta == NULL) {
//DEBUG_ERR( ("Set wpa_set_encryption: Obtain Sta_info fail \n")); //DEBUG_ERR( ("Set wpa_set_encryption: Obtain Sta_info fail\n"));
} }
else else
{ {
@ -225,7 +225,7 @@ void rtl8188e_sreset_linked_status_check(_adapter *padapter)
u8 fw_status=0; u8 fw_status=0;
rx_dma_status = rtw_read32(padapter,REG_RXDMA_STATUS); rx_dma_status = rtw_read32(padapter,REG_RXDMA_STATUS);
if (rx_dma_status!= 0x00){ if (rx_dma_status!= 0x00){
DBG_8192C("%s REG_RXDMA_STATUS:0x%08x \n",__FUNCTION__,rx_dma_status); DBG_8192C("%s REG_RXDMA_STATUS:0x%08x\n",__FUNCTION__,rx_dma_status);
rtw_write32(padapter,REG_RXDMA_STATUS,rx_dma_status); rtw_write32(padapter,REG_RXDMA_STATUS,rx_dma_status);
} }
fw_status = rtw_read8(padapter,REG_FMETHR); fw_status = rtw_read8(padapter,REG_FMETHR);

14
hal/rtl8188eu_xmit.c
View file

@ -333,7 +333,7 @@ if (padapter->registrypriv.mp_mode == 0)
ptxdesc->txdw1 |= cpu_to_le32(pattrib->mac_id&0x3F); ptxdesc->txdw1 |= cpu_to_le32(pattrib->mac_id&0x3F);
qsel = (uint)(pattrib->qsel & 0x0000001f); qsel = (uint)(pattrib->qsel & 0x0000001f);
//DBG_8192C("==> macid(%d) qsel:0x%02x \n",pattrib->mac_id,qsel); //DBG_8192C("==> macid(%d) qsel:0x%02x\n",pattrib->mac_id,qsel);
ptxdesc->txdw1 |= cpu_to_le32((qsel << QSEL_SHT) & 0x00001f00); ptxdesc->txdw1 |= cpu_to_le32((qsel << QSEL_SHT) & 0x00001f00);
ptxdesc->txdw1 |= cpu_to_le32((pattrib->raid<< RATE_ID_SHT) & 0x000F0000); ptxdesc->txdw1 |= cpu_to_le32((pattrib->raid<< RATE_ID_SHT) & 0x000F0000);
@ -763,12 +763,12 @@ s32 rtl8188eu_xmitframe_complete(_adapter *padapter, struct xmit_priv *pxmitpriv
if (pxmitbuf == NULL) { if (pxmitbuf == NULL) {
pxmitbuf = rtw_alloc_xmitbuf(pxmitpriv); pxmitbuf = rtw_alloc_xmitbuf(pxmitpriv);
if (pxmitbuf == NULL){ if (pxmitbuf == NULL){
//DBG_871X("%s #1, connot alloc xmitbuf!!!! \n",__FUNCTION__); //DBG_871X("%s #1, connot alloc xmitbuf!!!!\n",__FUNCTION__);
return _FALSE; return _FALSE;
} }
} }
//DBG_8192C("%s ===================================== \n",__FUNCTION__); //DBG_8192C("%s =====================================\n",__FUNCTION__);
//3 1. pick up first frame //3 1. pick up first frame
do { do {
rtw_free_xmitframe(pxmitpriv, pxmitframe); rtw_free_xmitframe(pxmitpriv, pxmitframe);
@ -936,7 +936,7 @@ s32 rtl8188eu_xmitframe_complete(_adapter *padapter, struct xmit_priv *pxmitpriv
#else #else
res = rtw_xmitframe_coalesce(padapter, pxmitframe->pkt, pxmitframe); res = rtw_xmitframe_coalesce(padapter, pxmitframe->pkt, pxmitframe);
if (res == _FALSE) { if (res == _FALSE) {
DBG_871X("%s coalesce failed \n",__FUNCTION__); DBG_871X("%s coalesce failed\n",__FUNCTION__);
rtw_free_xmitframe(pxmitpriv, pxmitframe); rtw_free_xmitframe(pxmitpriv, pxmitframe);
continue; continue;
} }
@ -1011,7 +1011,7 @@ s32 rtl8188eu_xmitframe_complete(_adapter *padapter, struct xmit_priv *pxmitpriv
//3 4. write xmit buffer to USB FIFO //3 4. write xmit buffer to USB FIFO
ff_hwaddr = rtw_get_ff_hwaddr(pfirstframe); ff_hwaddr = rtw_get_ff_hwaddr(pfirstframe);
//DBG_8192C("%s ===================================== write port,buf_size(%d) \n",__FUNCTION__,pbuf_tail); //DBG_8192C("%s ===================================== write port,buf_size(%d)\n",__FUNCTION__,pbuf_tail);
// xmit address == ((xmit_frame*)pxmitbuf->priv_data)->buf_addr // xmit address == ((xmit_frame*)pxmitbuf->priv_data)->buf_addr
rtw_write_port(padapter, ff_hwaddr, pbuf_tail, (u8*)pxmitbuf); rtw_write_port(padapter, ff_hwaddr, pbuf_tail, (u8*)pxmitbuf);
@ -1112,7 +1112,7 @@ s32 rtl8188eu_xmitframe_complete(_adapter *padapter, struct xmit_priv *pxmitpriv
static s32 xmitframe_direct(_adapter *padapter, struct xmit_frame *pxmitframe) static s32 xmitframe_direct(_adapter *padapter, struct xmit_frame *pxmitframe)
{ {
s32 res = _SUCCESS; s32 res = _SUCCESS;
//DBG_8192C("==> %s \n",__FUNCTION__); //DBG_8192C("==> %s\n",__FUNCTION__);
res = rtw_xmitframe_coalesce(padapter, pxmitframe->pkt, pxmitframe); res = rtw_xmitframe_coalesce(padapter, pxmitframe->pkt, pxmitframe);
if (res == _SUCCESS) { if (res == _SUCCESS) {
@ -1145,7 +1145,7 @@ static s32 pre_xmitframe(_adapter *padapter, struct xmit_frame *pxmitframe)
_enter_critical_bh(&pxmitpriv->lock, &irqL); _enter_critical_bh(&pxmitpriv->lock, &irqL);
//DBG_8192C("==> %s \n",__FUNCTION__); //DBG_8192C("==> %s\n",__FUNCTION__);
if (rtw_txframes_sta_ac_pending(padapter, pattrib) > 0) if (rtw_txframes_sta_ac_pending(padapter, pattrib) > 0)
{ {

46
hal/usb_halinit.c
View file

@ -88,7 +88,7 @@ _ConfigNormalChipOutEP_8188E(
break; break;
} }
DBG_871X("%s OutEpQueueSel(0x%02x), OutEpNumber(%d) \n",__FUNCTION__,pHalData->OutEpQueueSel,pHalData->OutEpNumber ); DBG_871X("%s OutEpQueueSel(0x%02x), OutEpNumber(%d)\n",__FUNCTION__,pHalData->OutEpQueueSel,pHalData->OutEpNumber );
} }
@ -212,7 +212,7 @@ static void _InitPABias(_adapter *padapter)
//efuse_one_byte_read(padapter, 0x1FA, &pa_setting); //efuse_one_byte_read(padapter, 0x1FA, &pa_setting);
pa_setting = EFUSE_Read1Byte(padapter, 0x1FA); pa_setting = EFUSE_Read1Byte(padapter, 0x1FA);
//RT_TRACE(COMP_INIT, DBG_LOUD, ("_InitPABias 0x1FA 0x%x \n",pa_setting)); //RT_TRACE(COMP_INIT, DBG_LOUD, ("_InitPABias 0x1FA 0x%x\n",pa_setting));
if (!(pa_setting & BIT0)) if (!(pa_setting & BIT0))
{ {
@ -1724,7 +1724,7 @@ HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_MAC);
status = PHY_MACConfig8188E(Adapter); status = PHY_MACConfig8188E(Adapter);
if (status == _FAIL) if (status == _FAIL)
{ {
DBG_871X(" ### Failed to init MAC ...... \n "); DBG_871X(" ### Failed to init MAC ......\n ");
goto exit; goto exit;
} }
#endif #endif
@ -1737,7 +1737,7 @@ HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_BB);
status = PHY_BBConfig8188E(Adapter); status = PHY_BBConfig8188E(Adapter);
if (status == _FAIL) if (status == _FAIL)
{ {
DBG_871X(" ### Failed to init BB ...... \n "); DBG_871X(" ### Failed to init BB ......\n ");
goto exit; goto exit;
} }
#endif #endif
@ -1748,7 +1748,7 @@ HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_RF);
status = PHY_RFConfig8188E(Adapter); status = PHY_RFConfig8188E(Adapter);
if (status == _FAIL) if (status == _FAIL)
{ {
DBG_871X(" ### Failed to init RF ...... \n "); DBG_871X(" ### Failed to init RF ......\n ");
goto exit; goto exit;
} }
#endif #endif
@ -1757,7 +1757,7 @@ HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_EFUSE_PATCH);
#if defined(CONFIG_IOL_EFUSE_PATCH) #if defined(CONFIG_IOL_EFUSE_PATCH)
status = rtl8188e_iol_efuse_patch(Adapter); status = rtl8188e_iol_efuse_patch(Adapter);
if (status == _FAIL){ if (status == _FAIL){
DBG_871X("%s rtl8188e_iol_efuse_patch failed \n",__FUNCTION__); DBG_871X("%s rtl8188e_iol_efuse_patch failed\n",__FUNCTION__);
goto exit; goto exit;
} }
#endif #endif
@ -1967,7 +1967,7 @@ HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_INIT_HAL_DM);
// Perform GPIO polling to find out current RF state. added by Roger, 2010.04.09. // Perform GPIO polling to find out current RF state. added by Roger, 2010.04.09.
if (pHalData->BoardType == BOARD_MINICARD /*&& (Adapter->MgntInfo.PowerSaveControl.bGpioRfSw)*/) if (pHalData->BoardType == BOARD_MINICARD /*&& (Adapter->MgntInfo.PowerSaveControl.bGpioRfSw)*/)
{ {
DBG_8192C("InitializeAdapter8192CU(): RF=%d \n", eRfPowerStateToSet); DBG_8192C("InitializeAdapter8192CU(): RF=%d\n", eRfPowerStateToSet);
if (eRfPowerStateToSet == rf_off) if (eRfPowerStateToSet == rf_off)
{ {
//MgntActSet_RF_State(Adapter, rf_off, RF_CHANGE_BY_HW, _TRUE); //MgntActSet_RF_State(Adapter, rf_off, RF_CHANGE_BY_HW, _TRUE);
@ -2197,7 +2197,7 @@ u32 rtl8188eu_hal_deinit(PADAPTER Adapter)
{ {
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
DBG_8192C("==> %s \n",__FUNCTION__); DBG_8192C("==> %s\n",__FUNCTION__);
#ifdef CONFIG_SUPPORT_USB_INT #ifdef CONFIG_SUPPORT_USB_INT
rtw_write32(Adapter, REG_HIMR_88E, IMR_DISABLED_88E); rtw_write32(Adapter, REG_HIMR_88E, IMR_DISABLED_88E);
@ -2247,7 +2247,7 @@ _func_enter_;
status = _SUCCESS; status = _SUCCESS;
RT_TRACE(_module_hci_hal_init_c_,_drv_info_,("===> usb_inirp_init \n")); RT_TRACE(_module_hci_hal_init_c_,_drv_info_,("===> usb_inirp_init\n"));
precvpriv->ff_hwaddr = RECV_BULK_IN_ADDR; precvpriv->ff_hwaddr = RECV_BULK_IN_ADDR;
@ -2257,7 +2257,7 @@ _func_enter_;
{ {
if (_read_port(pintfhdl, precvpriv->ff_hwaddr, 0, (unsigned char *)precvbuf) == _FALSE ) if (_read_port(pintfhdl, precvpriv->ff_hwaddr, 0, (unsigned char *)precvbuf) == _FALSE )
{ {
RT_TRACE(_module_hci_hal_init_c_,_drv_err_,("usb_rx_init: usb_read_port error \n")); RT_TRACE(_module_hci_hal_init_c_,_drv_err_,("usb_rx_init: usb_read_port error\n"));
status = _FAIL; status = _FAIL;
goto exit; goto exit;
} }
@ -2276,14 +2276,14 @@ _func_enter_;
_read_interrupt = pintfhdl->io_ops._read_interrupt; _read_interrupt = pintfhdl->io_ops._read_interrupt;
if (_read_interrupt(pintfhdl, RECV_INT_IN_ADDR) == _FALSE ) if (_read_interrupt(pintfhdl, RECV_INT_IN_ADDR) == _FALSE )
{ {
RT_TRACE(_module_hci_hal_init_c_,_drv_err_,("usb_rx_init: usb_read_interrupt error \n")); RT_TRACE(_module_hci_hal_init_c_,_drv_err_,("usb_rx_init: usb_read_interrupt error\n"));
status = _FAIL; status = _FAIL;
} }
#endif #endif
exit: exit:
RT_TRACE(_module_hci_hal_init_c_,_drv_info_,("<=== usb_inirp_init \n")); RT_TRACE(_module_hci_hal_init_c_,_drv_info_,("<=== usb_inirp_init\n"));
_func_exit_; _func_exit_;
@ -2293,11 +2293,11 @@ _func_exit_;
unsigned int rtl8188eu_inirp_deinit(PADAPTER Adapter) unsigned int rtl8188eu_inirp_deinit(PADAPTER Adapter)
{ {
RT_TRACE(_module_hci_hal_init_c_,_drv_info_,("\n ===> usb_rx_deinit \n")); RT_TRACE(_module_hci_hal_init_c_,_drv_info_,("\n ===> usb_rx_deinit\n"));
rtw_read_port_cancel(Adapter); rtw_read_port_cancel(Adapter);
RT_TRACE(_module_hci_hal_init_c_,_drv_info_,("\n <=== usb_rx_deinit \n")); RT_TRACE(_module_hci_hal_init_c_,_drv_info_,("\n <=== usb_rx_deinit\n"));
return _SUCCESS; return _SUCCESS;
} }
@ -2950,7 +2950,7 @@ static u32 Hal_readPGDataFromConfigFile(
vfs_read(fp, temp, 2, &pos); vfs_read(fp, temp, 2, &pos);
PROMContent[i] = simple_strtoul(temp, NULL, 16 ); PROMContent[i] = simple_strtoul(temp, NULL, 16 );
pos += 1; // Filter the space character pos += 1; // Filter the space character
DBG_871X("%02X \n", PROMContent[i]); DBG_871X("%02X\n", PROMContent[i]);
} }
DBG_871X("\n"); DBG_871X("\n");
set_fs(fs); set_fs(fs);
@ -3008,7 +3008,7 @@ Hal_ReadMACAddrFromFile_8188EU(
end++; end++;
head = end; head = end;
} }
DBG_871X("%02x \n", pEEPROM->mac_addr[i]); DBG_871X("%02x\n", pEEPROM->mac_addr[i]);
} }
DBG_871X("\n"); DBG_871X("\n");
set_fs(fs); set_fs(fs);
@ -4069,7 +4069,7 @@ _func_enter_;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
u16 bcn_interval = *((u16 *)val); u16 bcn_interval = *((u16 *)val);
if ((pmlmeinfo->state&0x03) == WIFI_FW_AP_STATE){ if ((pmlmeinfo->state&0x03) == WIFI_FW_AP_STATE){
DBG_8192C("%s==> bcn_interval:%d, eraly_int:%d \n",__FUNCTION__,bcn_interval,bcn_interval>>1); DBG_8192C("%s==> bcn_interval:%d, eraly_int:%d\n",__FUNCTION__,bcn_interval,bcn_interval>>1);
rtw_write8(Adapter, REG_DRVERLYINT, bcn_interval>>1);// 50ms for sdio rtw_write8(Adapter, REG_DRVERLYINT, bcn_interval>>1);// 50ms for sdio
} }
} }
@ -4198,9 +4198,9 @@ _func_enter_;
ulCommand= ulCommand | CAM_POLLINIG|CAM_WRITE; ulCommand= ulCommand | CAM_POLLINIG|CAM_WRITE;
// write content 0 is equall to mark invalid // write content 0 is equall to mark invalid
rtw_write32(Adapter, WCAMI, ulContent); //delay_ms(40); rtw_write32(Adapter, WCAMI, ulContent); //delay_ms(40);
//RT_TRACE(COMP_SEC, DBG_LOUD, ("CAM_empty_entry(): WRITE A4: %lx \n",ulContent)); //RT_TRACE(COMP_SEC, DBG_LOUD, ("CAM_empty_entry(): WRITE A4: %lx\n",ulContent));
rtw_write32(Adapter, RWCAM, ulCommand); //delay_ms(40); rtw_write32(Adapter, RWCAM, ulCommand); //delay_ms(40);
//RT_TRACE(COMP_SEC, DBG_LOUD, ("CAM_empty_entry(): WRITE A0: %lx \n",ulCommand)); //RT_TRACE(COMP_SEC, DBG_LOUD, ("CAM_empty_entry(): WRITE A0: %lx\n",ulCommand));
} }
} }
break; break;
@ -4495,7 +4495,7 @@ _func_enter_;
break; break;
}while (trycnt--); }while (trycnt--);
if (trycnt ==0) if (trycnt ==0)
DBG_8192C("Stop RX DMA failed...... \n"); DBG_8192C("Stop RX DMA failed......\n");
//RQPN Load 0 //RQPN Load 0
rtw_write16(Adapter,REG_RQPN_NPQ,0x0); rtw_write16(Adapter,REG_RQPN_NPQ,0x0);
@ -4574,7 +4574,7 @@ _func_enter_;
} }
}while (trycnt--); }while (trycnt--);
if (trycnt ==0) if (trycnt ==0)
DBG_871X_LEVEL(_drv_always_, "Stop RX DMA failed...... \n"); DBG_871X_LEVEL(_drv_always_, "Stop RX DMA failed......\n");
//Set WOWLAN H2C command. //Set WOWLAN H2C command.
DBG_871X_LEVEL(_drv_always_, "Set WOWLan cmd\n"); DBG_871X_LEVEL(_drv_always_, "Set WOWLan cmd\n");
@ -4836,7 +4836,7 @@ GetHalDefVar8188EUsb(
{ {
u8Byte DebugComponents = *((u32*)pValue); u8Byte DebugComponents = *((u32*)pValue);
PDM_ODM_T pDM_Odm = &(pHalData->odmpriv); PDM_ODM_T pDM_Odm = &(pHalData->odmpriv);
printk("pDM_Odm->DebugComponents = 0x%llx \n",pDM_Odm->DebugComponents ); printk("pDM_Odm->DebugComponents = 0x%llx\n",pDM_Odm->DebugComponents );
} }
break; break;
@ -5253,7 +5253,7 @@ _func_enter_;
padapter->HalData = rtw_zmalloc(sizeof(HAL_DATA_TYPE)); padapter->HalData = rtw_zmalloc(sizeof(HAL_DATA_TYPE));
if (padapter->HalData == NULL){ if (padapter->HalData == NULL){
DBG_8192C("cant not alloc memory for HAL DATA \n"); DBG_8192C("cant not alloc memory for HAL DATA\n");
} }
//_rtw_memset(padapter->HalData, 0, sizeof(HAL_DATA_TYPE)); //_rtw_memset(padapter->HalData, 0, sizeof(HAL_DATA_TYPE));
padapter->hal_data_sz = sizeof(HAL_DATA_TYPE); padapter->hal_data_sz = sizeof(HAL_DATA_TYPE);

40
hal/usb_ops_linux.c
View file

@ -99,7 +99,7 @@ static int usbctrl_vendorreq(struct intf_hdl *pintfhdl, u8 request, u16 value, u
#endif #endif
if ( pIo_buf== NULL) { if ( pIo_buf== NULL) {
DBG_8192C( "[%s] pIo_buf == NULL \n", __FUNCTION__ ); DBG_8192C( "[%s] pIo_buf == NULL\n", __FUNCTION__ );
status = -ENOMEM; status = -ENOMEM;
goto release_mutex; goto release_mutex;
} }
@ -409,7 +409,7 @@ void interrupt_handler_8188eu(_adapter *padapter,u16 pkt_len,u8 *pbuf)
hisr_ex = le32_to_cpu(hisr_ex); hisr_ex = le32_to_cpu(hisr_ex);
if ((hisr != 0) || (hisr_ex!=0)) if ((hisr != 0) || (hisr_ex!=0))
DBG_871X("===> %s hisr:0x%08x ,hisr_ex:0x%08x \n",__FUNCTION__,hisr,hisr_ex); DBG_871X("===> %s hisr:0x%08x ,hisr_ex:0x%08x\n",__FUNCTION__,hisr,hisr_ex);
} }
#endif #endif
@ -475,13 +475,13 @@ void interrupt_handler_8188eu(_adapter *padapter,u16 pkt_len,u8 *pbuf)
#ifdef DBG_CONFIG_ERROR_DETECT_INT #ifdef DBG_CONFIG_ERROR_DETECT_INT
if ( pHalData->IntArray[1] & IMR_TXERR_88E ) if ( pHalData->IntArray[1] & IMR_TXERR_88E )
DBG_871X("===> %s Tx Error Flag Interrupt Status \n",__FUNCTION__); DBG_871X("===> %s Tx Error Flag Interrupt Status\n",__FUNCTION__);
if ( pHalData->IntArray[1] & IMR_RXERR_88E ) if ( pHalData->IntArray[1] & IMR_RXERR_88E )
DBG_871X("===> %s Rx Error Flag INT Status \n",__FUNCTION__); DBG_871X("===> %s Rx Error Flag INT Status\n",__FUNCTION__);
if ( pHalData->IntArray[1] & IMR_TXFOVW_88E ) if ( pHalData->IntArray[1] & IMR_TXFOVW_88E )
DBG_871X("===> %s Transmit FIFO Overflow \n",__FUNCTION__); DBG_871X("===> %s Transmit FIFO Overflow\n",__FUNCTION__);
if ( pHalData->IntArray[1] & IMR_RXFOVW_88E ) if ( pHalData->IntArray[1] & IMR_RXFOVW_88E )
DBG_871X("===> %s Receive FIFO Overflow \n",__FUNCTION__); DBG_871X("===> %s Receive FIFO Overflow\n",__FUNCTION__);
#endif//DBG_CONFIG_ERROR_DETECT_INT #endif//DBG_CONFIG_ERROR_DETECT_INT
@ -844,7 +844,7 @@ static int recvbuf2recvframe(_adapter *padapter, struct recv_buf *precvbuf)
#ifdef CONFIG_SPECIAL_SETTING_FOR_FUNAI_TV #ifdef CONFIG_SPECIAL_SETTING_FOR_FUNAI_TV
//if (pattrib->pkt_len>2000){ //if (pattrib->pkt_len>2000){
// printk("%s: RX Warning!pkt_len= %d, data rate=0x%02x \n", __FUNCTION__,pattrib->pkt_len,pattrib->mcs_rate); // printk("%s: RX Warning!pkt_len= %d, data rate=0x%02x\n", __FUNCTION__,pattrib->pkt_len,pattrib->mcs_rate);
//} //}
#endif #endif
if ((pattrib->crc_err) || (pattrib->icv_err)) if ((pattrib->crc_err) || (pattrib->icv_err))
@ -852,7 +852,7 @@ static int recvbuf2recvframe(_adapter *padapter, struct recv_buf *precvbuf)
if (pattrib->pkt_len>2000){ if (pattrib->pkt_len>2000){
DBG_8192C("%s: RX Warning! crc_err=%d icv_err=%d, skip!\n", __FUNCTION__, pattrib->crc_err, pattrib->icv_err); DBG_8192C("%s: RX Warning! crc_err=%d icv_err=%d, skip!\n", __FUNCTION__, pattrib->crc_err, pattrib->icv_err);
#ifdef CONFIG_SPECIAL_SETTING_FOR_FUNAI_TV #ifdef CONFIG_SPECIAL_SETTING_FOR_FUNAI_TV
printk("%s: RX Warning!pkt_len= %d, data rate=0x%02x \n", __FUNCTION__,pattrib->pkt_len,pattrib->mcs_rate); printk("%s: RX Warning!pkt_len= %d, data rate=0x%02x\n", __FUNCTION__,pattrib->pkt_len,pattrib->mcs_rate);
#endif #endif
} }
rtw_free_recvframe(precvframe, pfree_recv_queue); rtw_free_recvframe(precvframe, pfree_recv_queue);
@ -980,13 +980,13 @@ static int recvbuf2recvframe(_adapter *padapter, struct recv_buf *precvbuf)
//enqueue recvframe to txrtp queue //enqueue recvframe to txrtp queue
if (pattrib->pkt_rpt_type == TX_REPORT1){ if (pattrib->pkt_rpt_type == TX_REPORT1){
//DBG_8192C("rx CCX \n"); //DBG_8192C("rx CCX\n");
//CCX-TXRPT ack for xmit mgmt frames. //CCX-TXRPT ack for xmit mgmt frames.
handle_txrpt_ccx_88e(padapter, precvframe->u.hdr.rx_data); handle_txrpt_ccx_88e(padapter, precvframe->u.hdr.rx_data);
} }
else if (pattrib->pkt_rpt_type == TX_REPORT2){ else if (pattrib->pkt_rpt_type == TX_REPORT2){
//DBG_8192C("rx TX RPT \n"); //DBG_8192C("rx TX RPT\n");
ODM_RA_TxRPT2Handle_8188E( ODM_RA_TxRPT2Handle_8188E(
&pHalData->odmpriv, &pHalData->odmpriv,
precvframe->u.hdr.rx_data, precvframe->u.hdr.rx_data,
@ -998,7 +998,7 @@ static int recvbuf2recvframe(_adapter *padapter, struct recv_buf *precvbuf)
} }
else if (pattrib->pkt_rpt_type == HIS_REPORT) else if (pattrib->pkt_rpt_type == HIS_REPORT)
{ {
//DBG_8192C("%s , rx USB HISR \n",__FUNCTION__); //DBG_8192C("%s , rx USB HISR\n",__FUNCTION__);
#ifdef CONFIG_SUPPORT_USB_INT #ifdef CONFIG_SUPPORT_USB_INT
interrupt_handler_8188eu(padapter,pattrib->pkt_len,precvframe->u.hdr.rx_data); interrupt_handler_8188eu(padapter,pattrib->pkt_len,precvframe->u.hdr.rx_data);
#endif #endif
@ -1033,7 +1033,7 @@ void rtl8188eu_recv_tasklet(void *priv)
{ {
if ((padapter->bDriverStopped == _TRUE)||(padapter->bSurpriseRemoved== _TRUE)) if ((padapter->bDriverStopped == _TRUE)||(padapter->bSurpriseRemoved== _TRUE))
{ {
DBG_8192C("recv_tasklet => bDriverStopped or bSurpriseRemoved \n"); DBG_8192C("recv_tasklet => bDriverStopped or bSurpriseRemoved\n");
break; break;
} }
@ -1086,7 +1086,7 @@ static void usb_read_port_complete(struct urb *purb, struct pt_regs *regs)
} }
else else
{ {
RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port_complete : purb->status(%d) != 0 \n", purb->status)); RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port_complete : purb->status(%d) != 0\n", purb->status));
DBG_8192C("###=> usb_read_port_complete => urb status(%d)\n", purb->status); DBG_8192C("###=> usb_read_port_complete => urb status(%d)\n", purb->status);
@ -1265,7 +1265,7 @@ static int recvbuf2recvframe(_adapter *padapter, _pkt *pskb)
if ((pattrib->pkt_len<=0) || (pkt_offset>transfer_len)) if ((pattrib->pkt_len<=0) || (pkt_offset>transfer_len))
{ {
RT_TRACE(_module_rtl871x_recv_c_,_drv_info_,("recvbuf2recvframe: pkt_len<=0\n")); RT_TRACE(_module_rtl871x_recv_c_,_drv_info_,("recvbuf2recvframe: pkt_len<=0\n"));
DBG_8192C("%s()-%d: RX Warning!,pkt_len<=0 or pkt_offset> transfoer_len \n", __FUNCTION__, __LINE__); DBG_8192C("%s()-%d: RX Warning!,pkt_len<=0 or pkt_offset> transfoer_len\n", __FUNCTION__, __LINE__);
rtw_free_recvframe(precvframe, pfree_recv_queue); rtw_free_recvframe(precvframe, pfree_recv_queue);
goto _exit_recvbuf2recvframe; goto _exit_recvbuf2recvframe;
} }
@ -1319,7 +1319,7 @@ static int recvbuf2recvframe(_adapter *padapter, _pkt *pskb)
{ {
if ((pattrib->mfrag == 1)&&(pattrib->frag_num == 0)) if ((pattrib->mfrag == 1)&&(pattrib->frag_num == 0))
{ {
DBG_8192C("recvbuf2recvframe: alloc_skb fail , drop frag frame \n"); DBG_8192C("recvbuf2recvframe: alloc_skb fail , drop frag frame\n");
rtw_free_recvframe(precvframe, pfree_recv_queue); rtw_free_recvframe(precvframe, pfree_recv_queue);
goto _exit_recvbuf2recvframe; goto _exit_recvbuf2recvframe;
} }
@ -1386,12 +1386,12 @@ static int recvbuf2recvframe(_adapter *padapter, _pkt *pskb)
//enqueue recvframe to txrtp queue //enqueue recvframe to txrtp queue
if (pattrib->pkt_rpt_type == TX_REPORT1){ if (pattrib->pkt_rpt_type == TX_REPORT1){
//DBG_8192C("rx CCX \n"); //DBG_8192C("rx CCX\n");
//CCX-TXRPT ack for xmit mgmt frames. //CCX-TXRPT ack for xmit mgmt frames.
handle_txrpt_ccx_88e(padapter, precvframe->u.hdr.rx_data); handle_txrpt_ccx_88e(padapter, precvframe->u.hdr.rx_data);
} }
else if (pattrib->pkt_rpt_type == TX_REPORT2){ else if (pattrib->pkt_rpt_type == TX_REPORT2){
//DBG_8192C("rx TX RPT \n"); //DBG_8192C("rx TX RPT\n");
ODM_RA_TxRPT2Handle_8188E( ODM_RA_TxRPT2Handle_8188E(
&pHalData->odmpriv, &pHalData->odmpriv,
precvframe->u.hdr.rx_data, precvframe->u.hdr.rx_data,
@ -1403,7 +1403,7 @@ static int recvbuf2recvframe(_adapter *padapter, _pkt *pskb)
} }
else if (pattrib->pkt_rpt_type == HIS_REPORT) else if (pattrib->pkt_rpt_type == HIS_REPORT)
{ {
//DBG_8192C("%s , rx USB HISR \n",__FUNCTION__); //DBG_8192C("%s , rx USB HISR\n",__FUNCTION__);
#ifdef CONFIG_SUPPORT_USB_INT #ifdef CONFIG_SUPPORT_USB_INT
interrupt_handler_8188eu(padapter,pattrib->pkt_len,precvframe->u.hdr.rx_data); interrupt_handler_8188eu(padapter,pattrib->pkt_len,precvframe->u.hdr.rx_data);
#endif #endif
@ -1438,7 +1438,7 @@ void rtl8188eu_recv_tasklet(void *priv)
{ {
if ((padapter->bDriverStopped == _TRUE)||(padapter->bSurpriseRemoved== _TRUE)) if ((padapter->bDriverStopped == _TRUE)||(padapter->bSurpriseRemoved== _TRUE))
{ {
DBG_8192C("recv_tasklet => bDriverStopped or bSurpriseRemoved \n"); DBG_8192C("recv_tasklet => bDriverStopped or bSurpriseRemoved\n");
dev_kfree_skb_any(pskb); dev_kfree_skb_any(pskb);
break; break;
} }
@ -1529,7 +1529,7 @@ static void usb_read_port_complete(struct urb *purb, struct pt_regs *regs)
} }
else else
{ {
RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port_complete : purb->status(%d) != 0 \n", purb->status)); RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port_complete : purb->status(%d) != 0\n", purb->status));
DBG_8192C("###=> usb_read_port_complete => urb status(%d)\n", purb->status); DBG_8192C("###=> usb_read_port_complete => urb status(%d)\n", purb->status);

4
include/osdep_service.h
View file

@ -717,12 +717,12 @@ __inline static void _cancel_timer(_timer *ptimer,u8 *bcancelled)
__inline static void _init_workitem(_workitem *pwork, void *pfunc, PVOID cntx) __inline static void _init_workitem(_workitem *pwork, void *pfunc, PVOID cntx)
{ {
printf("%s Not implement yet! \n",__FUNCTION__); printf("%s Not implement yet!\n",__FUNCTION__);
} }
__inline static void _set_workitem(_workitem *pwork) __inline static void _set_workitem(_workitem *pwork)
{ {
printf("%s Not implement yet! \n",__FUNCTION__); printf("%s Not implement yet!\n",__FUNCTION__);
// schedule_work(pwork); // schedule_work(pwork);
} }

14
os_dep/gspi_intf.c
View file

@ -208,14 +208,14 @@ _func_enter_;
spi_setup(spi); spi_setup(spi);
#if 1 #if 1
//DBG_8192C("set spi ==========================%d \n", spi_setup(spi)); //DBG_8192C("set spi ==========================%d\n", spi_setup(spi));
DBG_871X("%s, mode = %d \n", __func__, spi->mode); DBG_871X("%s, mode = %d\n", __func__, spi->mode);
DBG_871X("%s, bit_per_word = %d \n", __func__, spi->bits_per_word); DBG_871X("%s, bit_per_word = %d\n", __func__, spi->bits_per_word);
DBG_871X("%s, speed = %d \n", __func__, spi->max_speed_hz); DBG_871X("%s, speed = %d\n", __func__, spi->max_speed_hz);
DBG_871X("%s, chip_select = %d \n", __func__, spi->chip_select); DBG_871X("%s, chip_select = %d\n", __func__, spi->chip_select);
DBG_871X("%s, controller_data = %d \n", __func__, *(int *)spi->controller_data); DBG_871X("%s, controller_data = %d\n", __func__, *(int *)spi->controller_data);
DBG_871X("%s, irq= %d \n", __func__, oob_irq); DBG_871X("%s, irq= %d\n", __func__, oob_irq);
#endif #endif
spi_set_drvdata(spi, dvobj); spi_set_drvdata(spi, dvobj);

16
os_dep/ioctl_cfg80211.c
View file

@ -1095,14 +1095,14 @@ _func_enter_;
struct sta_info * psta,*pbcmc_sta; struct sta_info * psta,*pbcmc_sta;
struct sta_priv * pstapriv = &padapter->stapriv; struct sta_priv * pstapriv = &padapter->stapriv;
//DBG_8192C("%s, : dot11AuthAlgrthm == dot11AuthAlgrthm_8021X \n", __func__); //DBG_8192C("%s, : dot11AuthAlgrthm == dot11AuthAlgrthm_8021X\n", __func__);
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE | WIFI_MP_STATE) == _TRUE) //sta mode if (check_fwstate(pmlmepriv, WIFI_STATION_STATE | WIFI_MP_STATE) == _TRUE) //sta mode
{ {
psta = rtw_get_stainfo(pstapriv, get_bssid(pmlmepriv)); psta = rtw_get_stainfo(pstapriv, get_bssid(pmlmepriv));
if (psta == NULL) { if (psta == NULL) {
//DEBUG_ERR( ("Set wpa_set_encryption: Obtain Sta_info fail \n")); //DEBUG_ERR( ("Set wpa_set_encryption: Obtain Sta_info fail\n"));
DBG_8192C("%s, : Obtain Sta_info fail \n", __func__); DBG_8192C("%s, : Obtain Sta_info fail\n", __func__);
} }
else else
{ {
@ -1120,7 +1120,7 @@ _func_enter_;
if (param->u.crypt.set_tx ==1)//pairwise key if (param->u.crypt.set_tx ==1)//pairwise key
{ {
DBG_8192C("%s, : param->u.crypt.set_tx ==1 \n", __func__); DBG_8192C("%s, : param->u.crypt.set_tx ==1\n", __func__);
_rtw_memcpy(psta->dot118021x_UncstKey.skey, param->u.crypt.key, (param->u.crypt.key_len>16 ?16:param->u.crypt.key_len)); _rtw_memcpy(psta->dot118021x_UncstKey.skey, param->u.crypt.key, (param->u.crypt.key_len>16 ?16:param->u.crypt.key_len));
@ -1164,7 +1164,7 @@ _func_enter_;
pbcmc_sta=rtw_get_bcmc_stainfo(padapter); pbcmc_sta=rtw_get_bcmc_stainfo(padapter);
if (pbcmc_sta==NULL) if (pbcmc_sta==NULL)
{ {
//DEBUG_ERR( ("Set OID_802_11_ADD_KEY: bcmc stainfo is null \n")); //DEBUG_ERR( ("Set OID_802_11_ADD_KEY: bcmc stainfo is null\n"));
} }
else else
{ {
@ -1322,9 +1322,9 @@ static int cfg80211_rtw_add_key(struct wiphy *wiphy, struct net_device *ndev,
} }
_rtw_memcpy((void*)param->sta_addr, (void*)mac_addr, ETH_ALEN); _rtw_memcpy((void*)param->sta_addr, (void*)mac_addr, ETH_ALEN);
} else { } else {
DBG_871X("mac_addr is null \n"); DBG_871X("mac_addr is null\n");
} }
DBG_871X("rtw_wx_set_enc_ext: SMS4 case \n"); DBG_871X("rtw_wx_set_enc_ext: SMS4 case\n");
break; break;
#endif #endif
@ -2346,7 +2346,7 @@ static int rtw_cfg80211_set_wpa_ie(_adapter *padapter, u8 *pie, size_t ielen)
int i; int i;
DBG_8192C("set wpa_ie(length:%zu):\n", ielen); DBG_8192C("set wpa_ie(length:%zu):\n", ielen);
for (i=0;i<ielen;i=i+8) for (i=0;i<ielen;i=i+8)
DBG_8192C("0x%.2x 0x%.2x 0x%.2x 0x%.2x 0x%.2x 0x%.2x 0x%.2x 0x%.2x \n",buf[i],buf[i+1],buf[i+2],buf[i+3],buf[i+4],buf[i+5],buf[i+6],buf[i+7]); DBG_8192C("0x%.2x 0x%.2x 0x%.2x 0x%.2x 0x%.2x 0x%.2x 0x%.2x 0x%.2x\n",buf[i],buf[i+1],buf[i+2],buf[i+3],buf[i+4],buf[i+5],buf[i+6],buf[i+7]);
} }
pos = buf; pos = buf;

120
os_dep/ioctl_linux.c
View file

@ -629,7 +629,7 @@ static char *translate_scan(_adapter *padapter,
out_len_wapi=rtw_get_wapi_ie(pnetwork->network.IEs ,pnetwork->network.IELength,wapi_ie,&wapi_len); out_len_wapi=rtw_get_wapi_ie(pnetwork->network.IEs ,pnetwork->network.IELength,wapi_ie,&wapi_len);
RT_TRACE(_module_rtl871x_mlme_c_,_drv_info_,("rtw_wx_get_scan: ssid=%s\n",pnetwork->network.Ssid.Ssid)); RT_TRACE(_module_rtl871x_mlme_c_,_drv_info_,("rtw_wx_get_scan: ssid=%s\n",pnetwork->network.Ssid.Ssid));
RT_TRACE(_module_rtl871x_mlme_c_,_drv_info_,("rtw_wx_get_scan: wapi_len=%d \n",wapi_len)); RT_TRACE(_module_rtl871x_mlme_c_,_drv_info_,("rtw_wx_get_scan: wapi_len=%d\n",wapi_len));
DBG_871X("rtw_wx_get_scan: %s ",pnetwork->network.Ssid.Ssid); DBG_871X("rtw_wx_get_scan: %s ",pnetwork->network.Ssid.Ssid);
DBG_871X("rtw_wx_get_scan: ssid = %d ",wapi_len); DBG_871X("rtw_wx_get_scan: ssid = %d ",wapi_len);
@ -891,7 +891,7 @@ _func_enter_;
{ {
psta = rtw_get_stainfo(pstapriv, get_bssid(pmlmepriv)); psta = rtw_get_stainfo(pstapriv, get_bssid(pmlmepriv));
if (psta == NULL) { if (psta == NULL) {
//DEBUG_ERR( ("Set wpa_set_encryption: Obtain Sta_info fail \n")); //DEBUG_ERR( ("Set wpa_set_encryption: Obtain Sta_info fail\n"));
} }
else else
{ {
@ -949,7 +949,7 @@ _func_enter_;
pbcmc_sta=rtw_get_bcmc_stainfo(padapter); pbcmc_sta=rtw_get_bcmc_stainfo(padapter);
if (pbcmc_sta==NULL) if (pbcmc_sta==NULL)
{ {
//DEBUG_ERR( ("Set OID_802_11_ADD_KEY: bcmc stainfo is null \n")); //DEBUG_ERR( ("Set OID_802_11_ADD_KEY: bcmc stainfo is null\n"));
} }
else else
{ {
@ -1079,7 +1079,7 @@ static int rtw_set_wpa_ie(_adapter *padapter, char *pie, unsigned short ielen)
int i; int i;
DBG_871X("\n wpa_ie(length:%d):\n", ielen); DBG_871X("\n wpa_ie(length:%d):\n", ielen);
for (i=0;i<ielen;i=i+8) for (i=0;i<ielen;i=i+8)
DBG_871X("0x%.2x 0x%.2x 0x%.2x 0x%.2x 0x%.2x 0x%.2x 0x%.2x 0x%.2x \n",buf[i],buf[i+1],buf[i+2],buf[i+3],buf[i+4],buf[i+5],buf[i+6],buf[i+7]); DBG_871X("0x%.2x 0x%.2x 0x%.2x 0x%.2x 0x%.2x 0x%.2x 0x%.2x 0x%.2x\n",buf[i],buf[i+1],buf[i+2],buf[i+3],buf[i+4],buf[i+5],buf[i+6],buf[i+7]);
} }
pos = buf; pos = buf;
@ -1098,7 +1098,7 @@ static int rtw_set_wpa_ie(_adapter *padapter, char *pie, unsigned short ielen)
left -= RSN_SELECTOR_LEN; left -= RSN_SELECTOR_LEN;
} }
else if (left > 0){ else if (left > 0){
RT_TRACE(_module_rtl871x_ioctl_os_c,_drv_err_,("Ie length mismatch, %u too much \n", left)); RT_TRACE(_module_rtl871x_ioctl_os_c,_drv_err_,("Ie length mismatch, %u too much\n", left));
ret =-1; ret =-1;
goto exit; goto exit;
} }
@ -1401,7 +1401,7 @@ static int rtw_wx_get_mode(struct net_device *dev, struct iw_request_info *a,
_adapter *padapter = (_adapter *)rtw_netdev_priv(dev); _adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
RT_TRACE(_module_rtl871x_mlme_c_,_drv_info_,(" rtw_wx_get_mode \n")); RT_TRACE(_module_rtl871x_mlme_c_,_drv_info_,(" rtw_wx_get_mode\n"));
_func_enter_; _func_enter_;
@ -2574,7 +2574,7 @@ static int rtw_wx_set_rate(struct net_device *dev,
_func_enter_; _func_enter_;
RT_TRACE(_module_rtl871x_mlme_c_,_drv_info_,(" rtw_wx_set_rate \n")); RT_TRACE(_module_rtl871x_mlme_c_,_drv_info_,(" rtw_wx_set_rate\n"));
RT_TRACE(_module_rtl871x_ioctl_os_c,_drv_info_,("target_rate = %d, fixed = %d\n",target_rate,fixed)); RT_TRACE(_module_rtl871x_ioctl_os_c,_drv_info_,("target_rate = %d, fixed = %d\n",target_rate,fixed));
if (target_rate == -1){ if (target_rate == -1){
@ -3108,12 +3108,12 @@ static int rtw_wx_set_auth(struct net_device *dev,
case IW_AUTH_KEY_MGMT: case IW_AUTH_KEY_MGMT:
#ifdef CONFIG_WAPI_SUPPORT #ifdef CONFIG_WAPI_SUPPORT
#ifndef CONFIG_IOCTL_CFG80211 #ifndef CONFIG_IOCTL_CFG80211
DBG_871X("rtw_wx_set_auth: IW_AUTH_KEY_MGMT case \n"); DBG_871X("rtw_wx_set_auth: IW_AUTH_KEY_MGMT case\n");
if (value == IW_AUTH_KEY_MGMT_WAPI_PSK) if (value == IW_AUTH_KEY_MGMT_WAPI_PSK)
padapter->wapiInfo.bWapiPSK = true; padapter->wapiInfo.bWapiPSK = true;
else else
padapter->wapiInfo.bWapiPSK = false; padapter->wapiInfo.bWapiPSK = false;
DBG_871X("rtw_wx_set_auth: IW_AUTH_KEY_MGMT bwapipsk %d \n",padapter->wapiInfo.bWapiPSK); DBG_871X("rtw_wx_set_auth: IW_AUTH_KEY_MGMT bwapipsk %d\n",padapter->wapiInfo.bWapiPSK);
#endif #endif
#endif #endif
/* /*
@ -3261,7 +3261,7 @@ static int rtw_wx_set_enc_ext(struct net_device *dev,
case IW_ENCODE_ALG_SM4: case IW_ENCODE_ALG_SM4:
alg_name= "SMS4"; alg_name= "SMS4";
_rtw_memcpy(param->sta_addr, pext->addr.sa_data, ETH_ALEN); _rtw_memcpy(param->sta_addr, pext->addr.sa_data, ETH_ALEN);
DBG_871X("rtw_wx_set_enc_ext: SMS4 case \n"); DBG_871X("rtw_wx_set_enc_ext: SMS4 case\n");
break; break;
#endif #endif
#endif #endif
@ -4383,7 +4383,7 @@ static int rtw_p2p_profilefound(struct net_device *dev,
// YY => SSID Length // YY => SSID Length
// SSID => SSID for persistence group // SSID => SSID for persistence group
DBG_871X( "[%s] In value = %s, len = %d \n", __FUNCTION__, extra, wrqu->data.length -1); DBG_871X( "[%s] In value = %s, len = %d\n", __FUNCTION__, extra, wrqu->data.length -1);
// The upper application should pass the SSID to driver by using this rtw_p2p_profilefound function. // The upper application should pass the SSID to driver by using this rtw_p2p_profilefound function.
@ -5658,7 +5658,7 @@ static int rtw_p2p_set_pc(struct net_device *dev,
if ( rtw_get_p2p_attr_content( p2pie, p2pielen, P2P_ATTR_DEVICE_ID, attr_content, &attr_contentlen) ) if ( rtw_get_p2p_attr_content( p2pie, p2pielen, P2P_ATTR_DEVICE_ID, attr_content, &attr_contentlen) )
{ {
// Handle the P2P Device ID attribute of Beacon first // Handle the P2P Device ID attribute of Beacon first
printk( "[%s] P2P_ATTR_DEVICE_ID \n", __FUNCTION__ ); printk( "[%s] P2P_ATTR_DEVICE_ID\n", __FUNCTION__ );
if ( _rtw_memcmp( attr_content, peerMAC, ETH_ALEN ) ) if ( _rtw_memcmp( attr_content, peerMAC, ETH_ALEN ) )
{ {
uintPeerChannel = pnetwork->network.Configuration.DSConfig; uintPeerChannel = pnetwork->network.Configuration.DSConfig;
@ -5668,7 +5668,7 @@ static int rtw_p2p_set_pc(struct net_device *dev,
else if ( rtw_get_p2p_attr_content( p2pie, p2pielen, P2P_ATTR_DEVICE_INFO, attr_content, &attr_contentlen) ) else if ( rtw_get_p2p_attr_content( p2pie, p2pielen, P2P_ATTR_DEVICE_INFO, attr_content, &attr_contentlen) )
{ {
// Handle the P2P Device Info attribute of probe response // Handle the P2P Device Info attribute of probe response
printk( "[%s] P2P_ATTR_DEVICE_INFO \n", __FUNCTION__ ); printk( "[%s] P2P_ATTR_DEVICE_INFO\n", __FUNCTION__ );
if ( _rtw_memcmp( attr_content, peerMAC, ETH_ALEN ) ) if ( _rtw_memcmp( attr_content, peerMAC, ETH_ALEN ) )
{ {
uintPeerChannel = pnetwork->network.Configuration.DSConfig; uintPeerChannel = pnetwork->network.Configuration.DSConfig;
@ -7179,14 +7179,14 @@ static int rtw_dbg_port(struct net_device *dev,
if (0xf==extra_arg){ if (0xf==extra_arg){
rtw_hal_get_def_var(padapter, HAL_DEF_DBG_DM_FUNC,&odm_flag); rtw_hal_get_def_var(padapter, HAL_DEF_DBG_DM_FUNC,&odm_flag);
DBG_871X(" === DMFlag(0x%08x) === \n",odm_flag); DBG_871X(" === DMFlag(0x%08x) ===\n",odm_flag);
DBG_871X("extra_arg = 0 - disable all dynamic func \n"); DBG_871X("extra_arg = 0 - disable all dynamic func\n");
DBG_871X("extra_arg = 1 - disable DIG- BIT(0)\n"); DBG_871X("extra_arg = 1 - disable DIG- BIT(0)\n");
DBG_871X("extra_arg = 2 - disable High power - BIT(1)\n"); DBG_871X("extra_arg = 2 - disable High power - BIT(1)\n");
DBG_871X("extra_arg = 3 - disable tx power tracking - BIT(2)\n"); DBG_871X("extra_arg = 3 - disable tx power tracking - BIT(2)\n");
DBG_871X("extra_arg = 4 - disable BT coexistence - BIT(3)\n"); DBG_871X("extra_arg = 4 - disable BT coexistence - BIT(3)\n");
DBG_871X("extra_arg = 5 - disable antenna diversity - BIT(4)\n"); DBG_871X("extra_arg = 5 - disable antenna diversity - BIT(4)\n");
DBG_871X("extra_arg = 6 - enable all dynamic func \n"); DBG_871X("extra_arg = 6 - enable all dynamic func\n");
} }
else{ else{
/* extra_arg = 0 - disable all dynamic func /* extra_arg = 0 - disable all dynamic func
@ -7196,7 +7196,7 @@ static int rtw_dbg_port(struct net_device *dev,
*/ */
rtw_hal_set_def_var(padapter, HAL_DEF_DBG_DM_FUNC, &(extra_arg)); rtw_hal_set_def_var(padapter, HAL_DEF_DBG_DM_FUNC, &(extra_arg));
rtw_hal_get_def_var(padapter, HAL_DEF_DBG_DM_FUNC,&odm_flag); rtw_hal_get_def_var(padapter, HAL_DEF_DBG_DM_FUNC,&odm_flag);
DBG_871X(" === DMFlag(0x%08x) === \n",odm_flag); DBG_871X(" === DMFlag(0x%08x) ===\n",odm_flag);
} }
} }
break; break;
@ -9732,9 +9732,9 @@ static int rtw_mp_efuse_set(struct net_device *dev,
else if (strcmp(tmp[0], "wldumpfake") == 0) else if (strcmp(tmp[0], "wldumpfake") == 0)
{ {
if (rtw_efuse_map_read(padapter, 0, EFUSE_BT_MAX_MAP_LEN, pEfuseHal->fakeEfuseModifiedMap) == _SUCCESS) { if (rtw_efuse_map_read(padapter, 0, EFUSE_BT_MAX_MAP_LEN, pEfuseHal->fakeEfuseModifiedMap) == _SUCCESS) {
DBG_871X("%s: BT read all map success \n", __FUNCTION__); DBG_871X("%s: BT read all map success\n", __FUNCTION__);
} else { } else {
DBG_871X("%s: BT read all map Fail \n", __FUNCTION__); DBG_871X("%s: BT read all map Fail\n", __FUNCTION__);
err = -EFAULT; err = -EFAULT;
} }
} }
@ -10072,7 +10072,7 @@ static int rtw_mp_read_reg(struct net_device *dev,
write_rfreg(padapter, path, addr, data); write_rfreg(padapter, path, addr, data);
sprintf(extra, "write_rf completed \n"); sprintf(extra, "write_rf completed\n");
wrqu->length = strlen(extra); wrqu->length = strlen(extra);
return 0; return 0;
@ -10278,7 +10278,7 @@ static int rtw_mp_bandwidth(struct net_device *dev,
if (bandwidth != HT_CHANNEL_WIDTH_40) if (bandwidth != HT_CHANNEL_WIDTH_40)
bandwidth = HT_CHANNEL_WIDTH_20; bandwidth = HT_CHANNEL_WIDTH_20;
//DBG_871X("%s: bw=%d sg=%d \n", __func__, bandwidth , sg); //DBG_871X("%s: bw=%d sg=%d\n", __func__, bandwidth , sg);
padapter->mppriv.bandwidth = (u8)bandwidth; padapter->mppriv.bandwidth = (u8)bandwidth;
padapter->mppriv.preamble = sg; padapter->mppriv.preamble = sg;
@ -10479,9 +10479,9 @@ static int rtw_mp_ctx(struct net_device *dev,
return 0; return 0;
case MP_SINGLE_TONE_TX: case MP_SINGLE_TONE_TX:
//DBG_871X("%s: sgleTx %d \n", __func__, bStartTest); //DBG_871X("%s: sgleTx %d\n", __func__, bStartTest);
if (bStartTest != 0){ if (bStartTest != 0){
sprintf( extra, "Start continuous DA=ffffffffffff len=1500 \n infinite=yes."); sprintf( extra, "Start continuous DA=ffffffffffff len=1500\n infinite=yes.");
} }
Hal_SetSingleToneTx(padapter, (u8)bStartTest); Hal_SetSingleToneTx(padapter, (u8)bStartTest);
break; break;
@ -10489,7 +10489,7 @@ static int rtw_mp_ctx(struct net_device *dev,
case MP_CONTINUOUS_TX: case MP_CONTINUOUS_TX:
//DBG_871X("%s: cotuTx %d\n", __func__, bStartTest); //DBG_871X("%s: cotuTx %d\n", __func__, bStartTest);
if (bStartTest != 0){ if (bStartTest != 0){
sprintf( extra, "Start continuous DA=ffffffffffff len=1500 \n infinite=yes."); sprintf( extra, "Start continuous DA=ffffffffffff len=1500\n infinite=yes.");
} }
Hal_SetContinuousTx(padapter, (u8)bStartTest); Hal_SetContinuousTx(padapter, (u8)bStartTest);
break; break;
@ -10499,7 +10499,7 @@ static int rtw_mp_ctx(struct net_device *dev,
if (bStartTest != 0){ if (bStartTest != 0){
if ( pmp_priv->rateidx <= MPT_RATE_11M ) if ( pmp_priv->rateidx <= MPT_RATE_11M )
{ {
sprintf( extra, "Start continuous DA=ffffffffffff len=1500 \n infinite=yes."); sprintf( extra, "Start continuous DA=ffffffffffff len=1500\n infinite=yes.");
Hal_SetCarrierSuppressionTx(padapter, (u8)bStartTest); Hal_SetCarrierSuppressionTx(padapter, (u8)bStartTest);
}else }else
sprintf( extra, "Specify carrier suppression but not CCK rate"); sprintf( extra, "Specify carrier suppression but not CCK rate");
@ -10509,7 +10509,7 @@ static int rtw_mp_ctx(struct net_device *dev,
case MP_SINGLE_CARRIER_TX: case MP_SINGLE_CARRIER_TX:
//DBG_871X("%s: scTx %d\n", __func__, bStartTest); //DBG_871X("%s: scTx %d\n", __func__, bStartTest);
if (bStartTest != 0){ if (bStartTest != 0){
sprintf( extra, "Start continuous DA=ffffffffffff len=1500 \n infinite=yes."); sprintf( extra, "Start continuous DA=ffffffffffff len=1500\n infinite=yes.");
} }
Hal_SetSingleCarrierTx(padapter, (u8)bStartTest); Hal_SetSingleCarrierTx(padapter, (u8)bStartTest);
break; break;
@ -10705,7 +10705,7 @@ static int rtw_mp_thermal(struct net_device *dev,
if (copy_from_user(extra, wrqu->pointer, wrqu->length)) if (copy_from_user(extra, wrqu->pointer, wrqu->length))
return -EFAULT; return -EFAULT;
//DBG_871X("print extra %s \n",extra); //DBG_871X("print extra %s\n",extra);
bwrite = strncmp(extra, "write", 6); // strncmp TRUE is 0 bwrite = strncmp(extra, "write", 6); // strncmp TRUE is 0
@ -10722,7 +10722,7 @@ static int rtw_mp_thermal(struct net_device *dev,
} }
if ( rtw_efuse_map_write(padapter, addr, cnt, &val) == _FAIL ) if ( rtw_efuse_map_write(padapter, addr, cnt, &val) == _FAIL )
{ {
DBG_871X("rtw_efuse_map_write error \n"); DBG_871X("rtw_efuse_map_write error\n");
return -EFAULT; return -EFAULT;
} }
else else
@ -11005,7 +11005,7 @@ static int rtw_mp_SetBT(struct net_device *dev,
for (jj=0, kk=0; jj<cnts; jj++, kk+=2) for (jj=0, kk=0; jj<cnts; jj++, kk+=2)
{ {
BtReq.pParamStart[jj] = key_2char2num(tmp[1][kk], tmp[1][kk+1]); BtReq.pParamStart[jj] = key_2char2num(tmp[1][kk], tmp[1][kk+1]);
DBG_871X("BtReq.pParamStart[%d]=%x \n",ii,BtReq.pParamStart[jj]); DBG_871X("BtReq.pParamStart[%d]=%x\n",ii,BtReq.pParamStart[jj]);
} }
} }
@ -11023,21 +11023,21 @@ static int rtw_mp_SetBT(struct net_device *dev,
} }
if ( setgen==0 ) if ( setgen==0 )
{ {
DBG_871X("%s: BT_SET_GENERAL \n", __func__); DBG_871X("%s: BT_SET_GENERAL\n", __func__);
BtReq.opCodeVer=1; BtReq.opCodeVer=1;
BtReq.OpCode=3; //BT_SET_GENERAL 3 BtReq.OpCode=3; //BT_SET_GENERAL 3
BtReq.paraLength=cnts/2; BtReq.paraLength=cnts/2;
} }
if ( getgen==0 ) if ( getgen==0 )
{ {
DBG_871X("%s: BT_GET_GENERAL \n", __func__); DBG_871X("%s: BT_GET_GENERAL\n", __func__);
BtReq.opCodeVer=1; BtReq.opCodeVer=1;
BtReq.OpCode=4; //BT_GET_GENERAL 4 BtReq.OpCode=4; //BT_GET_GENERAL 4
BtReq.paraLength=cnts/2; BtReq.paraLength=cnts/2;
} }
if ( testctrl==0 ) if ( testctrl==0 )
{ {
DBG_871X("%s: BT_TEST_CTRL \n", __func__); DBG_871X("%s: BT_TEST_CTRL\n", __func__);
BtReq.opCodeVer=1; BtReq.opCodeVer=1;
BtReq.OpCode=5; //BT_TEST_CTRL 5 BtReq.OpCode=5; //BT_TEST_CTRL 5
BtReq.paraLength=cnts/2; BtReq.paraLength=cnts/2;
@ -11046,14 +11046,14 @@ static int rtw_mp_SetBT(struct net_device *dev,
DBG_871X("%s: BtReq.paraLength =%d\n", __FUNCTION__, BtReq.paraLength); DBG_871X("%s: BtReq.paraLength =%d\n", __FUNCTION__, BtReq.paraLength);
DBG_871X("opCodeVer=%d,OpCode=%d \n",BtReq.opCodeVer,BtReq.OpCode); DBG_871X("opCodeVer=%d,OpCode=%d\n",BtReq.opCodeVer,BtReq.OpCode);
if (BtReq.paraLength<1) if (BtReq.paraLength<1)
goto todo; goto todo;
for (i=0;i<BtReq.paraLength;i++) for (i=0;i<BtReq.paraLength;i++)
{ {
DBG_871X("%s: BtReq.pParamStart[ %d ] = 0x%02x \n", __func__,i,BtReq.pParamStart[i]); DBG_871X("%s: BtReq.pParamStart[ %d ] = 0x%02x\n", __func__,i,BtReq.pParamStart[i]);
} }
todo: todo:
@ -11100,28 +11100,28 @@ static int rtw_mp_set(struct net_device *dev,
switch (subcmd) switch (subcmd)
{ {
case MP_START: case MP_START:
DBG_871X("set case mp_start \n"); DBG_871X("set case mp_start\n");
rtw_mp_start (dev,info,wrqu,extra); rtw_mp_start (dev,info,wrqu,extra);
break; break;
case MP_STOP: case MP_STOP:
DBG_871X("set case mp_stop \n"); DBG_871X("set case mp_stop\n");
rtw_mp_stop (dev,info,wrqu,extra); rtw_mp_stop (dev,info,wrqu,extra);
break; break;
case MP_BANDWIDTH: case MP_BANDWIDTH:
DBG_871X("set case mp_bandwidth \n"); DBG_871X("set case mp_bandwidth\n");
rtw_mp_bandwidth (dev,info,wrqu,extra); rtw_mp_bandwidth (dev,info,wrqu,extra);
break; break;
case MP_RESET_STATS: case MP_RESET_STATS:
DBG_871X("set case MP_RESET_STATS \n"); DBG_871X("set case MP_RESET_STATS\n");
rtw_mp_reset_stats (dev,info,wrqu,extra); rtw_mp_reset_stats (dev,info,wrqu,extra);
break; break;
case MP_SetRFPathSwh: case MP_SetRFPathSwh:
DBG_871X("set MP_SetRFPathSwitch \n"); DBG_871X("set MP_SetRFPathSwitch\n");
rtw_mp_SetRFPath (dev,info,wdata,extra); rtw_mp_SetRFPath (dev,info,wdata,extra);
break; break;
case CTA_TEST: case CTA_TEST:
@ -11143,7 +11143,7 @@ static int rtw_mp_get(struct net_device *dev,
u32 subcmd = wrqu->flags; u32 subcmd = wrqu->flags;
PADAPTER padapter = rtw_netdev_priv(dev); PADAPTER padapter = rtw_netdev_priv(dev);
//DBG_871X("in mp_get extra= %s \n",extra); //DBG_871X("in mp_get extra= %s\n",extra);
if (padapter == NULL) if (padapter == NULL)
{ {
@ -11166,93 +11166,93 @@ static int rtw_mp_get(struct net_device *dev,
break; break;
case MP_PHYPARA: case MP_PHYPARA:
DBG_871X("mp_get MP_PHYPARA \n"); DBG_871X("mp_get MP_PHYPARA\n");
rtw_mp_phypara(dev,info,wrqu,extra); rtw_mp_phypara(dev,info,wrqu,extra);
break; break;
case MP_CHANNEL: case MP_CHANNEL:
DBG_871X("set case mp_channel \n"); DBG_871X("set case mp_channel\n");
rtw_mp_channel (dev,info,wrqu,extra); rtw_mp_channel (dev,info,wrqu,extra);
break; break;
case READ_REG: case READ_REG:
DBG_871X("mp_get READ_REG \n"); DBG_871X("mp_get READ_REG\n");
rtw_mp_read_reg (dev,info,wrqu,extra); rtw_mp_read_reg (dev,info,wrqu,extra);
break; break;
case READ_RF: case READ_RF:
DBG_871X("mp_get READ_RF \n"); DBG_871X("mp_get READ_RF\n");
rtw_mp_read_rf (dev,info,wrqu,extra); rtw_mp_read_rf (dev,info,wrqu,extra);
break; break;
case MP_RATE: case MP_RATE:
DBG_871X("set case mp_rate \n"); DBG_871X("set case mp_rate\n");
rtw_mp_rate (dev,info,wrqu,extra); rtw_mp_rate (dev,info,wrqu,extra);
break; break;
case MP_TXPOWER: case MP_TXPOWER:
DBG_871X("set case MP_TXPOWER \n"); DBG_871X("set case MP_TXPOWER\n");
rtw_mp_txpower (dev,info,wrqu,extra); rtw_mp_txpower (dev,info,wrqu,extra);
break; break;
case MP_ANT_TX: case MP_ANT_TX:
DBG_871X("set case MP_ANT_TX \n"); DBG_871X("set case MP_ANT_TX\n");
rtw_mp_ant_tx (dev,info,wrqu,extra); rtw_mp_ant_tx (dev,info,wrqu,extra);
break; break;
case MP_ANT_RX: case MP_ANT_RX:
DBG_871X("set case MP_ANT_RX \n"); DBG_871X("set case MP_ANT_RX\n");
rtw_mp_ant_rx (dev,info,wrqu,extra); rtw_mp_ant_rx (dev,info,wrqu,extra);
break; break;
case MP_QUERY: case MP_QUERY:
//DBG_871X("mp_get mp_query MP_QUERY \n"); //DBG_871X("mp_get mp_query MP_QUERY\n");
rtw_mp_trx_query(dev,info,wrqu,extra); rtw_mp_trx_query(dev,info,wrqu,extra);
break; break;
case MP_CTX: case MP_CTX:
DBG_871X("set case MP_CTX \n"); DBG_871X("set case MP_CTX\n");
rtw_mp_ctx (dev,info,wrqu,extra); rtw_mp_ctx (dev,info,wrqu,extra);
break; break;
case MP_ARX: case MP_ARX:
DBG_871X("set case MP_ARX \n"); DBG_871X("set case MP_ARX\n");
rtw_mp_arx (dev,info,wrqu,extra); rtw_mp_arx (dev,info,wrqu,extra);
break; break;
case EFUSE_GET: case EFUSE_GET:
DBG_871X("efuse get EFUSE_GET \n"); DBG_871X("efuse get EFUSE_GET\n");
rtw_mp_efuse_get(dev,info,wdata,extra); rtw_mp_efuse_get(dev,info,wdata,extra);
break; break;
case MP_DUMP: case MP_DUMP:
DBG_871X("set case MP_DUMP \n"); DBG_871X("set case MP_DUMP\n");
rtw_mp_dump (dev,info,wrqu,extra); rtw_mp_dump (dev,info,wrqu,extra);
break; break;
case MP_PSD: case MP_PSD:
DBG_871X("set case MP_PSD \n"); DBG_871X("set case MP_PSD\n");
rtw_mp_psd (dev,info,wrqu,extra); rtw_mp_psd (dev,info,wrqu,extra);
break; break;
case MP_THER: case MP_THER:
DBG_871X("set case MP_THER \n"); DBG_871X("set case MP_THER\n");
rtw_mp_thermal (dev,info,wrqu,extra); rtw_mp_thermal (dev,info,wrqu,extra);
break; break;
case MP_QueryDrvStats: case MP_QueryDrvStats:
DBG_871X("mp_get MP_QueryDrvStats \n"); DBG_871X("mp_get MP_QueryDrvStats\n");
rtw_mp_QueryDrv (dev,info,wdata,extra); rtw_mp_QueryDrv (dev,info,wdata,extra);
break; break;
case MP_PWRTRK: case MP_PWRTRK:
DBG_871X("set case MP_PWRTRK \n"); DBG_871X("set case MP_PWRTRK\n");
rtw_mp_pwrtrk (dev,info,wrqu,extra); rtw_mp_pwrtrk (dev,info,wrqu,extra);
break; break;
case EFUSE_SET: case EFUSE_SET:
DBG_871X("set case efuse set \n"); DBG_871X("set case efuse set\n");
rtw_mp_efuse_set (dev,info,wdata,extra); rtw_mp_efuse_set (dev,info,wdata,extra);
break; break;
#ifdef CONFIG_RTL8723A #ifdef CONFIG_RTL8723A
case MP_SetBT: case MP_SetBT:
DBG_871X("set MP_SetBT \n"); DBG_871X("set MP_SetBT\n");
rtw_mp_SetBT (dev,info,wdata,extra); rtw_mp_SetBT (dev,info,wdata,extra);
break; break;
#endif #endif
@ -11614,7 +11614,7 @@ static int rtw_tdls_setip(struct net_device *dev,
i++; i++;
} }
printk( "[%s] Set IP = %u.%u.%u.%u \n", __FUNCTION__, printk( "[%s] Set IP = %u.%u.%u.%u\n", __FUNCTION__,
ptdlsinfo->wfd_info->ip_address[0], ptdlsinfo->wfd_info->ip_address[1], ptdlsinfo->wfd_info->ip_address[0], ptdlsinfo->wfd_info->ip_address[1],
ptdlsinfo->wfd_info->ip_address[2], ptdlsinfo->wfd_info->ip_address[3] ptdlsinfo->wfd_info->ip_address[2], ptdlsinfo->wfd_info->ip_address[3]
); );

2
os_dep/mlme_linux.c
View file

@ -527,7 +527,7 @@ int hostapd_mode_init(_adapter *padapter)
if (dev_alloc_name(pnetdev,"mgnt.wlan%d") < 0) if (dev_alloc_name(pnetdev,"mgnt.wlan%d") < 0)
{ {
DBG_871X("hostapd_mode_init(): dev_alloc_name, fail! \n"); DBG_871X("hostapd_mode_init(): dev_alloc_name, fail!\n");
} }

22
os_dep/os_intfs.c
View file

@ -1032,7 +1032,7 @@ int rtw_init_netdev_name(struct net_device *pnetdev, const char *ifname)
if (dev_alloc_name(pnetdev, ifname) < 0) if (dev_alloc_name(pnetdev, ifname) < 0)
{ {
RT_TRACE(_module_os_intfs_c_,_drv_err_,("dev_alloc_name, fail! \n")); RT_TRACE(_module_os_intfs_c_,_drv_err_,("dev_alloc_name, fail!\n"));
} }
netif_carrier_off(pnetdev); netif_carrier_off(pnetdev);
@ -1179,14 +1179,14 @@ void rtw_stop_drv_threads (_adapter *padapter)
_rtw_up_sema(&padapter->xmitpriv.xmit_sema); _rtw_up_sema(&padapter->xmitpriv.xmit_sema);
_rtw_down_sema(&padapter->xmitpriv.terminate_xmitthread_sema); _rtw_down_sema(&padapter->xmitpriv.terminate_xmitthread_sema);
} }
RT_TRACE(_module_os_intfs_c_,_drv_info_,("\n drv_halt: rtw_xmit_thread can be terminated ! \n")); RT_TRACE(_module_os_intfs_c_,_drv_info_,("\n drv_halt: rtw_xmit_thread can be terminated !\n"));
#endif #endif
#ifdef CONFIG_RECV_THREAD_MODE #ifdef CONFIG_RECV_THREAD_MODE
// Below is to termindate rx_thread... // Below is to termindate rx_thread...
_rtw_up_sema(&padapter->recvpriv.recv_sema); _rtw_up_sema(&padapter->recvpriv.recv_sema);
_rtw_down_sema(&padapter->recvpriv.terminate_recvthread_sema); _rtw_down_sema(&padapter->recvpriv.terminate_recvthread_sema);
RT_TRACE(_module_os_intfs_c_,_drv_info_,("\n drv_halt:recv_thread can be terminated! \n")); RT_TRACE(_module_os_intfs_c_,_drv_info_,("\n drv_halt:recv_thread can be terminated!\n"));
#endif #endif
rtw_hal_stop_thread(padapter); rtw_hal_stop_thread(padapter);
@ -1451,7 +1451,7 @@ exit:
void rtw_cancel_dynamic_chk_timer(_adapter *padapter) void rtw_cancel_dynamic_chk_timer(_adapter *padapter)
{ {
_cancel_timer_ex(&padapter->mlmepriv.dynamic_chk_timer); _cancel_timer_ex(&padapter->mlmepriv.dynamic_chk_timer);
RT_TRACE(_module_os_intfs_c_,_drv_info_,("rtw_cancel_all_timer:cancel dynamic_chk_timer! \n")); RT_TRACE(_module_os_intfs_c_,_drv_info_,("rtw_cancel_all_timer:cancel dynamic_chk_timer!\n"));
} }
#endif #endif
@ -1460,20 +1460,20 @@ void rtw_cancel_all_timer(_adapter *padapter)
RT_TRACE(_module_os_intfs_c_,_drv_info_,("+rtw_cancel_all_timer\n")); RT_TRACE(_module_os_intfs_c_,_drv_info_,("+rtw_cancel_all_timer\n"));
_cancel_timer_ex(&padapter->mlmepriv.assoc_timer); _cancel_timer_ex(&padapter->mlmepriv.assoc_timer);
RT_TRACE(_module_os_intfs_c_,_drv_info_,("rtw_cancel_all_timer:cancel association timer complete! \n")); RT_TRACE(_module_os_intfs_c_,_drv_info_,("rtw_cancel_all_timer:cancel association timer complete!\n"));
//_cancel_timer_ex(&padapter->securitypriv.tkip_timer); //_cancel_timer_ex(&padapter->securitypriv.tkip_timer);
//RT_TRACE(_module_os_intfs_c_,_drv_info_,("rtw_cancel_all_timer:cancel tkip_timer! \n")); //RT_TRACE(_module_os_intfs_c_,_drv_info_,("rtw_cancel_all_timer:cancel tkip_timer!\n"));
_cancel_timer_ex(&padapter->mlmepriv.scan_to_timer); _cancel_timer_ex(&padapter->mlmepriv.scan_to_timer);
RT_TRACE(_module_os_intfs_c_,_drv_info_,("rtw_cancel_all_timer:cancel scan_to_timer! \n")); RT_TRACE(_module_os_intfs_c_,_drv_info_,("rtw_cancel_all_timer:cancel scan_to_timer!\n"));
_cancel_timer_ex(&padapter->mlmepriv.dynamic_chk_timer); _cancel_timer_ex(&padapter->mlmepriv.dynamic_chk_timer);
RT_TRACE(_module_os_intfs_c_,_drv_info_,("rtw_cancel_all_timer:cancel dynamic_chk_timer! \n")); RT_TRACE(_module_os_intfs_c_,_drv_info_,("rtw_cancel_all_timer:cancel dynamic_chk_timer!\n"));
// cancel sw led timer // cancel sw led timer
rtw_hal_sw_led_deinit(padapter); rtw_hal_sw_led_deinit(padapter);
RT_TRACE(_module_os_intfs_c_,_drv_info_,("rtw_cancel_all_timer:cancel DeInitSwLeds! \n")); RT_TRACE(_module_os_intfs_c_,_drv_info_,("rtw_cancel_all_timer:cancel DeInitSwLeds!\n"));
_cancel_timer_ex(&padapter->pwrctrlpriv.pwr_state_check_timer); _cancel_timer_ex(&padapter->pwrctrlpriv.pwr_state_check_timer);
@ -1485,7 +1485,7 @@ void rtw_cancel_all_timer(_adapter *padapter)
#ifdef CONFIG_SET_SCAN_DENY_TIMER #ifdef CONFIG_SET_SCAN_DENY_TIMER
_cancel_timer_ex(&padapter->mlmepriv.set_scan_deny_timer); _cancel_timer_ex(&padapter->mlmepriv.set_scan_deny_timer);
RT_TRACE(_module_os_intfs_c_,_drv_info_,("rtw_cancel_all_timer:cancel set_scan_deny_timer! \n")); RT_TRACE(_module_os_intfs_c_,_drv_info_,("rtw_cancel_all_timer:cancel set_scan_deny_timer!\n"));
#endif #endif
#ifdef CONFIG_NEW_SIGNAL_STAT_PROCESS #ifdef CONFIG_NEW_SIGNAL_STAT_PROCESS
@ -1801,7 +1801,7 @@ _adapter *rtw_drv_if2_init(_adapter *primary_padapter, char *name,
//step init_io_priv //step init_io_priv
if ((rtw_init_io_priv(padapter, set_intf_ops)) == _FAIL) { if ((rtw_init_io_priv(padapter, set_intf_ops)) == _FAIL) {
RT_TRACE(_module_hci_intfs_c_,_drv_err_,(" \n Can't init io_reqs\n")); RT_TRACE(_module_hci_intfs_c_,_drv_err_,("\n Can't init io_reqs\n"));
} }
//step read_chip_version //step read_chip_version

8
os_dep/pci_intf.c
View file

@ -843,7 +843,7 @@ void rtw_pci_enable_aspm(_adapter *padapter)
//NdisRawWritePortUlong((ULONG_PTR)PCI_CONF_ADDRESS , PciCfgAddrPort+(Num4Bytes << 2)); //NdisRawWritePortUlong((ULONG_PTR)PCI_CONF_ADDRESS , PciCfgAddrPort+(Num4Bytes << 2));
//NdisRawReadPortUlong((ULONG_PTR)PCI_CONF_DATA,&uDeviceASPMSupportSetting); //NdisRawReadPortUlong((ULONG_PTR)PCI_CONF_DATA,&uDeviceASPMSupportSetting);
pci_read_config_dword(bridge_pdev, (pcipriv->pcibridge_pciehdr_offset+0x0C), &u_device_aspmsupportsetting); pci_read_config_dword(bridge_pdev, (pcipriv->pcibridge_pciehdr_offset+0x0C), &u_device_aspmsupportsetting);
DBG_871X("rtw_pci_enable_aspm(): Bridge ASPM support %x \n",u_device_aspmsupportsetting); DBG_871X("rtw_pci_enable_aspm(): Bridge ASPM support %x\n",u_device_aspmsupportsetting);
if (((u_device_aspmsupportsetting & BIT(11)) != BIT(11)) || ((u_device_aspmsupportsetting & BIT(10)) != BIT(10))) if (((u_device_aspmsupportsetting & BIT(11)) != BIT(11)) || ((u_device_aspmsupportsetting & BIT(10)) != BIT(10)))
{ {
if (pdvobjpriv->const_devicepci_aspm_setting == 3) if (pdvobjpriv->const_devicepci_aspm_setting == 3)
@ -855,7 +855,7 @@ void rtw_pci_enable_aspm(_adapter *padapter)
{ {
if ((u_device_aspmsupportsetting & BIT(11)) != BIT(11)) if ((u_device_aspmsupportsetting & BIT(11)) != BIT(11))
{ {
DBG_871X("rtw_pci_enable_aspm(): Bridge not support L1 \n"); DBG_871X("rtw_pci_enable_aspm(): Bridge not support L1\n");
return; return;
} }
} }
@ -863,7 +863,7 @@ void rtw_pci_enable_aspm(_adapter *padapter)
{ {
if ((u_device_aspmsupportsetting & BIT(10)) != BIT(10)) if ((u_device_aspmsupportsetting & BIT(10)) != BIT(10))
{ {
DBG_871X("rtw_pci_enable_aspm(): Bridge not support L0s \n"); DBG_871X("rtw_pci_enable_aspm(): Bridge not support L0s\n");
return; return;
} }
@ -871,7 +871,7 @@ void rtw_pci_enable_aspm(_adapter *padapter)
} }
else else
{ {
DBG_871X("rtw_pci_enable_aspm(): Bridge support L0s and L1 \n"); DBG_871X("rtw_pci_enable_aspm(): Bridge support L0s and L1\n");
} }
} }

6
os_dep/recv_linux.c
View file

@ -283,7 +283,7 @@ _func_enter_;
RT_TRACE(_module_recv_osdep_c_,_drv_info_,("rtw_recv_indicatepkt():skb != NULL !!!\n")); RT_TRACE(_module_recv_osdep_c_,_drv_info_,("rtw_recv_indicatepkt():skb != NULL !!!\n"));
RT_TRACE(_module_recv_osdep_c_,_drv_info_,("rtw_recv_indicatepkt():precv_frame->u.hdr.rx_head=%p precv_frame->hdr.rx_data=%p\n", precv_frame->u.hdr.rx_head, precv_frame->u.hdr.rx_data)); RT_TRACE(_module_recv_osdep_c_,_drv_info_,("rtw_recv_indicatepkt():precv_frame->u.hdr.rx_head=%p precv_frame->hdr.rx_data=%p\n", precv_frame->u.hdr.rx_head, precv_frame->u.hdr.rx_data));
RT_TRACE(_module_recv_osdep_c_,_drv_info_,("precv_frame->hdr.rx_tail=%p precv_frame->u.hdr.rx_end=%p precv_frame->hdr.len=%d \n", precv_frame->u.hdr.rx_tail, precv_frame->u.hdr.rx_end, precv_frame->u.hdr.len)); RT_TRACE(_module_recv_osdep_c_,_drv_info_,("precv_frame->hdr.rx_tail=%p precv_frame->u.hdr.rx_end=%p precv_frame->hdr.len=%d\n", precv_frame->u.hdr.rx_tail, precv_frame->u.hdr.rx_end, precv_frame->u.hdr.len));
skb->data = precv_frame->u.hdr.rx_data; skb->data = precv_frame->u.hdr.rx_data;
@ -375,10 +375,10 @@ _func_enter_;
#ifdef CONFIG_TCP_CSUM_OFFLOAD_RX #ifdef CONFIG_TCP_CSUM_OFFLOAD_RX
if ( (pattrib->tcpchk_valid == 1) && (pattrib->tcp_chkrpt == 1) ) { if ( (pattrib->tcpchk_valid == 1) && (pattrib->tcp_chkrpt == 1) ) {
skb->ip_summed = CHECKSUM_UNNECESSARY; skb->ip_summed = CHECKSUM_UNNECESSARY;
//DBG_871X("CHECKSUM_UNNECESSARY \n"); //DBG_871X("CHECKSUM_UNNECESSARY\n");
} else { } else {
skb->ip_summed = CHECKSUM_NONE; skb->ip_summed = CHECKSUM_NONE;
//DBG_871X("CHECKSUM_NONE(%d, %d) \n", pattrib->tcpchk_valid, pattrib->tcp_chkrpt); //DBG_871X("CHECKSUM_NONE(%d, %d)\n", pattrib->tcpchk_valid, pattrib->tcp_chkrpt);
} }
#else /* !CONFIG_TCP_CSUM_OFFLOAD_RX */ #else /* !CONFIG_TCP_CSUM_OFFLOAD_RX */

10
os_dep/usb_intf.c
View file

@ -887,7 +887,7 @@ int rtw_hw_suspend(_adapter *padapter )
return 0; return 0;
error_exit: error_exit:
DBG_871X("%s, failed \n",__FUNCTION__); DBG_871X("%s, failed\n",__FUNCTION__);
return (-1); return (-1);
} }
@ -938,7 +938,7 @@ int rtw_hw_resume(_adapter *padapter)
return 0; return 0;
error_exit: error_exit:
DBG_871X("%s, Open net dev failed \n",__FUNCTION__); DBG_871X("%s, Open net dev failed\n",__FUNCTION__);
return (-1); return (-1);
} }
#endif #endif
@ -1282,7 +1282,7 @@ int autoresume_enter(_adapter* padapter)
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
struct dvobj_priv *dvobj = adapter_to_dvobj(padapter); struct dvobj_priv *dvobj = adapter_to_dvobj(padapter);
DBG_871X("====> autoresume_enter \n"); DBG_871X("====> autoresume_enter\n");
if (rf_off == pwrpriv->rf_pwrstate ) if (rf_off == pwrpriv->rf_pwrstate )
{ {
@ -1332,7 +1332,7 @@ int autoresume_enter(_adapter* padapter)
DBG_871X("0!=pwrpriv->autopm_cnt[%d] didn't usb_autopm_get_interface\n",pwrpriv->autopm_cnt); DBG_871X("0!=pwrpriv->autopm_cnt[%d] didn't usb_autopm_get_interface\n",pwrpriv->autopm_cnt);
#endif //#ifndef CONFIG_BT_COEXIST #endif //#ifndef CONFIG_BT_COEXIST
} }
DBG_871X("<==== autoresume_enter \n"); DBG_871X("<==== autoresume_enter\n");
error_exit: error_exit:
return result; return result;
@ -1483,7 +1483,7 @@ _adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj,
#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,33)) #if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,33))
if (usb_autopm_get_interface(pusb_intf) < 0) if (usb_autopm_get_interface(pusb_intf) < 0)
{ {
DBG_871X( "can't get autopm: \n"); DBG_871X( "can't get autopm:\n");
} }
#endif #endif
#ifdef CONFIG_BT_COEXIST #ifdef CONFIG_BT_COEXIST

8
os_dep/usb_ops_linux.c
View file

@ -292,7 +292,7 @@ void usb_read_port_cancel(struct intf_hdl *pintfhdl)
precvbuf->reuse = _TRUE; precvbuf->reuse = _TRUE;
if (precvbuf->purb) { if (precvbuf->purb) {
//DBG_8192C("usb_read_port_cancel : usb_kill_urb \n"); //DBG_8192C("usb_read_port_cancel : usb_kill_urb\n");
usb_kill_urb(precvbuf->purb); usb_kill_urb(precvbuf->purb);
} }
precvbuf++; precvbuf++;
@ -385,7 +385,7 @@ _func_enter_;
if (padapter->bSurpriseRemoved || padapter->bDriverStopped ||padapter->bWritePortCancel) if (padapter->bSurpriseRemoved || padapter->bDriverStopped ||padapter->bWritePortCancel)
{ {
RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_write_port_complete:bDriverStopped(%d) OR bSurpriseRemoved(%d)", padapter->bDriverStopped, padapter->bSurpriseRemoved)); RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_write_port_complete:bDriverStopped(%d) OR bSurpriseRemoved(%d)", padapter->bDriverStopped, padapter->bSurpriseRemoved));
DBG_8192C("%s(): TX Warning! bDriverStopped(%d) OR bSurpriseRemoved(%d) bWritePortCancel(%d) pxmitbuf->ext_tag(%x) \n", DBG_8192C("%s(): TX Warning! bDriverStopped(%d) OR bSurpriseRemoved(%d) bWritePortCancel(%d) pxmitbuf->ext_tag(%x)\n",
__FUNCTION__,padapter->bDriverStopped, padapter->bSurpriseRemoved,padapter->bReadPortCancel,pxmitbuf->ext_tag); __FUNCTION__,padapter->bDriverStopped, padapter->bSurpriseRemoved,padapter->bReadPortCancel,pxmitbuf->ext_tag);
goto check_completion; goto check_completion;
@ -395,7 +395,7 @@ _func_enter_;
if (purb->status==0) { if (purb->status==0) {
} else { } else {
RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_write_port_complete : purb->status(%d) != 0 \n", purb->status)); RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_write_port_complete : purb->status(%d) != 0\n", purb->status));
DBG_871X("###=> urb_write_port_complete status(%d)\n",purb->status); DBG_871X("###=> urb_write_port_complete status(%d)\n",purb->status);
if ((purb->status==-EPIPE)||(purb->status==-EPROTO)) if ((purb->status==-EPIPE)||(purb->status==-EPROTO))
{ {
@ -618,7 +618,7 @@ void usb_write_port_cancel(struct intf_hdl *pintfhdl)
_adapter *padapter = pintfhdl->padapter; _adapter *padapter = pintfhdl->padapter;
struct xmit_buf *pxmitbuf = (struct xmit_buf *)padapter->xmitpriv.pxmitbuf; struct xmit_buf *pxmitbuf = (struct xmit_buf *)padapter->xmitpriv.pxmitbuf;
DBG_871X("%s \n", __func__); DBG_871X("%s\n", __func__);
padapter->bWritePortCancel = _TRUE; padapter->bWritePortCancel = _TRUE;