Commit 88ebc4b9 authored by Pekka Enberg's avatar Pekka Enberg Committed by Greg Kroah-Hartman
Browse files

Staging: w35und: padapter struct typedef removal 



Remove the PADAPTER typedef and its strange variants. Also fix up variable
names that use the type while we're at it.

Signed-off-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
Acked-by: default avatarPavel Machek <pavel@suse.cz>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 65144de7

drivers/staging/winbond/adapter.h

+5 −5
Original line number Diff line number Diff line 
//

// ADAPTER.H -

// Windows NDIS global variable 'Adapter' typedef

// Windows NDIS global variable 'adapter' typedef

//

#define MAX_ANSI_STRING		40

typedef struct WB32_ADAPTER

{

	u32 AdapterIndex; // 20060703.4 Add for using pAdapterContext global Adapter point



struct wb35_adapter {

	u32 adapterIndex; // 20060703.4 Add for using padapterContext global adapter point



	WB_LOCALDESCRIPT	sLocalPara;		// Myself connected parameters

	PWB_BSSDESCRIPTION	asBSSDescriptElement;
@@ -20,4 +20,4 @@ typedef struct WB32_ADAPTER 
        struct iw_statistics iw_stats;



	u8	LinkName[MAX_ANSI_STRING];

} WB32_ADAPTER, ADAPTER, *PWB32_ADAPTER, *PADAPTER;
 
};

drivers/staging/winbond/bss_f.h

+34 −34
Original line number Diff line number Diff line
@@ -2,54 +2,54 @@ 
// BSS descriptor DataBase management global function

//



void vBSSdescriptionInit(PWB32_ADAPTER Adapter);

void vBSSfoundList(PWB32_ADAPTER Adapter);

u8 boChanFilter(PWB32_ADAPTER Adapter, u8 ChanNo);

u16 wBSSallocateEntry(PWB32_ADAPTER Adapter);

u16 wBSSGetEntry(PWB32_ADAPTER Adapter);

void vSimpleHouseKeeping(PWB32_ADAPTER Adapter);

u16 wBSShouseKeeping(PWB32_ADAPTER Adapter);

void ClearBSSdescpt(PWB32_ADAPTER Adapter, u16 i);

u16 wBSSfindBssID(PWB32_ADAPTER Adapter, u8 *pbBssid);

u16 wBSSfindDedicateCandidate(PWB32_ADAPTER Adapter, struct SSID_Element *psSsid, u8 *pbBssid);

u16 wBSSfindMACaddr(PWB32_ADAPTER Adapter, u8 *pbMacAddr);

u16 wBSSsearchMACaddr(PWB32_ADAPTER Adapter, u8 *pbMacAddr, u8 band);

u16 wBSSaddScanData(PWB32_ADAPTER, u16, psRXDATA);

u16 wBSSUpdateScanData(PWB32_ADAPTER Adapter, u16 wBssIdx, psRXDATA psRcvData);

u16 wBSScreateIBSSdata(PWB32_ADAPTER Adapter, PWB_BSSDESCRIPTION psDesData);

void DesiredRate2BSSdescriptor(PWB32_ADAPTER Adapter, PWB_BSSDESCRIPTION psDesData,

void vBSSdescriptionInit(struct wb35_adapter * adapter);

void vBSSfoundList(struct wb35_adapter * adapter);

u8 boChanFilter(struct wb35_adapter * adapter, u8 ChanNo);

u16 wBSSallocateEntry(struct wb35_adapter * adapter);

u16 wBSSGetEntry(struct wb35_adapter * adapter);

void vSimpleHouseKeeping(struct wb35_adapter * adapter);

u16 wBSShouseKeeping(struct wb35_adapter * adapter);

void ClearBSSdescpt(struct wb35_adapter * adapter, u16 i);

u16 wBSSfindBssID(struct wb35_adapter * adapter, u8 *pbBssid);

u16 wBSSfindDedicateCandidate(struct wb35_adapter * adapter, struct SSID_Element *psSsid, u8 *pbBssid);

u16 wBSSfindMACaddr(struct wb35_adapter * adapter, u8 *pbMacAddr);

u16 wBSSsearchMACaddr(struct wb35_adapter * adapter, u8 *pbMacAddr, u8 band);

u16 wBSSaddScanData(struct wb35_adapter *, u16, psRXDATA);

u16 wBSSUpdateScanData(struct wb35_adapter * adapter, u16 wBssIdx, psRXDATA psRcvData);

u16 wBSScreateIBSSdata(struct wb35_adapter * adapter, PWB_BSSDESCRIPTION psDesData);

void DesiredRate2BSSdescriptor(struct wb35_adapter * adapter, PWB_BSSDESCRIPTION psDesData,

							 u8 *pBasicRateSet, u8 BasicRateCount,

							 u8 *pOperationRateSet, u8 OperationRateCount);

void DesiredRate2InfoElement(PWB32_ADAPTER Adapter, u8	*addr, u16 *iFildOffset,

void DesiredRate2InfoElement(struct wb35_adapter * adapter, u8	*addr, u16 *iFildOffset,

							 u8 *pBasicRateSet, u8 BasicRateCount,

							 u8 *pOperationRateSet, u8 OperationRateCount);

void BSSAddIBSSdata(PWB32_ADAPTER Adapter, PWB_BSSDESCRIPTION psDesData);

void BSSAddIBSSdata(struct wb35_adapter * adapter, PWB_BSSDESCRIPTION psDesData);

unsigned char boCmpMacAddr( u8 *, u8 *);

unsigned char boCmpSSID(struct SSID_Element *psSSID1, struct SSID_Element *psSSID2);

u16 wBSSfindSSID(PWB32_ADAPTER Adapter, struct SSID_Element *psSsid);

u16 wRoamingQuery(PWB32_ADAPTER Adapter);

void vRateToBitmap(PWB32_ADAPTER Adapter, u16 index);

u8 bRateToBitmapIndex(PWB32_ADAPTER Adapter, u8 bRate);

u16 wBSSfindSSID(struct wb35_adapter * adapter, struct SSID_Element *psSsid);

u16 wRoamingQuery(struct wb35_adapter * adapter);

void vRateToBitmap(struct wb35_adapter * adapter, u16 index);

u8 bRateToBitmapIndex(struct wb35_adapter * adapter, u8 bRate);

u8 bBitmapToRate(u8 i);

unsigned char boIsERPsta(PWB32_ADAPTER Adapter, u16 i);

unsigned char boCheckConnect(PWB32_ADAPTER Adapter);

unsigned char boCheckSignal(PWB32_ADAPTER Adapter);

void AddIBSSIe(PWB32_ADAPTER Adapter,PWB_BSSDESCRIPTION psDesData );//added by ws for WPA_None06/01/04

void BssScanUpToDate(PWB32_ADAPTER Adapter);

void BssUpToDate(PWB32_ADAPTER Adapter);

unsigned char boIsERPsta(struct wb35_adapter * adapter, u16 i);

unsigned char boCheckConnect(struct wb35_adapter * adapter);

unsigned char boCheckSignal(struct wb35_adapter * adapter);

void AddIBSSIe(struct wb35_adapter * adapter,PWB_BSSDESCRIPTION psDesData );//added by ws for WPA_None06/01/04

void BssScanUpToDate(struct wb35_adapter * adapter);

void BssUpToDate(struct wb35_adapter * adapter);

void RateSort(u8 *RateArray, u8 num, u8 mode);

void RateReSortForSRate(PWB32_ADAPTER Adapter, u8 *RateArray, u8 num);

void Assemble_IE(PWB32_ADAPTER Adapter, u16 wBssIdx);

void SetMaxTxRate(PWB32_ADAPTER Adapter);

void RateReSortForSRate(struct wb35_adapter * adapter, u8 *RateArray, u8 num);

void Assemble_IE(struct wb35_adapter * adapter, u16 wBssIdx);

void SetMaxTxRate(struct wb35_adapter * adapter);



void CreateWpaIE(PWB32_ADAPTER Adapter, u16* iFildOffset, u8 *msg, struct  Management_Frame* msgHeader,

void CreateWpaIE(struct wb35_adapter * adapter, u16* iFildOffset, u8 *msg, struct  Management_Frame* msgHeader,

				 struct Association_Request_Frame_Body* msgBody, u16 iMSindex); //added by WS 05/14/05



#ifdef _WPA2_

void CreateRsnIE(PWB32_ADAPTER Adapter, u16* iFildOffset, u8 *msg, struct  Management_Frame* msgHeader,

void CreateRsnIE(struct wb35_adapter * adapter, u16* iFildOffset, u8 *msg, struct  Management_Frame* msgHeader,

				 struct Association_Request_Frame_Body* msgBody, u16 iMSindex);//added by WS 05/14/05



u16 SearchPmkid(PWB32_ADAPTER Adapter, struct  Management_Frame* msgHeader,

u16 SearchPmkid(struct wb35_adapter * adapter, struct  Management_Frame* msgHeader,

				   struct PMKID_Information_Element * AssoReq_PMKID );

#endif

drivers/staging/winbond/bssdscpt.h

+4 −4
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ typedef struct BSSDescriptionElement 
    u16		wState;			// the current state of the system

	u16		wIndex;			// THIS BSS element entry index



	void*	psAdapter;		// pointer to THIS Adapter

	void*	psadapter;		// pointer to THIS adapter

	OS_TIMER	nTimer;  // MLME timer



    // Authentication
@@ -148,9 +148,9 @@ typedef struct BSSDescriptionElement 


} WB_BSSDESCRIPTION, *PWB_BSSDESCRIPTION;



#define wBSSConnectedSTA(Adapter)             \

    ((u16)(Adapter)->sLocalPara.wConnectedSTAindex)

#define wBSSConnectedSTA(adapter)             \

    ((u16)(adapter)->sLocalPara.wConnectedSTAindex)



#define psBSS(i)			(&(Adapter->asBSSDescriptElement[(i)]))

#define psBSS(i)			(&(adapter->asBSSDescriptElement[(i)]))

drivers/staging/winbond/ds_tkip.h

+2 −2
Original line number Diff line number Diff line
@@ -26,8 +26,8 @@ typedef struct tkip 
} tkip_t;



//void _append_data( u8 *pData, u16 size, tkip_t *p );

void Mds_MicGet(  void* Adapter,  void* pRxLayer1,  u8 *pKey,  u8 *pMic );

void Mds_MicFill(  void* Adapter,  void* pDes,  u8 *XmitBufAddress );

void Mds_MicGet(  void* adapter,  void* pRxLayer1,  u8 *pKey,  u8 *pMic );

void Mds_MicFill(  void* adapter,  void* pDes,  u8 *XmitBufAddress );

drivers/staging/winbond/linux/wb35reg.c

+4 −4
Original line number Diff line number Diff line
@@ -386,11 +386,11 @@ Wb35Reg_EP0VM_start( phw_data_t pHwData ) 
{

	struct wb35_reg *reg = &pHwData->reg;



	if (OS_ATOMIC_INC( pHwData->Adapter, &reg->RegFireCount) == 1) {

	if (OS_ATOMIC_INC( pHwData->adapter, &reg->RegFireCount) == 1) {

		reg->EP0vm_state = VM_RUNNING;

		Wb35Reg_EP0VM(pHwData);

	} else

		OS_ATOMIC_DEC( pHwData->Adapter, &reg->RegFireCount );

		OS_ATOMIC_DEC( pHwData->adapter, &reg->RegFireCount );

}



void
@@ -447,7 +447,7 @@ Wb35Reg_EP0VM(phw_data_t pHwData ) 


 cleanup:

	reg->EP0vm_state = VM_STOP;

	OS_ATOMIC_DEC( pHwData->Adapter, &reg->RegFireCount );

	OS_ATOMIC_DEC( pHwData->adapter, &reg->RegFireCount );

}
@@ -465,7 +465,7 @@ Wb35Reg_EP0VM_complete(struct urb *urb) 


	if (pHwData->SurpriseRemove) { // Let WbWlanHalt to handle surprise remove

		reg->EP0vm_state = VM_STOP;

		OS_ATOMIC_DEC( pHwData->Adapter, &reg->RegFireCount );

		OS_ATOMIC_DEC( pHwData->adapter, &reg->RegFireCount );

	} else {

		// Complete to send, remove the URB from the first

		spin_lock_irq( &reg->EP0VM_spin_lock );