Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f2046f93 authored by Joe Perches's avatar Joe Perches Committed by Greg Kroah-Hartman
Browse files

staging: vt6655: Remove commented out printks 



These are just noise in the code so remove them.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 00d0603c

drivers/staging/vt6655/baseband.c

+2 −25
Original line number Diff line number Diff line
@@ -1732,10 +1732,6 @@ s_vChangeAntenna( 
	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) {

		pDevice->dwRxAntennaSel = 1;

		if (pDevice->bTxRxAntInv == true)
@@ -2564,9 +2560,6 @@ BBvSetTxAntennaMode(unsigned long dwIoBase, unsigned char byAntennaMode) 
{

	unsigned char byBBTxConf;



#ifdef	PLICE_DEBUG

	//printk("Enter BBvSetTxAntennaMode\n");

#endif

	BBbReadEmbedded(dwIoBase, 0x09, &byBBTxConf);//CR09

	if (byAntennaMode == ANT_DIVERSITY) {

		// bit 1 is diversity
@@ -2575,9 +2568,6 @@ BBvSetTxAntennaMode(unsigned long dwIoBase, unsigned char byAntennaMode) 
		// bit 2 is ANTSEL

		byBBTxConf &= 0xF9; // 1111 1001

	} else if (byAntennaMode == ANT_B) {

#ifdef	PLICE_DEBUG

		//printk("BBvSetTxAntennaMode:ANT_B\n");

#endif

		byBBTxConf &= 0xFD; // 1111 1101

		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",

					(int)pDevice->ulRatio_State0, (int)pDevice->wAntDiversityMaxRate,

					(int)pDevice->uNumSQ3[(int)pDevice->wAntDiversityMaxRate], (int)pDevice->uDiversityCnt);

#ifdef	PLICE_DEBUG

				//printk("BBvAntennaDiversity1:call s_vChangeAntenna\n");

#endif



				s_vChangeAntenna(pDevice);

				pDevice->byAntennaState = 1;

				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->wAntDiversityMaxRate,

					(int)pDevice->uNumSQ3[(int)pDevice->wAntDiversityMaxRate], (int)pDevice->uDiversityCnt);

#ifdef	PLICE_DEBUG

				//printk("BBvAntennaDiversity2:call s_vChangeAntenna\n");

#endif



				s_vChangeAntenna(pDevice);

				pDevice->TimerSQ3Tmax3.expires =  RUN_AT(pDevice->byTMax3 * HZ);

				pDevice->TimerSQ3Tmax2.expires =  RUN_AT(pDevice->byTMax2 * HZ);
@@ -2885,9 +2871,6 @@ TimerSQ3CallBack( 
	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);

#ifdef	PLICE_DEBUG

	//printk("TimerSQ3CallBack1:call s_vChangeAntenna\n");

#endif



	s_vChangeAntenna(pDevice);

	pDevice->byAntennaState = 0;
@@ -2933,9 +2916,6 @@ TimerState1CallBack( 


	spin_lock_irq(&pDevice->lock);

	if (pDevice->uDiversityCnt < pDevice->ulDiversityMValue/100) {

#ifdef	PLICE_DEBUG

		//printk("TimerSQ3CallBack2:call s_vChangeAntenna\n");

#endif



		s_vChangeAntenna(pDevice);

		pDevice->TimerSQ3Tmax3.expires =  RUN_AT(pDevice->byTMax3 * HZ);
@@ -2952,9 +2932,6 @@ TimerState1CallBack( 
				(int)pDevice->ulRatio_State0, (int)pDevice->ulRatio_State1,

				(int)pDevice->wAntDiversityMaxRate,

				(int)pDevice->uNumSQ3[(int)pDevice->wAntDiversityMaxRate], (int)pDevice->uDiversityCnt);

#ifdef	PLICE_DEBUG

			//printk("TimerSQ3CallBack3:call s_vChangeAntenna\n");

#endif



			s_vChangeAntenna(pDevice);

drivers/staging/vt6655/bssdb.c

+0 −8
Original line number Diff line number Diff line
@@ -1413,12 +1413,7 @@ BSSvUpdateNodeTxCounter( 
		byFallBack = AUTO_FB_NONE;

	}

	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

	if (pTxBufHead->wFIFOCtl & FIFOCTL_NEEDACK) {

		DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "wRate %04X, byTsr0 %02X, byTsr1 %02X\n", wRate, byTsr0, byTsr1);
@@ -1466,13 +1461,11 @@ BSSvUpdateNodeTxCounter( 


//PLICE_DEBUG

							wFallBackRate = awHWRetry0[wRate-RATE_18M][ii];

							//printk(" II is %d:BSSvUpdateNodeTx:wFallBackRate is %d\n",ii,wFallBackRate);

							//wFallBackRate = awHWRetry0[wRate-RATE_12M][ii];

						}

						else

						{

							wFallBackRate = awHWRetry0[wRate-RATE_18M][4];

							//printk("ii is %d BSSvUpdateNodeTx:wFallBackRate is %d\n",ii,wFallBackRate);

							//wFallBackRate = awHWRetry0[wRate-RATE_12M][4];

						}

						pMgmt->sNodeDBTable[0].uTxFail[wFallBackRate]++;
@@ -1686,7 +1679,6 @@ void s_uCalculateLinkQual( 
//decide link quality

	if (pDevice->bLinkPass != true)

	{

		//  printk("s_uCalculateLinkQual-->Link disconnect and Poor quality**\n");

		pDevice->scStatistic.LinkQuality = 0;

		pDevice->scStatistic.SignalStren = 0;

	}

drivers/staging/vt6655/channel.c

+0 −7
Original line number Diff line number Diff line
@@ -433,7 +433,6 @@ void init_channel_table(void *pDeviceHandler) 
	case RF_AL2230S:

	case RF_UW2451:

	case RF_VT3226:

		//printk("chester-false\n");

		bMultiBand = false;

		break;

	case RF_AIROHA7230:
@@ -581,14 +580,8 @@ bool set_channel(void *pDeviceHandler, unsigned int uConnectionChannel) 
	}



	if (pDevice->eCurrentPHYType == PHY_TYPE_11B) {

#ifdef	PLICE_DEBUG

		//printk("Func:ChbSetChannel:call RFbSetPower:11B\n");

#endif

		RFbSetPower(pDevice, RATE_1M, pDevice->byCurrentCh);

	} else {

#ifdef	PLICE_DEBUG

		//printk("Func:ChbSetChannel:call RFbSetPower\n");

#endif

		RFbSetPower(pDevice, RATE_6M, pDevice->byCurrentCh);

	}

drivers/staging/vt6655/device.h

+0 −4
Original line number Diff line number Diff line
@@ -815,10 +815,8 @@ typedef struct __device_info { 


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)

	{

		//printk("Queue is Full,tail is %d\n",pDevice->rxManeQueue.tail);

		return;

	}

	else
@@ -826,7 +824,6 @@ inline static void EnQueue(PSDevice pDevice, PSRxMgmtPacket pRxMgmtPacket) 
		pDevice->rxManeQueue.tail = (pDevice->rxManeQueue.tail + 1) % NUM;

		pDevice->rxManeQueue.Q[pDevice->rxManeQueue.tail] = pRxMgmtPacket;

		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;

		pDevice->rxManeQueue.head = (pDevice->rxManeQueue.head+1)%NUM;

		x = pDevice->rxManeQueue.head;

		//printk("Enter DeQueue:head is %d\n",x);

		pRxMgmtPacket = pDevice->rxManeQueue.Q[x];

		pDevice->rxManeQueue.packet_num--;

		return pRxMgmtPacket;

drivers/staging/vt6655/device_main.c

+3 −36
Original line number Diff line number Diff line
@@ -570,16 +570,11 @@ static void device_init_registers(PSDevice pDevice, DEVICE_INIT_TYPE InitType) 
			pDevice->bTxRxAntInv = true;

		else

			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);

		if (byValue == 0) // if not set default is All

			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->ulDiversityMValue = 100*16;//SROMbyReadEmbedded(pDevice->PortOffset, 0x52);

		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);

			else

				pDevice->bDiversityEnable = true;

#ifdef	PLICE_DEBUG

			//printk("aux |main antenna: RxAntennaMode is %d\n",pDevice->byRxAntennaMode);

#endif

		} else  {

			pDevice->bDiversityEnable = false;

			pDevice->byAntennaCount = 1;
@@ -625,9 +617,6 @@ static void device_init_registers(PSDevice pDevice, DEVICE_INIT_TYPE InitType) 
					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",

			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);



		//byOFDMPwrdBm = SROMbyReadEmbedded(pDevice->PortOffset, EEP_OFS_OFDM_PWR_dBm);

//printk("CCKPwrdBm is 0x%x,byOFDMPwrdBm is 0x%x\n",byCCKPwrdBm,byOFDMPwrdBm);



		// Load power Table
@@ -756,9 +745,6 @@ static void device_init_registers(PSDevice pDevice, DEVICE_INIT_TYPE InitType) 
			pDevice->byBBVGANew = pDevice->byBBVGACurrent;

			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);

		BBvSetTxAntennaMode(pDevice->PortOffset, pDevice->byTxAntennaMode);
@@ -1162,13 +1148,11 @@ static bool device_get_pci_info(PSDevice pDevice, struct pci_dev *pcid) { 


#ifdef	PLICE_DEBUG

	//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++)

	//pci_read_config_word(pcid,PCI_MAX_LAT,&max_lat);

	//max_lat  = 0x20;

	//pci_write_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++)

	{
@@ -1604,9 +1588,6 @@ static bool device_alloc_rx_buf(PSDevice pDevice, PSRxDesc pRD) { 




	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)

		return false;

	ASSERT(pRDInfo->skb);
@@ -1828,15 +1809,12 @@ int MlmeThread( 
	PSRxMgmtPacket			pRxMgmtPacket;

	// int i;

	//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;

#if 1

	while (1)

	{



		//printk("DDDD\n");

		//down(&pDevice->mlme_semaphore);

		// pRxMgmtPacket =  DeQueue(pDevice);

#if 1
@@ -1847,20 +1825,15 @@ int MlmeThread( 
			//pDevice;

			//DequeueManageObject(pDevice->FirstRecvMngList, pDevice->LastRecvMngList);

			vMgrRxManagePacket(pDevice, pDevice->pMgmt, pRxMgmtPacket);

			//printk("packet_num is %d\n",pDevice->rxManeQueue.packet_num);



		}

		spin_unlock_irq(&pDevice->lock);

		if (mlme_kill == 0)

			break;

		//udelay(200);

#endif

		//printk("Before schedule thread jiffies is %x\n",jiffies);

		schedule();

		//printk("after schedule thread jiffies is %x\n",jiffies);

		if (mlme_kill == 0)

			break;

		//printk("i is %d\n",i);

	}



#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);

	if (i)

		return i;

	//printk("DEBUG1\n");



#ifdef WPA_SM_Transtatus

	memset(wpa_Result.ifname, 0, sizeof(wpa_Result.ifname));

	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);
@@ -1972,9 +1943,6 @@ static int device_open(struct net_device *dev) { 
		pDevice->eEncryptionStatus = Ndis802_11Encryption1Enabled;

	}



//printk("DEBUG2\n");





	DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "call MACvIntEnable\n");

	MACvIntEnable(pDevice->PortOffset, IMR_MASK_VALUE);
@@ -2579,7 +2547,6 @@ static int device_xmit(struct sk_buff *skb, struct net_device *dev) { 
	}

	else

	{

		//printk("Auto Rate:Rate is %d,TxPower is %d\n",pDevice->wCurrentRate,pDevice->byCurPwr);

	}

//#endif