Skip to contentSkip to conversation

w35und: more windows-specific code removal

PATCH Pavel Machek 1 participant 1 message Apr 8, 2008 Networking drivers (wireless)

lore
Share & tools
lore
#0 lore raw

Remove more windows-specific code. Still untested, but very easy.

---
commit 05affe25840089b2e8c3ea4033b38efb933ddbc1
tree 147eb636c8f1066d10f3d4719d5035212b14e35d
parent 294c54c23b3317222ab524827b9c40c02e01112f
author Pavel <[email protected]> Tue, 08 Apr 2008 12:13:29 +0200 committer Pavel <[email protected]> Tue, 08 Apr 2008 12:13:29 +0200

 drivers/net/wireless/winbond/winbondport/adapter.h |   14 
 .../net/wireless/winbond/winbondport/bssdbase.c    |   82 -
 drivers/net/wireless/winbond/winbondport/mto.h     |  116 -
 drivers/net/wireless/winbond/winbondport/smetask.c |    6 
 drivers/net/wireless/winbond/winbondport/wbhal.c   |   72 -
 drivers/net/wireless/winbond/winbondport/wbndis.c  |  590 -----
 .../net/wireless/winbond/winbondport/wbndis51.c    | 2311 -----------------------
 .../net/wireless/winbond/winbondport/wbndis51_f.h  |   27 
 .../net/wireless/winbond/winbondport/wbndis51_s.h  |   27 
 .../net/wireless/winbond/winbondport/wbndis_f.h    |   42 
 .../net/wireless/winbond/winbondport/wbndis_s.h    |  158 --
 11 files changed, 108 insertions(+), 3337 deletions(-)
drivers/net/wireless/winbond/winbondport/adapter.h +2 -12
index c5caaab..64585c5 100644
@@ -5,32 +5,22 @@
 #define MAX_ANSI_STRING		40
 typedef struct WB32_ADAPTER
 {
-	u32				AdapterIndex; // 20060703.4 Add for using pAdapterContext global Adapter point
+	u32 AdapterIndex; // 20060703.4 Add for using pAdapterContext global Adapter point
 
 	WB_LOCALDESCRIPT	sLocalPara;		// Myself connected parameters
 	PWB_BSSDESCRIPTION	asBSSDescriptElement;
 	SME_PARAMETERS		sSmePara;		// GUI desired/WEP parameters
 	SCAN_PARAMETERS 	sScanPara;		// Myself scan parameters
-	MLME_FRAME			sMlmeFrame;		// connect to peerSTA parameters
+	MLME_FRAME		sMlmeFrame;		// connect to peerSTA parameters
 	ROAM_PARAMETERS		sRoamPara;			// Roaming Module
 	MTO_PARAMETERS		sMtoPara; // MTO_struct ...
 	hw_data_t			sHwData; //For HAL
 	MDS					Mds;
 	TESTSTA				sTestSta; // For test station
 
-	#ifdef NDIS_MINIPORT_DRIVER
-	WBNDIS						WbNdis;
-	NDIS51_DESIRED_PARAMETER	DesiredNdis51Parameter;
-	#endif
-
-	#ifdef WB_LINUX
 	WBLINUX		WbLinux;
 	WB_STA_WPA_DESCRIPTION Global_STA_Wpa;//For WB_WPA
         struct iw_statistics iw_stats;
-       #endif
 
-   
-	// 20060704.1 Add for recognize
 	u8	LinkName[MAX_ANSI_STRING];
-
 } WB32_ADAPTER, ADAPTER, *PWB32_ADAPTER, *PADAPTER;
drivers/net/wireless/winbond/winbondport/bssdbase.c +24 -58

126 lines not on this page · raw message

drivers/net/wireless/winbond/winbondport/mto.h +47 -69

198 lines not on this page · raw message

drivers/net/wireless/winbond/winbondport/smetask.c +2 -4
index bb1caa9..782eca1 100644
@@ -52,10 +52,8 @@ void vNetDisconnectInd(PWB32_ADAPTER Ada
 void vSmeTimerStart(PWB32_ADAPTER Adapter, u32 timeout_value);
 void vSmeTimerStop(PWB32_ADAPTER Adapter);
 void vSmeTimerHandler_1a( void*	Data);
-void vSmeTimerHandler( void*			SystemSpecific1,
-					   PWB32_ADAPTER 	Adapter,
-					   void*			SystemSpecific2,
-					   void*			SystemSpecific3);
+void vSmeTimerHandler(void* SystemSpecific1, PWB32_ADAPTER Adapter,
+		      void* SystemSpecific2, void* SystemSpecific3);
 void TxRateHandler(PWB32_ADAPTER Adapter);
 
 //=================== Action Function of SME Module
drivers/net/wireless/winbond/winbondport/wbhal.c +31 -41

199 lines not on this page · raw message

drivers/net/wireless/winbond/winbondport/wbndis.c +1 -589

590 lines not on this page · raw message

drivers/net/wireless/winbond/winbondport/wbndis51.c +1 -2310

1,841 lines not on this page · raw message

drivers/net/wireless/winbond/winbondport/wbndis51_f.h +0 -27
index 97c501a..e69de29 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/winbond/winbondport/wbndis51_s.h +0 -27
index 65cbf2d..e69de29 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/winbond/winbondport/wbndis_f.h +0 -42

42 lines not on this page · raw message

drivers/net/wireless/winbond/winbondport/wbndis_s.h +0 -158

158 lines not on this page · raw message

The rest of this diff is not shown. View the raw message.

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

Part of the diff is not shown here. View the raw message.