Commit 063f22af authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by Greg Kroah-Hartman
Browse files

Staging: rt2860: remove dead RALINK_ATE code 



Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 55468fae

drivers/staging/rt2860/common/action.c

+0 −5
Original line number Diff line number Diff line
@@ -881,11 +881,6 @@ VOID ORIBATimerTimeout( 
	INT			i, total;

	UCHAR			TID;



#ifdef RALINK_ATE

	if (ATE_ON(pAd))

		return;

#endif // RALINK_ATE //



	total = pAd->MacTab.Size * NUM_OF_TID;



	for (i = 1; ((i <MAX_LEN_OF_BA_ORI_TABLE) && (total > 0)) ; i++)

drivers/staging/rt2860/common/ba_action.c

+0 −6
Original line number Diff line number Diff line
@@ -1092,12 +1092,6 @@ VOID BAOriSessionSetupTimeout( 
	}

#endif // CONFIG_STA_SUPPORT //



#ifdef RALINK_ATE

	// Nothing to do in ATE mode.

	if (ATE_ON(pAd))

		return;

#endif // RALINK_ATE //



	pEntry = &pAd->MacTab.Content[pBAEntry->Wcid];



	if ((pBAEntry->ORI_BA_Status == Originator_WaitRes) && (pBAEntry->Token < ORI_SESSION_MAX_RETRY))

drivers/staging/rt2860/common/cmm_data.c

+0 −131
Original line number Diff line number Diff line
@@ -1771,85 +1771,6 @@ BOOLEAN RTMPFreeTXDUponTxDmaDone( 
	RTMP_IO_READ32(pAd, TX_DTX_IDX0 + QueIdx * RINGREG_DIFF, &pTxRing->TxDmaIdx);

	while (pTxRing->TxSwFreeIdx != pTxRing->TxDmaIdx)

	{

#ifdef RALINK_ATE

#ifdef RALINK_28xx_QA

		PHEADER_802_11	pHeader80211;



		if ((ATE_ON(pAd)) && (pAd->ate.bQATxStart == TRUE))

		{

			if (pAd->ate.QID == QueIdx)

			{

				pAd->ate.TxDoneCount++;

				//pAd->ate.Repeat++;

				pAd->RalinkCounters.KickTxCount++;



				/* always use QID_AC_BE and FIFO_EDCA */

				ASSERT(pAd->ate.QID == 0);

				pAd->ate.TxAc0++;



				FREE++;

#ifndef RT_BIG_ENDIAN

				pTxD = (PTXD_STRUC) (pTxRing->Cell[pTxRing->TxSwFreeIdx].AllocVa);

				pOriTxD = pTxD;

		        NdisMoveMemory(&TxD, pTxD, sizeof(TXD_STRUC));

				pTxD = &TxD;

#else

		        pDestTxD = (PTXD_STRUC) (pTxRing->Cell[pTxRing->TxSwFreeIdx].AllocVa);

		        pOriTxD = pDestTxD ;

		        TxD = *pDestTxD;

		        pTxD = &TxD;

		        RTMPDescriptorEndianChange((PUCHAR)pTxD, TYPE_TXD);

#endif

				pTxD->DMADONE = 0;



				pHeader80211 = pTxRing->Cell[pTxRing->TxSwFreeIdx].DmaBuf.AllocVa + sizeof(TXWI_STRUC);

#ifdef RT_BIG_ENDIAN

				RTMPFrameEndianChange(pAd, (PUCHAR)pHeader80211, DIR_READ, FALSE);

#endif

				pHeader80211->Sequence = ++pAd->ate.seq;

#ifdef RT_BIG_ENDIAN

				RTMPFrameEndianChange(pAd, (PUCHAR)pHeader80211, DIR_WRITE, FALSE);

#endif



				if  ((pAd->ate.bQATxStart == TRUE) && (pAd->ate.Mode & ATE_TXFRAME) && (pAd->ate.TxDoneCount < pAd->ate.TxCount))

				{

					pAd->RalinkCounters.TransmittedByteCount +=  (pTxD->SDLen1 + pTxD->SDLen0);

					pAd->RalinkCounters.OneSecDmaDoneCount[QueIdx] ++;

					INC_RING_INDEX(pTxRing->TxSwFreeIdx, TX_RING_SIZE);

					/* get tx_tdx_idx again */

					RTMP_IO_READ32(pAd, TX_DTX_IDX0 + QueIdx * RINGREG_DIFF ,  &pTxRing->TxDmaIdx);

					goto kick_out;

				}

				else if ((pAd->ate.TxStatus == 1)/* or (pAd->ate.bQATxStart == TRUE) ??? */ && (pAd->ate.TxDoneCount == pAd->ate.TxCount))//<========================PETER

				{

					DBGPRINT(RT_DEBUG_TRACE,("all Tx is done\n"));

					// Tx status enters idle mode.

					pAd->ate.TxStatus = 0;

				}

				else if (!(pAd->ate.Mode & ATE_TXFRAME))

				{

					/* not complete sending yet, but someone press the Stop TX botton. */

					DBGPRINT(RT_DEBUG_ERROR,("not complete sending yet, but someone pressed the Stop TX bottom\n"));

					DBGPRINT(RT_DEBUG_ERROR,("pAd->ate.Mode = 0x%02x\n", pAd->ate.Mode));

				}

				else

				{

					DBGPRINT(RT_DEBUG_OFF,("pTxRing->TxSwFreeIdx = %d\n", pTxRing->TxSwFreeIdx));

  				}

#ifndef RT_BIG_ENDIAN

	        	NdisMoveMemory(pOriTxD, pTxD, sizeof(TXD_STRUC));

#else

        		RTMPDescriptorEndianChange((PUCHAR)pTxD, TYPE_TXD);

        		*pDestTxD = TxD;

#endif // RT_BIG_ENDIAN //



				INC_RING_INDEX(pTxRing->TxSwFreeIdx, TX_RING_SIZE);

				continue;

			}

		}

#endif // RALINK_28xx_QA //

#endif // RALINK_ATE //



		// static rate also need NICUpdateFifoStaCounters() function.

		//if (OPSTATUS_TEST_FLAG(pAd, fOP_STATUS_TX_RATE_SWITCH_ENABLED))

			NICUpdateFifoStaCounters(pAd);
@@ -1871,11 +1792,6 @@ BOOLEAN RTMPFreeTXDUponTxDmaDone( 


		pTxD->DMADONE = 0;





#ifdef RALINK_ATE

		/* Execution of this block is not allowed when ATE is running. */

		if (!(ATE_ON(pAd)))

#endif // RALINK_ATE //

/*====================================================================*/

		{

			pPacket = pTxRing->Cell[pTxRing->TxSwFreeIdx].pNdisPacket;
@@ -1921,53 +1837,6 @@ BOOLEAN RTMPFreeTXDUponTxDmaDone( 
#else

        NdisMoveMemory(pOriTxD, pTxD, sizeof(TXD_STRUC));

#endif



#ifdef RALINK_ATE

#ifdef RALINK_28xx_QA

kick_out:

#endif // RALINK_28xx_QA //



		//

		// ATE_TXCONT mode also need to send some normal frames, so let it in.

		// ATE_STOP must be changed not to be 0xff

		// to prevent it from running into this block.

		//

		if ((pAd->ate.Mode & ATE_TXFRAME) && (pAd->ate.QID == QueIdx))

		{

			// TxDoneCount++ has been done if QA is used.

			if (pAd->ate.bQATxStart == FALSE)

			{

				pAd->ate.TxDoneCount++;

			}

			if (((pAd->ate.TxCount - pAd->ate.TxDoneCount + 1) >= TX_RING_SIZE))

			{

				/* Note : We increase TxCpuIdx here, not TxSwFreeIdx ! */

				INC_RING_INDEX(pAd->TxRing[QueIdx].TxCpuIdx, TX_RING_SIZE);

#ifndef RT_BIG_ENDIAN//<==========================PETER

				pTxD = (PTXD_STRUC) (pTxRing->Cell[pAd->TxRing[QueIdx].TxCpuIdx].AllocVa);

				pOriTxD = pTxD;

		        NdisMoveMemory(&TxD, pTxD, sizeof(TXD_STRUC));

				pTxD = &TxD;

#else

		        pDestTxD = (PTXD_STRUC) (pTxRing->Cell[pAd->TxRing[QueIdx].TxCpuIdx].AllocVa);

		        pOriTxD = pDestTxD ;

		        TxD = *pDestTxD;

		        pTxD = &TxD;

		        RTMPDescriptorEndianChange((PUCHAR)pTxD, TYPE_TXD);

#endif

				pTxD->DMADONE = 0;

#ifndef RT_BIG_ENDIAN//<==========================PETER

        		NdisMoveMemory(pOriTxD, pTxD, sizeof(TXD_STRUC));

#else

        		RTMPDescriptorEndianChange((PUCHAR)pTxD, TYPE_TXD);

        		*pDestTxD = TxD;

#endif

				// kick Tx-Ring.

				RTMP_IO_WRITE32(pAd, TX_CTX_IDX0 + QueIdx * RINGREG_DIFF, pAd->TxRing[QueIdx].TxCpuIdx);

				pAd->RalinkCounters.KickTxCount++;

			}

		}

#endif // RALINK_ATE //

	}

drivers/staging/rt2860/common/cmm_sync.c

+0 −6
Original line number Diff line number Diff line
@@ -397,12 +397,6 @@ VOID ScanNextChannel( 
	}

#endif // CONFIG_STA_SUPPORT //



#ifdef RALINK_ATE

	// Nothing to do in ATE mode.

	if (ATE_ON(pAd))

		return;

#endif // RALINK_ATE //



	if (pAd->MlmeAux.Channel == 0)

	{

		if ((pAd->CommonCfg.BBPCurrentBW == BW_40)

drivers/staging/rt2860/common/mlme.c

+1 −122
Original line number Diff line number Diff line
@@ -589,14 +589,6 @@ VOID MlmeHandler( 
			break;

		}



#ifdef RALINK_ATE

		if(ATE_ON(pAd))

		{

			DBGPRINT(RT_DEBUG_TRACE, ("The driver is in ATE mode now in MlmeHandler\n"));

			break;

		}

#endif // RALINK_ATE //



		//From message type, determine which state machine I should drive

		if (MlmeDequeue(&pAd->Mlme.Queue, &Elem))

		{
@@ -906,18 +898,6 @@ VOID MlmePeriodicExec( 


	RT28XX_MLME_PRE_SANITY_CHECK(pAd);



#ifdef RALINK_ATE

	/* Do not show RSSI until "Normal 1 second Mlme PeriodicExec". */

	if (ATE_ON(pAd))

	{

		if (pAd->Mlme.PeriodicRound % MLME_TASK_EXEC_MULTIPLE != (MLME_TASK_EXEC_MULTIPLE - 1))

	{

			pAd->Mlme.PeriodicRound ++;

			return;

		}

	}

#endif // RALINK_ATE //



#ifdef CONFIG_STA_SUPPORT

	IF_DEV_CONFIG_OPMODE_ON_STA(pAd)

	{
@@ -971,30 +951,6 @@ VOID MlmePeriodicExec( 
	{

                pAd->Mlme.OneSecPeriodicRound ++;



#ifdef RALINK_ATE

    	if (ATE_ON(pAd))

    	{

			/* request from Baron : move this routine from later to here */

			/* for showing Rx error count in ATE RXFRAME */

            NICUpdateRawCounters(pAd);

			if (pAd->ate.bRxFer == 1)

			{

				pAd->ate.RxTotalCnt += pAd->ate.RxCntPerSec;

			    ate_print(KERN_EMERG "MlmePeriodicExec: Rx packet cnt = %d/%d\n", pAd->ate.RxCntPerSec, pAd->ate.RxTotalCnt);

				pAd->ate.RxCntPerSec = 0;



				if (pAd->ate.RxAntennaSel == 0)

					ate_print(KERN_EMERG "MlmePeriodicExec: Rx AvgRssi0=%d, AvgRssi1=%d, AvgRssi2=%d\n\n",

						pAd->ate.AvgRssi0, pAd->ate.AvgRssi1, pAd->ate.AvgRssi2);

				else

					ate_print(KERN_EMERG "MlmePeriodicExec: Rx AvgRssi=%d\n\n", pAd->ate.AvgRssi0);

			}

			MlmeResetRalinkCounters(pAd);

			return;

    	}

#endif // RALINK_ATE //





		if (rx_Total)

		{
@@ -1103,17 +1059,6 @@ VOID STAMlmePeriodicExec( 
{

	ULONG			    TxTotalCnt;



//

// We return here in ATE mode, because the statistics

// that ATE needs are not collected via this routine.

//

#ifdef RALINK_ATE

	// It is supposed that we will never reach here in ATE mode.

	ASSERT(!(ATE_ON(pAd)));

	if (ATE_ON(pAd))

		return;

#endif // RALINK_ATE //



#ifdef WPA_SUPPLICANT_SUPPORT

    if (pAd->StaCfg.WpaSupplicantUP == WPA_SUPPLICANT_DISABLE)

#endif // WPA_SUPPLICANT_SUPPORT //
@@ -2127,13 +2072,6 @@ VOID MlmeDynamicTxRateSwitching( 
	ULONG					TxRetransmit = 0, TxSuccess = 0, TxFailCount = 0;

	MAC_TABLE_ENTRY			*pEntry;



#ifdef RALINK_ATE

	if (ATE_ON(pAd))

	{

		return;

	}

#endif // RALINK_ATE //



	/*if (pAd->Antenna.field.RxPath > 1)

		Rssi = (pAd->StaCfg.RssiSample.AvgRssi0 + pAd->StaCfg.RssiSample.AvgRssi1) >> 1;

	else
@@ -4922,12 +4860,6 @@ BOOLEAN MlmeEnqueueForRecv( 
	INT		 MsgType;

	MLME_QUEUE	*Queue = (MLME_QUEUE *)&pAd->Mlme.Queue;



#ifdef RALINK_ATE

	/* Nothing to do in ATE mode */

	if(ATE_ON(pAd))

		return FALSE;

#endif // RALINK_ATE //



	// Do nothing if the driver is starting halt state.

	// This might happen when timer already been fired before cancel timer with mlmehalt

	if (RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_HALT_IN_PROGRESS | fRTMP_ADAPTER_NIC_NOT_EXIST))
@@ -5634,11 +5566,6 @@ VOID AsicUpdateProtect( 
	UCHAR			i;

	UINT32 MacReg = 0;



#ifdef RALINK_ATE

	if (ATE_ON(pAd))

		return;

#endif // RALINK_ATE //



#ifdef DOT11_N_SUPPORT

	if (!(pAd->CommonCfg.bHTProtect) && (OperationMode != 8))

	{
@@ -7596,9 +7523,7 @@ BOOLEAN AsicSendCommandToMcu( 
	HOST_CMD_CSR_STRUC	H2MCmd;

	H2M_MAILBOX_STRUC	H2MMailbox;

	ULONG				i = 0;

#ifdef RALINK_ATE

	static UINT32 j = 0;

#endif // RALINK_ATE //



	do

	{

		RTMP_IO_READ32(pAd, H2M_MAILBOX_CSR, &H2MMailbox.word);
@@ -7610,30 +7535,6 @@ BOOLEAN AsicSendCommandToMcu( 


	if (i >= 100)

	{

#ifdef RALINK_ATE

		if (pAd->ate.bFWLoading == TRUE)

		{

			/* reloading firmware when received iwpriv cmd "ATE=ATESTOP" */

			if (j > 0)

			{

				if (j % 64 != 0)

				{

					DBGPRINT(RT_DEBUG_ERROR, ("#"));

				}

				else

				{

					DBGPRINT(RT_DEBUG_ERROR, ("\n"));

				}

				++j;

			}

			else if (j == 0)

			{

				DBGPRINT(RT_DEBUG_ERROR, ("Loading firmware. Please wait for a moment...\n"));

				++j;

			}

		}

		else

#endif // RALINK_ATE //

		{

			UINT32 Data;
@@ -7661,16 +7562,6 @@ BOOLEAN AsicSendCommandToMcu( 
		//return FALSE;

	}



#ifdef RALINK_ATE

	else if (pAd->ate.bFWLoading == TRUE)

	{

		/* reloading of firmware is completed */

		pAd->ate.bFWLoading = FALSE;

		DBGPRINT(RT_DEBUG_ERROR, ("\n"));

		j = 0;

	}

#endif // RALINK_ATE //



	H2MMailbox.field.Owner	  = 1;	   // pass ownership to MCU

	H2MMailbox.field.CmdToken = Token;

	H2MMailbox.field.HighByte = Arg1;
@@ -8126,12 +8017,6 @@ VOID AsicEvaluateRxAnt( 
{

	UCHAR	BBPR3 = 0;



#ifdef RALINK_ATE

	if (ATE_ON(pAd))

		return;

#endif // RALINK_ATE //





#ifdef CONFIG_STA_SUPPORT

	IF_DEV_CONFIG_OPMODE_ON_STA(pAd)

	{
@@ -8211,12 +8096,6 @@ VOID AsicRxAntEvalTimeout( 
	CHAR			larger = -127, rssi0, rssi1, rssi2;

#endif // CONFIG_STA_SUPPORT //



#ifdef RALINK_ATE

	if (ATE_ON(pAd))

		return;

#endif // RALINK_ATE //





#ifdef CONFIG_STA_SUPPORT

	IF_DEV_CONFIG_OPMODE_ON_STA(pAd)

	{