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

drivers/staging/vt6656/80211mgr.c

+0 −87
Original line number Diff line number Diff line
@@ -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;

}

drivers/staging/vt6656/80211mgr.h

+0 −15
Original line number Diff line number Diff line
@@ -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__ */

drivers/staging/vt6656/baseband.c

+0 −113
Original line number Diff line number Diff line
@@ -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

 *

drivers/staging/vt6656/baseband.h

+0 −3
Original line number Diff line number Diff line
@@ -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);

drivers/staging/vt6656/card.c

+0 −41
Original line number Diff line number Diff line
@@ -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;

}