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

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

staging: w35und: Remove remaining typedef declarations 



This patch removes remaining typedef declarations from the w35und driver. Most
of them were unused so I just killed them off completely.

Cc: Lars Lindley <lindley@coyote.org>
Acked-by: default avatarPavel Machek <pavel@ucw.cz>
Cc: Ruslan Pisarev <ruslan@rpisarev.org.ua>
Signed-off-by: default avatarPekka Enberg <penberg@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 5fb10855

drivers/staging/winbond/TODO

+0 −1
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ TODO: 
	- checkpatch cleanups

	- kerneldoc cleanups

	- fix severeCamelCaseInfestation

	- remove typedefs

	- remove unused ioctls

	- use cfg80211 for regulatory stuff

	- fix 4k stack problems

drivers/staging/winbond/core.h

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ struct wbsoft_priv { 
	struct wb_local_para sLocalPara;	/* Myself connected

							parameters */



	MLME_FRAME sMlmeFrame;	/* connect to peerSTA parameters */

	struct mlme_frame sMlmeFrame;	/* connect to peerSTA parameters */



	struct wb35_mto_params sMtoPara;	/* MTO_struct ... */

	struct hw_data sHwData;	/*For HAL */

drivers/staging/winbond/mac_structures.h

+0 −17
Original line number Diff line number Diff line
@@ -177,23 +177,6 @@ enum enum_MMPDUResultCode 
} WB_MMPDURESULTCODE, *PWB_MMPDURESULTCODE;

*/



/*===========================================================

// enum_TxRate --

//   Define the transmission constants based on W89C32 MAC

//   target specification.

//===========================================================*/

typedef enum enum_TxRate {

    TXRATE_1M               = 0,

    TXRATE_2MLONG           = 2,

    TXRATE_2MSHORT          = 3,

    TXRATE_55MLONG          = 4,

    TXRATE_55MSHORT         = 5,

    TXRATE_11MLONG          = 6,

    TXRATE_11MSHORT         = 7,

    TXRATE_AUTO             = 255           /* PD43 20021108 */

} WB_TXRATE, *PWB_TXRATE;





#define	RATE_BITMAP_1M				1

#define	RATE_BITMAP_2M				2

#define	RATE_BITMAP_5dot5M			5

drivers/staging/winbond/mds.c

+17 −17
Original line number Diff line number Diff line
@@ -24,12 +24,12 @@ Mds_Destroy(struct wbsoft_priv *adapter) 


static void Mds_DurationSet(struct wbsoft_priv *adapter,  struct wb35_descriptor *pDes,  u8 *buffer)

{

	PT00_DESCRIPTOR	pT00;

	PT01_DESCRIPTOR	pT01;

	struct T00_descriptor *pT00;

	struct T01_descriptor *pT01;

	u16	Duration, NextBodyLen, OffsetSize;

	u8	Rate, i;

	unsigned char	CTS_on = false, RTS_on = false;

	PT00_DESCRIPTOR pNextT00;

	struct T00_descriptor *pNextT00;

	u16 BodyLen = 0;

	unsigned char boGroupAddr = false;
@@ -39,9 +39,9 @@ static void Mds_DurationSet(struct wbsoft_priv *adapter, struct wb35_descriptor 
	if (!Rate)

		Rate = 1;



	pT00 = (PT00_DESCRIPTOR)buffer;

	pT01 = (PT01_DESCRIPTOR)(buffer+4);

	pNextT00 = (PT00_DESCRIPTOR)(buffer+OffsetSize);

	pT00 = (struct T00_descriptor *)buffer;

	pT01 = (struct T01_descriptor *)(buffer+4);

	pNextT00 = (struct T00_descriptor *)(buffer+OffsetSize);



	if( buffer[ DOT_11_DA_OFFSET+8 ] & 0x1 ) /* +8 for USB hdr */

		boGroupAddr = true;
@@ -176,9 +176,9 @@ static void Mds_DurationSet(struct wbsoft_priv *adapter, struct wb35_descriptor 
			/* ----end 20061009 add by anson's endian */



			buffer += OffsetSize;

			pT01 = (PT01_DESCRIPTOR)(buffer+4);

			pT01 = (struct T01_descriptor *)(buffer+4);

			if (i != 1)	/* The last fragment will not have the next fragment */

				pNextT00 = (PT00_DESCRIPTOR)(buffer+OffsetSize);

				pNextT00 = (struct T00_descriptor *)(buffer+OffsetSize);

		}



		/*******************************************
@@ -219,7 +219,7 @@ static void Mds_DurationSet(struct wbsoft_priv *adapter, struct wb35_descriptor 
/* The function return the 4n size of usb pk */

static u16 Mds_BodyCopy(struct wbsoft_priv *adapter, struct wb35_descriptor *pDes, u8 *TargetBuffer)

{

	PT00_DESCRIPTOR	pT00;

	struct T00_descriptor *pT00;

	struct wb35_mds *pMds = &adapter->Mds;

	u8	*buffer;

	u8	*src_buffer;
@@ -234,9 +234,9 @@ static u16 Mds_BodyCopy(struct wbsoft_priv *adapter, struct wb35_descriptor *pDe 
	SizeLeft = pDes->buffer_total_size;

	buf_index = pDes->buffer_start_index;



	pT00 = (PT00_DESCRIPTOR)buffer;

	pT00 = (struct T00_descriptor *)buffer;

	while (SizeLeft) {

		pT00 = (PT00_DESCRIPTOR)buffer;

		pT00 = (struct T00_descriptor *)buffer;

		CopySize = SizeLeft;

		if (SizeLeft > pDes->FragmentThreshold) {

			CopySize = pDes->FragmentThreshold;
@@ -303,7 +303,7 @@ static u16 Mds_BodyCopy(struct wbsoft_priv *adapter, struct wb35_descriptor *pDe 
		if (SizeLeft) {

			buffer = TargetBuffer + Size; /* Get the next 4n start address */

			memcpy( buffer, TargetBuffer, 32 ); /* Copy 8B USB +24B 802.11 */

			pT00 = (PT00_DESCRIPTOR)buffer;

			pT00 = (struct T00_descriptor *)buffer;

			pT00->T00_first_mpdu = 0;

		}
@@ -322,8 +322,8 @@ static void Mds_HeaderCopy(struct wbsoft_priv *adapter, struct wb35_descriptor * 
{

	struct wb35_mds *pMds = &adapter->Mds;

	u8	*src_buffer = pDes->buffer_address[0]; /* 931130.5.g */

	PT00_DESCRIPTOR	pT00;

	PT01_DESCRIPTOR	pT01;

	struct T00_descriptor *pT00;

	struct T01_descriptor *pT01;

	u16	stmp;

	u8	i, ctmp1, ctmp2, ctmpf;

	u16	FragmentThreshold = CURRENT_FRAGMENT_THRESHOLD;
@@ -333,9 +333,9 @@ static void Mds_HeaderCopy(struct wbsoft_priv *adapter, struct wb35_descriptor * 
	/*

	 * Set USB header 8 byte

	 */

	pT00 = (PT00_DESCRIPTOR)TargetBuffer;

	pT00 = (struct T00_descriptor *)TargetBuffer;

	TargetBuffer += 4;

	pT01 = (PT01_DESCRIPTOR)TargetBuffer;

	pT01 = (struct T01_descriptor *)TargetBuffer;

	TargetBuffer += 4;



	pT00->value = 0; /* Clear */
@@ -550,7 +550,7 @@ Mds_Tx(struct wbsoft_priv *adapter) 
}



void

Mds_SendComplete(struct wbsoft_priv *adapter, PT02_DESCRIPTOR pT02)

Mds_SendComplete(struct wbsoft_priv *adapter, struct T02_descriptor *pT02)

{

	struct wb35_mds *pMds = &adapter->Mds;

	struct hw_data *pHwData = &adapter->sHwData;

drivers/staging/winbond/mds_f.h

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
unsigned char Mds_initial(struct wbsoft_priv *adapter);

void Mds_Destroy(struct wbsoft_priv *adapter);

void Mds_Tx(struct wbsoft_priv *adapter);

void Mds_SendComplete(struct wbsoft_priv *adapter, PT02_DESCRIPTOR pt02);

void Mds_SendComplete(struct wbsoft_priv *adapter, struct T02_descriptor *pt02);

void Mds_MpduProcess(struct wbsoft_priv *adapter, struct wb35_descriptor *prxdes);

extern void DataDmp(u8 *pdata, u32 len, u32 offset);