Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e64354c0 authored by Charles Clément's avatar Charles Clément Committed by Greg Kroah-Hartman
Browse files

Staging: vt6655: remove HANDLE definition and use 



Signed-off-by: default avatarCharles Clément <caratorn@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 089a4198

drivers/staging/vt6655/baseband.c

+2 −2
Original line number Diff line number Diff line
@@ -2878,7 +2878,7 @@ BBvAntennaDiversity (PSDevice pDevice, BYTE byRxRate, BYTE bySQ3) 


void

TimerSQ3CallBack (

    IN  HANDLE      hDeviceContext

    IN void *hDeviceContext

    )

{

    PSDevice        pDevice = (PSDevice)hDeviceContext;
@@ -2926,7 +2926,7 @@ TimerSQ3CallBack ( 


void

TimerState1CallBack (

    IN  HANDLE      hDeviceContext

    IN void *hDeviceContext

    )

{

    PSDevice        pDevice = (PSDevice)hDeviceContext;

drivers/staging/vt6655/baseband.h

+2 −2
Original line number Diff line number Diff line
@@ -162,12 +162,12 @@ void BBvExitDeepSleep(DWORD_PTR dwIoBase, BYTE byLocalID); 


void

TimerSQ3CallBack (

    IN  HANDLE      hDeviceContext

    IN void *hDeviceContext

    );



void

TimerState1CallBack(

    IN  HANDLE      hDeviceContext

    IN void *hDeviceContext

    );



void BBvAntennaDiversity(PSDevice pDevice, BYTE byRxRate, BYTE bySQ3);

drivers/staging/vt6655/bssdb.c

+36 −36
Original line number Diff line number Diff line
@@ -91,18 +91,18 @@ const WORD awHWRetry1[5][5] = { 
/*---------------------  Static Functions  --------------------------*/



void s_vCheckSensitivity(

    IN HANDLE hDeviceContext

    IN void *hDeviceContext

    );



#ifdef Calcu_LinkQual

void s_uCalculateLinkQual(

    IN HANDLE hDeviceContext

    IN void *hDeviceContext

    );

#endif





void s_vCheckPreEDThreshold(

    IN HANDLE hDeviceContext

    IN void *hDeviceContext

    );

/*---------------------  Export Variables  --------------------------*/
@@ -125,7 +125,7 @@ void s_vCheckPreEDThreshold( 


PKnownBSS

BSSpSearchBSSList(

    IN HANDLE hDeviceContext,

    IN void *hDeviceContext,

    IN PBYTE pbyDesireBSSID,

    IN PBYTE pbyDesireSSID,

    IN CARD_PHY_TYPE  ePhyType
@@ -282,7 +282,7 @@ if(pDevice->bLinkPass==FALSE) pCurrBSS->bSelected = FALSE; 


void

BSSvClearBSSList(

    IN HANDLE hDeviceContext,

    IN void *hDeviceContext,

    IN BOOL bKeepCurrBSSID

    )

{
@@ -325,7 +325,7 @@ BSSvClearBSSList( 
-*/

PKnownBSS

BSSpAddrIsInBSSList(

    IN HANDLE hDeviceContext,

    IN void *hDeviceContext,

    IN PBYTE abyBSSID,

    IN PWLAN_IE_SSID pSSID

    )
@@ -368,7 +368,7 @@ BSSpAddrIsInBSSList( 


BOOL

BSSbInsertToBSSList (

    IN HANDLE hDeviceContext,

    IN void *hDeviceContext,

    IN PBYTE abyBSSIDAddr,

    IN QWORD qwTimestamp,

    IN WORD wBeaconInterval,
@@ -384,7 +384,7 @@ BSSbInsertToBSSList ( 
    IN PWLAN_IE_QUIET pIE_Quiet,

    IN UINT uIELength,

    IN PBYTE pbyIEs,

    IN HANDLE pRxPacketContext

    IN void *pRxPacketContext

    )

{
@@ -502,7 +502,7 @@ BSSbInsertToBSSList ( 
        if ((bIs802_1x == TRUE) && (pSSID->len == ((PWLAN_IE_SSID)pMgmt->abyDesireSSID)->len) &&

            ( !memcmp(pSSID->abySSID, ((PWLAN_IE_SSID)pMgmt->abyDesireSSID)->abySSID, pSSID->len))) {



            bAdd_PMKID_Candidate((HANDLE)pDevice, pBSSList->abyBSSID, &pBSSList->sRSNCapObj);

            bAdd_PMKID_Candidate((void *)pDevice, pBSSList->abyBSSID, &pBSSList->sRSNCapObj);



            if ((pDevice->bLinkPass == TRUE) && (pMgmt->eCurrState == WMAC_STATE_ASSOC)) {

                if ((KeybGetTransmitKey(&(pDevice->sKey), pDevice->abyBSSID, PAIRWISE_KEY, &pTransmitKey) == TRUE) ||
@@ -585,7 +585,7 @@ BSSbInsertToBSSList ( 


BOOL

BSSbUpdateToBSSList (

    IN HANDLE hDeviceContext,

    IN void *hDeviceContext,

    IN QWORD qwTimestamp,

    IN WORD wBeaconInterval,

    IN WORD wCapInfo,
@@ -602,7 +602,7 @@ BSSbUpdateToBSSList ( 
    IN PKnownBSS pBSSList,

    IN UINT uIELength,

    IN PBYTE pbyIEs,

    IN HANDLE pRxPacketContext

    IN void *pRxPacketContext

    )

{

    int             ii;
@@ -799,7 +799,7 @@ BSSDBbIsSTAInNodeDB( 
-*/

void

BSSvCreateOneNode(

    IN HANDLE hDeviceContext,

    IN void *hDeviceContext,

    OUT PUINT puNodeIndex

    )

{
@@ -864,7 +864,7 @@ BSSvCreateOneNode( 
-*/

void

BSSvRemoveOneNode(

    IN HANDLE hDeviceContext,

    IN void *hDeviceContext,

    IN UINT uNodeIndex

    )

{
@@ -897,7 +897,7 @@ BSSvRemoveOneNode( 


void

BSSvUpdateAPNode(

    IN HANDLE hDeviceContext,

    IN void *hDeviceContext,

    IN PWORD pwCapInfo,

    IN PWLAN_IE_SUPP_RATES pSuppRates,

    IN PWLAN_IE_SUPP_RATES pExtSuppRates
@@ -960,7 +960,7 @@ BSSvUpdateAPNode( 


void

BSSvAddMulticastNode(

    IN HANDLE hDeviceContext

    IN void *hDeviceContext

    )

{

    PSDevice     pDevice = (PSDevice)hDeviceContext;
@@ -1013,7 +1013,7 @@ UINT status; 
#endif

void

BSSvSecondCallBack(

    IN  HANDLE hDeviceContext

    IN  void *hDeviceContext

    )

{

    PSDevice        pDevice = (PSDevice)hDeviceContext;
@@ -1111,7 +1111,7 @@ CARDbRadioPowerOn(pDevice); 
}



#ifdef Calcu_LinkQual

   s_uCalculateLinkQual((HANDLE)pDevice);

   s_uCalculateLinkQual((void *)pDevice);

#endif



    for (ii = 0; ii < (MAX_NODE_NUM + 1); ii++) {
@@ -1261,18 +1261,18 @@ CARDbRadioPowerOn(pDevice); 
        if (pMgmt->sNodeDBTable[0].bActive) { // Assoc with BSS

           // DBG_PRT(MSG_LEVEL_INFO, KERN_INFO "Callback inactive Count = [%d]\n", pMgmt->sNodeDBTable[0].uInActiveCount);

            //if (pDevice->bUpdateBBVGA) {

            //  s_vCheckSensitivity((HANDLE) pDevice);

            //  s_vCheckSensitivity((void *) pDevice);

            //}



            if (pDevice->bUpdateBBVGA) {

               // s_vCheckSensitivity((HANDLE) pDevice);

               s_vCheckPreEDThreshold((HANDLE)pDevice);

               // s_vCheckSensitivity((void *) pDevice);

               s_vCheckPreEDThreshold((void *)pDevice);

            }



    	    if ((pMgmt->sNodeDBTable[0].uInActiveCount >= (LOST_BEACON_COUNT/2)) &&

    	        (pDevice->byBBVGACurrent != pDevice->abyBBVGA[0]) ) {

    	        pDevice->byBBVGANew = pDevice->abyBBVGA[0];

                bScheduleCommand((HANDLE) pDevice, WLAN_CMD_CHANGE_BBSENSITIVITY, NULL);

                bScheduleCommand((void *) pDevice, WLAN_CMD_CHANGE_BBSENSITIVITY, NULL);

    	    }



        	if (pMgmt->sNodeDBTable[0].uInActiveCount >= LOST_BEACON_COUNT) {
@@ -1324,10 +1324,10 @@ CARDbRadioPowerOn(pDevice); 
	          pDevice->eEncryptionStatus = pDevice->eOldEncryptionStatus;



                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Roaming ...\n");

                BSSvClearBSSList((HANDLE)pDevice, pDevice->bLinkPass);

                BSSvClearBSSList((void *)pDevice, pDevice->bLinkPass);

 	      pMgmt->eScanType = WMAC_SCAN_ACTIVE;

                bScheduleCommand((HANDLE) pDevice, WLAN_CMD_BSSID_SCAN, pMgmt->abyDesireSSID);

                bScheduleCommand((HANDLE) pDevice, WLAN_CMD_SSID, pMgmt->abyDesireSSID);

                bScheduleCommand((void *) pDevice, WLAN_CMD_BSSID_SCAN, pMgmt->abyDesireSSID);

                bScheduleCommand((void *) pDevice, WLAN_CMD_SSID, pMgmt->abyDesireSSID);

                pDevice->uAutoReConnectTime = 0;

            }

        }
@@ -1342,16 +1342,16 @@ CARDbRadioPowerOn(pDevice); 
            else {

                DBG_PRT(MSG_LEVEL_NOTICE, KERN_INFO "Adhoc re-scaning ...\n");

	      pMgmt->eScanType = WMAC_SCAN_ACTIVE;

                bScheduleCommand((HANDLE) pDevice, WLAN_CMD_BSSID_SCAN, NULL);

                bScheduleCommand((HANDLE) pDevice, WLAN_CMD_SSID, NULL);

                bScheduleCommand((void *) pDevice, WLAN_CMD_BSSID_SCAN, NULL);

                bScheduleCommand((void *) pDevice, WLAN_CMD_SSID, NULL);

                pDevice->uAutoReConnectTime = 0;

            };

        }

        if (pMgmt->eCurrState == WMAC_STATE_JOINTED) {



            if (pDevice->bUpdateBBVGA) {

               //s_vCheckSensitivity((HANDLE) pDevice);

               s_vCheckPreEDThreshold((HANDLE)pDevice);

               //s_vCheckSensitivity((void *) pDevice);

               s_vCheckPreEDThreshold((void *)pDevice);

            }

        	if (pMgmt->sNodeDBTable[0].uInActiveCount >=ADHOC_LOST_BEACON_COUNT) {

        	    DBG_PRT(MSG_LEVEL_NOTICE, KERN_INFO "Lost other STA beacon [%d] sec, started !\n", pMgmt->sNodeDBTable[0].uInActiveCount);
@@ -1390,7 +1390,7 @@ CARDbRadioPowerOn(pDevice); 


void

BSSvUpdateNodeTxCounter(

    IN HANDLE      hDeviceContext,

    IN void *hDeviceContext,

    IN BYTE        byTsr0,

    IN BYTE        byTsr1,

    IN PBYTE       pbyBuffer,
@@ -1503,7 +1503,7 @@ BSSvUpdateNodeTxCounter( 


            pMACHeader = (PS802_11Header)(pbyBuffer + uFIFOHeaderSize);



            if (BSSDBbIsSTAInNodeDB((HANDLE)pMgmt, &(pMACHeader->abyAddr1[0]), &uNodeIndex)){

            if (BSSDBbIsSTAInNodeDB((void *)pMgmt, &(pMACHeader->abyAddr1[0]), &uNodeIndex)){

                pMgmt->sNodeDBTable[uNodeIndex].uTxAttempts += 1;

                if ((byTsr1 & TSR1_TERR) == 0) {

                    // transmit success, TxAttempts at least plus one
@@ -1583,7 +1583,7 @@ BSSvUpdateNodeTxCounter( 


void

BSSvClearNodeDBTable(

    IN HANDLE hDeviceContext,

    IN void *hDeviceContext,

    IN UINT uStartIndex

    )
@@ -1611,7 +1611,7 @@ BSSvClearNodeDBTable( 




void s_vCheckSensitivity(

    IN HANDLE hDeviceContext

    IN void *hDeviceContext

    )

{

    PSDevice        pDevice = (PSDevice)hDeviceContext;
@@ -1649,7 +1649,7 @@ void s_vCheckSensitivity( 
                if (pDevice->byBBVGANew != pDevice->byBBVGACurrent) {

                    pDevice->uBBVGADiffCount++;

                    if (pDevice->uBBVGADiffCount >= BB_VGA_CHANGE_THRESHOLD)

                        bScheduleCommand((HANDLE) pDevice, WLAN_CMD_CHANGE_BBSENSITIVITY, NULL);

                        bScheduleCommand((void *) pDevice, WLAN_CMD_CHANGE_BBSENSITIVITY, NULL);

                } else {

                    pDevice->uBBVGADiffCount = 0;

                }
@@ -1661,7 +1661,7 @@ void s_vCheckSensitivity( 


void

BSSvClearAnyBSSJoinRecord (

    IN HANDLE hDeviceContext

    IN void *hDeviceContext

    )

{

    PSDevice        pDevice = (PSDevice)hDeviceContext;
@@ -1676,7 +1676,7 @@ BSSvClearAnyBSSJoinRecord ( 


#ifdef Calcu_LinkQual

void s_uCalculateLinkQual(

    IN HANDLE hDeviceContext

    IN void *hDeviceContext

    )

{

   PSDevice        pDevice = (PSDevice)hDeviceContext;
@@ -1724,7 +1724,7 @@ else 
#endif



void s_vCheckPreEDThreshold(

    IN HANDLE hDeviceContext

    IN void *hDeviceContext

    )

{

    PSDevice        pDevice = (PSDevice)hDeviceContext;

drivers/staging/vt6655/bssdb.h

+16 −16
Original line number Diff line number Diff line
@@ -244,7 +244,7 @@ typedef struct tagKnownNodeDB { 


PKnownBSS

BSSpSearchBSSList(

    IN HANDLE hDeviceContext,

    IN void *hDeviceContext,

    IN PBYTE pbyDesireBSSID,

    IN PBYTE pbyDesireSSID,

    IN CARD_PHY_TYPE ePhyType
@@ -252,20 +252,20 @@ BSSpSearchBSSList( 


PKnownBSS

BSSpAddrIsInBSSList(

    IN HANDLE hDeviceContext,

    IN void *hDeviceContext,

    IN PBYTE abyBSSID,

    IN PWLAN_IE_SSID pSSID

    );



void

BSSvClearBSSList(

    IN HANDLE hDeviceContext,

    IN void *hDeviceContext,

    IN BOOL bKeepCurrBSSID

    );



BOOL

BSSbInsertToBSSList(

    IN HANDLE hDeviceContext,

    IN void *hDeviceContext,

    IN PBYTE abyBSSIDAddr,

    IN QWORD qwTimestamp,

    IN WORD wBeaconInterval,
@@ -281,13 +281,13 @@ BSSbInsertToBSSList( 
    IN PWLAN_IE_QUIET pIE_Quiet,

    IN UINT uIELength,

    IN PBYTE pbyIEs,

    IN HANDLE pRxPacketContext

    IN void *pRxPacketContext

    );





BOOL

BSSbUpdateToBSSList(

    IN HANDLE hDeviceContext,

    IN void *hDeviceContext,

    IN QWORD qwTimestamp,

    IN WORD wBeaconInterval,

    IN WORD wCapInfo,
@@ -304,26 +304,26 @@ BSSbUpdateToBSSList( 
    IN PKnownBSS pBSSList,

    IN UINT uIELength,

    IN PBYTE pbyIEs,

    IN HANDLE pRxPacketContext

    IN void *pRxPacketContext

    );





BOOL

BSSDBbIsSTAInNodeDB(

    IN HANDLE hDeviceContext,

    IN void *hDeviceContext,

    IN PBYTE abyDstAddr,

    OUT PUINT puNodeIndex

    );



void

BSSvCreateOneNode(

    IN HANDLE hDeviceContext,

    IN void *hDeviceContext,

    OUT PUINT puNodeIndex

    );



void

BSSvUpdateAPNode(

    IN HANDLE hDeviceContext,

    IN void *hDeviceContext,

    IN PWORD pwCapInfo,

    IN PWLAN_IE_SUPP_RATES pItemRates,

    IN PWLAN_IE_SUPP_RATES pExtSuppRates
@@ -332,13 +332,13 @@ BSSvUpdateAPNode( 


void

BSSvSecondCallBack(

    IN HANDLE hDeviceContext

    IN void *hDeviceContext

    );





void

BSSvUpdateNodeTxCounter(

    IN HANDLE hDeviceContext,

    IN void *hDeviceContext,

    IN BYTE        byTsr0,

    IN BYTE        byTsr1,

    IN PBYTE       pbyBuffer,
@@ -347,25 +347,25 @@ BSSvUpdateNodeTxCounter( 


void

BSSvRemoveOneNode(

    IN HANDLE hDeviceContext,

    IN void *hDeviceContext,

    IN UINT uNodeIndex

    );



void

BSSvAddMulticastNode(

    IN HANDLE hDeviceContext

    IN void *hDeviceContext

    );





void

BSSvClearNodeDBTable(

    IN HANDLE hDeviceContext,

    IN void *hDeviceContext,

    IN UINT uStartIndex

    );



void

BSSvClearAnyBSSJoinRecord(

    IN HANDLE hDeviceContext

    IN void *hDeviceContext

    );



#endif //__BSSDB_H__

drivers/staging/vt6655/device_main.c

+12 −12
Original line number Diff line number Diff line
@@ -2011,11 +2011,11 @@ DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "call MACvIntEnable\n"); 
	MACvIntEnable(pDevice->PortOffset, IMR_MASK_VALUE);



    if (pDevice->pMgmt->eConfigMode == WMAC_CONFIG_AP) {

        bScheduleCommand((HANDLE)pDevice, WLAN_CMD_RUN_AP, NULL);

        bScheduleCommand((void *)pDevice, WLAN_CMD_RUN_AP, NULL);

	}

	else {

        bScheduleCommand((HANDLE)pDevice, WLAN_CMD_BSSID_SCAN, NULL);

        bScheduleCommand((HANDLE)pDevice, WLAN_CMD_SSID, NULL);

        bScheduleCommand((void *)pDevice, WLAN_CMD_BSSID_SCAN, NULL);

        bScheduleCommand((void *)pDevice, WLAN_CMD_SSID, NULL);

    }

    pDevice->flags |=DEVICE_FLAGS_OPENED;
@@ -2034,7 +2034,7 @@ static int device_close(struct net_device *dev) { 
//PLICE_DEBUG<-

//2007-1121-02<Add>by EinsnLiu

    if (pDevice->bLinkPass) {

	bScheduleCommand((HANDLE)pDevice, WLAN_CMD_DISASSOCIATE, NULL);

	bScheduleCommand((void *)pDevice, WLAN_CMD_DISASSOCIATE, NULL);

        mdelay(30);

    }

#ifdef TxInSleep
@@ -2860,7 +2860,7 @@ static irqreturn_t device_intr(int irq, void *dev_instance) { 


            pDevice->bBeaconSent = FALSE;

            if (pDevice->bEnablePSMode) {

                PSbIsNextTBTTWakeUp((HANDLE)pDevice);

                PSbIsNextTBTTWakeUp((void *)pDevice);

            };



            if ((pDevice->eOPMode == OP_MODE_AP) ||
@@ -2893,7 +2893,7 @@ static irqreturn_t device_intr(int irq, void *dev_instance) { 
                        // check if mutltcast tx bufferring

                        pMgmt->byDTIMCount = pMgmt->byDTIMPeriod - 1;

                        pMgmt->sNodeDBTable[0].bRxPSPoll = TRUE;

                        bScheduleCommand((HANDLE)pDevice, WLAN_CMD_RX_PSPOLL, NULL);

                        bScheduleCommand((void *)pDevice, WLAN_CMD_RX_PSPOLL, NULL);

                    }

                }

            }
@@ -3549,7 +3549,7 @@ static int device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { 
       if (pMgmt->eConfigMode == WMAC_CONFIG_AP) {

           netif_stop_queue(pDevice->dev);

           spin_lock_irq(&pDevice->lock);

           bScheduleCommand((HANDLE)pDevice, WLAN_CMD_RUN_AP, NULL);

           bScheduleCommand((void *)pDevice, WLAN_CMD_RUN_AP, NULL);

           spin_unlock_irq(&pDevice->lock);

       }

       else {
@@ -3563,8 +3563,8 @@ static int device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { 
	      pMgmt->eScanType = WMAC_SCAN_ACTIVE;

	 if(pDevice->bWPASuppWextEnabled !=TRUE)

	 #endif

           bScheduleCommand((HANDLE) pDevice, WLAN_CMD_BSSID_SCAN, pMgmt->abyDesireSSID);

           bScheduleCommand((HANDLE) pDevice, WLAN_CMD_SSID, NULL);

           bScheduleCommand((void *) pDevice, WLAN_CMD_BSSID_SCAN, pMgmt->abyDesireSSID);

           bScheduleCommand((void *) pDevice, WLAN_CMD_SSID, NULL);

           spin_unlock_irq(&pDevice->lock);

      }

      pDevice->bCommit = FALSE;
@@ -3719,9 +3719,9 @@ viawget_resume(struct pci_dev *pcid) 
        init_timer(&pMgmt->sTimerSecondCallback);

        init_timer(&pDevice->sTimerCommand);

        MACvIntEnable(pDevice->PortOffset, IMR_MASK_VALUE);

        BSSvClearBSSList((HANDLE)pDevice, pDevice->bLinkPass);

        bScheduleCommand((HANDLE) pDevice, WLAN_CMD_BSSID_SCAN, NULL);

        bScheduleCommand((HANDLE) pDevice, WLAN_CMD_SSID, NULL);

        BSSvClearBSSList((void *)pDevice, pDevice->bLinkPass);

        bScheduleCommand((void *) pDevice, WLAN_CMD_BSSID_SCAN, NULL);

        bScheduleCommand((void *) pDevice, WLAN_CMD_SSID, NULL);

        spin_unlock_irq(&pDevice->lock);

    }

    return 0;