Commit 4e8a7e5f authored by Guido Martínez's avatar Guido Martínez Committed by Greg Kroah-Hartman
Browse files

staging: vt6655: remove dead code 



Remove dead code in many places on this driver.

Signed-off-by: default avatarGuido Martínez <guido@vanguardiasur.com.ar>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 838c2d6c

drivers/staging/vt6655/IEEE11h.c

+0 −6
Original line number Diff line number Diff line
@@ -192,8 +192,6 @@ static bool s_bRxTPCReq(PSMgmtObject pMgmt, 
	if (csMgmt_xmit(pMgmt->pAdapter, pTxPacket) != CMD_STATUS_PENDING)

		return false;

	return true;

/*    return CARDbSendPacket(pMgmt->pAdapter, pFrame, PKT_TYPE_802_11_MNG,

      sizeof(WLAN_FRAME_TPCREP)); */

}



/*---------------------  Export Variables  --------------------------*/
@@ -274,8 +272,6 @@ IEEE11hbMgrRxAction(void *pMgmtHandle, void *pRxPacket) 
			pAction->byCategory);

		pAction->byCategory |= 0x80;



		/*return CARDbSendPacket(pMgmt->pAdapter, pAction, PKT_TYPE_802_11_MNG,

		  uLength);*/

		return true;

	}

	return true;
@@ -317,6 +313,4 @@ bool IEEE11hbMSRRepTx(void *pMgmtHandle) 
	if (csMgmt_xmit(pMgmt->pAdapter, pTxPacket) != CMD_STATUS_PENDING)

		return false;

	return true;

/*    return CARDbSendPacket(pMgmt->pAdapter, pMSRRep, PKT_TYPE_802_11_MNG,

      uLength); */

}

drivers/staging/vt6655/baseband.c

+0 −17
Original line number Diff line number Diff line
@@ -1095,7 +1095,6 @@ unsigned char byVT3253B0_AIROHA2230[CB_VT3253B0_INIT_FOR_AIROHA2230][2] = { 
	{0x69, 0x00},

	{0x6a, 0x00},

	{0x6b, 0x00},

	//{0x6c, 0x80},

	{0x6c, 0x00}, //RobertYu:20050125, request by JJSue

	{0x6d, 0x03},

	{0x6e, 0x01},
@@ -1357,7 +1356,6 @@ unsigned char byVT3253B0_UW2451[CB_VT3253B0_INIT_FOR_UW2451][2] = { 
	{0x69, 0x00},

	{0x6a, 0x00},

	{0x6b, 0x00},

	//{0x6c, 0x80},

	{0x6c, 0x00}, //RobertYu:20050125, request by JJSue

	{0x6d, 0x03},

	{0x6e, 0x01},
@@ -2208,8 +2206,6 @@ bool BBbVT3253Init(PSDevice pDevice) 
		for (ii = 0; ii < CB_VT3253B0_AGC; ii++) {

			bResult &= BBbWriteEmbedded(dwIoBase, byVT3253B0_AGC[ii][0], byVT3253B0_AGC[ii][1]);

		}

		//VNSvOutPortB(dwIoBase + MAC_REG_ITRTMSET, 0x23); // RobertYu: 20050104, 20050131 disable PA_Delay

		//MACvRegBitsOn(dwIoBase, MAC_REG_PAPEDELAY, BIT0); // RobertYu: 20050104, 20050131 disable PA_Delay



		pDevice->abyBBVGA[0] = 0x14;

		pDevice->abyBBVGA[1] = 0x0A;
@@ -2613,13 +2609,11 @@ s_ulGetRatio(PSDevice pDevice) 
	if (pDevice->uNumSQ3[RATE_54M] != 0) {

		ulPacketNum = pDevice->uNumSQ3[RATE_54M];

		ulRatio = (ulPacketNum * 1000 / pDevice->uDiversityCnt);

		//ulRatio = (pDevice->uNumSQ3[RATE_54M] * 1000 / pDevice->uDiversityCnt);

		ulRatio += TOP_RATE_54M;

	}

	if (pDevice->uNumSQ3[RATE_48M] > ulMaxPacket) {

		ulPacketNum = pDevice->uNumSQ3[RATE_54M] + pDevice->uNumSQ3[RATE_48M];

		ulRatio = (ulPacketNum * 1000 / pDevice->uDiversityCnt);

		//ulRatio = (pDevice->uNumSQ3[RATE_48M] * 1000 / pDevice->uDiversityCnt);

		ulRatio += TOP_RATE_48M;

		ulMaxPacket = pDevice->uNumSQ3[RATE_48M];

	}
@@ -2627,7 +2621,6 @@ s_ulGetRatio(PSDevice pDevice) 
		ulPacketNum = pDevice->uNumSQ3[RATE_54M] + pDevice->uNumSQ3[RATE_48M] +

			pDevice->uNumSQ3[RATE_36M];

		ulRatio = (ulPacketNum * 1000 / pDevice->uDiversityCnt);

		//ulRatio = (pDevice->uNumSQ3[RATE_36M] * 1000 / pDevice->uDiversityCnt);

		ulRatio += TOP_RATE_36M;

		ulMaxPacket = pDevice->uNumSQ3[RATE_36M];

	}
@@ -2635,7 +2628,6 @@ s_ulGetRatio(PSDevice pDevice) 
		ulPacketNum = pDevice->uNumSQ3[RATE_54M] + pDevice->uNumSQ3[RATE_48M] +

			pDevice->uNumSQ3[RATE_36M] + pDevice->uNumSQ3[RATE_24M];

		ulRatio = (ulPacketNum * 1000 / pDevice->uDiversityCnt);

		//ulRatio = (pDevice->uNumSQ3[RATE_24M] * 1000 / pDevice->uDiversityCnt);

		ulRatio += TOP_RATE_24M;

		ulMaxPacket = pDevice->uNumSQ3[RATE_24M];

	}
@@ -2644,7 +2636,6 @@ s_ulGetRatio(PSDevice pDevice) 
			pDevice->uNumSQ3[RATE_36M] + pDevice->uNumSQ3[RATE_24M] +

			pDevice->uNumSQ3[RATE_18M];

		ulRatio = (ulPacketNum * 1000 / pDevice->uDiversityCnt);

		//ulRatio = (pDevice->uNumSQ3[RATE_18M] * 1000 / pDevice->uDiversityCnt);

		ulRatio += TOP_RATE_18M;

		ulMaxPacket = pDevice->uNumSQ3[RATE_18M];

	}
@@ -2653,7 +2644,6 @@ s_ulGetRatio(PSDevice pDevice) 
			pDevice->uNumSQ3[RATE_36M] + pDevice->uNumSQ3[RATE_24M] +

			pDevice->uNumSQ3[RATE_18M] + pDevice->uNumSQ3[RATE_12M];

		ulRatio = (ulPacketNum * 1000 / pDevice->uDiversityCnt);

		//ulRatio = (pDevice->uNumSQ3[RATE_12M] * 1000 / pDevice->uDiversityCnt);

		ulRatio += TOP_RATE_12M;

		ulMaxPacket = pDevice->uNumSQ3[RATE_12M];

	}
@@ -2662,7 +2652,6 @@ s_ulGetRatio(PSDevice pDevice) 
			pDevice->uNumSQ3[RATE_2M] - pDevice->uNumSQ3[RATE_5M] -

			pDevice->uNumSQ3[RATE_6M] - pDevice->uNumSQ3[RATE_9M];

		ulRatio = (ulPacketNum * 1000 / pDevice->uDiversityCnt);

		//ulRatio = (pDevice->uNumSQ3[RATE_11M] * 1000 / pDevice->uDiversityCnt);

		ulRatio += TOP_RATE_11M;

		ulMaxPacket = pDevice->uNumSQ3[RATE_11M];

	}
@@ -2671,7 +2660,6 @@ s_ulGetRatio(PSDevice pDevice) 
			pDevice->uNumSQ3[RATE_2M] - pDevice->uNumSQ3[RATE_5M] -

			pDevice->uNumSQ3[RATE_6M];

		ulRatio = (ulPacketNum * 1000 / pDevice->uDiversityCnt);

		//ulRatio = (pDevice->uNumSQ3[RATE_9M] * 1000 / pDevice->uDiversityCnt);

		ulRatio += TOP_RATE_9M;

		ulMaxPacket = pDevice->uNumSQ3[RATE_9M];

	}
@@ -2679,7 +2667,6 @@ s_ulGetRatio(PSDevice pDevice) 
		ulPacketNum = pDevice->uDiversityCnt - pDevice->uNumSQ3[RATE_1M] -

			pDevice->uNumSQ3[RATE_2M] - pDevice->uNumSQ3[RATE_5M];

		ulRatio = (ulPacketNum * 1000 / pDevice->uDiversityCnt);

		//ulRatio = (pDevice->uNumSQ3[RATE_6M] * 1000 / pDevice->uDiversityCnt);

		ulRatio += TOP_RATE_6M;

		ulMaxPacket = pDevice->uNumSQ3[RATE_6M];

	}
@@ -2687,21 +2674,18 @@ s_ulGetRatio(PSDevice pDevice) 
		ulPacketNum = pDevice->uDiversityCnt - pDevice->uNumSQ3[RATE_1M] -

			pDevice->uNumSQ3[RATE_2M];

		ulRatio = (ulPacketNum * 1000 / pDevice->uDiversityCnt);

		//ulRatio = (pDevice->uNumSQ3[RATE_5M] * 1000 / pDevice->uDiversityCnt);

		ulRatio += TOP_RATE_55M;

		ulMaxPacket = pDevice->uNumSQ3[RATE_5M];

	}

	if (pDevice->uNumSQ3[RATE_2M] > ulMaxPacket) {

		ulPacketNum = pDevice->uDiversityCnt - pDevice->uNumSQ3[RATE_1M];

		ulRatio = (ulPacketNum * 1000 / pDevice->uDiversityCnt);

		//ulRatio = (pDevice->uNumSQ3[RATE_2M]  * 1000 / pDevice->uDiversityCnt);

		ulRatio += TOP_RATE_2M;

		ulMaxPacket = pDevice->uNumSQ3[RATE_2M];

	}

	if (pDevice->uNumSQ3[RATE_1M] > ulMaxPacket) {

		ulPacketNum = pDevice->uDiversityCnt;

		ulRatio = (ulPacketNum * 1000 / pDevice->uDiversityCnt);

		//ulRatio = (pDevice->uNumSQ3[RATE_1M]  * 1000 / pDevice->uDiversityCnt);

		ulRatio += TOP_RATE_1M;

	}
@@ -2741,7 +2725,6 @@ BBvAntennaDiversity(PSDevice pDevice, unsigned char byRxRate, unsigned char bySQ 
		return;

	}

	pDevice->uDiversityCnt++;

	// DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "pDevice->uDiversityCnt = %d\n", (int)pDevice->uDiversityCnt);



	pDevice->uNumSQ3[byRxRate]++;

drivers/staging/vt6655/bssdb.h

+0 −2
Original line number Diff line number Diff line
@@ -112,7 +112,6 @@ typedef struct tagKnownBSS { 
	unsigned char abySSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1];

	unsigned char byRxRate;



//    unsigned short wATIMWindow;

	unsigned char byRSSIStatCnt;

	long            ldBmMAX;

	long            ldBmAverage[RSSI_STAT_COUNT];
@@ -147,7 +146,6 @@ typedef struct tagKnownBSS { 


	// Clear count

	unsigned int	uClearCount;

//    unsigned char abyIEs[WLAN_BEACON_FR_MAXLEN];

	unsigned int	uIELength;

	QWORD           qwBSSTimestamp;

	QWORD           qwLocalTSF;     // local TSF timer

drivers/staging/vt6655/card.c

+1 −37
Original line number Diff line number Diff line
@@ -59,7 +59,6 @@ 


/*---------------------  Static Definitions -------------------------*/



//static int          msglevel                =MSG_LEVEL_DEBUG;

static int msglevel = MSG_LEVEL_INFO;



#define C_SIFS_A        16      // micro sec.
@@ -337,36 +336,6 @@ s_vSetRSPINF(PSDevice pDevice, CARD_PHY_TYPE ePHYType, void *pvSupportRateIEs, v 


/*---------------------  Export Functions  --------------------------*/



/*

 * Description: Card Send packet function

 *

 * Parameters:

 *  In:

 *      pDeviceHandler      - The adapter to be set

 *      pPacket             - Packet buffer pointer

 *      ePktType            - Packet type

 *      uLength             - Packet length

 *  Out:

 *      none

 *

 * Return Value: true if succeeded; false if failed.

 *

 */

/*

  bool CARDbSendPacket (void *pDeviceHandler, void *pPacket, CARD_PKT_TYPE ePktType, unsigned int uLength) {

  PSDevice    pDevice = (PSDevice) pDeviceHandler;

  if (ePktType == PKT_TYPE_802_11_MNG) {

  return TXbTD0Send(pDevice, pPacket, uLength);

  } else if (ePktType == PKT_TYPE_802_11_BCN) {

  return TXbBeaconSend(pDevice, pPacket, uLength);

  } if (ePktType == PKT_TYPE_802_11_DATA) {

  return TXbTD1Send(pDevice, pPacket, uLength);

  }



  return true;

  }

*/



/*

 * Description: Get Card short preamble option value

 *
@@ -426,7 +395,6 @@ bool CARDbSetPhyParameter(void *pDeviceHandler, CARD_PHY_TYPE ePHYType, unsigned 
	unsigned char bySIFS = 0;

	unsigned char byDIFS = 0;

	unsigned char byData;

//    PWLAN_IE_SUPP_RATES pRates = NULL;

	PWLAN_IE_SUPP_RATES pSupportRates = (PWLAN_IE_SUPP_RATES) pvSupportRateIEs;

	PWLAN_IE_SUPP_RATES pExtSupportRates = (PWLAN_IE_SUPP_RATES) pvExtSupportRateIEs;
@@ -1301,8 +1269,6 @@ CARDbSetQuiet( 
		if (pDevice->byQuietStartCount < byQuietCount) {

			pDevice->byQuietStartCount = byQuietCount;

		}

	} else {

		// we can not handle Quiet EID more

	}

	return true;

}
@@ -2060,8 +2026,6 @@ QWORD CARDqGetNextTBTT(QWORD qwTSF, unsigned short wBeaconInterval) 
	uLowNextTBTT = (LODWORD(qwTSF) >> 10) << 10;

	// low dword (mod) bcn

	uLowRemain = (uLowNextTBTT) % uBeaconInterval;

//    uHighRemain = ((0x80000000 % uBeaconInterval)* 2 * HIDWORD(qwTSF))

//                  % uBeaconInterval;

	// high dword (mod) bcn

	uHighRemain = (((0xffffffff % uBeaconInterval) + 1) * HIDWORD(qwTSF))

		% uBeaconInterval;
@@ -2103,7 +2067,7 @@ void CARDvSetFirstNextTBTT(unsigned long dwIoBase, unsigned short wBeaconInterva 
	VNSvOutPortD(dwIoBase + MAC_REG_NEXTTBTT, LODWORD(qwNextTBTT));

	VNSvOutPortD(dwIoBase + MAC_REG_NEXTTBTT + 4, HIDWORD(qwNextTBTT));

	MACvRegBitsOn(dwIoBase, MAC_REG_TFTCTL, TFTCTL_TBTTSYNCEN);

	//DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Card:First Next TBTT[%8xh:%8xh] \n", HIDWORD(qwNextTBTT), LODWORD(qwNextTBTT));



	return;

}

drivers/staging/vt6655/card.h

+0 −1
Original line number Diff line number Diff line
@@ -104,7 +104,6 @@ void CARDvSafeResetRx(void *pDeviceHandler); 
//xxx

bool CARDbRadioPowerOff(void *pDeviceHandler);

bool CARDbRadioPowerOn(void *pDeviceHandler);

//bool CARDbSendPacket(void *pDeviceHandler, void *pPacket, CARD_PKT_TYPE ePktType, unsigned int uLength);

bool CARDbIsShortPreamble(void *pDeviceHandler);

bool CARDbIsShorSlotTime(void *pDeviceHandler);

bool CARDbSetPhyParameter(void *pDeviceHandler, CARD_PHY_TYPE ePHYType, unsigned short wCapInfo, unsigned char byERPField, void *pvSupportRateIEs, void *pvExtSupportRateIEs);