[PATCH 01/26] w35und: Remove unused struct _RXLAYER1

[PATCH 01/26] w35und: Remove unused struct _RXLAYER1

[Pekka Enberg]

Cc: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
---
 drivers/staging/winbond/mds_f.h |    3 ---
 drivers/staging/winbond/mds_s.h |   28 ----------------------------
 2 files changed, 0 insertions(+), 31 deletions(-)

diff --git a/drivers/staging/winbond/mds_f.h b/drivers/staging/winbond/mds_f.h
index ab1ea53..e09dd4b 100644
--- a/drivers/staging/winbond/mds_f.h
+++ b/drivers/staging/winbond/mds_f.h
@@ -11,9 +11,6 @@ void Mds_SendComplete(  struct wbsoft_priv *adapter,  PT02_DESCRIPTOR pT02 );
 void Mds_MpduProcess(  struct wbsoft_priv *adapter,  struct wb35_descriptor *pRxDes );
 extern void DataDmp(u8 *pdata, u32 len, u32 offset);
 
-// For Asynchronous indicating. The routine collocates with USB.
-void Mds_MsduProcess(  struct wbsoft_priv *adapter,  PRXLAYER1 pRxLayer1,  u8 SlotIndex);
-
 // For data frame sending 20060802
 u16 MDS_GetPacketSize(  struct wbsoft_priv *adapter );
 void MDS_GetNextPacket(  struct wbsoft_priv *adapter,  struct wb35_descriptor *pDes );
diff --git a/drivers/staging/winbond/mds_s.h b/drivers/staging/winbond/mds_s.h
index e8e13bd..217ff08 100644
--- a/drivers/staging/winbond/mds_s.h
+++ b/drivers/staging/winbond/mds_s.h
@@ -133,32 +133,4 @@ struct wb35_mds {
 
 };
 
-//
-// Reveive Layer 1 Format.
-//----------------------------
-typedef struct _RXLAYER1
-{
-    u16  SequenceNumber;     // The sequence number of the last received packet.
-	u16	BufferTotalSize;
-
-	u32	InUsed;
-    u32   DecryptionMethod;   // The desired defragment number of the next incoming packet.
-
-	u8	DeFragmentNumber;
-	u8	FrameType;
-    u8	TypeEncapsulated;
-	u8	BufferNumber;
-
-	u32	FirstFrameArrivedTime;
-
-	u8		LastFrameType; // 20061004 for fix intel 3945 's bug
-	u8		RESERVED[3];  //@@ anson
-
-	/////////////////////////////////////////////////////////////////////////////////////////////
-	// For brand-new Rx system
-	u8	ReservedBuffer[ 2400 ];//If Buffer ID is reserved one, it must copy the data into this area
-	u8	*ReservedBufferPoint;// Point to the next availabe address of reserved buffer
-
-}RXLAYER1, * PRXLAYER1;
-
 #endif
-- 
1.6.3.3

[PATCH 02/26] w35und: Remove unused struct _EVENTLOG

[Pekka Enberg]

Cc: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
---
 drivers/staging/winbond/localpara.h |    9 ---------
 1 files changed, 0 insertions(+), 9 deletions(-)

diff --git a/drivers/staging/winbond/localpara.h b/drivers/staging/winbond/localpara.h
index 5626a76..bdce73c 100644
--- a/drivers/staging/winbond/localpara.h
+++ b/drivers/staging/winbond/localpara.h
@@ -110,13 +110,6 @@
 // 20061108 WPS IE buffer
 #define MAX_IE_APPEND_SIZE					256 + 4 // Due to [E id][Length][OUI][Data] may 257 bytes
 
-typedef struct _EVENTLOG
-{
-	u16		Count;			//Total count from start
-	u16		index;			//Buffer index, 0 ~ 63
-	u32		EventValue[64];	//BYTE 3~2 : count, BYTE 1 : Event, BYTE 0 : reason
-} Event_Log, *pEvent_Log;
-
 typedef struct _ChanInfo
 {
 	u8		band;
@@ -264,8 +257,6 @@ typedef struct LOCAL_PARA
     u32         bToSelfPacketReceived;
     u32         WepKeyDetectTimerCount;
 
-	Event_Log	EventLog;
-
 	u16		SignalLostTh;
 	u16		SignalRoamTh;
 
-- 
1.6.3.3

[PATCH 03/26] w35und: Remove unused struct _CHAN_LIST

[Pekka Enberg]

Cc: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
---
 drivers/staging/winbond/localpara.h |    7 -------
 drivers/staging/winbond/scan_s.h    |    2 --
 2 files changed, 0 insertions(+), 9 deletions(-)

diff --git a/drivers/staging/winbond/localpara.h b/drivers/staging/winbond/localpara.h
index bdce73c..54ab3b7 100644
--- a/drivers/staging/winbond/localpara.h
+++ b/drivers/staging/winbond/localpara.h
@@ -116,12 +116,6 @@ typedef struct _ChanInfo
 	u8		ChanNo;
 } ChanInfo, *pChanInfo;
 
-typedef struct _CHAN_LIST
-{
-	u16				Count;
-	ChanInfo		Channel[50]; // 100B
-} CHAN_LIST, *psCHAN_LIST;
-
 typedef struct _RadioOff
 {
 	u8			boHwRadioOff;
@@ -250,7 +244,6 @@ typedef struct LOCAL_PARA
 	u8		reserved_5[2];		//It may not be used after considering RF type,
 									//region and modulation type.
 
-	CHAN_LIST	sSupportChanList;	// 86B. It will be obtained according to RF type and region
 	u8		reserved_6[2];		//two variables are for wep key error detection added by ws 02/02/04
 
     u32	      bWepKeyError;
diff --git a/drivers/staging/winbond/scan_s.h b/drivers/staging/winbond/scan_s.h
index 775bb81..d35f194 100644
--- a/drivers/staging/winbond/scan_s.h
+++ b/drivers/staging/winbond/scan_s.h
@@ -34,8 +34,6 @@
 typedef struct _SCAN_REQ_PARA	//mandatory parameters for SCAN request
 {
 	u32				ScanType;			//passive/active scan
-
-	CHAN_LIST		sChannelList;	// 86B
 	u8			reserved_1[2];
 
 	struct SSID_Element	sSSID; // 34B. scan only for this SSID
-- 
1.6.3.3

[PATCH 04/26] w35und: Remove unused enum enum_PowerManagementMode

[Pekka Enberg]

Cc: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
---
 drivers/staging/winbond/mac_structures.h |    7 -------
 1 files changed, 0 insertions(+), 7 deletions(-)

diff --git a/drivers/staging/winbond/mac_structures.h b/drivers/staging/winbond/mac_structures.h
index 0d16196..8a9c5e8 100644
--- a/drivers/staging/winbond/mac_structures.h
+++ b/drivers/staging/winbond/mac_structures.h
@@ -116,13 +116,6 @@
 #define WLAN_MAX_PAIRWISE_CIPHER_SUITE_COUNT    ((u16) 6)
 #define WLAN_MAX_AUTH_KEY_MGT_SUITE_LIST_COUNT  ((u16) 2)
 
-//========================================================
-typedef enum enum_PowerManagementMode
-{
-    ACTIVE = 0,
-    POWER_SAVE
-} WB_PM_Mode, *PWB_PM_MODE;
-
 //===================================================================
 //  Reason Code (Table 18): indicate the reason of DisAssoc, DeAuthen
 //  length of ReasonCode is 2 Octs.
-- 
1.6.3.3

[PATCH 05/26] w35und: Remove unused enum enum_TxRate

[Pekka Enberg]

Cc: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
---
 drivers/staging/winbond/mac_structures.h |   18 ------------------
 1 files changed, 0 insertions(+), 18 deletions(-)

diff --git a/drivers/staging/winbond/mac_structures.h b/drivers/staging/winbond/mac_structures.h
index 8a9c5e8..861b471 100644
--- a/drivers/staging/winbond/mac_structures.h
+++ b/drivers/staging/winbond/mac_structures.h
@@ -175,24 +175,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
-- 
1.6.3.3

[PATCH 06/26] w35und: Remove unused struct _PMKID

[Pekka Enberg]

Cc: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
---
 drivers/staging/winbond/mac_structures.h |   11 -----------
 1 files changed, 0 insertions(+), 11 deletions(-)

diff --git a/drivers/staging/winbond/mac_structures.h b/drivers/staging/winbond/mac_structures.h
index 861b471..5d2d642 100644
--- a/drivers/staging/winbond/mac_structures.h
+++ b/drivers/staging/winbond/mac_structures.h
@@ -480,11 +480,6 @@ struct RSN_Capability_Element
 }__attribute__ ((packed)) ;
 
 #ifdef _WPA2_
-typedef struct _PMKID
-{
-  u8 pValue[16];
-}PMKID;
-
 struct	WPA2_RSN_Information_Element
 {
 	u8					Element_ID;
@@ -503,12 +498,6 @@ struct WPA2_RSN_Auth_Sub_Information_Element
 }__attribute__ ((packed));
 
 
-struct PMKID_Information_Element
-{
-	u16				PMKID_Count;
-	PMKID pmkid [16] ;
-}__attribute__ ((packed));
-
 #endif //enddef _WPA2_
 //============================================================
 // MAC Frame structure (different type) and subfield structure
-- 
1.6.3.3

[PATCH 07/26] w35und: Remove unused struct _SUITE_SELECTOR_

[Pekka Enberg]

Cc: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
---
 drivers/staging/winbond/mac_structures.h |   50 ------------------------------
 1 files changed, 0 insertions(+), 50 deletions(-)

diff --git a/drivers/staging/winbond/mac_structures.h b/drivers/staging/winbond/mac_structures.h
index 5d2d642..12013d8 100644
--- a/drivers/staging/winbond/mac_structures.h
+++ b/drivers/staging/winbond/mac_structures.h
@@ -418,36 +418,6 @@ struct Extended_Supported_Rates_Element
 #define OUI_CIPHER_CCMP				0x04
 #define OUI_CIPHER_WEP_104			0x05
 
-typedef struct _SUITE_SELECTOR_
-{
-	union
-	{
-		u8	Value[4];
-		struct _SUIT_
-		{
-			u8	OUI[3];
-			u8	Type;
-		}SuitSelector;
-	};
-}SUITE_SELECTOR;
-
-//--  WPA  --
-struct	RSN_Information_Element
-{
-	u8					Element_ID;
-	u8					Length;
-	SUITE_SELECTOR	OuiWPAAdditional;//WPA version 2.0 additional field, and should be 00:50:F2:01
-	u16					Version;
-	SUITE_SELECTOR		GroupKeySuite;
-	u16					PairwiseKeySuiteCount;
-	SUITE_SELECTOR		PairwiseKeySuite[1];
-}__attribute__ ((packed));
-struct RSN_Auth_Sub_Information_Element
-{
-	u16				AuthKeyMngtSuiteCount;
-	SUITE_SELECTOR	AuthKeyMngtSuite[1];
-}__attribute__ ((packed));
-
 //--  WPA2  --
 struct RSN_Capability_Element
 {
@@ -479,26 +449,6 @@ struct RSN_Capability_Element
   }__attribute__ ((packed)) ;
 }__attribute__ ((packed)) ;
 
-#ifdef _WPA2_
-struct	WPA2_RSN_Information_Element
-{
-	u8					Element_ID;
-	u8					Length;
-	u16					Version;
-	SUITE_SELECTOR		GroupKeySuite;
-	u16					PairwiseKeySuiteCount;
-	SUITE_SELECTOR		PairwiseKeySuite[1];
-
-}__attribute__ ((packed));
-
-struct WPA2_RSN_Auth_Sub_Information_Element
-{
-	u16				AuthKeyMngtSuiteCount;
-	SUITE_SELECTOR	AuthKeyMngtSuite[1];
-}__attribute__ ((packed));
-
-
-#endif //enddef _WPA2_
 //============================================================
 // MAC Frame structure (different type) and subfield structure
 //============================================================
-- 
1.6.3.3

[PATCH 08/26] w35und: Remove unused typedef TXRETRY_REC

[Pekka Enberg]

Cc: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
---
 drivers/staging/winbond/mto.h |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/winbond/mto.h b/drivers/staging/winbond/mto.h
index 4fe24b0..fb4781d 100644
--- a/drivers/staging/winbond/mto.h
+++ b/drivers/staging/winbond/mto.h
@@ -141,11 +141,6 @@ extern u16  MTO_Frag_Th_Tbl[];
 #define MTO_DATA_RATE()          MTO_Data_Rate_Tbl[MTO_RATE_LEVEL()]
 #define MTO_FRAG_TH()            MTO_Frag_Th_Tbl[MTO_FRAG_TH_LEVEL()]
 
-typedef struct {
-	u8 tx_rate;
-	u8 tx_retry_rate;
-} TXRETRY_REC;
-
 extern void MTO_Init(struct wbsoft_priv *);
 extern void MTO_PeriodicTimerExpired(struct wbsoft_priv *);
 extern void MTO_SetDTORateRange(struct wbsoft_priv *, u8 *, u8);
-- 
1.6.3.3

[PATCH 09/26] w35und: Remove unused struct _Reason_Code

[Pekka Enberg]

Cc: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
---
 drivers/staging/winbond/mlme_s.h |    8 --------
 1 files changed, 0 insertions(+), 8 deletions(-)

diff --git a/drivers/staging/winbond/mlme_s.h b/drivers/staging/winbond/mlme_s.h
index ea12684..1217a1c 100644
--- a/drivers/staging/winbond/mlme_s.h
+++ b/drivers/staging/winbond/mlme_s.h
@@ -165,14 +165,6 @@ typedef struct _AUTHREQ {
 
 } MLME_AUTHREQ_PARA, *psMLME_AUTHREQ_PARA;
 
-struct _Reason_Code {
-
-	u8	peerMACaddr[MAC_ADDR_LENGTH];
-	u16	wReasonCode;
-};
-typedef struct _Reason_Code MLME_DEAUTHREQ_PARA, *psMLME_DEAUTHREQ_PARA;
-typedef struct _Reason_Code MLME_DISASSOCREQ_PARA, *psMLME_DISASSOCREQ_PARA;
-
 typedef struct _ASSOCREQ {
   u8       PeerSTAAddr[MAC_ADDR_LENGTH];
   u16       CapabilityInfo;
-- 
1.6.3.3

[PATCH 10/26] w35und: Remove unused struct _SCAN_REQ_PARA

[Pekka Enberg]

Cc: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
---
 drivers/staging/winbond/scan_s.h |   54 --------------------------------------
 1 files changed, 0 insertions(+), 54 deletions(-)

diff --git a/drivers/staging/winbond/scan_s.h b/drivers/staging/winbond/scan_s.h
index d35f194..a577884 100644
--- a/drivers/staging/winbond/scan_s.h
+++ b/drivers/staging/winbond/scan_s.h
@@ -31,60 +31,6 @@
 
 ///////////////////////////////////////////////////////////////////////////
 //Global data structures, Initial Scan & Background Scan
-typedef struct _SCAN_REQ_PARA	//mandatory parameters for SCAN request
-{
-	u32				ScanType;			//passive/active scan
-	u8			reserved_1[2];
-
-	struct SSID_Element	sSSID; // 34B. scan only for this SSID
-	u8			reserved_2[2];
-
-} SCAN_REQ_PARA, *psSCAN_REQ_PARA;
-
-typedef struct _SCAN_PARAMETERS
-{
-	u16				wState;
-	u16				iCurrentChannelIndex;
-
-	SCAN_REQ_PARA	sScanReq;
-
-	u8				BSSID[MAC_ADDR_LENGTH + 2];		//scan only for this BSSID
-
-	u32				BssType;						//scan only for this BSS type
-
-	//struct SSID_Element	sSSID;						//scan only for this SSID
-	u16				ProbeDelay;
-	u16				MinChannelTime;
-
-	u16				MaxChannelTime;
-	u16				reserved_1;
-
-    s32				iBgScanPeriod;				// XP: 5 sec
-
-    u8				boBgScan;					// Wb: enable BG scan, For XP, this value must be FALSE
-    u8				boFastScan;					// Wb: reserved
-	u8				boCCAbusy;					// Wb: HWMAC CCA busy status
-	u8				reserved_2;
-
-	struct timer_list timer;
-
-	u32				ScanTimeStamp;			//Increase 1 per background scan(1 minute)
-	u32				BssTimeStamp;			//Increase 1 per connect status check
-	u32				RxNumPerAntenna[2];		//
-
-	u8				AntennaToggle;			//
-	u8				boInTimerHandler;
-	u8 				boTimerActive;				// Wb: reserved
-	u8				boSave;
-
-	u32				BScanEnable; // Background scan enable. Default is On
-
-} SCAN_PARAMETERS, *psSCAN_PARAMETERS;
-
-// Encapsulate 'adapter' data structure
-#define psSCAN			(&(adapter->sScanPara))
-#define psSCANREQ			(&(adapter->sScanPara.sScanReq))
-
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //	scan.h
 //		Define the related definitions of scan module
-- 
1.6.3.3

[PATCH 11/26] w35und: Remove unused header file scan_s.h

[Pekka Enberg]

Cc: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
---
 drivers/staging/winbond/mds_s.h  |    1 -
 drivers/staging/winbond/scan_s.h |   65 --------------------------------------
 2 files changed, 0 insertions(+), 66 deletions(-)
 delete mode 100644 drivers/staging/winbond/scan_s.h

diff --git a/drivers/staging/winbond/mds_s.h b/drivers/staging/winbond/mds_s.h
index 217ff08..2b1f3a6 100644
--- a/drivers/staging/winbond/mds_s.h
+++ b/drivers/staging/winbond/mds_s.h
@@ -7,7 +7,6 @@
 
 #include "localpara.h"
 #include "mac_structures.h"
-#include "scan_s.h"
 
 /* Preamble_Type, see <SFS-802.11G-MIB-203> */
 enum {
diff --git a/drivers/staging/winbond/scan_s.h b/drivers/staging/winbond/scan_s.h
deleted file mode 100644
index a577884..0000000
--- a/drivers/staging/winbond/scan_s.h
+++ /dev/null
@@ -1,65 +0,0 @@
-#ifndef __WINBOND_SCAN_S_H
-#define __WINBOND_SCAN_S_H
-
-#include <linux/types.h>
-#include "localpara.h"
-
-//
-// SCAN task global CONSTANTS, STRUCTURES, variables
-//
-
-//////////////////////////////////////////////////////////////////////////
-//define the msg type of SCAN module
-#define SCANMSG_SCAN_REQ			0x01
-#define SCANMSG_BEACON				0x02
-#define SCANMSG_PROBE_RESPONSE		0x03
-#define SCANMSG_TIMEOUT				0x04
-#define SCANMSG_TXPROBE_FAIL		0x05
-#define SCANMSG_ENABLE_BGSCAN		0x06
-#define SCANMSG_STOP_SCAN			0x07
-
-// BSS Type =>conform to
-// IBSS             : ToDS/FromDS = 00
-// Infrastructure   : ToDS/FromDS = 01
-#define IBSS_NET			0
-#define ESS_NET				1
-#define ANYBSS_NET			2
-
-// Scan Type
-#define ACTIVE_SCAN			0
-#define PASSIVE_SCAN		1
-
-///////////////////////////////////////////////////////////////////////////
-//Global data structures, Initial Scan & Background Scan
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-//	scan.h
-//		Define the related definitions of scan module
-//	history -- 01/14/03' created
-//
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-//Define the state of scan module
-#define SCAN_INACTIVE						0
-#define WAIT_PROBE_DELAY					1
-#define WAIT_RESPONSE_MIN					2
-#define WAIT_RESPONSE_MAX_ACTIVE			3
-#define WAIT_BEACON_MAX_PASSIVE				4
-#define SCAN_COMPLETE						5
-#define BG_SCAN								6
-#define BG_SCANNING							7
-
-
-// The value will load from EEPROM
-// If 0xff is set in EEPOM, the driver will use SCAN_MAX_CHNL_TIME instead.
-// The definition is in WbHal.h
-//	#define SCAN_MAX_CHNL_TIME				(50)
-
-
-
-// static functions
-
-//static void ScanTimerHandler(struct wbsoft_priv * adapter);
-//static void vScanTimerStart(struct wbsoft_priv *	adapter, int timeout_value);
-//static void vScanTimerStop(struct wbsoft_priv * adapter);
-
-#endif
-- 
1.6.3.3

[PATCH 12/26] w35und: Remove unused structs _AUTHREQ, _ASSOCREQ, and _REASSOCREQ

[Pekka Enberg]

Cc: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
---
 drivers/staging/winbond/mlme_s.h |   21 ---------------------
 1 files changed, 0 insertions(+), 21 deletions(-)

diff --git a/drivers/staging/winbond/mlme_s.h b/drivers/staging/winbond/mlme_s.h
index 1217a1c..cab3b38 100644
--- a/drivers/staging/winbond/mlme_s.h
+++ b/drivers/staging/winbond/mlme_s.h
@@ -158,27 +158,6 @@ typedef struct _MLME_FRAME
                     	            //  excluding the discarded
 } MLME_FRAME, *psMLME_FRAME;
 
-typedef struct _AUTHREQ {
-
-	u8 	peerMACaddr[MAC_ADDR_LENGTH];
-	u16	wAuthAlgorithm;
-
-} MLME_AUTHREQ_PARA, *psMLME_AUTHREQ_PARA;
-
-typedef struct _ASSOCREQ {
-  u8       PeerSTAAddr[MAC_ADDR_LENGTH];
-  u16       CapabilityInfo;
-  u16       ListenInterval;
-
-}__attribute__ ((packed)) MLME_ASSOCREQ_PARA, *psMLME_ASSOCREQ_PARA;
-
-typedef struct _REASSOCREQ {
-  u8       NewAPAddr[MAC_ADDR_LENGTH];
-  u16       CapabilityInfo;
-  u16       ListenInterval;
-
-}__attribute__ ((packed)) MLME_REASSOCREQ_PARA, *psMLME_REASSOCREQ_PARA;
-
 typedef struct _MLMECALLBACK {
 
   u8 	*psFramePtr;
-- 
1.6.3.3

[PATCH 13/26] w35und: Remove unused struct _MLMECALLBACK

[Pekka Enberg]

Cc: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
---
 drivers/staging/winbond/mlme_s.h   |    7 -------
 drivers/staging/winbond/mlmetxrx.c |    5 -----
 2 files changed, 0 insertions(+), 12 deletions(-)

diff --git a/drivers/staging/winbond/mlme_s.h b/drivers/staging/winbond/mlme_s.h
index cab3b38..2126d13 100644
--- a/drivers/staging/winbond/mlme_s.h
+++ b/drivers/staging/winbond/mlme_s.h
@@ -158,13 +158,6 @@ typedef struct _MLME_FRAME
                     	            //  excluding the discarded
 } MLME_FRAME, *psMLME_FRAME;
 
-typedef struct _MLMECALLBACK {
-
-  u8 	*psFramePtr;
-  u8		bResult;
-
-} MLME_TXCALLBACK, *psMLME_TXCALLBACK;
-
 typedef struct _RXDATA
 {
 	s32		FrameLength;
diff --git a/drivers/staging/winbond/mlmetxrx.c b/drivers/staging/winbond/mlmetxrx.c
index f856b94..4f16121 100644
--- a/drivers/staging/winbond/mlmetxrx.c
+++ b/drivers/staging/winbond/mlmetxrx.c
@@ -76,15 +76,10 @@ static void MLMEfreeMMPDUBuffer(struct wbsoft_priv *adapter, s8 *pData)
 void
 MLME_SendComplete(struct wbsoft_priv * adapter, u8 PacketID, unsigned char SendOK)
 {
-	MLME_TXCALLBACK	TxCallback;
-
     // Reclaim the data buffer
 	adapter->sMlmeFrame.len = 0;
 	MLMEfreeMMPDUBuffer( adapter, adapter->sMlmeFrame.pMMPDU );
 
-
-	TxCallback.bResult = MLME_SUCCESS;
-
 	// Return resource
 	adapter->sMlmeFrame.IsInUsed = PACKET_FREE_TO_USE;
 }
-- 
1.6.3.3

[PATCH 14/26] w35und: Convert ChanInfo typedef to struct wb35_chan_info

[Pekka Enberg]

Cc: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
---
 drivers/staging/winbond/localpara.h |    9 ++++-----
 drivers/staging/winbond/reg.c       |   10 +++++-----
 drivers/staging/winbond/sme_api.h   |    2 +-
 drivers/staging/winbond/wb35reg_f.h |    2 +-
 drivers/staging/winbond/wbusb.c     |    8 ++++----
 5 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/drivers/staging/winbond/localpara.h b/drivers/staging/winbond/localpara.h
index 54ab3b7..7f22f5b 100644
--- a/drivers/staging/winbond/localpara.h
+++ b/drivers/staging/winbond/localpara.h
@@ -110,11 +110,10 @@
 // 20061108 WPS IE buffer
 #define MAX_IE_APPEND_SIZE					256 + 4 // Due to [E id][Length][OUI][Data] may 257 bytes
 
-typedef struct _ChanInfo
-{
+struct wb35_chan_info {
 	u8		band;
 	u8		ChanNo;
-} ChanInfo, *pChanInfo;
+};
 
 typedef struct _RadioOff
 {
@@ -183,7 +182,7 @@ typedef struct LOCAL_PARA
 	u8			RoamStatus;
 	u8			reserved7[3];
 
-	ChanInfo	CurrentChan;			//Current channel no. and channel band. It may be changed by scanning.
+	struct wb35_chan_info	CurrentChan;			//Current channel no. and channel band. It may be changed by scanning.
 	u8			boHandover;				// Roaming, Hnadover to other AP.
 	u8			boCCAbusy;
 
@@ -240,7 +239,7 @@ typedef struct LOCAL_PARA
     u32	   		_dot11WEPUndecryptableCount;
     u32	   		_dot11FrameDuplicateCount;
 
-	ChanInfo	IbssChanSetting;	// 2B. Start IBSS Channel setting by registry or WWU.
+	struct wb35_chan_info	IbssChanSetting;	// 2B. Start IBSS Channel setting by registry or WWU.
 	u8		reserved_5[2];		//It may not be used after considering RF type,
 									//region and modulation type.
 
diff --git a/drivers/staging/winbond/reg.c b/drivers/staging/winbond/reg.c
index d915cbd..ebfbe1d 100644
--- a/drivers/staging/winbond/reg.c
+++ b/drivers/staging/winbond/reg.c
@@ -1823,12 +1823,12 @@ BBProcessor_initial(  struct hw_data * pHwData )
 		reg->SQ3_filter[i] = 0x2f; // half of Bit 0 ~ 6
 }
 
-void set_tx_power_per_channel_max2829(  struct hw_data * pHwData,  ChanInfo Channel)
+void set_tx_power_per_channel_max2829(  struct hw_data * pHwData,  struct wb35_chan_info Channel)
 {
 	RFSynthesizer_SetPowerIndex( pHwData, 100 ); // 20060620.1 Modify
 }
 
-void set_tx_power_per_channel_al2230(  struct hw_data * pHwData,  ChanInfo Channel )
+void set_tx_power_per_channel_al2230(  struct hw_data * pHwData,  struct wb35_chan_info Channel )
 {
 	u8	index = 100;
 
@@ -1838,7 +1838,7 @@ void set_tx_power_per_channel_al2230(  struct hw_data * pHwData,  ChanInfo Chann
 	RFSynthesizer_SetPowerIndex( pHwData, index );
 }
 
-void set_tx_power_per_channel_al7230(  struct hw_data * pHwData,  ChanInfo Channel)
+void set_tx_power_per_channel_al7230(  struct hw_data * pHwData,  struct wb35_chan_info Channel)
 {
 	u8	i, index = 100;
 
@@ -1868,7 +1868,7 @@ void set_tx_power_per_channel_al7230(  struct hw_data * pHwData,  ChanInfo Chann
 	RFSynthesizer_SetPowerIndex( pHwData, index );
 }
 
-void set_tx_power_per_channel_wb242(  struct hw_data * pHwData,  ChanInfo Channel)
+void set_tx_power_per_channel_wb242(  struct hw_data * pHwData,  struct wb35_chan_info Channel)
 {
 	u8	index = 100;
 
@@ -1901,7 +1901,7 @@ void set_tx_power_per_channel_wb242(  struct hw_data * pHwData,  ChanInfo Channe
 //   None.
 //=============================================================================================================
 void
-RFSynthesizer_SwitchingChannel(  struct hw_data * pHwData,  ChanInfo Channel )
+RFSynthesizer_SwitchingChannel(  struct hw_data * pHwData,  struct wb35_chan_info Channel )
 {
 	struct wb35_reg *reg = &pHwData->reg;
 	u32	pltmp[16]; // The 16 is the maximum capability of hardware
diff --git a/drivers/staging/winbond/sme_api.h b/drivers/staging/winbond/sme_api.h
index 5498783..4a60aca 100644
--- a/drivers/staging/winbond/sme_api.h
+++ b/drivers/staging/winbond/sme_api.h
@@ -203,7 +203,7 @@ void sme_get_rx_antenna(void *pcore_data, u32 *RxAntenna);
 u8 sme_set_rx_antenna(void *pcore_data, u32 RxAntenna);
 void sme_get_tx_antenna(void *pcore_data, u32 *TxAntenna);
 s8 sme_set_tx_antenna(void *pcore_data, u32 TxAntenna);
-s8 sme_set_IBSS_chan(void *pcore_data, ChanInfo chan);
+s8 sme_set_IBSS_chan(void *pcore_data, struct wb35_chan_info chan);
 
 //20061108 WPS
 s8 sme_set_IE_append(void *pcore_data, u8 *buffer, u16 buf_len);
diff --git a/drivers/staging/winbond/wb35reg_f.h b/drivers/staging/winbond/wb35reg_f.h
index 30f5b5a..1b5d065 100644
--- a/drivers/staging/winbond/wb35reg_f.h
+++ b/drivers/staging/winbond/wb35reg_f.h
@@ -14,7 +14,7 @@ void Dxx_initial(  struct hw_data * pHwData );
 void Mxx_initial(  struct hw_data * pHwData );
 void RFSynthesizer_initial(  struct hw_data * pHwData );
 //void RFSynthesizer_SwitchingChannel(  struct hw_data * pHwData,  s8 Channel );
-void RFSynthesizer_SwitchingChannel(  struct hw_data * pHwData,  ChanInfo Channel );
+void RFSynthesizer_SwitchingChannel(  struct hw_data * pHwData,  struct wb35_chan_info Channel );
 void BBProcessor_initial(  struct hw_data * pHwData );
 void BBProcessor_RateChanging(  struct hw_data * pHwData,  u8 rate ); // 20060613.1
 //void RF_RateChanging(  struct hw_data * pHwData,  u8 rate ); // 20060626.5.c Add
diff --git a/drivers/staging/winbond/wbusb.c b/drivers/staging/winbond/wbusb.c
index 067082a..944d1b4 100644
--- a/drivers/staging/winbond/wbusb.c
+++ b/drivers/staging/winbond/wbusb.c
@@ -161,7 +161,7 @@ static void hal_set_radio_mode(struct hw_data *pHwData, unsigned char radio_off)
 }
 
 static void
-hal_set_current_channel_ex(struct hw_data *pHwData, ChanInfo channel)
+hal_set_current_channel_ex(struct hw_data *pHwData, struct wb35_chan_info channel)
 {
 	struct wb35_reg *reg = &pHwData->reg;
 
@@ -180,10 +180,10 @@ hal_set_current_channel_ex(struct hw_data *pHwData, ChanInfo channel)
 	reg->M28_MacControl &= ~0xff;	// Clean channel information field
 	reg->M28_MacControl |= channel.ChanNo;
 	Wb35Reg_WriteWithCallbackValue(pHwData, 0x0828, reg->M28_MacControl,
-				       (s8 *) & channel, sizeof(ChanInfo));
+				       (s8 *) & channel, sizeof(struct wb35_chan_info));
 }
 
-static void hal_set_current_channel(struct hw_data *pHwData, ChanInfo channel)
+static void hal_set_current_channel(struct hw_data *pHwData, struct wb35_chan_info channel)
 {
 	hal_set_current_channel_ex(pHwData, channel);
 }
@@ -253,7 +253,7 @@ static void hal_set_accept_beacon(struct hw_data *pHwData, u8 enable)
 static int wbsoft_config(struct ieee80211_hw *dev, u32 changed)
 {
 	struct wbsoft_priv *priv = dev->priv;
-	ChanInfo ch;
+	struct wb35_chan_info ch;
 
 	printk("wbsoft_config called\n");
 
-- 
1.6.3.3

[PATCH 15/26] w35und: Convert RadioOff typedef to struct wb35_radio_off

[Pekka Enberg]

Cc: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
---
 drivers/staging/winbond/localpara.h |    7 +++----
 drivers/staging/winbond/sme_api.h   |    4 ++--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/winbond/localpara.h b/drivers/staging/winbond/localpara.h
index 7f22f5b..ebce37f 100644
--- a/drivers/staging/winbond/localpara.h
+++ b/drivers/staging/winbond/localpara.h
@@ -115,11 +115,10 @@ struct wb35_chan_info {
 	u8		ChanNo;
 };
 
-typedef struct _RadioOff
-{
+struct wb35_radio_off {
 	u8			boHwRadioOff;
 	u8			boSwRadioOff;
-} RadioOff, *psRadioOff;
+};
 
 //===========================================================================
 typedef struct LOCAL_PARA
@@ -172,7 +171,7 @@ typedef struct LOCAL_PARA
     u16			ListenInterval;     	// The listen interval when SME invoking MLME_
             	                    	// (Re)Associate_Request().
 
-	RadioOff		RadioOffStatus;
+	struct wb35_radio_off	RadioOffStatus;
 	u8			Reserved0[2];
 
 	u8			boMsRadioOff;			// Ndis demands to be true when set Disassoc. OID and be false when set SSID OID.
diff --git a/drivers/staging/winbond/sme_api.h b/drivers/staging/winbond/sme_api.h
index 4a60aca..6aba9a9 100644
--- a/drivers/staging/winbond/sme_api.h
+++ b/drivers/staging/winbond/sme_api.h
@@ -193,8 +193,8 @@ s8 sme_get_cwmin_value(void *pcore_data, u8 *cwmin);
 s8 sme_get_cwmax_value(void *pcore_data, u16 *cwmax);
 s8 sme_get_ms_radio_mode(void *pcore_data, u8 * pMsRadioOff);
 s8 sme_set_ms_radio_mode(void *pcore_data, u8 boMsRadioOff);
-s8 sme_get_radio_mode(void *pcore_data, psRadioOff pRadioOffData);
-s8 sme_set_radio_mode(void *pcore_data, RadioOff RadioOffData);
+s8 sme_get_radio_mode(void *pcore_data, struct wb35_radio_off *pRadioOffData);
+s8 sme_set_radio_mode(void *pcore_data, struct wb35_radio_off RadioOffData);
 
 void sme_get_tx_power_level(void *pcore_data, u32 *TxPower);
 u8 sme_set_tx_power_level(void *pcore_data, u32 TxPower);
-- 
1.6.3.3

[PATCH 16/26] w35und: Convert WB_LOCALDESCRIPT typedef to struct wb35_local_para

[Pekka Enberg]

Cc: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
---
 drivers/staging/winbond/core.h      |    2 +-
 drivers/staging/winbond/localpara.h |    5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/winbond/core.h b/drivers/staging/winbond/core.h
index 7d4bd5e..4dc6b71 100644
--- a/drivers/staging/winbond/core.h
+++ b/drivers/staging/winbond/core.h
@@ -14,7 +14,7 @@
 struct wbsoft_priv {
 	u32 adapterIndex;	// 20060703.4 Add for using padapterContext global adapter point
 
-	WB_LOCALDESCRIPT sLocalPara;	// Myself connected parameters
+	struct wb35_local_para sLocalPara;	// Myself connected parameters
 
 	MLME_FRAME sMlmeFrame;	// connect to peerSTA parameters
 
diff --git a/drivers/staging/winbond/localpara.h b/drivers/staging/winbond/localpara.h
index ebce37f..4e761b7 100644
--- a/drivers/staging/winbond/localpara.h
+++ b/drivers/staging/winbond/localpara.h
@@ -121,8 +121,7 @@ struct wb35_radio_off {
 };
 
 //===========================================================================
-typedef struct LOCAL_PARA
-{
+struct wb35_local_para {
 	u8			PermanentAddress[ MAC_ADDR_LENGTH + 2 ]; 	// read from EPROM, manufacture set for each NetCard
     u8    		ThisMacAddress[ MAC_ADDR_LENGTH + 2 ];			// the driver will use actually.
 
@@ -256,6 +255,6 @@ typedef struct LOCAL_PARA
 	u16		IE_Append_size;
 	u16		reserved_7;
 
-} WB_LOCALDESCRIPT, *PWB_LOCALDESCRIPT;
+};
 
 #endif
-- 
1.6.3.3

[PATCH 17/26] w35und: Convert MLME_FRAME typedef to struct wb35_mlme_frame

[Pekka Enberg]

Cc: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
---
 drivers/staging/winbond/core.h   |    2 +-
 drivers/staging/winbond/mlme_s.h |    5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/winbond/core.h b/drivers/staging/winbond/core.h
index 4dc6b71..cf09dbe 100644
--- a/drivers/staging/winbond/core.h
+++ b/drivers/staging/winbond/core.h
@@ -16,7 +16,7 @@ struct wbsoft_priv {
 
 	struct wb35_local_para sLocalPara;	// Myself connected parameters
 
-	MLME_FRAME sMlmeFrame;	// connect to peerSTA parameters
+	struct wb35_mlme_frame sMlmeFrame;	// connect to peerSTA parameters
 
 	struct wb35_mto_params sMtoPara;	// MTO_struct ...
 	struct hw_data sHwData;	//For HAL
diff --git a/drivers/staging/winbond/mlme_s.h b/drivers/staging/winbond/mlme_s.h
index 2126d13..88f9666 100644
--- a/drivers/staging/winbond/mlme_s.h
+++ b/drivers/staging/winbond/mlme_s.h
@@ -131,8 +131,7 @@
 #define boMLME_IdleScanState(_BB_)	(_BB_->wState==IDLE_SCAN)
 #define boMLME_FoundSTAinfo(_CC_)	(_CC_->wState>=IDLE_SCAN)
 
-typedef struct _MLME_FRAME
-{
+struct wb35_mlme_frame {
 	//NDIS_PACKET		MLME_Packet;
 	s8 *			pMMPDU;
 	u16			len;
@@ -156,7 +155,7 @@ typedef struct _MLME_FRAME
 	u16		wNumRxMMPDUInMLME; 	// Number of the Rx MMPDU
 	u16		reserved_1;			//  in MLME.
                     	            //  excluding the discarded
-} MLME_FRAME, *psMLME_FRAME;
+};
 
 typedef struct _RXDATA
 {
-- 
1.6.3.3

[PATCH 18/26] w35und: Remove unused struct _RXDATA

[Pekka Enberg]

Cc: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
---
 drivers/staging/winbond/mlme_s.h |    7 -------
 1 files changed, 0 insertions(+), 7 deletions(-)

diff --git a/drivers/staging/winbond/mlme_s.h b/drivers/staging/winbond/mlme_s.h
index 88f9666..f637539 100644
--- a/drivers/staging/winbond/mlme_s.h
+++ b/drivers/staging/winbond/mlme_s.h
@@ -157,11 +157,4 @@ struct wb35_mlme_frame {
                     	            //  excluding the discarded
 };
 
-typedef struct _RXDATA
-{
-	s32		FrameLength;
-	u8	__attribute__ ((packed)) *pbFramePtr;
-
-}__attribute__ ((packed)) RXDATA, *psRXDATA;
-
 #endif
-- 
1.6.3.3

[PATCH 19/26] w35und: Convert R00_DESCRIPTOR typedef to struct wb35_R00_descriptor

[Pekka Enberg]

Cc: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
---
 drivers/staging/winbond/wb35rx.c  |    2 +-
 drivers/staging/winbond/wbhal_s.h |    7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/winbond/wb35rx.c b/drivers/staging/winbond/wb35rx.c
index 4d41f6c..b7abee6 100644
--- a/drivers/staging/winbond/wb35rx.c
+++ b/drivers/staging/winbond/wb35rx.c
@@ -168,7 +168,7 @@ static void Wb35Rx_Complete(struct urb *urb)
 	u32		SizeCheck;
 	u16		BulkLength;
 	u32		RxBufferId;
-	R00_DESCRIPTOR 	R00;
+	struct wb35_R00_descriptor 	R00;
 
 	// Variable setting
 	pWb35Rx->EP3vm_state = VM_COMPLETED;
diff --git a/drivers/staging/winbond/wbhal_s.h b/drivers/staging/winbond/wbhal_s.h
index 372a05e..67cddb5 100644
--- a/drivers/staging/winbond/wbhal_s.h
+++ b/drivers/staging/winbond/wbhal_s.h
@@ -107,8 +107,7 @@ enum {
 
 #define FLAG_BAND_RX_MASK			0x10000000	//Bit 28
 
-typedef struct _R00_DESCRIPTOR
-{
+struct wb35_R00_descriptor {
 	union
 	{
 		u32	value;
@@ -132,7 +131,7 @@ typedef struct _R00_DESCRIPTOR
 		};
 		#endif
 	};
-} R00_DESCRIPTOR, *PR00_DESCRIPTOR;
+};
 
 typedef struct _T00_DESCRIPTOR
 {
@@ -332,7 +331,7 @@ struct wb35_descriptor {		// Skip length = 8 DWORD
 	// For R00 and T00 ----------------------------------------------
 	union
 	{
-		R00_DESCRIPTOR	R00;
+		struct wb35_R00_descriptor	R00;
 		T00_DESCRIPTOR	T00;
 	};
 
-- 
1.6.3.3

[PATCH 20/26] w35und: Convert R01_DESCRIPTOR typedef to struct wb35_R01_descriptor

[Pekka Enberg]

Cc: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
---
 drivers/staging/winbond/wbhal_s.h |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/winbond/wbhal_s.h b/drivers/staging/winbond/wbhal_s.h
index 67cddb5..e772fad 100644
--- a/drivers/staging/winbond/wbhal_s.h
+++ b/drivers/staging/winbond/wbhal_s.h
@@ -168,8 +168,7 @@ typedef struct _T00_DESCRIPTOR
 	};
 } T00_DESCRIPTOR, *PT00_DESCRIPTOR;
 
-typedef struct _R01_DESCRIPTOR
-{
+struct wb35_R01_descriptor {
 	union
 	{
 		u32	value;
@@ -221,7 +220,7 @@ typedef struct _R01_DESCRIPTOR
 		};
 		#endif
 	};
-} R01_DESCRIPTOR, *PR01_DESCRIPTOR;
+};
 
 typedef struct _T01_DESCRIPTOR
 {
@@ -338,7 +337,7 @@ struct wb35_descriptor {		// Skip length = 8 DWORD
 	// For R01 and T01 ----------------------------------------------
 	union
 	{
-		R01_DESCRIPTOR	R01;
+		struct wb35_R01_descriptor	R01;
 		T01_DESCRIPTOR	T01;
 	};
 
-- 
1.6.3.3

[PATCH 21/26] w35und: Convert T00_DESCRIPTOR typedef to struct wb35_T00_descriptor

[Pekka Enberg]

Cc: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
---
 drivers/staging/winbond/mds.c     |   22 +++++++++++-----------
 drivers/staging/winbond/wbhal_s.h |    7 +++----
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/drivers/staging/winbond/mds.c b/drivers/staging/winbond/mds.c
index 37e0c18..de8cec9 100644
--- a/drivers/staging/winbond/mds.c
+++ b/drivers/staging/winbond/mds.c
@@ -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;
+	struct wb35_T00_descriptor *	pT00;
 	PT01_DESCRIPTOR	pT01;
 	u16	Duration, NextBodyLen, OffsetSize;
 	u8	Rate, i;
 	unsigned char	CTS_on = false, RTS_on = false;
-	PT00_DESCRIPTOR pNextT00;
+	struct wb35_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;
+	pT00 = (struct wb35_T00_descriptor *)buffer;
 	pT01 = (PT01_DESCRIPTOR)(buffer+4);
-	pNextT00 = (PT00_DESCRIPTOR)(buffer+OffsetSize);
+	pNextT00 = (struct wb35_T00_descriptor *)(buffer+OffsetSize);
 
 	if( buffer[ DOT_11_DA_OFFSET+8 ] & 0x1 ) // +8 for USB hdr
 		boGroupAddr = true;
@@ -178,7 +178,7 @@ static void Mds_DurationSet(struct wbsoft_priv *adapter,  struct wb35_descriptor
 			buffer += OffsetSize;
 			pT01 = (PT01_DESCRIPTOR)(buffer+4);
 			if (i != 1)	//The last fragment will not have the next fragment
-				pNextT00 = (PT00_DESCRIPTOR)(buffer+OffsetSize);
+				pNextT00 = (struct wb35_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 wb35_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 wb35_T00_descriptor *)buffer;
 	while (SizeLeft) {
-		pT00 = (PT00_DESCRIPTOR)buffer;
+		pT00 = (struct wb35_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 wb35_T00_descriptor *)buffer;
 			pT00->T00_first_mpdu = 0;
 		}
 
@@ -322,7 +322,7 @@ 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;
+	struct wb35_T00_descriptor *	pT00;
 	PT01_DESCRIPTOR	pT01;
 	u16	stmp;
 	u8	i, ctmp1, ctmp2, ctmpf;
@@ -333,7 +333,7 @@ static void Mds_HeaderCopy(struct wbsoft_priv * adapter, struct wb35_descriptor
 	//
 	// Set USB header 8 byte
 	//
-	pT00 = (PT00_DESCRIPTOR)TargetBuffer;
+	pT00 = (struct wb35_T00_descriptor *)TargetBuffer;
 	TargetBuffer += 4;
 	pT01 = (PT01_DESCRIPTOR)TargetBuffer;
 	TargetBuffer += 4;
diff --git a/drivers/staging/winbond/wbhal_s.h b/drivers/staging/winbond/wbhal_s.h
index e772fad..1185205 100644
--- a/drivers/staging/winbond/wbhal_s.h
+++ b/drivers/staging/winbond/wbhal_s.h
@@ -133,8 +133,7 @@ struct wb35_R00_descriptor {
 	};
 };
 
-typedef struct _T00_DESCRIPTOR
-{
+struct wb35_T00_descriptor {
 	union
 	{
 		u32	value;
@@ -166,7 +165,7 @@ typedef struct _T00_DESCRIPTOR
 		};
 		#endif
 	};
-} T00_DESCRIPTOR, *PT00_DESCRIPTOR;
+};
 
 struct wb35_R01_descriptor {
 	union
@@ -331,7 +330,7 @@ struct wb35_descriptor {		// Skip length = 8 DWORD
 	union
 	{
 		struct wb35_R00_descriptor	R00;
-		T00_DESCRIPTOR	T00;
+		struct wb35_T00_descriptor	T00;
 	};
 
 	// For R01 and T01 ----------------------------------------------
-- 
1.6.3.3

[PATCH 22/26] w35und: Convert T01_DESCRIPTOR typedef to struct wb35_T01_descriptor

[Pekka Enberg]

Cc: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
---
 drivers/staging/winbond/mds.c     |   10 +++++-----
 drivers/staging/winbond/wbhal_s.h |    7 +++----
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/drivers/staging/winbond/mds.c b/drivers/staging/winbond/mds.c
index de8cec9..b9dbb2c 100644
--- a/drivers/staging/winbond/mds.c
+++ b/drivers/staging/winbond/mds.c
@@ -25,7 +25,7 @@ Mds_Destroy(struct wbsoft_priv * adapter)
 static void Mds_DurationSet(struct wbsoft_priv *adapter,  struct wb35_descriptor *pDes,  u8 *buffer)
 {
 	struct wb35_T00_descriptor *	pT00;
-	PT01_DESCRIPTOR	pT01;
+	struct wb35_T01_descriptor *	pT01;
 	u16	Duration, NextBodyLen, OffsetSize;
 	u8	Rate, i;
 	unsigned char	CTS_on = false, RTS_on = false;
@@ -40,7 +40,7 @@ static void Mds_DurationSet(struct wbsoft_priv *adapter,  struct wb35_descriptor
 		Rate = 1;
 
 	pT00 = (struct wb35_T00_descriptor *)buffer;
-	pT01 = (PT01_DESCRIPTOR)(buffer+4);
+	pT01 = (struct wb35_T01_descriptor *)(buffer+4);
 	pNextT00 = (struct wb35_T00_descriptor *)(buffer+OffsetSize);
 
 	if( buffer[ DOT_11_DA_OFFSET+8 ] & 0x1 ) // +8 for USB hdr
@@ -176,7 +176,7 @@ 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 wb35_T01_descriptor *)(buffer+4);
 			if (i != 1)	//The last fragment will not have the next fragment
 				pNextT00 = (struct wb35_T00_descriptor *)(buffer+OffsetSize);
 		}
@@ -323,7 +323,7 @@ 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
 	struct wb35_T00_descriptor *	pT00;
-	PT01_DESCRIPTOR	pT01;
+	struct wb35_T01_descriptor *	pT01;
 	u16	stmp;
 	u8	i, ctmp1, ctmp2, ctmpf;
 	u16	FragmentThreshold = CURRENT_FRAGMENT_THRESHOLD;
@@ -335,7 +335,7 @@ static void Mds_HeaderCopy(struct wbsoft_priv * adapter, struct wb35_descriptor
 	//
 	pT00 = (struct wb35_T00_descriptor *)TargetBuffer;
 	TargetBuffer += 4;
-	pT01 = (PT01_DESCRIPTOR)TargetBuffer;
+	pT01 = (struct wb35_T01_descriptor *)TargetBuffer;
 	TargetBuffer += 4;
 
 	pT00->value = 0;// Clear
diff --git a/drivers/staging/winbond/wbhal_s.h b/drivers/staging/winbond/wbhal_s.h
index 1185205..00329df 100644
--- a/drivers/staging/winbond/wbhal_s.h
+++ b/drivers/staging/winbond/wbhal_s.h
@@ -221,8 +221,7 @@ struct wb35_R01_descriptor {
 	};
 };
 
-typedef struct _T01_DESCRIPTOR
-{
+struct wb35_T01_descriptor {
 	union
 	{
 		u32	value;
@@ -260,7 +259,7 @@ typedef struct _T01_DESCRIPTOR
 		};
 		#endif
 	};
-} T01_DESCRIPTOR, *PT01_DESCRIPTOR;
+};
 
 typedef struct _T02_DESCRIPTOR
 {
@@ -337,7 +336,7 @@ struct wb35_descriptor {		// Skip length = 8 DWORD
 	union
 	{
 		struct wb35_R01_descriptor	R01;
-		T01_DESCRIPTOR	T01;
+		struct wb35_T01_descriptor	T01;
 	};
 
 	// For R02 and T02 ----------------------------------------------
-- 
1.6.3.3

[PATCH 23/26] w35und: Convert T02_DESCRIPTOR typedef to struct wb35_T02_descriptor

[Pekka Enberg]

Cc: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
---
 drivers/staging/winbond/mds.c     |    2 +-
 drivers/staging/winbond/mds_f.h   |    2 +-
 drivers/staging/winbond/wb35tx.c  |    2 +-
 drivers/staging/winbond/wbhal_s.h |    7 +++----
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/drivers/staging/winbond/mds.c b/drivers/staging/winbond/mds.c
index b9dbb2c..403149f 100644
--- a/drivers/staging/winbond/mds.c
+++ b/drivers/staging/winbond/mds.c
@@ -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 wb35_T02_descriptor * pT02)
 {
 	struct wb35_mds *pMds = &adapter->Mds;
 	struct hw_data *	pHwData = &adapter->sHwData;
diff --git a/drivers/staging/winbond/mds_f.h b/drivers/staging/winbond/mds_f.h
index e09dd4b..e5e3b4e 100644
--- a/drivers/staging/winbond/mds_f.h
+++ b/drivers/staging/winbond/mds_f.h
@@ -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 wb35_T02_descriptor * pT02 );
 void Mds_MpduProcess(  struct wbsoft_priv *adapter,  struct wb35_descriptor *pRxDes );
 extern void DataDmp(u8 *pdata, u32 len, u32 offset);
 
diff --git a/drivers/staging/winbond/wb35tx.c b/drivers/staging/winbond/wb35tx.c
index 5869ef4..615e20e 100644
--- a/drivers/staging/winbond/wb35tx.c
+++ b/drivers/staging/winbond/wb35tx.c
@@ -209,7 +209,7 @@ static void Wb35Tx_EP2VM_complete(struct urb * pUrb)
 {
 	struct wbsoft_priv *adapter = pUrb->context;
 	struct hw_data *	pHwData = &adapter->sHwData;
-	T02_DESCRIPTOR	T02, TSTATUS;
+	struct wb35_T02_descriptor	T02, TSTATUS;
 	struct wb35_tx *pWb35Tx = &pHwData->Wb35Tx;
 	u32 *		pltmp = (u32 *)pWb35Tx->EP2_buf;
 	u32		i;
diff --git a/drivers/staging/winbond/wbhal_s.h b/drivers/staging/winbond/wbhal_s.h
index 00329df..d8c32c0 100644
--- a/drivers/staging/winbond/wbhal_s.h
+++ b/drivers/staging/winbond/wbhal_s.h
@@ -261,8 +261,7 @@ struct wb35_T01_descriptor {
 	};
 };
 
-typedef struct _T02_DESCRIPTOR
-{
+struct wb35_T02_descriptor {
 	union
 	{
 		u32	value;
@@ -308,7 +307,7 @@ typedef struct _T02_DESCRIPTOR
 		};
 		#endif
 	};
-} T02_DESCRIPTOR, *PT02_DESCRIPTOR;
+};
 
 struct wb35_descriptor {		// Skip length = 8 DWORD
 	// ID for descriptor ---, The field doesn't be cleard in the operation of Descriptor definition
@@ -343,7 +342,7 @@ struct wb35_descriptor {		// Skip length = 8 DWORD
 	union
 	{
 		u32			R02;
-		T02_DESCRIPTOR	T02;
+		struct wb35_T02_descriptor	T02;
 	};
 
 	// For R03 and T03 ----------------------------------------------
-- 
1.6.3.3

[PATCH 24/26] w35und: Convert _TXVGA_FOR_50 typedef to struct wb35_txvga_for_50

[Pekka Enberg]

Cc: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
---
 drivers/staging/winbond/wbhal_s.h |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/winbond/wbhal_s.h b/drivers/staging/winbond/wbhal_s.h
index d8c32c0..bcb709f 100644
--- a/drivers/staging/winbond/wbhal_s.h
+++ b/drivers/staging/winbond/wbhal_s.h
@@ -371,10 +371,10 @@ struct wb35_descriptor {		// Skip length = 8 DWORD
 #define MAX_TXVGA_EEPROM	9	//How many word(u16) of EEPROM will be used for TxVGA
 #define MAX_RF_PARAMETER	32
 
-typedef struct _TXVGA_FOR_50 {
+struct wb35_txvga_for_50 {
 	u8      ChanNo;
 	u8      TxVgaValue;
-} TXVGA_FOR_50;
+};
 
 
 //=====================================================================
@@ -497,7 +497,7 @@ struct hw_data {
 
 	u8		TxVgaSettingInEEPROM[ (((MAX_TXVGA_EEPROM*2)+3) & ~0x03) ]; // 20060621 For backup EEPROM value
 	u8		TxVgaFor24[16]; // Max is 14, 2 for alignment
-	TXVGA_FOR_50	TxVgaFor50[36];	// 35 channels in 5G. 35x2 = 70 byte. 2 for alignments
+	struct wb35_txvga_for_50	TxVgaFor50[36];	// 35 channels in 5G. 35x2 = 70 byte. 2 for alignments
 
 	u16		Scan_Interval;
 	u16		RESERVED6;
-- 
1.6.3.3

[PATCH 25/26] w35und: Rename fixed typedef to fixp32_t

[Pekka Enberg]

The 'fixed' typedef is the one and only typedef that actually makes
sense. Lets rename the thing to 'fixp32_t' to follow the naming
convention set by generic kernel types such as 'atomic_t' and the
existing in-kernel fixed-point implementation in
drivers/input/fixp-arith.h (which is unfortunately only 16 bits and thus
can't be used here).

Cc: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
---
 drivers/staging/winbond/phy_calibration.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/winbond/phy_calibration.c b/drivers/staging/winbond/phy_calibration.c
index 8c56962..381d8e9 100644
--- a/drivers/staging/winbond/phy_calibration.c
+++ b/drivers/staging/winbond/phy_calibration.c
@@ -26,9 +26,9 @@
 #define DEG2RAD(X)      0.017453 * (X)
 
 /****************** LOCAL TYPE DEFINITION SECTION ***************************/
-typedef s32         fixed; /* 16.16 fixed-point */
+typedef s32         fixp32_t;	/* 16.16 fixed-point */
 
-static const fixed Angles[]=
+static const fixp32_t Angles[]=
 {
     FIXED(DEG2RAD(45.0)),    FIXED(DEG2RAD(26.565)),  FIXED(DEG2RAD(14.0362)),
     FIXED(DEG2RAD(7.12502)), FIXED(DEG2RAD(3.57633)), FIXED(DEG2RAD(1.78991)),
@@ -300,7 +300,7 @@ u32 _sqrt(u32 sqsum)
 /****************************************************************************/
 void _sin_cos(s32 angle, s32 *sin, s32 *cos)
 {
-    fixed       X, Y, TargetAngle, CurrAngle;
+    fixp32_t X, Y, TargetAngle, CurrAngle;
     unsigned    Step;
 
     X=FIXED(AG_CONST);      // AG_CONST * cos(0)
@@ -310,7 +310,7 @@ void _sin_cos(s32 angle, s32 *sin, s32 *cos)
 
     for (Step=0; Step < 12; Step++)
     {
-        fixed NewX;
+        fixp32_t NewX;
 
         if(TargetAngle > CurrAngle)
         {
-- 
1.6.3.3

[PATCH 26/26] w35und: Update README

[Pekka Enberg]

Typedefs are gone now so update the README file.

Cc: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
---
 drivers/staging/winbond/README |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/drivers/staging/winbond/README b/drivers/staging/winbond/README
index cb944e4..4b480df 100644
--- a/drivers/staging/winbond/README
+++ b/drivers/staging/winbond/README
@@ -2,7 +2,6 @@ TODO:
 	- sparse cleanups
 	- checkpatch cleanups
 	- kerneldoc cleanups
-	- remove typedefs
 	- remove unused ioctls
 	- use cfg80211 for regulatory stuff
 	- fix 4k stack problems
-- 
1.6.3.3

Re: [PATCH 01/26] w35und: Remove unused struct _RXLAYER1

[Pavel Machek]

On Mon 2010-03-01 17:04:03, Pekka Enberg wrote:
> Cc: Pavel Machek <pavel@ucw.cz>
> Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>

ACK.

-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

Re: [PATCH 02/26] w35und: Remove unused struct _EVENTLOG

[Pavel Machek]

On Mon 2010-03-01 17:04:04, Pekka Enberg wrote:
> Cc: Pavel Machek <pavel@ucw.cz>
> Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>

ACK.

> ---
>  drivers/staging/winbond/localpara.h |    9 ---------
>  1 files changed, 0 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/staging/winbond/localpara.h b/drivers/staging/winbond/localpara.h
> index 5626a76..bdce73c 100644
> --- a/drivers/staging/winbond/localpara.h
> +++ b/drivers/staging/winbond/localpara.h
> @@ -110,13 +110,6 @@
>  // 20061108 WPS IE buffer
>  #define MAX_IE_APPEND_SIZE					256 + 4 // Due to [E id][Length][OUI][Data] may 257 bytes
>  
> -typedef struct _EVENTLOG
> -{
> -	u16		Count;			//Total count from start
> -	u16		index;			//Buffer index, 0 ~ 63
> -	u32		EventValue[64];	//BYTE 3~2 : count, BYTE 1 : Event, BYTE 0 : reason
> -} Event_Log, *pEvent_Log;
> -
>  typedef struct _ChanInfo
>  {
>  	u8		band;
> @@ -264,8 +257,6 @@ typedef struct LOCAL_PARA
>      u32         bToSelfPacketReceived;
>      u32         WepKeyDetectTimerCount;
>  
> -	Event_Log	EventLog;
> -
>  	u16		SignalLostTh;
>  	u16		SignalRoamTh;
>  

-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

Re: [PATCH 26/26] w35und: Update README

[Pavel Machek]

On Mon 2010-03-01 17:04:28, Pekka Enberg wrote:
> Typedefs are gone now so update the README file.

All but one that makes sense :-). Yep, ACK for whole series. And
thanks for your work.
							Pavel

> --- a/drivers/staging/winbond/README
> +++ b/drivers/staging/winbond/README
> @@ -2,7 +2,6 @@ TODO:
>  	- sparse cleanups
>  	- checkpatch cleanups
>  	- kerneldoc cleanups
> -	- remove typedefs
>  	- remove unused ioctls
>  	- use cfg80211 for regulatory stuff
>  	- fix 4k stack problems

-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

Re: [PATCH 13/26] w35und: Remove unused struct _MLMECALLBACK

[Pavel Machek]

Hi!

> Cc: Pavel Machek <pavel@ucw.cz>
> Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>

1-13 all look good. ACK.


-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html