Commit 51f94a7b authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by Greg Kroah-Hartman
Browse files

Staging: rt2860: remove dead RT_BIG_ENDIAN code 



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

drivers/staging/rt2860/2860_main_dev.c

+1 −3
Original line number Diff line number Diff line
@@ -1167,9 +1167,7 @@ VOID RT28xx_UpdateBeaconToAsic( 
	else

	{

		ptr = (PUCHAR)&pAd->BeaconTxWI;

#ifdef RT_BIG_ENDIAN

		RTMPWIEndianChange(ptr, TYPE_TXWI);

#endif



		for (i=0; i<TXWI_SIZE; i+=4)  // 16-byte TXWI field

		{

			UINT32 longptr =  *ptr + (*(ptr+1)<<8) + (*(ptr+2)<<16) + (*(ptr+3)<<24);

drivers/staging/rt2860/common/2860_rtmp_init.c

+0 −25
Original line number Diff line number Diff line
@@ -173,9 +173,6 @@ NDIS_STATUS RTMPAllocTxRxRingMemory( 
				pTxD->SDPtr0 = BufBasePaLow;

				// advance to next ring descriptor address

				pTxD->DMADONE = 1;

#ifdef RT_BIG_ENDIAN

				RTMPDescriptorEndianChange((PUCHAR)pTxD, TYPE_TXD);

#endif

				RingBasePaLow += TXD_SIZE;

				RingBaseVa = (PUCHAR) RingBaseVa + TXD_SIZE;
@@ -236,9 +233,6 @@ NDIS_STATUS RTMPAllocTxRxRingMemory( 
			pTxD = (PTXD_STRUC) pAd->MgmtRing.Cell[index].AllocVa;

			pTxD->DMADONE = 1;



#ifdef RT_BIG_ENDIAN

			RTMPDescriptorEndianChange((PUCHAR)pTxD, TYPE_TXD);

#endif

			// no pre-allocated buffer required in MgmtRing for scatter-gather case

		}

		DBGPRINT(RT_DEBUG_TRACE, ("MGMT Ring: total %d entry allocated\n", index));
@@ -318,10 +312,6 @@ NDIS_STATUS RTMPAllocTxRxRingMemory( 
			pRxD = (PRXD_STRUC) pAd->RxRing.Cell[index].AllocVa;

			pRxD->SDP0 = RTMP_GetPhysicalAddressLow(pDmaBuf->AllocPa);

			pRxD->DDONE = 0;



#ifdef RT_BIG_ENDIAN

			RTMPDescriptorEndianChange((PUCHAR)pRxD, TYPE_RXD);

#endif

		}



		DBGPRINT(RT_DEBUG_TRACE, ("Rx Ring: total %d entry allocated\n", index));
@@ -821,10 +811,6 @@ PNDIS_PACKET GetPacketFromRxRing( 
	IN OUT	UINT32			*pRxPending)

{

	PRXD_STRUC				pRxD;

#ifdef RT_BIG_ENDIAN

	PRXD_STRUC				pDestRxD;

	RXD_STRUC				RxD;

#endif

	PNDIS_PACKET			pRxPacket = NULL;

	PNDIS_PACKET			pNewPacket;

	PVOID					AllocVa;
@@ -853,15 +839,8 @@ PNDIS_PACKET GetPacketFromRxRing( 


	}



#ifdef RT_BIG_ENDIAN

	pDestRxD = (PRXD_STRUC) pAd->RxRing.Cell[pAd->RxRing.RxSwReadIdx].AllocVa;

	RxD = *pDestRxD;

	pRxD = &RxD;

	RTMPDescriptorEndianChange((PUCHAR)pRxD, TYPE_RXD);

#else

	// Point to Rx indexed rx ring descriptor

	pRxD = (PRXD_STRUC) pAd->RxRing.Cell[pAd->RxRing.RxSwReadIdx].AllocVa;

#endif



	if (pRxD->DDONE == 0)

	{
@@ -904,10 +883,6 @@ PNDIS_PACKET GetPacketFromRxRing( 
	*pRxPending = *pRxPending - 1;



	// update rx descriptor and kick rx

#ifdef RT_BIG_ENDIAN

	RTMPDescriptorEndianChange((PUCHAR)pRxD, TYPE_RXD);

	WriteBackToDescriptor((PUCHAR)pDestRxD, (PUCHAR)pRxD, FALSE, TYPE_RXD);

#endif

	INC_RING_INDEX(pAd->RxRing.RxSwReadIdx, RX_RING_SIZE);



	pAd->RxRing.RxCpuIdx = (pAd->RxRing.RxSwReadIdx == 0) ? (RX_RING_SIZE-1) : (pAd->RxRing.RxSwReadIdx-1);

drivers/staging/rt2860/common/action.h

+0 −7
Original line number Diff line number Diff line
@@ -41,17 +41,10 @@ 


typedef struct PACKED __HT_INFO_OCTET

{

#ifdef RT_BIG_ENDIAN

	UCHAR	Reserved:5;

	UCHAR 	STA_Channel_Width:1;

	UCHAR	Forty_MHz_Intolerant:1;

	UCHAR	Request:1;

#else

	UCHAR	Request:1;

	UCHAR	Forty_MHz_Intolerant:1;

	UCHAR 	STA_Channel_Width:1;

	UCHAR	Reserved:5;

#endif

} HT_INFORMATION_OCTET;

drivers/staging/rt2860/common/cmm_data.c

+2 −62
Original line number Diff line number Diff line
@@ -300,10 +300,6 @@ NDIS_STATUS MlmeHardTransmitTxRing( 
	PUCHAR			pSrcBufVA;

	UINT			SrcBufLen;

	PTXD_STRUC		pTxD;

#ifdef RT_BIG_ENDIAN

    PTXD_STRUC      pDestTxD;

    TXD_STRUC       TxD;

#endif

	PHEADER_802_11	pHeader_802_11;

	BOOLEAN 		bAckRequired, bInsertTimestamp;

	ULONG			SrcBufPA;
@@ -335,14 +331,7 @@ NDIS_STATUS MlmeHardTransmitTxRing( 


	SwIdx = pAd->TxRing[QueIdx].TxCpuIdx;



#ifndef RT_BIG_ENDIAN

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

#else

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

    TxD = *pDestTxD;

    pTxD = &TxD;

    RTMPDescriptorEndianChange((PUCHAR)pTxD, TYPE_TXD);

#endif



	if (pAd->TxRing[QueIdx].Cell[SwIdx].pNdisPacket)

	{
@@ -438,9 +427,6 @@ NDIS_STATUS MlmeHardTransmitTxRing( 
		return (NDIS_STATUS_FAILURE);

	}



#ifdef RT_BIG_ENDIAN

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

#endif

	//

	// fill scatter-and-gather buffer list into TXD. Internally created NDIS PACKET

	// should always has only one ohysical buffer, and the whole frame size equals
@@ -470,9 +456,7 @@ NDIS_STATUS MlmeHardTransmitTxRing( 


	pAd->TxRing[QueIdx].Cell[SwIdx].pNdisPacket = pPacket;

	pAd->TxRing[QueIdx].Cell[SwIdx].pNextNdisPacket = NULL;

#ifdef RT_BIG_ENDIAN

	RTMPWIEndianChange((PUCHAR)pFirstTxWI, TYPE_TXWI);

#endif



	SrcBufPA = PCI_MAP_SINGLE(pAd, pSrcBufVA, SrcBufLen, 0, PCI_DMA_TODEVICE);
@@ -484,11 +468,6 @@ NDIS_STATUS MlmeHardTransmitTxRing( 
	pTxD->SDPtr0 = SrcBufPA;

	pTxD->DMADONE = 0;



#ifdef RT_BIG_ENDIAN

    RTMPDescriptorEndianChange((PUCHAR)pTxD, TYPE_TXD);

    WriteBackToDescriptor((PUCHAR)pDestTxD, (PUCHAR)pTxD, FALSE, TYPE_TXD);

#endif



	pAd->RalinkCounters.KickTxCount++;

	pAd->RalinkCounters.OneSecTxDoneCount++;
@@ -639,10 +618,6 @@ NDIS_STATUS MlmeHardTransmitMgmtRing( 
		return (NDIS_STATUS_FAILURE);

	}



#ifdef RT_BIG_ENDIAN

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

#endif



	//

	// fill scatter-and-gather buffer list into TXD. Internally created NDIS PACKET

	// should always has only one ohysical buffer, and the whole frame size equals
@@ -669,10 +644,6 @@ NDIS_STATUS MlmeHardTransmitMgmtRing( 
					IFS_BACKOFF, FALSE, &pMacEntry->MaxHTPhyMode);

	}



#ifdef RT_BIG_ENDIAN

	RTMPWIEndianChange((PUCHAR)pFirstTxWI, TYPE_TXWI);

#endif



	// Now do hardware-depened kick out.

	HAL_KickOutMgmtTx(pAd, QueIdx, pPacket, pSrcBufVA, SrcBufLen);
@@ -1723,9 +1694,6 @@ BOOLEAN RTMPFreeTXDUponTxDmaDone( 
{

	PRTMP_TX_RING pTxRing;

	PTXD_STRUC	  pTxD;

#ifdef	RT_BIG_ENDIAN

    PTXD_STRUC      pDestTxD;

#endif

	PNDIS_PACKET  pPacket;

	UCHAR	FREE = 0;

	TXD_STRUC	TxD, *pOriTxD;
@@ -1745,18 +1713,10 @@ BOOLEAN RTMPFreeTXDUponTxDmaDone( 


		/* Note : If (pAd->ate.bQATxStart == TRUE), we will never reach here. */

		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;
@@ -1799,12 +1759,8 @@ BOOLEAN RTMPFreeTXDUponTxDmaDone( 
		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);

#ifdef RT_BIG_ENDIAN

        RTMPDescriptorEndianChange((PUCHAR)pTxD, TYPE_TXD);

        *pDestTxD = TxD;

#else



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

#endif

	}
@@ -1887,10 +1843,6 @@ VOID RTMPHandleMgmtRingDmaDoneInterrupt( 
	IN	PRTMP_ADAPTER	pAd)

{

	PTXD_STRUC	 pTxD;

#ifdef RT_BIG_ENDIAN

    PTXD_STRUC      pDestTxD;

    TXD_STRUC       TxD;

#endif

	PNDIS_PACKET pPacket;

	UCHAR	FREE = 0;

	PRTMP_MGMT_RING pMgmtRing = &pAd->MgmtRing;
@@ -1901,14 +1853,7 @@ VOID RTMPHandleMgmtRingDmaDoneInterrupt( 
	while (pMgmtRing->TxSwFreeIdx!= pMgmtRing->TxDmaIdx)

	{

		FREE++;

#ifdef RT_BIG_ENDIAN

        pDestTxD = (PTXD_STRUC) (pMgmtRing->Cell[pAd->MgmtRing.TxSwFreeIdx].AllocVa);

        TxD = *pDestTxD;

        pTxD = &TxD;

		RTMPDescriptorEndianChange((PUCHAR)pTxD, TYPE_TXD);

#else

		pTxD = (PTXD_STRUC) (pMgmtRing->Cell[pAd->MgmtRing.TxSwFreeIdx].AllocVa);

#endif

		pTxD->DMADONE = 0;

		pPacket = pMgmtRing->Cell[pMgmtRing->TxSwFreeIdx].pNdisPacket;
@@ -1928,11 +1873,6 @@ VOID RTMPHandleMgmtRingDmaDoneInterrupt( 
		}

		pMgmtRing->Cell[pMgmtRing->TxSwFreeIdx].pNextNdisPacket = NULL;

		INC_RING_INDEX(pMgmtRing->TxSwFreeIdx, MGMT_RING_SIZE);



#ifdef RT_BIG_ENDIAN

        RTMPDescriptorEndianChange((PUCHAR)pTxD, TYPE_TXD);

        WriteBackToDescriptor((PUCHAR)pDestTxD, (PUCHAR)pTxD, TRUE, TYPE_TXD);

#endif

	}

	NdisReleaseSpinLock(&pAd->MgmtRingLock);

drivers/staging/rt2860/common/cmm_data_2860.c

+3 −90
Original line number Diff line number Diff line
@@ -110,10 +110,6 @@ USHORT RtmpPCI_WriteSingleTxResource( 
	UCHAR			*pDMAHeaderBufVA;

	USHORT			TxIdx, RetTxIdx;

	PTXD_STRUC		pTxD;

#ifdef RT_BIG_ENDIAN

    PTXD_STRUC      pDestTxD;

    TXD_STRUC       TxD;

#endif

	UINT32			BufBasePaLow;

	PRTMP_TX_RING	pTxRing;

	USHORT			hwHeaderLen;
@@ -137,13 +133,8 @@ USHORT RtmpPCI_WriteSingleTxResource( 
	//

	// build Tx Descriptor

	//

#ifndef RT_BIG_ENDIAN

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

#else

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

	TxD = *pDestTxD;

	pTxD = &TxD;

#endif



	NdisZeroMemory(pTxD, TXD_SIZE);



	pTxD->SDPtr0 = BufBasePaLow;
@@ -154,12 +145,6 @@ USHORT RtmpPCI_WriteSingleTxResource( 
	pTxD->LastSec1 = (bIsLast) ? 1 : 0;



	RTMPWriteTxDescriptor(pAd, pTxD, FALSE, FIFO_EDCA);

#ifdef RT_BIG_ENDIAN

	RTMPWIEndianChange((PUCHAR)(pDMAHeaderBufVA + TXINFO_SIZE), TYPE_TXWI);

	RTMPFrameEndianChange(pAd, (PUCHAR)(pDMAHeaderBufVA + TXINFO_SIZE + TXWI_SIZE), DIR_WRITE, FALSE);

	RTMPDescriptorEndianChange((PUCHAR)pTxD, TYPE_TXD);

    WriteBackToDescriptor((PUCHAR)pDestTxD, (PUCHAR)pTxD, FALSE, TYPE_TXD);

#endif // RT_BIG_ENDIAN //



	RetTxIdx = TxIdx;

	//
@@ -184,10 +169,6 @@ USHORT RtmpPCI_WriteMultiTxResource( 
	UCHAR			*pDMAHeaderBufVA;

	USHORT			TxIdx, RetTxIdx;

	PTXD_STRUC		pTxD;

#ifdef RT_BIG_ENDIAN

    PTXD_STRUC      pDestTxD;

    TXD_STRUC       TxD;

#endif

	UINT32			BufBasePaLow;

	PRTMP_TX_RING	pTxRing;

	USHORT			hwHdrLen;
@@ -231,13 +212,8 @@ USHORT RtmpPCI_WriteMultiTxResource( 
	//

	// build Tx Descriptor

	//

#ifndef RT_BIG_ENDIAN

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

#else

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

	TxD = *pDestTxD;

	pTxD = &TxD;

#endif



	NdisZeroMemory(pTxD, TXD_SIZE);



	pTxD->SDPtr0 = BufBasePaLow;
@@ -249,17 +225,6 @@ USHORT RtmpPCI_WriteMultiTxResource( 


	RTMPWriteTxDescriptor(pAd, pTxD, FALSE, FIFO_EDCA);



#ifdef RT_BIG_ENDIAN

	if (frameNum == 0)

		RTMPFrameEndianChange(pAd, (PUCHAR)(pDMAHeaderBufVA+ TXINFO_SIZE + TXWI_SIZE), DIR_WRITE, FALSE);



	if (frameNum != 0)

		RTMPWIEndianChange((PUCHAR)(pDMAHeaderBufVA + TXINFO_SIZE), TYPE_TXWI);



	RTMPDescriptorEndianChange((PUCHAR)pTxD, TYPE_TXD);

	WriteBackToDescriptor((PUCHAR)pDestTxD, (PUCHAR)pTxD, FALSE, TYPE_TXD);

#endif // RT_BIG_ENDIAN //



	RetTxIdx = TxIdx;

	//

	// Update Tx index
@@ -290,10 +255,6 @@ VOID RtmpPCI_FinalWriteTxResource( 
	pTxRing = &pAd->TxRing[pTxBlk->QueIdx];

	pTxWI = (PTXWI_STRUC) pTxRing->Cell[FirstTxIdx].DmaBuf.AllocVa;

	pTxWI->MPDUtotalByteCount = totalMPDUSize;

#ifdef RT_BIG_ENDIAN

	RTMPWIEndianChange((PUCHAR)pTxWI, TYPE_TXWI);

#endif // RT_BIG_ENDIAN //



}
@@ -303,10 +264,6 @@ VOID RtmpPCIDataLastTxIdx( 
	IN	USHORT			LastTxIdx)

{

	PTXD_STRUC		pTxD;

#ifdef RT_BIG_ENDIAN

    PTXD_STRUC      pDestTxD;

    TXD_STRUC       TxD;

#endif

	PRTMP_TX_RING	pTxRing;



	//
@@ -317,21 +274,9 @@ VOID RtmpPCIDataLastTxIdx( 
	//

	// build Tx Descriptor

	//

#ifndef RT_BIG_ENDIAN

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

#else

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

	TxD = *pDestTxD;

	pTxD = &TxD;

#endif



	pTxD->LastSec1 = 1;



#ifdef RT_BIG_ENDIAN

	RTMPDescriptorEndianChange((PUCHAR)pTxD, TYPE_TXD);

    WriteBackToDescriptor((PUCHAR)pDestTxD, (PUCHAR)pTxD, FALSE, TYPE_TXD);

#endif // RT_BIG_ENDIAN //



}
@@ -344,10 +289,6 @@ USHORT RtmpPCI_WriteFragTxResource( 
	UCHAR			*pDMAHeaderBufVA;

	USHORT			TxIdx, RetTxIdx;

	PTXD_STRUC		pTxD;

#ifdef RT_BIG_ENDIAN

    PTXD_STRUC      pDestTxD;

    TXD_STRUC       TxD;

#endif

	UINT32			BufBasePaLow;

	PRTMP_TX_RING	pTxRing;

	USHORT			hwHeaderLen;
@@ -373,13 +314,8 @@ USHORT RtmpPCI_WriteFragTxResource( 
	//

	// Build Tx Descriptor

	//

#ifndef RT_BIG_ENDIAN

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

#else

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

	TxD = *pDestTxD;

	pTxD = &TxD;

#endif



	NdisZeroMemory(pTxD, TXD_SIZE);



	if (fragNum == pTxBlk->TotalFragNum)
@@ -397,13 +333,6 @@ USHORT RtmpPCI_WriteFragTxResource( 


	RTMPWriteTxDescriptor(pAd, pTxD, FALSE, FIFO_EDCA);



#ifdef RT_BIG_ENDIAN

	RTMPWIEndianChange((PUCHAR)(pDMAHeaderBufVA + TXINFO_SIZE), TYPE_TXWI);

	RTMPFrameEndianChange(pAd, (PUCHAR)(pDMAHeaderBufVA + TXINFO_SIZE + TXWI_SIZE), DIR_WRITE, FALSE);

	RTMPDescriptorEndianChange((PUCHAR)pTxD, TYPE_TXD);

    WriteBackToDescriptor((PUCHAR)pDestTxD, (PUCHAR)pTxD, FALSE, TYPE_TXD);

#endif // RT_BIG_ENDIAN //



	RetTxIdx = TxIdx;

	pTxBlk->Priv += pTxBlk->SrcBufLen;
@@ -431,20 +360,9 @@ int RtmpPCIMgmtKickOut( 
	IN UINT 			SrcBufLen)

{

	PTXD_STRUC		pTxD;

#ifdef RT_BIG_ENDIAN

    PTXD_STRUC      pDestTxD;

    TXD_STRUC       TxD;

#endif

	ULONG			SwIdx = pAd->MgmtRing.TxCpuIdx;



#ifdef RT_BIG_ENDIAN

    pDestTxD  = (PTXD_STRUC)pAd->MgmtRing.Cell[SwIdx].AllocVa;

    TxD = *pDestTxD;

    pTxD = &TxD;

    RTMPDescriptorEndianChange((PUCHAR)pTxD, TYPE_TXD);

#else

	pTxD  = (PTXD_STRUC) pAd->MgmtRing.Cell[SwIdx].AllocVa;

#endif



	pAd->MgmtRing.Cell[SwIdx].pNdisPacket = pPacket;

	pAd->MgmtRing.Cell[SwIdx].pNextNdisPacket = NULL;
@@ -457,11 +375,6 @@ int RtmpPCIMgmtKickOut( 
	pTxD->SDPtr0 = PCI_MAP_SINGLE(pAd, pSrcBufVA, SrcBufLen, 0, PCI_DMA_TODEVICE);;

	pTxD->SDLen0 = SrcBufLen;



#ifdef RT_BIG_ENDIAN

	RTMPDescriptorEndianChange((PUCHAR)pTxD, TYPE_TXD);

    WriteBackToDescriptor((PUCHAR)pDestTxD, (PUCHAR)pTxD, FALSE, TYPE_TXD);

#endif



	pAd->RalinkCounters.KickTxCount++;

	pAd->RalinkCounters.OneSecTxDoneCount++;