Commit e1970fce authored by Andres More's avatar Andres More Committed by Greg Kroah-Hartman
Browse files

staging: vt6656: remove unused functions



Removed defined symbols not being used elsewhere.
Only compile tested.
Signed-off-by: default avatarAndres More <more.andres@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d88fe15b
......@@ -27,8 +27,6 @@
* Functions:
* vMgrEncodeBeacon - Encode the Beacon frame
* vMgrDecodeBeacon - Decode the Beacon frame
* vMgrEncodeIBSSATIM - Encode the IBSS ATIM frame
* vMgrDecodeIBSSATIM - Decode the IBSS ATIM frame
* vMgrEncodeDisassociation - Encode the Disassociation frame
* vMgrDecodeDisassociation - Decode the Disassociation frame
* vMgrEncodeAssocRequest - Encode the Association request frame
......@@ -46,7 +44,6 @@
* vMgrEncodeDeauthen - Encode the DeAuthentication frame
* vMgrDecodeDeauthen - Decode the DeAuthentication frame
* vMgrEncodeReassocResponse - Encode the Reassociation response frame
* vMgrDecodeReassocResponse - Decode the Reassociation response frame
*
* Revision History:
*
......@@ -222,49 +219,6 @@ vMgrDecodeBeacon(
}
}
/*+
*
* Routine Description:
* Encode IBSS ATIM
*
*
* Return Value:
* None.
*
-*/
void
vMgrEncodeIBSSATIM(
PWLAN_FR_IBSSATIM pFrame
)
{
pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;
pFrame->len = WLAN_HDR_ADDR3_LEN;
}
/*+
*
* Routine Description:
* Decode IBSS ATIM
*
*
* Return Value:
* None.
*
-*/
void
vMgrDecodeIBSSATIM(
PWLAN_FR_IBSSATIM pFrame
)
{
pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;
}
/*+
*
* Routine Description:
......@@ -938,44 +892,3 @@ vMgrEncodeReassocResponse(
pFrame->len = WLAN_HDR_ADDR3_LEN + WLAN_REASSOCRESP_OFF_AID + sizeof(*(pFrame->pwAid));
}
/*+
*
* Routine Description:
* Decode Reassociation Response
*
*
* Return Value:
* None.
*
-*/
void
vMgrDecodeReassocResponse(
PWLAN_FR_REASSOCRESP pFrame
)
{
PWLAN_IE pItem;
pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;
/* Fixed Fields */
pFrame->pwCapInfo = (u16 *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
+ WLAN_REASSOCRESP_OFF_CAP_INFO);
pFrame->pwStatus = (u16 *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
+ WLAN_REASSOCRESP_OFF_STATUS);
pFrame->pwAid = (u16 *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
+ WLAN_REASSOCRESP_OFF_AID);
/* Information elements */
pFrame->pSuppRates = (PWLAN_IE_SUPP_RATES)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
+ WLAN_REASSOCRESP_OFF_SUPP_RATES);
pItem = (PWLAN_IE)(pFrame->pSuppRates);
pItem = (PWLAN_IE)(((u8 *)pItem) + 2 + pItem->len);
if ((((u8 *)pItem) < (pFrame->pBuf + pFrame->len)) && (pItem->byElementID == WLAN_EID_EXTSUPP_RATES))
pFrame->pExtSuppRates = (PWLAN_IE_SUPP_RATES)pItem;
}
......@@ -726,16 +726,6 @@ vMgrDecodeBeacon(
PWLAN_FR_BEACON pFrame
);
void
vMgrEncodeIBSSATIM(
PWLAN_FR_IBSSATIM pFrame
);
void
vMgrDecodeIBSSATIM(
PWLAN_FR_IBSSATIM pFrame
);
void
vMgrEncodeDisassociation(
PWLAN_FR_DISASSOC pFrame
......@@ -821,9 +811,4 @@ vMgrEncodeReassocResponse(
PWLAN_FR_REASSOCRESP pFrame
);
void
vMgrDecodeReassocResponse(
PWLAN_FR_REASSOCRESP pFrame
);
#endif /* __80211MGR_H__ */
......@@ -29,8 +29,6 @@
* BBuGetFrameTime - Calculate data frame transmitting time
* BBvCalculateParameter - Calculate PhyLength, PhyService and Phy Signal parameter for baseband Tx
* BBbVT3184Init - VIA VT3184 baseband chip init code
* BBvLoopbackOn - Turn on BaseBand Loopback mode
* BBvLoopbackOff - Turn off BaseBand Loopback mode
*
* Revision History:
*
......@@ -1129,96 +1127,6 @@ else {
return true;//ntStatus;
}
/*
* Description: Turn on BaseBand Loopback mode
*
* Parameters:
* In:
* pDevice - Device Structure
*
* Out:
* none
*
* Return Value: none
*
*/
void BBvLoopbackOn(struct vnt_private *pDevice)
{
u8 byData;
//CR C9 = 0x00
ControlvReadByte (pDevice, MESSAGE_REQUEST_BBREG, 0xC9, &pDevice->byBBCRc9);//CR201
ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0xC9, 0);
ControlvReadByte (pDevice, MESSAGE_REQUEST_BBREG, 0x4D, &pDevice->byBBCR4d);//CR77
ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x4D, 0x90);
//CR 88 = 0x02(CCK), 0x03(OFDM)
ControlvReadByte (pDevice, MESSAGE_REQUEST_BBREG, 0x88, &pDevice->byBBCR88);//CR136
if (pDevice->wCurrentRate <= RATE_11M) { //CCK
// Enable internal digital loopback: CR33 |= 0000 0001
ControlvReadByte (pDevice, MESSAGE_REQUEST_BBREG, 0x21, &byData);//CR33
ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x21, (u8)(byData | 0x01));//CR33
// CR154 = 0x00
ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x9A, 0); //CR154
ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x88, 0x02);//CR239
}
else { //OFDM
// Enable internal digital loopback:CR154 |= 0000 0001
ControlvReadByte (pDevice, MESSAGE_REQUEST_BBREG, 0x9A, &byData);//CR154
ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x9A, (u8)(byData | 0x01));//CR154
// CR33 = 0x00
ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x21, 0); //CR33
ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x88, 0x03);//CR239
}
//CR14 = 0x00
ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x0E, 0);//CR14
// Disable TX_IQUN
ControlvReadByte (pDevice, MESSAGE_REQUEST_BBREG, 0x09, &pDevice->byBBCR09);
ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x09, (u8)(pDevice->byBBCR09 & 0xDE));
}
/*
* Description: Turn off BaseBand Loopback mode
*
* Parameters:
* In:
* pDevice - Device Structure
*
* Out:
* none
*
* Return Value: none
*
*/
void BBvLoopbackOff(struct vnt_private *pDevice)
{
u8 byData;
ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0xC9, pDevice->byBBCRc9);//CR201
ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x88, pDevice->byBBCR88);//CR136
ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x09, pDevice->byBBCR09);//CR136
ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x4D, pDevice->byBBCR4d);//CR77
if (pDevice->wCurrentRate <= RATE_11M) { // CCK
// Set the CR33 Bit2 to disable internal Loopback.
ControlvReadByte (pDevice, MESSAGE_REQUEST_BBREG, 0x21, &byData);//CR33
ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x21, (u8)(byData & 0xFE));//CR33
} else { /* OFDM */
ControlvReadByte (pDevice, MESSAGE_REQUEST_BBREG, 0x9A, &byData);//CR154
ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x9A, (u8)(byData & 0xFE));//CR154
}
ControlvReadByte (pDevice, MESSAGE_REQUEST_BBREG, 0x0E, &byData);//CR14
ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x0E, (u8)(byData | 0x80));//CR14
}
/*
* Description: Set ShortSlotTime mode
*
......@@ -1262,27 +1170,6 @@ void BBvSetVGAGainOffset(struct vnt_private *pDevice, u8 byData)
ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x0A, pDevice->byBBRxConf);//CR10
}
/*
* Description: Baseband SoftwareReset
*
* Parameters:
* In:
* dwIoBase - I/O base address
* Out:
* none
*
* Return Value: none
*
*/
void BBvSoftwareReset(struct vnt_private *pDevice)
{
ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x50, 0x40);
ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x50, 0);
ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x9C, 0x01);
ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x9C, 0);
}
/*
* Description: BBvSetDeepSleep
*
......
......@@ -106,9 +106,6 @@ void TimerSQ3CallBack(struct vnt_private *);
void TimerSQ3Tmax3CallBack(struct vnt_private *);
void BBvAntennaDiversity(struct vnt_private *, u8 byRxRate, u8 bySQ3);
void BBvLoopbackOn(struct vnt_private *);
void BBvLoopbackOff(struct vnt_private *);
void BBvSoftwareReset(struct vnt_private *);
void BBvSetShortSlotTime(struct vnt_private *);
void BBvSetVGAGainOffset(struct vnt_private *, u8 byData);
......
......@@ -1009,44 +1009,3 @@ void CARDvSetBSSMode(struct vnt_private *pDevice)
pDevice->abyBBVGA[3] = 0x0;
}
}
/*
*
* Description:
* Do Channel Switch defined in 802.11h
*
* Parameters:
* In:
* hDeviceContext - device structure point
* Out:
* none
*
* Return Value: none.
*
-*/
int CARDbChannelSwitch(struct vnt_private *pDevice, u8 byMode,
u8 byNewChannel, u8 byCount)
{
int bResult = true;
if (byCount == 0) {
pDevice->vnt_mgmt.uCurrChannel = byNewChannel;
CARDbSetMediaChannel(pDevice, byNewChannel);
return bResult;
}
pDevice->byChannelSwitchCount = byCount;
pDevice->byNewChannel = byNewChannel;
pDevice->bChannelSwitch = true;
if (byMode == 1) {
//bResult=CARDbStopTxPacket(pDevice, PKT_TYPE_802_11_ALL);
pDevice->bStopDataPkt = true;
}
return bResult;
}
......@@ -74,7 +74,5 @@ int CARDbRadioPowerOff(struct vnt_private *pDevice);
int CARDbRadioPowerOn(struct vnt_private *pDevice);
u8 CARDbyGetPktType(struct vnt_private *pDevice);
void CARDvSetBSSMode(struct vnt_private *pDevice);
int CARDbChannelSwitch(struct vnt_private *pDevice, u8 byMode,
u8 byNewChannel, u8 byCount);
#endif /* __CARD_H__ */
......@@ -406,32 +406,6 @@ ChannelValid(unsigned int CountryCode, unsigned int ChannelIndex)
} /* end ChannelValid */
/************************************************************************
* CHvChannelGetList
* Get Available Channel List for a given country
* Input:
* CountryCode = The country code defined in country.h
* Output:
* ChannelBitMask = (QWORD *) correspondent bit mask
* of available channels
* 0x0000000000000001 means channel 1 is supported
* 0x0000000000000003 means channel 1,2 are supported
* 0x000000000000000F means channel 1,2,..15 are supported
************************************************************************/
bool
CHvChannelGetList (
unsigned int uCountryCodeIdx,
u8 * pbyChannelTable
)
{
if (uCountryCodeIdx >= CCODE_MAX) {
return (false);
}
memcpy(pbyChannelTable, ChannelRuleTab[uCountryCodeIdx].bChannelIdxList, CB_MAX_CHANNEL);
return (true);
}
void CHvInitChannelTable(struct vnt_private *pDevice)
{
int bMultiBand = false;
......@@ -503,15 +477,3 @@ void CHvInitChannelTable(struct vnt_private *pDevice)
}*/
}
}
u8 CHbyGetChannelMapping(u8 byChannelNumber)
{
u8 ii;
u8 byCHMapping = 0;
for (ii = 1; ii <= CB_MAX_CHANNEL; ii++) {
if (sChannelTbl[ii].byChannelNumber == byChannelNumber)
byCHMapping = ii;
}
return byCHMapping;
}
......@@ -44,8 +44,5 @@ typedef struct tagSChannelTblElement {
bool ChannelValid(unsigned int CountryCode, unsigned int ChannelNum);
void CHvInitChannelTable(struct vnt_private *pDevice);
u8 CHbyGetChannelMapping(u8 byChannelNumber);
bool CHvChannelGetList(unsigned int uCountryCodeIdx, u8 * pbyChannelTable);
#endif /* _CHANNEL_H_ */
......@@ -77,40 +77,6 @@ void s_vResetCounter(PKnownNodeDB psNodeDBTable)
/*+
*
* Description:
* Get RateIdx from the value in SuppRates IE or ExtSuppRates IE
*
* Parameters:
* In:
* u8 - Rate value in SuppRates IE or ExtSuppRates IE
* Out:
* none
*
* Return Value: RateIdx
*
-*/
u8
DATARATEbyGetRateIdx (
u8 byRate
)
{
u8 ii;
/* erase BasicRate flag */
byRate = byRate & 0x7F;
for (ii = 0; ii < MAX_RATE; ii ++) {
if (acbyIERate[ii] == byRate)
return ii;
}
return 0;
}
/*+
*
* Routine Description:
......
......@@ -84,10 +84,4 @@ RATEwGetRateIdx(
u8 byRate
);
u8
DATARATEbyGetRateIdx(
u8 byRate
);
#endif /* __DATARATE_H__ */
......@@ -472,45 +472,6 @@ int KeybRemoveAllKey(struct vnt_private *pDevice, PSKeyManagement pTable,
return (false);
}
/*
* Description: Remove WEP Key from table
*
* Parameters:
* In:
* pTable - Pointer to Key table
* Out:
* none
*
* Return Value: true if success otherwise false
*
*/
void KeyvRemoveWEPKey(struct vnt_private *pDevice, PSKeyManagement pTable,
u32 dwKeyIndex)
{
if ((dwKeyIndex & 0x000000FF) < MAX_GROUP_KEY) {
if (pTable->KeyTable[MAX_KEY_TABLE-1].bInUse == true) {
if (pTable->KeyTable[MAX_KEY_TABLE-1].GroupKey[dwKeyIndex & 0x000000FF].byCipherSuite == KEY_CTL_WEP) {
pTable->KeyTable[MAX_KEY_TABLE-1].GroupKey[dwKeyIndex & 0x000000FF].bKeyValid = false;
if ((dwKeyIndex & 0x7FFFFFFF) == (pTable->KeyTable[MAX_KEY_TABLE-1].dwGTKeyIndex & 0x7FFFFFFF)) {
// remove Group transmit key
pTable->KeyTable[MAX_KEY_TABLE-1].dwGTKeyIndex = 0;
}
}
}
s_vCheckKeyTableValid(pDevice, pTable);
}
return;
}
void KeyvRemoveAllWEPKey(struct vnt_private *pDevice, PSKeyManagement pTable)
{
int i;
for (i = 0; i < MAX_GROUP_KEY; i++)
KeyvRemoveWEPKey(pDevice, pTable, i);
}
/*
* Description: Get Transmit Key from table
*
......@@ -589,35 +550,6 @@ int KeybGetTransmitKey(PSKeyManagement pTable, u8 *pbyBSSID, u32 dwKeyType,
return (false);
}
/*
* Description: Check Pairwise Key
*
* Parameters:
* In:
* pTable - Pointer to Key table
* Out:
* none
*
* Return Value: true if found otherwise false
*
*/
int KeybCheckPairewiseKey(PSKeyManagement pTable, PSKeyItem *pKey)
{
int i;
*pKey = NULL;
for (i=0;i<MAX_KEY_TABLE;i++) {
if ((pTable->KeyTable[i].bInUse == true) &&
(pTable->KeyTable[i].PairwiseKey.bKeyValid == true)) {
*pKey = &(pTable->KeyTable[i].PairwiseKey);
return (true);
}
}
return (false);
}
/*
* Description: Set Key to table
*
......
......@@ -105,16 +105,9 @@ int KeybRemoveKey(struct vnt_private *, PSKeyManagement pTable,
int KeybRemoveAllKey(struct vnt_private *, PSKeyManagement pTable,
u8 *pbyBSSID);
void KeyvRemoveWEPKey(struct vnt_private *, PSKeyManagement pTable,
u32 dwKeyIndex);
void KeyvRemoveAllWEPKey(struct vnt_private *, PSKeyManagement pTable);
int KeybGetTransmitKey(PSKeyManagement pTable, u8 *pbyBSSID, u32 dwKeyType,
PSKeyItem *pKey);
int KeybCheckPairewiseKey(PSKeyManagement pTable, PSKeyItem *pKey);
int KeybSetDefaultKey(struct vnt_private *, PSKeyManagement pTable,
u32 dwKeyIndex, u32 uKeyLength, u64 *KeyRSC, u8 *pbyKey,
u8 byKeyDecMode);
......
......@@ -45,51 +45,6 @@ static int msglevel =MSG_LEVEL_INFO;
/*
* Description:
* Set this hash index into multicast address register bit
*
* Parameters:
* In:
* byHashIdx - Hash index to set
* Out:
* none
*
* Return Value: none
*
*/
void MACvSetMultiAddrByHash(struct vnt_private *pDevice, u8 byHashIdx)
{
u8 uByteIdx;
u8 byBitMask;
u8 pbyData[2];
// calculate byte position
uByteIdx = byHashIdx / 8;
// calculate bit position
byBitMask = 1;
byBitMask <<= (byHashIdx % 8);
// turn on the bit
pbyData[0] = byBitMask;
pbyData[1] = byBitMask;
CONTROLnsRequestOut(pDevice,
MESSAGE_TYPE_WRITE_MASK,
(u16) (MAC_REG_MAR0 + uByteIdx),
MESSAGE_REQUEST_MACREG,
2,
pbyData);
}
/*
* Description:
* Write MAC Multicast Address Mask
......@@ -157,26 +112,6 @@ void MACvSetBBType(struct vnt_private *pDevice, u8 byType)
);
}
void MACvSetMISCFifo(struct vnt_private *pDevice, u16 wOffset, u32 dwData)
{
u8 pbyData[4];
if (wOffset > 273)
return;
pbyData[0] = (u8)dwData;
pbyData[1] = (u8)(dwData>>8);
pbyData[2] = (u8)(dwData>>16);
pbyData[3] = (u8)(dwData>>24);
CONTROLnsRequestOut(pDevice,
MESSAGE_TYPE_WRITE_MISCFF,
wOffset,
0,
4,
pbyData
);