Commit 8b384e0c authored by Pekka Enberg's avatar Pekka Enberg Committed by Greg Kroah-Hartman
Browse files

Staging: w35und: remove some typedefs 



This patch removes some obfuscating typedefs from the driver code.

Cc: Pavel Machek <pavel@suse.cz>
Signed-off-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 58be3fb0

drivers/staging/winbond/bss_f.h

+3 −3
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ void DesiredRate2InfoElement(PWB32_ADAPTER Adapter, u8 *addr, u16 *iFildOffset, 
							 u8 *pBasicRateSet, u8 BasicRateCount,

							 u8 *pOperationRateSet, u8 OperationRateCount);

void BSSAddIBSSdata(PWB32_ADAPTER Adapter, PWB_BSSDESCRIPTION psDesData);

unsigned char boCmpMacAddr( PUCHAR, PUCHAR );

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);
@@ -42,11 +42,11 @@ void RateReSortForSRate(PWB32_ADAPTER Adapter, u8 *RateArray, u8 num); 
void Assemble_IE(PWB32_ADAPTER Adapter, u16 wBssIdx);

void SetMaxTxRate(PWB32_ADAPTER Adapter);



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

void CreateWpaIE(PWB32_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, PUCHAR msg, struct  Management_Frame* msgHeader,

void CreateRsnIE(PWB32_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,

drivers/staging/winbond/ds_tkip.h

+3 −3
Original line number Diff line number Diff line
@@ -25,9 +25,9 @@ typedef struct tkip 
	s32		bytes_in_M;	// # bytes in M

} tkip_t;



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

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

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

//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 );

drivers/staging/winbond/linux/common.h

+1 −9
Original line number Diff line number Diff line
@@ -39,14 +39,6 @@ 
// Common type definition

//===============================================================



typedef u8*            PUCHAR;

typedef s8*            PCHAR;

typedef u8*            PBOOLEAN;

typedef u16*           PUSHORT;

typedef u32*           PULONG;

typedef s16*   PSHORT;





//===========================================

#define IGNORE      2

#define	SUCCESS     1
@@ -110,7 +102,7 @@ typedef struct urb * PURB; 
#define OS_ATOMIC_READ( _A, _V )	_V

#define OS_ATOMIC_INC( _A, _V )		EncapAtomicInc( _A, (void*)_V )

#define OS_ATOMIC_DEC( _A, _V )		EncapAtomicDec( _A, (void*)_V )

#define OS_MEMORY_CLEAR( _A, _S )	memset( (PUCHAR)_A,0,_S)

#define OS_MEMORY_CLEAR( _A, _S )	memset( (u8 *)_A,0,_S)

#define OS_MEMORY_COMPARE( _A, _B, _S )	(memcmp(_A,_B,_S)? 0 : 1) // Definition is reverse with Ndis 1: the same 0: different

drivers/staging/winbond/linux/wb35reg.c

+13 −13
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ extern void phy_calibration_winbond(hw_data_t *phw_data, u32 frequency); 
// Flag : AUTO_INCREMENT - RegisterNo will auto increment 4

//		  NO_INCREMENT - Function will write data into the same register

unsigned char

Wb35Reg_BurstWrite(phw_data_t pHwData, u16 RegisterNo, PULONG pRegisterData, u8 NumberOfData, u8 Flag)

Wb35Reg_BurstWrite(phw_data_t pHwData, u16 RegisterNo, u32 * pRegisterData, u8 NumberOfData, u8 Flag)

{

	PWB35REG pWb35Reg = &pHwData->Wb35Reg;

	PURB		pUrb = NULL;
@@ -30,13 +30,13 @@ Wb35Reg_BurstWrite(phw_data_t pHwData, u16 RegisterNo, PULONG pRegisterData, u8 
	if( pUrb && pRegQueue ) {

		pRegQueue->DIRECT = 2;// burst write register

		pRegQueue->INDEX = RegisterNo;

		pRegQueue->pBuffer = (PULONG)((PUCHAR)pRegQueue + sizeof(REG_QUEUE));

		pRegQueue->pBuffer = (u32 *)((u8 *)pRegQueue + sizeof(REG_QUEUE));

		memcpy( pRegQueue->pBuffer, pRegisterData, DataSize );

		//the function for reversing register data from little endian to big endian

		for( i=0; i<NumberOfData ; i++ )

			pRegQueue->pBuffer[i] = cpu_to_le32( pRegQueue->pBuffer[i] );



		dr = (struct usb_ctrlrequest *)((PUCHAR)pRegQueue + sizeof(REG_QUEUE) + DataSize);

		dr = (struct usb_ctrlrequest *)((u8 *)pRegQueue + sizeof(REG_QUEUE) + DataSize);

		dr->bRequestType = USB_TYPE_VENDOR | USB_DIR_OUT | USB_RECIP_DEVICE;

		dr->bRequest = 0x04; // USB or vendor-defined request code, burst mode

		dr->wValue = cpu_to_le16( Flag ); // 0: Register number auto-increment, 1: No auto increment
@@ -181,7 +181,7 @@ Wb35Reg_Write( phw_data_t pHwData, u16 RegisterNo, u32 RegisterValue ) 
		pRegQueue->INDEX = RegisterNo;

		pRegQueue->VALUE = cpu_to_le32(RegisterValue);

		pRegQueue->RESERVED_VALID = FALSE;

		dr = (struct usb_ctrlrequest *)((PUCHAR)pRegQueue + sizeof(REG_QUEUE));

		dr = (struct usb_ctrlrequest *)((u8 *)pRegQueue + sizeof(REG_QUEUE));

		dr->bRequestType = USB_TYPE_VENDOR|USB_DIR_OUT |USB_RECIP_DEVICE;

		dr->bRequest = 0x03; // USB or vendor-defined request code, burst mode

		dr->wValue = cpu_to_le16(0x0);
@@ -220,7 +220,7 @@ Wb35Reg_Write( phw_data_t pHwData, u16 RegisterNo, u32 RegisterValue ) 
// FALSE : register not support

unsigned char

Wb35Reg_WriteWithCallbackValue( phw_data_t pHwData, u16 RegisterNo, u32 RegisterValue,

				PCHAR pValue, s8 Len)

				s8 *pValue, s8 Len)

{

	PWB35REG	pWb35Reg = &pHwData->Wb35Reg;

	struct usb_ctrlrequest *dr;
@@ -243,7 +243,7 @@ Wb35Reg_WriteWithCallbackValue( phw_data_t pHwData, u16 RegisterNo, u32 Register 
		//NOTE : Users must guarantee the size of value will not exceed the buffer size.

		memcpy(pRegQueue->RESERVED, pValue, Len);

		pRegQueue->RESERVED_VALID = TRUE;

		dr = (struct usb_ctrlrequest *)((PUCHAR)pRegQueue + sizeof(REG_QUEUE));

		dr = (struct usb_ctrlrequest *)((u8 *)pRegQueue + sizeof(REG_QUEUE));

		dr->bRequestType = USB_TYPE_VENDOR|USB_DIR_OUT |USB_RECIP_DEVICE;

		dr->bRequest = 0x03; // USB or vendor-defined request code, burst mode

		dr->wValue = cpu_to_le16(0x0);
@@ -278,10 +278,10 @@ Wb35Reg_WriteWithCallbackValue( phw_data_t pHwData, u16 RegisterNo, u32 Register 
// FALSE : register not support

// pRegisterValue : It must be a resident buffer due to asynchronous read register.

unsigned char

Wb35Reg_ReadSync(  phw_data_t pHwData,  u16 RegisterNo,   PULONG pRegisterValue )

Wb35Reg_ReadSync(  phw_data_t pHwData,  u16 RegisterNo,   u32 * pRegisterValue )

{

	PWB35REG pWb35Reg = &pHwData->Wb35Reg;

	PULONG	pltmp = pRegisterValue;

	u32 *	pltmp = pRegisterValue;

	int ret = -1;



	// Module shutdown
@@ -327,7 +327,7 @@ Wb35Reg_ReadSync( phw_data_t pHwData, u16 RegisterNo, PULONG pRegisterValue 
// FALSE : register not support

// pRegisterValue : It must be a resident buffer due to asynchronous read register.

unsigned char

Wb35Reg_Read(phw_data_t pHwData, u16 RegisterNo,  PULONG pRegisterValue )

Wb35Reg_Read(phw_data_t pHwData, u16 RegisterNo,  u32 * pRegisterValue )

{

	PWB35REG	pWb35Reg = &pHwData->Wb35Reg;

	struct usb_ctrlrequest * dr;
@@ -348,7 +348,7 @@ Wb35Reg_Read(phw_data_t pHwData, u16 RegisterNo, PULONG pRegisterValue ) 
		pRegQueue->DIRECT = 0;// read register

		pRegQueue->INDEX = RegisterNo;

		pRegQueue->pBuffer = pRegisterValue;

		dr = (struct usb_ctrlrequest *)((PUCHAR)pRegQueue + sizeof(REG_QUEUE));

		dr = (struct usb_ctrlrequest *)((u8 *)pRegQueue + sizeof(REG_QUEUE));

		dr->bRequestType = USB_TYPE_VENDOR|USB_RECIP_DEVICE|USB_DIR_IN;

		dr->bRequest = 0x01; // USB or vendor-defined request code, burst mode

		dr->wValue = cpu_to_le16(0x0);
@@ -399,7 +399,7 @@ Wb35Reg_EP0VM(phw_data_t pHwData ) 
	PWB35REG	pWb35Reg = &pHwData->Wb35Reg;

	PURB		pUrb;

	struct usb_ctrlrequest *dr;

	PULONG		pBuffer;

	u32 *		pBuffer;

	int			ret = -1;

	PREG_QUEUE	pRegQueue;
@@ -429,7 +429,7 @@ Wb35Reg_EP0VM(phw_data_t pHwData ) 


	usb_fill_control_urb( pUrb, pHwData->WbUsb.udev,

			      REG_DIRECTION(pHwData->WbUsb.udev,pRegQueue),

			      (PUCHAR)dr,pBuffer,cpu_to_le16(dr->wLength),

			      (u8 *)dr,pBuffer,cpu_to_le16(dr->wLength),

			      Wb35Reg_EP0VM_complete, (void*)pHwData);



	pWb35Reg->EP0vm_state = VM_RUNNING;
@@ -655,7 +655,7 @@ unsigned char Wb35Reg_initial(phw_data_t pHwData) 
//    version in _GENREQ.ASM of the DWB NE1000/2000 driver.

//==================================================================================

u32

CardComputeCrc(PUCHAR Buffer, u32 Length)

CardComputeCrc(u8 * Buffer, u32 Length)

{

    u32 Crc, Carry;

    u32  i, j;

drivers/staging/winbond/linux/wb35reg_f.h

+6 −6
Original line number Diff line number Diff line
@@ -29,16 +29,16 @@ void EEPROMTxVgaAdjust( phw_data_t pHwData ); // 20060619.5 Add 


void Wb35Reg_destroy(  phw_data_t pHwData );



unsigned char Wb35Reg_Read(  phw_data_t pHwData,  u16 RegisterNo,   PULONG pRegisterValue );

unsigned char Wb35Reg_ReadSync(  phw_data_t pHwData,  u16 RegisterNo,   PULONG pRegisterValue );

unsigned char Wb35Reg_Read(  phw_data_t pHwData,  u16 RegisterNo,   u32 * pRegisterValue );

unsigned char Wb35Reg_ReadSync(  phw_data_t pHwData,  u16 RegisterNo,   u32 * pRegisterValue );

unsigned char Wb35Reg_Write(  phw_data_t pHwData,  u16 RegisterNo,  u32 RegisterValue );

unsigned char Wb35Reg_WriteSync(  phw_data_t pHwData,  u16 RegisterNo,  u32 RegisterValue );

unsigned char Wb35Reg_WriteWithCallbackValue(  phw_data_t pHwData,

								 u16 RegisterNo,

								 u32 RegisterValue,

								 PCHAR pValue,

								 s8 *pValue,

								 s8 Len);

unsigned char Wb35Reg_BurstWrite(  phw_data_t pHwData,  u16 RegisterNo,  PULONG pRegisterData,  u8 NumberOfData,  u8 Flag );

unsigned char Wb35Reg_BurstWrite(  phw_data_t pHwData,  u16 RegisterNo,  u32 * pRegisterData,  u8 NumberOfData,  u8 Flag );



void Wb35Reg_EP0VM(  phw_data_t pHwData );

void Wb35Reg_EP0VM_start(  phw_data_t pHwData );
@@ -47,7 +47,7 @@ void Wb35Reg_EP0VM_complete( PURB pUrb ); 
u32 BitReverse( u32 dwData, u32 DataLength);



void CardGetMulticastBit(   u8 Address[MAC_ADDR_LENGTH],  u8 *Byte,  u8 *Value );

u32 CardComputeCrc(  PUCHAR Buffer,  u32 Length );

u32 CardComputeCrc(  u8 * Buffer,  u32 Length );



void Wb35Reg_phy_calibration(  phw_data_t pHwData );

void Wb35Reg_Update(  phw_data_t pHwData,  u16 RegisterNo,  u32 RegisterValue );

CRA Git | Maintained and supported by SUSTech CRA and CCSE