UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: vt6655: Remove commented out printks 

These are just noise in the code so remove them.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Joe Perches 2013-03-18 20:55:36 -07:00 committed by Greg Kroah-Hartman
parent 00d0603cbd
commit f2046f93db
12 changed files with 6 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1732,10 +1732,6 @@ s_vChangeAntenna(
PSDevice pDevice PSDevice pDevice
) )
{ {
#ifdef PLICE_DEBUG
//printk("Enter s_vChangeAntenna:original RxMode is %d,TxMode is %d\n",pDevice->byRxAntennaMode,pDevice->byTxAntennaMode);
#endif
if (pDevice->dwRxAntennaSel == 0) { if (pDevice->dwRxAntennaSel == 0) {
pDevice->dwRxAntennaSel = 1; pDevice->dwRxAntennaSel = 1;
if (pDevice->bTxRxAntInv == true) if (pDevice->bTxRxAntInv == true)
@ -2564,9 +2560,6 @@ BBvSetTxAntennaMode(unsigned long dwIoBase, unsigned char byAntennaMode)
{ {
unsigned char byBBTxConf; unsigned char byBBTxConf;
#ifdef PLICE_DEBUG
//printk("Enter BBvSetTxAntennaMode\n");
#endif
BBbReadEmbedded(dwIoBase, 0x09, &byBBTxConf);//CR09 BBbReadEmbedded(dwIoBase, 0x09, &byBBTxConf);//CR09
if (byAntennaMode == ANT_DIVERSITY) { if (byAntennaMode == ANT_DIVERSITY) {
// bit 1 is diversity // bit 1 is diversity
@ -2575,9 +2568,6 @@ BBvSetTxAntennaMode(unsigned long dwIoBase, unsigned char byAntennaMode)
// bit 2 is ANTSEL // bit 2 is ANTSEL
byBBTxConf &= 0xF9; // 1111 1001 byBBTxConf &= 0xF9; // 1111 1001
} else if (byAntennaMode == ANT_B) { } else if (byAntennaMode == ANT_B) {
#ifdef PLICE_DEBUG
//printk("BBvSetTxAntennaMode:ANT_B\n");
#endif
byBBTxConf &= 0xFD; // 1111 1101 byBBTxConf &= 0xFD; // 1111 1101
byBBTxConf |= 0x04; byBBTxConf |= 0x04;
} }
@ -2812,9 +2802,7 @@ BBvAntennaDiversity(PSDevice pDevice, unsigned char byRxRate, unsigned char bySQ
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "1.[%08x], uNumSQ3[%d]=%d, %d\n", DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "1.[%08x], uNumSQ3[%d]=%d, %d\n",
(int)pDevice->ulRatio_State0, (int)pDevice->wAntDiversityMaxRate, (int)pDevice->ulRatio_State0, (int)pDevice->wAntDiversityMaxRate,
(int)pDevice->uNumSQ3[(int)pDevice->wAntDiversityMaxRate], (int)pDevice->uDiversityCnt); (int)pDevice->uNumSQ3[(int)pDevice->wAntDiversityMaxRate], (int)pDevice->uDiversityCnt);
#ifdef PLICE_DEBUG
//printk("BBvAntennaDiversity1:call s_vChangeAntenna\n");
#endif
s_vChangeAntenna(pDevice); s_vChangeAntenna(pDevice);
pDevice->byAntennaState = 1; pDevice->byAntennaState = 1;
del_timer(&pDevice->TimerSQ3Tmax3); del_timer(&pDevice->TimerSQ3Tmax3);
@ -2845,9 +2833,7 @@ BBvAntennaDiversity(PSDevice pDevice, unsigned char byRxRate, unsigned char bySQ
(int)pDevice->ulRatio_State0, (int)pDevice->ulRatio_State1, (int)pDevice->ulRatio_State0, (int)pDevice->ulRatio_State1,
(int)pDevice->wAntDiversityMaxRate, (int)pDevice->wAntDiversityMaxRate,
(int)pDevice->uNumSQ3[(int)pDevice->wAntDiversityMaxRate], (int)pDevice->uDiversityCnt); (int)pDevice->uNumSQ3[(int)pDevice->wAntDiversityMaxRate], (int)pDevice->uDiversityCnt);
#ifdef PLICE_DEBUG
//printk("BBvAntennaDiversity2:call s_vChangeAntenna\n");
#endif
s_vChangeAntenna(pDevice); s_vChangeAntenna(pDevice);
pDevice->TimerSQ3Tmax3.expires = RUN_AT(pDevice->byTMax3 * HZ); pDevice->TimerSQ3Tmax3.expires = RUN_AT(pDevice->byTMax3 * HZ);
pDevice->TimerSQ3Tmax2.expires = RUN_AT(pDevice->byTMax2 * HZ); pDevice->TimerSQ3Tmax2.expires = RUN_AT(pDevice->byTMax2 * HZ);
@ -2885,9 +2871,6 @@ TimerSQ3CallBack(
spin_lock_irq(&pDevice->lock); spin_lock_irq(&pDevice->lock);
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "3.[%08x][%08x], %d\n", (int)pDevice->ulRatio_State0, (int)pDevice->ulRatio_State1, (int)pDevice->uDiversityCnt); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "3.[%08x][%08x], %d\n", (int)pDevice->ulRatio_State0, (int)pDevice->ulRatio_State1, (int)pDevice->uDiversityCnt);
#ifdef PLICE_DEBUG
//printk("TimerSQ3CallBack1:call s_vChangeAntenna\n");
#endif
s_vChangeAntenna(pDevice); s_vChangeAntenna(pDevice);
pDevice->byAntennaState = 0; pDevice->byAntennaState = 0;
@ -2933,9 +2916,6 @@ TimerState1CallBack(
spin_lock_irq(&pDevice->lock); spin_lock_irq(&pDevice->lock);
if (pDevice->uDiversityCnt < pDevice->ulDiversityMValue/100) { if (pDevice->uDiversityCnt < pDevice->ulDiversityMValue/100) {
#ifdef PLICE_DEBUG
//printk("TimerSQ3CallBack2:call s_vChangeAntenna\n");
#endif
s_vChangeAntenna(pDevice); s_vChangeAntenna(pDevice);
pDevice->TimerSQ3Tmax3.expires = RUN_AT(pDevice->byTMax3 * HZ); pDevice->TimerSQ3Tmax3.expires = RUN_AT(pDevice->byTMax3 * HZ);
@ -2952,9 +2932,6 @@ TimerState1CallBack(
(int)pDevice->ulRatio_State0, (int)pDevice->ulRatio_State1, (int)pDevice->ulRatio_State0, (int)pDevice->ulRatio_State1,
(int)pDevice->wAntDiversityMaxRate, (int)pDevice->wAntDiversityMaxRate,
(int)pDevice->uNumSQ3[(int)pDevice->wAntDiversityMaxRate], (int)pDevice->uDiversityCnt); (int)pDevice->uNumSQ3[(int)pDevice->wAntDiversityMaxRate], (int)pDevice->uDiversityCnt);
#ifdef PLICE_DEBUG
//printk("TimerSQ3CallBack3:call s_vChangeAntenna\n");
#endif
s_vChangeAntenna(pDevice); s_vChangeAntenna(pDevice);

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

@ -1413,12 +1413,7 @@ BSSvUpdateNodeTxCounter(
byFallBack = AUTO_FB_NONE; byFallBack = AUTO_FB_NONE;
} }
wRate = pTxBufHead->wReserved; //?wRate wRate = pTxBufHead->wReserved; //?wRate
//printk("BSSvUpdateNodeTxCounter:byTxRetry is %d\n",byTxRetry);
//printk("BSSvUpdateNodeTx:wRate is %d,byFallback is %d\n",wRate,byFallBack);
//#ifdef PLICE_DEBUG
//printk("BSSvUpdateNodeTx: wRate is %d\n",wRate);
////#endif
// Only Unicast using support rates // Only Unicast using support rates
if (pTxBufHead->wFIFOCtl & FIFOCTL_NEEDACK) { if (pTxBufHead->wFIFOCtl & FIFOCTL_NEEDACK) {
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "wRate %04X, byTsr0 %02X, byTsr1 %02X\n", wRate, byTsr0, byTsr1); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "wRate %04X, byTsr0 %02X, byTsr1 %02X\n", wRate, byTsr0, byTsr1);
@ -1466,13 +1461,11 @@ BSSvUpdateNodeTxCounter(
//PLICE_DEBUG //PLICE_DEBUG
wFallBackRate = awHWRetry0[wRate-RATE_18M][ii]; wFallBackRate = awHWRetry0[wRate-RATE_18M][ii];
//printk(" II is %d:BSSvUpdateNodeTx:wFallBackRate is %d\n",ii,wFallBackRate);
//wFallBackRate = awHWRetry0[wRate-RATE_12M][ii]; //wFallBackRate = awHWRetry0[wRate-RATE_12M][ii];
} }
else else
{ {
wFallBackRate = awHWRetry0[wRate-RATE_18M][4]; wFallBackRate = awHWRetry0[wRate-RATE_18M][4];
//printk("ii is %d BSSvUpdateNodeTx:wFallBackRate is %d\n",ii,wFallBackRate);
//wFallBackRate = awHWRetry0[wRate-RATE_12M][4]; //wFallBackRate = awHWRetry0[wRate-RATE_12M][4];
} }
pMgmt->sNodeDBTable[0].uTxFail[wFallBackRate]++; pMgmt->sNodeDBTable[0].uTxFail[wFallBackRate]++;
@ -1686,7 +1679,6 @@ void s_uCalculateLinkQual(
//decide link quality //decide link quality
if (pDevice->bLinkPass != true) if (pDevice->bLinkPass != true)
{ {
// printk("s_uCalculateLinkQual-->Link disconnect and Poor quality**\n");
pDevice->scStatistic.LinkQuality = 0; pDevice->scStatistic.LinkQuality = 0;
pDevice->scStatistic.SignalStren = 0; pDevice->scStatistic.SignalStren = 0;
} }

7
drivers/staging/vt6655/channel.c
View File

@ -433,7 +433,6 @@ void init_channel_table(void *pDeviceHandler)
case RF_AL2230S: case RF_AL2230S:
case RF_UW2451: case RF_UW2451:
case RF_VT3226: case RF_VT3226:
//printk("chester-false\n");
bMultiBand = false; bMultiBand = false;
break; break;
case RF_AIROHA7230: case RF_AIROHA7230:
@ -581,14 +580,8 @@ bool set_channel(void *pDeviceHandler, unsigned int uConnectionChannel)
} }
if (pDevice->eCurrentPHYType == PHY_TYPE_11B) { if (pDevice->eCurrentPHYType == PHY_TYPE_11B) {
#ifdef PLICE_DEBUG
//printk("Func:ChbSetChannel:call RFbSetPower:11B\n");
#endif
RFbSetPower(pDevice, RATE_1M, pDevice->byCurrentCh); RFbSetPower(pDevice, RATE_1M, pDevice->byCurrentCh);
} else { } else {
#ifdef PLICE_DEBUG
//printk("Func:ChbSetChannel:call RFbSetPower\n");
#endif
RFbSetPower(pDevice, RATE_6M, pDevice->byCurrentCh); RFbSetPower(pDevice, RATE_6M, pDevice->byCurrentCh);
} }

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

@ -815,10 +815,8 @@ typedef struct __device_info {
inline static void EnQueue(PSDevice pDevice, PSRxMgmtPacket pRxMgmtPacket) inline static void EnQueue(PSDevice pDevice, PSRxMgmtPacket pRxMgmtPacket)
{ {
//printk("Enter EnQueue:tail is %d\n",pDevice->rxManeQueue.tail);
if ((pDevice->rxManeQueue.tail+1) % NUM == pDevice->rxManeQueue.head) if ((pDevice->rxManeQueue.tail+1) % NUM == pDevice->rxManeQueue.head)
{ {
//printk("Queue is Full,tail is %d\n",pDevice->rxManeQueue.tail);
return; return;
} }
else else
@ -826,7 +824,6 @@ inline static void EnQueue(PSDevice pDevice, PSRxMgmtPacket pRxMgmtPacket)
pDevice->rxManeQueue.tail = (pDevice->rxManeQueue.tail + 1) % NUM; pDevice->rxManeQueue.tail = (pDevice->rxManeQueue.tail + 1) % NUM;
pDevice->rxManeQueue.Q[pDevice->rxManeQueue.tail] = pRxMgmtPacket; pDevice->rxManeQueue.Q[pDevice->rxManeQueue.tail] = pRxMgmtPacket;
pDevice->rxManeQueue.packet_num++; pDevice->rxManeQueue.packet_num++;
//printk("packet num is %d\n",pDevice->rxManeQueue.packet_num);
} }
} }
@ -847,7 +844,6 @@ inline static PSRxMgmtPacket DeQueue(PSDevice pDevice)
//x=pDevice->rxManeQueue.head = (pDevice->rxManeQueue.head+1)%NUM; //x=pDevice->rxManeQueue.head = (pDevice->rxManeQueue.head+1)%NUM;
pDevice->rxManeQueue.head = (pDevice->rxManeQueue.head+1)%NUM; pDevice->rxManeQueue.head = (pDevice->rxManeQueue.head+1)%NUM;
x = pDevice->rxManeQueue.head; x = pDevice->rxManeQueue.head;
//printk("Enter DeQueue:head is %d\n",x);
pRxMgmtPacket = pDevice->rxManeQueue.Q[x]; pRxMgmtPacket = pDevice->rxManeQueue.Q[x];
pDevice->rxManeQueue.packet_num--; pDevice->rxManeQueue.packet_num--;
return pRxMgmtPacket; return pRxMgmtPacket;

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

@ -570,16 +570,11 @@ static void device_init_registers(PSDevice pDevice, DEVICE_INIT_TYPE InitType)
pDevice->bTxRxAntInv = true; pDevice->bTxRxAntInv = true;
else else
pDevice->bTxRxAntInv = false; pDevice->bTxRxAntInv = false;
#ifdef PLICE_DEBUG
//printk("init_register:TxRxAntInv is %d,byValue is %d\n",pDevice->bTxRxAntInv,byValue);
#endif
byValue &= (EEP_ANTENNA_AUX | EEP_ANTENNA_MAIN); byValue &= (EEP_ANTENNA_AUX | EEP_ANTENNA_MAIN);
if (byValue == 0) // if not set default is All if (byValue == 0) // if not set default is All
byValue = (EEP_ANTENNA_AUX | EEP_ANTENNA_MAIN); byValue = (EEP_ANTENNA_AUX | EEP_ANTENNA_MAIN);
#ifdef PLICE_DEBUG
//printk("init_register:byValue is %d\n",byValue);
#endif
pDevice->ulDiversityNValue = 100*260;//100*SROMbyReadEmbedded(pDevice->PortOffset, 0x51); pDevice->ulDiversityNValue = 100*260;//100*SROMbyReadEmbedded(pDevice->PortOffset, 0x51);
pDevice->ulDiversityMValue = 100*16;//SROMbyReadEmbedded(pDevice->PortOffset, 0x52); pDevice->ulDiversityMValue = 100*16;//SROMbyReadEmbedded(pDevice->PortOffset, 0x52);
pDevice->byTMax = 1;//SROMbyReadEmbedded(pDevice->PortOffset, 0x53); pDevice->byTMax = 1;//SROMbyReadEmbedded(pDevice->PortOffset, 0x53);
@ -603,9 +598,6 @@ static void device_init_registers(PSDevice pDevice, DEVICE_INIT_TYPE InitType)
pDevice->bDiversityEnable = false;//SROMbyReadEmbedded(pDevice->PortOffset, 0x50); pDevice->bDiversityEnable = false;//SROMbyReadEmbedded(pDevice->PortOffset, 0x50);
else else
pDevice->bDiversityEnable = true; pDevice->bDiversityEnable = true;
#ifdef PLICE_DEBUG
//printk("aux |main antenna: RxAntennaMode is %d\n",pDevice->byRxAntennaMode);
#endif
} else { } else {
pDevice->bDiversityEnable = false; pDevice->bDiversityEnable = false;
pDevice->byAntennaCount = 1; pDevice->byAntennaCount = 1;
@ -625,9 +617,6 @@ static void device_init_registers(PSDevice pDevice, DEVICE_INIT_TYPE InitType)
pDevice->byRxAntennaMode = ANT_B; pDevice->byRxAntennaMode = ANT_B;
} }
} }
#ifdef PLICE_DEBUG
//printk("init registers: TxAntennaMode is %d\n",pDevice->byTxAntennaMode);
#endif
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "bDiversityEnable=[%d],NValue=[%d],MValue=[%d],TMax=[%d],TMax2=[%d]\n", DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "bDiversityEnable=[%d],NValue=[%d],MValue=[%d],TMax=[%d],TMax2=[%d]\n",
pDevice->bDiversityEnable, (int)pDevice->ulDiversityNValue, (int)pDevice->ulDiversityMValue, pDevice->byTMax, pDevice->byTMax2); pDevice->bDiversityEnable, (int)pDevice->ulDiversityNValue, (int)pDevice->ulDiversityMValue, pDevice->byTMax, pDevice->byTMax2);
@ -692,7 +681,7 @@ static void device_init_registers(PSDevice pDevice, DEVICE_INIT_TYPE InitType)
//byCCKPwrdBm = SROMbyReadEmbedded(pDevice->PortOffset, EEP_OFS_CCK_PWR_dBm); //byCCKPwrdBm = SROMbyReadEmbedded(pDevice->PortOffset, EEP_OFS_CCK_PWR_dBm);
//byOFDMPwrdBm = SROMbyReadEmbedded(pDevice->PortOffset, EEP_OFS_OFDM_PWR_dBm); //byOFDMPwrdBm = SROMbyReadEmbedded(pDevice->PortOffset, EEP_OFS_OFDM_PWR_dBm);
//printk("CCKPwrdBm is 0x%x,byOFDMPwrdBm is 0x%x\n",byCCKPwrdBm,byOFDMPwrdBm);
// Load power Table // Load power Table
@ -756,9 +745,6 @@ static void device_init_registers(PSDevice pDevice, DEVICE_INIT_TYPE InitType)
pDevice->byBBVGANew = pDevice->byBBVGACurrent; pDevice->byBBVGANew = pDevice->byBBVGACurrent;
BBvSetVGAGainOffset(pDevice, pDevice->abyBBVGA[0]); BBvSetVGAGainOffset(pDevice, pDevice->abyBBVGA[0]);
} }
#ifdef PLICE_DEBUG
//printk("init registers:RxAntennaMode is %x,TxAntennaMode is %x\n",pDevice->byRxAntennaMode,pDevice->byTxAntennaMode);
#endif
BBvSetRxAntennaMode(pDevice->PortOffset, pDevice->byRxAntennaMode); BBvSetRxAntennaMode(pDevice->PortOffset, pDevice->byRxAntennaMode);
BBvSetTxAntennaMode(pDevice->PortOffset, pDevice->byTxAntennaMode); BBvSetTxAntennaMode(pDevice->PortOffset, pDevice->byTxAntennaMode);
@ -1162,13 +1148,11 @@ static bool device_get_pci_info(PSDevice pDevice, struct pci_dev *pcid) {
#ifdef PLICE_DEBUG #ifdef PLICE_DEBUG
//pci_read_config_word(pcid,PCI_MAX_LAT,&max_lat); //pci_read_config_word(pcid,PCI_MAX_LAT,&max_lat);
//printk("max lat is %x,SubSystemID is %x\n",max_lat,pDevice->SubSystemID);
//for (ii=0;ii<0xFF;ii++) //for (ii=0;ii<0xFF;ii++)
//pci_read_config_word(pcid,PCI_MAX_LAT,&max_lat); //pci_read_config_word(pcid,PCI_MAX_LAT,&max_lat);
//max_lat = 0x20; //max_lat = 0x20;
//pci_write_config_word(pcid,PCI_MAX_LAT,max_lat); //pci_write_config_word(pcid,PCI_MAX_LAT,max_lat);
//pci_read_config_word(pcid,PCI_MAX_LAT,&max_lat); //pci_read_config_word(pcid,PCI_MAX_LAT,&max_lat);
//printk("max lat is %x\n",max_lat);
for (ii = 0; ii < 0xFF; ii++) for (ii = 0; ii < 0xFF; ii++)
{ {
@ -1604,9 +1588,6 @@ static bool device_alloc_rx_buf(PSDevice pDevice, PSRxDesc pRD) {
pRDInfo->skb = dev_alloc_skb((int)pDevice->rx_buf_sz); pRDInfo->skb = dev_alloc_skb((int)pDevice->rx_buf_sz);
#ifdef PLICE_DEBUG
//printk("device_alloc_rx_buf:skb is %x\n",pRDInfo->skb);
#endif
if (pRDInfo->skb == NULL) if (pRDInfo->skb == NULL)
return false; return false;
ASSERT(pRDInfo->skb); ASSERT(pRDInfo->skb);
@ -1828,15 +1809,12 @@ int MlmeThread(
PSRxMgmtPacket pRxMgmtPacket; PSRxMgmtPacket pRxMgmtPacket;
// int i; // int i;
//complete(&pDevice->notify); //complete(&pDevice->notify);
//printk("Enter MngWorkItem,Queue packet num is %d\n",pDevice->rxManeQueue.packet_num);
//printk("Enter MlmeThread,packet _num is %d\n",pDevice->rxManeQueue.packet_num);
//i = 0; //i = 0;
#if 1 #if 1
while (1) while (1)
{ {
//printk("DDDD\n");
//down(&pDevice->mlme_semaphore); //down(&pDevice->mlme_semaphore);
// pRxMgmtPacket = DeQueue(pDevice); // pRxMgmtPacket = DeQueue(pDevice);
#if 1 #if 1
@ -1847,20 +1825,15 @@ int MlmeThread(
//pDevice; //pDevice;
//DequeueManageObject(pDevice->FirstRecvMngList, pDevice->LastRecvMngList); //DequeueManageObject(pDevice->FirstRecvMngList, pDevice->LastRecvMngList);
vMgrRxManagePacket(pDevice, pDevice->pMgmt, pRxMgmtPacket); vMgrRxManagePacket(pDevice, pDevice->pMgmt, pRxMgmtPacket);
//printk("packet_num is %d\n",pDevice->rxManeQueue.packet_num);
} }
spin_unlock_irq(&pDevice->lock); spin_unlock_irq(&pDevice->lock);
if (mlme_kill == 0) if (mlme_kill == 0)
break; break;
//udelay(200); //udelay(200);
#endif #endif
//printk("Before schedule thread jiffies is %x\n",jiffies);
schedule(); schedule();
//printk("after schedule thread jiffies is %x\n",jiffies);
if (mlme_kill == 0) if (mlme_kill == 0)
break; break;
//printk("i is %d\n",i);
} }
#endif #endif
@ -1885,7 +1858,7 @@ static int device_open(struct net_device *dev) {
i = request_irq(pDevice->pcid->irq, &device_intr, IRQF_SHARED, dev->name, dev); i = request_irq(pDevice->pcid->irq, &device_intr, IRQF_SHARED, dev->name, dev);
if (i) if (i)
return i; return i;
//printk("DEBUG1\n");
#ifdef WPA_SM_Transtatus #ifdef WPA_SM_Transtatus
memset(wpa_Result.ifname, 0, sizeof(wpa_Result.ifname)); memset(wpa_Result.ifname, 0, sizeof(wpa_Result.ifname));
wpa_Result.proto = 0; wpa_Result.proto = 0;
@ -1927,8 +1900,6 @@ static int device_open(struct net_device *dev) {
//printk("thread id is %d\n",pDevice->MLMEThr_pid);
//printk("Create thread time is %x\n",jiffies);
//wait_for_completion(&pDevice->notify); //wait_for_completion(&pDevice->notify);
@ -1972,9 +1943,6 @@ static int device_open(struct net_device *dev) {
pDevice->eEncryptionStatus = Ndis802_11Encryption1Enabled; pDevice->eEncryptionStatus = Ndis802_11Encryption1Enabled;
} }
//printk("DEBUG2\n");
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "call MACvIntEnable\n"); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "call MACvIntEnable\n");
MACvIntEnable(pDevice->PortOffset, IMR_MASK_VALUE); MACvIntEnable(pDevice->PortOffset, IMR_MASK_VALUE);
@ -2579,7 +2547,6 @@ static int device_xmit(struct sk_buff *skb, struct net_device *dev) {
} }
else else
{ {
//printk("Auto Rate:Rate is %d,TxPower is %d\n",pDevice->wCurrentRate,pDevice->byCurPwr);
} }
//#endif //#endif

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

@ -297,7 +297,7 @@ void MngWorkItem(void *Context)
{ {
PSRxMgmtPacket pRxMgmtPacket; PSRxMgmtPacket pRxMgmtPacket;
PSDevice pDevice = (PSDevice) Context; PSDevice pDevice = (PSDevice) Context;
//printk("Enter MngWorkItem,Queue packet num is %d\n",pDevice->rxManeQueue.packet_num);
spin_lock_irq(&pDevice->lock); spin_lock_irq(&pDevice->lock);
while (pDevice->rxManeQueue.packet_num != 0) while (pDevice->rxManeQueue.packet_num != 0)
{ {
@ -320,9 +320,6 @@ device_receive_frame(
{ {
PDEVICE_RD_INFO pRDInfo = pCurrRD->pRDInfo; PDEVICE_RD_INFO pRDInfo = pCurrRD->pRDInfo;
#ifdef PLICE_DEBUG
//printk("device_receive_frame:pCurrRD is %x,pRDInfo is %x\n",pCurrRD,pCurrRD->pRDInfo);
#endif
struct net_device_stats *pStats = &pDevice->stats; struct net_device_stats *pStats = &pDevice->stats;
struct sk_buff *skb; struct sk_buff *skb;
PSMgmtObject pMgmt = pDevice->pMgmt; PSMgmtObject pMgmt = pDevice->pMgmt;
@ -600,7 +597,6 @@ device_receive_frame(
#ifdef THREAD #ifdef THREAD
EnQueue(pDevice, pRxPacket); EnQueue(pDevice, pRxPacket);
//printk("enque time is %x\n",jiffies);
//up(&pDevice->mlme_semaphore); //up(&pDevice->mlme_semaphore);
//Enque (pDevice->FirstRecvMngList,pDevice->LastRecvMngList,pMgmt); //Enque (pDevice->FirstRecvMngList,pDevice->LastRecvMngList,pMgmt);
#else #else
@ -609,7 +605,6 @@ device_receive_frame(
EnQueue(pDevice, pRxPacket); EnQueue(pDevice, pRxPacket);
tasklet_schedule(&pDevice->RxMngWorkItem); tasklet_schedule(&pDevice->RxMngWorkItem);
#else #else
//printk("RxMan\n");
vMgrRxManagePacket((void *)pDevice, pDevice->pMgmt, pRxPacket); vMgrRxManagePacket((void *)pDevice, pDevice->pMgmt, pRxPacket);
//tasklet_schedule(&pDevice->RxMngWorkItem); //tasklet_schedule(&pDevice->RxMngWorkItem);
#endif #endif
@ -705,7 +700,6 @@ device_receive_frame(
if (pDevice->bDiversityEnable && (FrameSize > 50) && if (pDevice->bDiversityEnable && (FrameSize > 50) &&
(pDevice->eOPMode == OP_MODE_INFRASTRUCTURE) && (pDevice->eOPMode == OP_MODE_INFRASTRUCTURE) &&
(pDevice->bLinkPass == true)) { (pDevice->bLinkPass == true)) {
//printk("device_receive_frame: RxRate is %d\n",*pbyRxRate);
BBvAntennaDiversity(pDevice, s_byGetRateIdx(*pbyRxRate), 0); BBvAntennaDiversity(pDevice, s_byGetRateIdx(*pbyRxRate), 0);
} }
@ -967,13 +961,6 @@ device_receive_frame(
} }
return false; return false;
} }
// if (pDevice->bRxMICFail == false) {
// for (ii =0; ii < 100; ii++)
// printk(" %02x", *(skb->data + ii));
// printk("\n");
// }
} }
skb->data += cbHeaderOffset; skb->data += cbHeaderOffset;

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

@ -192,7 +192,6 @@ int iwctl_siwscan(struct net_device *dev,
} }
pMgmt->eScanType = WMAC_SCAN_PASSIVE; pMgmt->eScanType = WMAC_SCAN_PASSIVE;
//printk("SIOCSIWSCAN:WLAN_CMD_BSSID_SCAN\n");
bScheduleCommand((void *)pDevice, WLAN_CMD_BSSID_SCAN, NULL); bScheduleCommand((void *)pDevice, WLAN_CMD_BSSID_SCAN, NULL);
spin_unlock_irq(&pDevice->lock); spin_unlock_irq(&pDevice->lock);

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

@ -988,8 +988,6 @@ bool RFbSetPower(
//PLICE_DEBUG-> //PLICE_DEBUG->
//byPwr+=5; //byPwr+=5;
//PLICE_DEBUG <- //PLICE_DEBUG <-
//printk("Rate <11:byPwr is %d\n",byPwr);
break; break;
case RATE_6M: case RATE_6M:
case RATE_9M: case RATE_9M:
@ -1015,8 +1013,6 @@ bool RFbSetPower(
//PLICE_DEBUG-> //PLICE_DEBUG->
//byPwr+=5; //byPwr+=5;
//PLICE_DEBUG<- //PLICE_DEBUG<-
//printk("Rate <24:byPwr is %d\n",byPwr);
break; break;
case RATE_24M: case RATE_24M:
case RATE_36M: case RATE_36M:
@ -1027,7 +1023,6 @@ bool RFbSetPower(
//PLICE_DEBUG-> //PLICE_DEBUG->
//byPwr+=5; //byPwr+=5;
//PLICE_DEBUG<- //PLICE_DEBUG<-
//printk("Rate < 54:byPwr is %d\n",byPwr);
break; break;
} }

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

@ -378,9 +378,6 @@ s_uGetTxRsvTime(
unsigned int uDataTime, uAckTime; unsigned int uDataTime, uAckTime;
uDataTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, cbFrameLength, wRate); uDataTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, cbFrameLength, wRate);
#ifdef PLICE_DEBUG
//printk("s_uGetTxRsvTime is %d\n",uDataTime);
#endif
if (byPktType == PK_TYPE_11B) {//llb,CCK mode if (byPktType == PK_TYPE_11B) {//llb,CCK mode
uAckTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, 14, (unsigned short)pDevice->byTopCCKBasicRate); uAckTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, 14, (unsigned short)pDevice->byTopCCKBasicRate);
} else {//11g 2.4G OFDM mode & 11a 5G OFDM mode } else {//11g 2.4G OFDM mode & 11a 5G OFDM mode
@ -2178,8 +2175,6 @@ vGenerateFIFOHeader(PSDevice pDevice, unsigned char byPktType, unsigned char *pb
} }
#ifdef PLICE_DEBUG #ifdef PLICE_DEBUG
//printk("Func:vGenerateFIFOHeader:TxDataRate is %d,TxPower is %d\n",pDevice->wCurrentRate,pDevice->byCurPwr);
//if (pDevice->wCurrentRate <= 3) //if (pDevice->wCurrentRate <= 3)
//{ //{
// RFbRawSetPower(pDevice,36,pDevice->wCurrentRate); // RFbRawSetPower(pDevice,36,pDevice->wCurrentRate);
@ -2605,9 +2600,6 @@ CMD_STATUS csMgmt_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket) {
} }
pDevice->apCurrTD[TYPE_TXDMA0] = pFrstTD->next; pDevice->apCurrTD[TYPE_TXDMA0] = pFrstTD->next;
#ifdef PLICE_DEBUG
//printk("SCAN:CurrentRate is %d,TxPower is %d\n",wCurrentRate,pTxBufHead->byTxPower);
#endif
#ifdef TxInSleep #ifdef TxInSleep
pDevice->nTxDataTimeCout = 0; //2008-8-21 chester <add> for send null packet pDevice->nTxDataTimeCout = 0; //2008-8-21 chester <add> for send null packet

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

@ -415,7 +415,6 @@ vCommandTimer(
spin_unlock_irq(&pDevice->lock); spin_unlock_irq(&pDevice->lock);
return; return;
} }
//printk("chester-pMgmt->uScanChannel=%d,pDevice->byMaxChannel=%d\n",pMgmt->uScanChannel,pDevice->byMaxChannel);
if (pMgmt->uScanChannel == pDevice->byMinChannel) { if (pMgmt->uScanChannel == pDevice->byMinChannel) {
//pMgmt->eScanType = WMAC_SCAN_ACTIVE; //pMgmt->eScanType = WMAC_SCAN_ACTIVE;
pMgmt->abyScanBSSID[0] = 0xFF; pMgmt->abyScanBSSID[0] = 0xFF;
@ -439,8 +438,6 @@ vCommandTimer(
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "SET SCAN Channel Fail: %d\n", pMgmt->uScanChannel); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "SET SCAN Channel Fail: %d\n", pMgmt->uScanChannel);
} }
CARDbSetBSSID(pMgmt->pAdapter, pMgmt->abyCurrBSSID, OP_MODE_UNKNOWN); CARDbSetBSSID(pMgmt->pAdapter, pMgmt->abyCurrBSSID, OP_MODE_UNKNOWN);
// printk("chester-mxch=%d\n",pDevice->byMaxChannel);
// printk("chester-ch=%d\n",pMgmt->uScanChannel);
pMgmt->uScanChannel++; pMgmt->uScanChannel++;
//2008-8-4 <modify> by chester //2008-8-4 <modify> by chester
if (!is_channel_valid(pMgmt->uScanChannel) && if (!is_channel_valid(pMgmt->uScanChannel) &&
@ -546,7 +543,6 @@ vCommandTimer(
spin_unlock_irq(&pDevice->lock); spin_unlock_irq(&pDevice->lock);
return; return;
} }
//printk("chester-currmode=%d\n",pMgmt->eCurrMode);
printk("chester-abyDesireSSID=%s\n", ((PWLAN_IE_SSID)pMgmt->abyDesireSSID)->abySSID); printk("chester-abyDesireSSID=%s\n", ((PWLAN_IE_SSID)pMgmt->abyDesireSSID)->abySSID);
//memcpy(pMgmt->abyAdHocSSID,pMgmt->abyDesireSSID, //memcpy(pMgmt->abyAdHocSSID,pMgmt->abyDesireSSID,
//((PWLAN_IE_SSID)pMgmt->abyDesireSSID)->len + WLAN_IEHDR_LEN); //((PWLAN_IE_SSID)pMgmt->abyDesireSSID)->len + WLAN_IEHDR_LEN);
@ -710,7 +706,6 @@ vCommandTimer(
} }
#ifdef TxInSleep #ifdef TxInSleep
if (pDevice->IsTxDataTrigger != false) { //TxDataTimer is not triggered at the first time if (pDevice->IsTxDataTrigger != false) { //TxDataTimer is not triggered at the first time
// printk("Re-initial TxDataTimer****\n");
del_timer(&pDevice->sTimerTxData); del_timer(&pDevice->sTimerTxData);
init_timer(&pDevice->sTimerTxData); init_timer(&pDevice->sTimerTxData);
pDevice->sTimerTxData.data = (unsigned long) pDevice; pDevice->sTimerTxData.data = (unsigned long) pDevice;
@ -720,7 +715,6 @@ vCommandTimer(
pDevice->nTxDataTimeCout = 0; pDevice->nTxDataTimeCout = 0;
} }
else { else {
// printk("mike:-->First time trigger TimerTxData InSleep\n");
} }
pDevice->IsTxDataTrigger = true; pDevice->IsTxDataTrigger = true;
add_timer(&pDevice->sTimerTxData); add_timer(&pDevice->sTimerTxData);
@ -1094,8 +1088,6 @@ BSSvSecondTxData(
if (pDevice->nTxDataTimeCout < 4) //don't tx data if timer less than 40s if (pDevice->nTxDataTimeCout < 4) //don't tx data if timer less than 40s
{ {
// printk("mike:%s-->no data Tx not exceed the desired Time as %d\n",__FUNCTION__,
// (int)pDevice->nTxDataTimeCout);
pDevice->sTimerTxData.expires = RUN_AT(10*HZ); //10s callback pDevice->sTimerTxData.expires = RUN_AT(10*HZ); //10s callback
add_timer(&pDevice->sTimerTxData); add_timer(&pDevice->sTimerTxData);
return; return;
@ -1108,8 +1100,6 @@ BSSvSecondTxData(
#else #else
if (pDevice->bLinkPass == true) { if (pDevice->bLinkPass == true) {
#endif #endif
// printk("mike:%s-->InSleep Tx Data Procedure\n",__FUNCTION__);
pDevice->fTxDataInSleep = true; pDevice->fTxDataInSleep = true;
PSbSendNullPacket(pDevice); //send null packet PSbSendNullPacket(pDevice); //send null packet
pDevice->fTxDataInSleep = false; pDevice->fTxDataInSleep = false;

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

@ -2102,9 +2102,6 @@ s_vMgrRxBeacon(
&(pMgmt->sNodeDBTable[0].byTopCCKBasicRate), &(pMgmt->sNodeDBTable[0].byTopCCKBasicRate),
&(pMgmt->sNodeDBTable[0].byTopOFDMBasicRate) &(pMgmt->sNodeDBTable[0].byTopOFDMBasicRate)
); );
#ifdef PLICE_DEBUG
//printk("RxBeacon:MaxSuppRate is %d\n",pMgmt->sNodeDBTable[0].wMaxSuppRate);
#endif
if (bUpdatePhyParameter == true) { if (bUpdatePhyParameter == true) {
CARDbSetPhyParameter(pMgmt->pAdapter, CARDbSetPhyParameter(pMgmt->pAdapter,
pMgmt->eCurrentPHYMode, pMgmt->eCurrentPHYMode,

9
drivers/staging/vt6655/wpactl.c
View File

@ -658,15 +658,6 @@ static int wpa_get_scan(PSDevice pDevice,
} }
kfree(ptempBSS); kfree(ptempBSS);
// printk("bubble sort result:\n");
//for (ii = 0; ii < MAX_BSS_NUM; ii++)
// printk("%d [%s]:RSSI=%d\n",ii,((PWLAN_IE_SSID)(pMgmt->sBSSList[ii].abySSID))->abySSID,
// pMgmt->sBSSList[ii].uRSSI);
#endif #endif
//******mike:bubble sort by stronger RSSI*****// //******mike:bubble sort by stronger RSSI*****//