diff options
| author | Jim Lieb <lieb@canonical.com> | 2009-08-12 14:54:09 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-15 12:02:08 -0700 |
| commit | a7ad322a46663755718a214a9a34e5cfe64d07f7 (patch) | |
| tree | 619bceb63a7cd8b95c504d1292bcc48d8ca3de4b /drivers | |
| parent | 9d26d60f99855056a20ac7c0b68eb5ed04619831 (diff) | |
Staging: vt665x: Clean up include files, Part 2
Remove cplusplus lines from include files
Remove needless ifdefs on includes to conform with C
conventions. Remove misc commented code/includes
Update TODO
Signed-off-by: Jim Lieb <lieb@canonical.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
74 files changed, 11 insertions, 1132 deletions
diff --git a/drivers/staging/vt6655/80211hdr.h b/drivers/staging/vt6655/80211hdr.h index 84cb1d020cb7..e5cee6fd0533 100644 --- a/drivers/staging/vt6655/80211hdr.h +++ b/drivers/staging/vt6655/80211hdr.h @@ -28,15 +28,10 @@ * */ - - #ifndef __80211HDR_H__ #define __80211HDR_H__ - -#if !defined(__TTYPE_H__) #include "ttype.h" -#endif /*--------------------- Export Definitions -------------------------*/ // bit type diff --git a/drivers/staging/vt6655/80211mgr.c b/drivers/staging/vt6655/80211mgr.c index da7c2ab29bad..d309049370eb 100644 --- a/drivers/staging/vt6655/80211mgr.c +++ b/drivers/staging/vt6655/80211mgr.c @@ -52,28 +52,12 @@ * */ - - -#if !defined(__TMACRO_H__) #include "tmacro.h" -#endif -#if !defined(__TETHER_H__) #include "tether.h" -#endif -#if !defined(__80211MGR_H__) #include "80211mgr.h" -#endif -#if !defined(__80211HDR_H__) #include "80211hdr.h" -#endif -#if !defined(__DEVICE_H__) #include "device.h" -#endif -#if !defined(__WPA_H__) #include "wpa.h" -#endif - - /*--------------------- Static Definitions -------------------------*/ diff --git a/drivers/staging/vt6655/80211mgr.h b/drivers/staging/vt6655/80211mgr.h index 18c9e3ad7fde..5efc13227eb8 100644 --- a/drivers/staging/vt6655/80211mgr.h +++ b/drivers/staging/vt6655/80211mgr.h @@ -28,17 +28,11 @@ * */ - #ifndef __80211MGR_H__ #define __80211MGR_H__ -#if !defined(__TTYPE_H__) #include "ttype.h" -#endif -#if !defined(__80211HDR_H__) #include "80211hdr.h" -#endif - /*--------------------- Export Definitions -------------------------*/ @@ -719,6 +713,7 @@ typedef struct tagWLAN_FR_DEAUTHEN { } WLAN_FR_DEAUTHEN, *PWLAN_FR_DEAUTHEN; /*--------------------- Export Functions --------------------------*/ + VOID vMgrEncodeBeacon( IN PWLAN_FR_BEACON pFrame diff --git a/drivers/staging/vt6655/IEEE11h.c b/drivers/staging/vt6655/IEEE11h.c index e1addc6d700a..ea546e5406ea 100644 --- a/drivers/staging/vt6655/IEEE11h.c +++ b/drivers/staging/vt6655/IEEE11h.c @@ -31,34 +31,14 @@ * */ - -#if !defined(__TTYPE_H__) #include "ttype.h" -#endif -#if !defined(__UMEM_H__) #include "umem.h" -#endif -#if !defined(__TMACRO_H__) #include "tmacro.h" -#endif -#if !defined(__TETHER_H__) #include "tether.h" -#endif -#if !defined(__IEEE11h_H__) #include "IEEE11h.h" -#endif - -#if !defined(__DEVICE_H__) #include "device.h" -#endif -#if !defined(__WMGR_H__) #include "wmgr.h" -#endif -#if !defined(__RXTX_H__) #include "rxtx.h" -#endif - - /*--------------------- Static Definitions -------------------------*/ static int msglevel =MSG_LEVEL_INFO; diff --git a/drivers/staging/vt6655/IEEE11h.h b/drivers/staging/vt6655/IEEE11h.h index 22bcaf1f6817..0f61eddd6f26 100644 --- a/drivers/staging/vt6655/IEEE11h.h +++ b/drivers/staging/vt6655/IEEE11h.h @@ -31,17 +31,9 @@ #ifndef __IEEE11h_H__ #define __IEEE11h_H__ - -#if !defined(__TTYPE_H__) #include "ttype.h" -#endif -#if !defined(__80211HDR_H__) #include "80211hdr.h" -#endif -#if !defined(__80211MGR_H__) #include "80211mgr.h" -#endif - /*--------------------- Export Definitions -------------------------*/ @@ -52,17 +44,9 @@ /*--------------------- Export Types ------------------------------*/ /*--------------------- Export Functions --------------------------*/ -#ifdef __cplusplus -extern "C" { /* Assume C declarations for C++ */ -#endif /* __cplusplus */ BOOL IEEE11hbMSRRepTx ( IN PVOID pMgmtHandle ); -#ifdef __cplusplus -} /* End of extern "C" { */ -#endif /* __cplusplus */ - - #endif // __IEEE11h_H__ diff --git a/drivers/staging/vt6655/TODO b/drivers/staging/vt6655/TODO index ae46c525cbd9..8462cd17eb61 100644 --- a/drivers/staging/vt6655/TODO +++ b/drivers/staging/vt6655/TODO @@ -1,7 +1,7 @@ TODO: -- remove __cplusplus ifdefs +- remove __cplusplus ifdefs -- done - prepare for merge with vt6656 driver: - - rename DEVICE_PRT() to DBG_PRT() + - rename DEVICE_PRT() to DBG_PRT() -- done - share 80211*.h includes - move code for channel mapping from card.c to channel.c - split rf.c diff --git a/drivers/staging/vt6655/aes_ccmp.c b/drivers/staging/vt6655/aes_ccmp.c index 59cc018d48a2..e79a0d164282 100644 --- a/drivers/staging/vt6655/aes_ccmp.c +++ b/drivers/staging/vt6655/aes_ccmp.c @@ -33,16 +33,9 @@ * */ -#if !defined(__UMEM_H__) #include "umem.h" -#endif -#if !defined(__DEVICE_H__) #include "device.h" -#endif -#if !defined(__80211HDR_H__) #include "80211hdr.h" -#endif - /*--------------------- Static Definitions -------------------------*/ diff --git a/drivers/staging/vt6655/aes_ccmp.h b/drivers/staging/vt6655/aes_ccmp.h index 2b1920f28609..f2ba1d5aa1e5 100644 --- a/drivers/staging/vt6655/aes_ccmp.h +++ b/drivers/staging/vt6655/aes_ccmp.h @@ -30,9 +30,7 @@ #ifndef __AES_H__ #define __AES_H__ -#if !defined(__TTYPE_H__) #include "ttype.h" -#endif /*--------------------- Export Definitions -------------------------*/ diff --git a/drivers/staging/vt6655/baseband.c b/drivers/staging/vt6655/baseband.c index 02cf0b735702..4b8f8db0097d 100644 --- a/drivers/staging/vt6655/baseband.c +++ b/drivers/staging/vt6655/baseband.c @@ -49,31 +49,14 @@ * */ - -#if !defined(__TMACRO_H__) #include "tmacro.h" -#endif -#if !defined(__TBIT_H__) #include "tbit.h" -#endif -#if !defined(__TETHER_H__) #include "tether.h" -#endif -#if !defined(__MAC_H__) #include "mac.h" -#endif -#if !defined(__BASEBAND_H__) #include "baseband.h" -#endif -#if !defined(__SROM_H__) #include "srom.h" -#endif -#if !defined(__UMEM_H__) #include "umem.h" -#endif -#if !defined(__RF_H__) #include "rf.h" -#endif /*--------------------- Static Definitions -------------------------*/ //static int msglevel =MSG_LEVEL_DEBUG; diff --git a/drivers/staging/vt6655/baseband.h b/drivers/staging/vt6655/baseband.h index 6fb4e5ff8862..0682a396ea44 100644 --- a/drivers/staging/vt6655/baseband.h +++ b/drivers/staging/vt6655/baseband.h @@ -30,18 +30,9 @@ #ifndef __BASEBAND_H__ #define __BASEBAND_H__ -#if !defined(__TTYPE_H__) #include "ttype.h" -#endif - -#if !defined(__TETHER_H__) #include "tether.h" -#endif - -#if !defined(__DEVICE_H__) #include "device.h" -#endif - /*--------------------- Export Definitions -------------------------*/ @@ -126,9 +117,6 @@ /*--------------------- Export Variables --------------------------*/ /*--------------------- Export Functions --------------------------*/ -#ifdef __cplusplus -extern "C" { /* Assume C declarations for C++ */ -#endif /* __cplusplus */ UINT BBuGetFrameTime( @@ -186,10 +174,4 @@ void BBvAntennaDiversity(PSDevice pDevice, BYTE byRxRate, BYTE bySQ3); VOID BBvClearAntDivSQ3Value (PSDevice pDevice); - -#ifdef __cplusplus -} /* End of extern "C" { */ -#endif /* __cplusplus */ - - #endif // __BASEBAND_H__ diff --git a/drivers/staging/vt6655/bssdb.c b/drivers/staging/vt6655/bssdb.c index 57c043b9822d..28c00578d209 100644 --- a/drivers/staging/vt6655/bssdb.c +++ b/drivers/staging/vt6655/bssdb.c @@ -39,65 +39,25 @@ * */ - -#if !defined(__TBIT_H__) #include "tbit.h" -#endif//chester -#if !defined(__TTYPE_H__) #include "ttype.h" -#endif -#if !defined(__TMACRO_H__) #include "tmacro.h" -#endif -#if !defined(__TETHER_H__) #include "tether.h" -#endif -#if !defined(__DEVICE_H__) #include "device.h" -#endif -#if !defined(__80211HDR_H__) #include "80211hdr.h" -#endif -#if !defined(__BSSDB_H__) #include "bssdb.h" -#endif -#if !defined(__WMGR_H__) #include "wmgr.h" -#endif -#if !defined(__DATARATE_H__) #include "datarate.h" -#endif -#if !defined(__DESC_H__) #include "desc.h" -#endif -#if !defined(__WCMD_H__) #include "wcmd.h" -#endif -#if !defined(__WPA_H__) #include "wpa.h" -#endif -#if !defined(__BASEBAND_H__) #include "baseband.h" -#endif -#if !defined(__RF_H__) #include "rf.h" -#endif -#if !defined(__CARD_H__) #include "card.h" -#endif -#if !defined(__MAC_H__) #include "mac.h" -#endif -#if !defined(__WPA2_H__) #include "wpa2.h" -#endif -#if !defined(__UMEM_H__) #include "umem.h" -#endif -//DavidWang -#if !defined(__IOWPA_H__) #include "iowpa.h" -#endif //#define PLICE_DEBUG /*--------------------- Static Definitions -------------------------*/ diff --git a/drivers/staging/vt6655/bssdb.h b/drivers/staging/vt6655/bssdb.h index 44962f6e3778..5ce4ef9c1bd1 100644 --- a/drivers/staging/vt6655/bssdb.h +++ b/drivers/staging/vt6655/bssdb.h @@ -30,23 +30,10 @@ #ifndef __BSSDB_H__ #define __BSSDB_H__ -//#if !defined(__DEVICE_H__) -//#include "device.h" -//#endif - #include <linux/skbuff.h> - -#if !defined(__80211HDR_H__) #include "80211hdr.h" -#endif -#if !defined(__80211MGR_H__) #include "80211mgr.h" -#endif -#if !defined(__CARD_H__) #include "card.h" -#endif - - /*--------------------- Export Definitions -------------------------*/ diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c index 93b767c18821..03051e899184 100644 --- a/drivers/staging/vt6655/card.c +++ b/drivers/staging/vt6655/card.c @@ -45,47 +45,19 @@ * */ -#if !defined(__TMACRO_H__) #include "tmacro.h" -#endif -#if !defined(__CARD_H__) #include "card.h" -#endif -#if !defined(__TBIT_H__) #include "tbit.h" -#endif -#if !defined(__BASEBAND_H__) #include "baseband.h" -#endif -#if !defined(__MAC_H__) #include "mac.h" -#endif -#if !defined(__DESC_H__) #include "desc.h" -#endif -#if !defined(__RF_H__) #include "rf.h" -#endif -#if !defined(__VNTWIFI_H__) #include "vntwifi.h" -#endif -#if !defined(__POWER_H__) #include "power.h" -#endif -#if !defined(__KEY_H__) #include "key.h" -#endif -#if !defined(__RC4_H__) #include "rc4.h" -#endif -#if !defined(__COUNTRY_H__) #include "country.h" -#endif -#if !defined(__UMEM_H__) #include "umem.h" -#endif - - /*--------------------- Static Definitions -------------------------*/ diff --git a/drivers/staging/vt6655/card.h b/drivers/staging/vt6655/card.h index bb292e14b0b3..264b844cf055 100644 --- a/drivers/staging/vt6655/card.h +++ b/drivers/staging/vt6655/card.h @@ -26,19 +26,10 @@ * */ - #ifndef __CARD_H__ #define __CARD_H__ -//#if !defined(__DEVICE_H__) -//#include "device.h" -//#endif -#if !defined(__TTYPE_H__) #include "ttype.h" -#endif - - - /*--------------------- Export Definitions -------------------------*/ // @@ -94,9 +85,6 @@ typedef enum _CARD_OP_MODE { /*--------------------- Export Variables --------------------------*/ /*--------------------- Export Functions --------------------------*/ -#ifdef __cplusplus -extern "C" { /* Assume C declarations for C++ */ -#endif /* __cplusplus */ BOOL ChannelValid(UINT CountryCode, UINT ChannelIndex); void CARDvSetRSPINF(PVOID pDeviceHandler, CARD_PHY_TYPE ePHYType); @@ -262,11 +250,6 @@ CARDbyAutoChannelSelect( BYTE CARDbyGetChannelNumber(PVOID pDeviceHandler, BYTE byChannelIndex); -#ifdef __cplusplus -} /* End of extern "C" { */ -#endif /* __cplusplus */ - - #endif // __CARD_H__ diff --git a/drivers/staging/vt6655/country.h b/drivers/staging/vt6655/country.h index e60649350fb9..2005d2768680 100644 --- a/drivers/staging/vt6655/country.h +++ b/drivers/staging/vt6655/country.h @@ -30,10 +30,7 @@ #ifndef __COUNTRY_H__ #define __COUNTRY_H__ -#if !defined(__TTYPE_H__) #include "ttype.h" -#endif - /*--------------------- Export Definitions -------------------------*/ /************************************************************************ @@ -176,17 +173,5 @@ typedef struct tagSCountryTable extern SCountryTable ChannelRuleTab[CCODE_MAX+1]; /*--------------------- Export Functions --------------------------*/ -#ifdef __cplusplus -extern "C" { /* Assume C declarations for C++ */ -#endif /* __cplusplus */ - - -#ifdef __cplusplus -} /* End of extern "C" { */ -#endif /* __cplusplus */ - -/************************************************************************ - * Function prototype - ************************************************************************/ #endif /* __COUNTRY_H__ */ diff --git a/drivers/staging/vt6655/datarate.c b/drivers/staging/vt6655/datarate.c index 92995a8f72cf..10da57f28449 100644 --- a/drivers/staging/vt6655/datarate.c +++ b/drivers/staging/vt6655/datarate.c @@ -33,33 +33,15 @@ * */ -#if !defined(__TTYPE_H__) #include "ttype.h" -#endif -#if !defined(__TMACRO_H__) #include "tmacro.h" -#endif -#if !defined(__MAC_H__) #include "mac.h" -#endif -#if !defined(__80211MGR_H__) #include "80211mgr.h" -#endif -#if !defined(__BSSDB_H__) #include "bssdb.h" -#endif -#if !defined(__DATARATE_H__) #include "datarate.h" -#endif -#if !defined(__CARD_H__) #include "card.h" -#endif -#if !defined(__BASEBAND_H__) #include "baseband.h" -#endif -#if !defined(__SROM_H__) #include "srom.h" -#endif /*--------------------- Static Definitions -------------------------*/ diff --git a/drivers/staging/vt6655/desc.h b/drivers/staging/vt6655/desc.h index 45caea098b58..b573ef77abe1 100644 --- a/drivers/staging/vt6655/desc.h +++ b/drivers/staging/vt6655/desc.h @@ -28,23 +28,13 @@ * */ - #ifndef __DESC_H__ #define __DESC_H__ #include <linux/types.h> #include <linux/mm.h> - -#if !defined(__TTYPE_H__) #include "ttype.h" -#endif -#if !defined(__TETHER_H__) #include "tether.h" -#endif - - - - /*--------------------- Export Definitions -------------------------*/ diff --git a/drivers/staging/vt6655/device.h b/drivers/staging/vt6655/device.h index e8b13f782c50..7dfe80002912 100644 --- a/drivers/staging/vt6655/device.h +++ b/drivers/staging/vt6655/device.h @@ -85,50 +85,20 @@ // device specific // -#if !defined(_KCOMPAT_H) #include "kcompat.h" -#endif - -#if !defined(__DEVICE_CONFIG_H) #include "device_cfg.h" -#endif - -#if !defined(__TTYPE_H__) #include "ttype.h" -#endif -#if !defined(__80211HDR_H__) #include "80211hdr.h" -#endif -#if !defined(__TETHER_H__) #include "tether.h" -#endif -#if !defined(__WMGR_H__) #include "wmgr.h" -#endif -#if !defined(__WCMD_H__) #include "wcmd.h" -#endif -#if !defined(__MIB_H__) #include "mib.h" -#endif -#if !defined(__SROM_H__) #include "srom.h" -#endif -#if !defined(__RC4_H__) #include "rc4.h" -#endif -#if !defined(__TPCI_H__) #include "tpci.h" -#endif -#if !defined(__DESC_H__) #include "desc.h" -#endif -#if !defined(__KEY_H__) #include "key.h" -#endif -#if !defined(__MAC_H__) #include "mac.h" -#endif //PLICE_DEBUG-> //#define THREAD diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c index f158e4c530a7..b8788a315c47 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -60,80 +60,32 @@ */ #undef __NO_VERSION__ -#if !defined(__DEVICE_H__) #include "device.h" -#endif -#if !defined(__CARD_H__) #include "card.h" -#endif -#if !defined(__TBIT_H__) #include "tbit.h" -#endif -#if !defined(__BASEBAND_H__) #include "baseband.h" -#endif -#if !defined(__MAC_H__) #include "mac.h" -#endif -#if !defined(__TETHER_H__) #include "tether.h" -#endif -#if !defined(__WMGR_H__) #include "wmgr.h" -#endif -#if !defined(__WCTL_H__) #include "wctl.h" -#endif -#if !defined(__POWER_H__) #include "power.h" -#endif -#if !defined(__WCMD_H__) #include "wcmd.h" -#endif -#if !defined(__IOCMD_H__) #include "iocmd.h" -#endif -#if !defined(__TCRC_H__) #include "tcrc.h" -#endif -#if !defined(__RXTX_H__) #include "rxtx.h" -#endif -#if !defined(__WROUTE_H__) #include "wroute.h" -#endif -#if !defined(__BSSDB_H__) #include "bssdb.h" -#endif -#if !defined(__HOSTAP_H__) #include "hostap.h" -#endif -#if !defined(__WPACTL_H__) #include "wpactl.h" -#endif -#if !defined(__IOCTL_H__) #include "ioctl.h" -#endif -#if !defined(__IWCTL_H__) #include "iwctl.h" -#endif -#if !defined(__DPC_H__) #include "dpc.h" -#endif -#if !defined(__DATARATE_H__) #include "datarate.h" -#endif -#if !defined(__RF_H__) #include "rf.h" -#endif -#if !defined(__IOWPA_H__) #include "iowpa.h" -#endif - #include <linux/delay.h> #include <linux/kthread.h> - //#define DEBUG /*--------------------- Static Definitions -------------------------*/ //static int msglevel =MSG_LEVEL_DEBUG; diff --git a/drivers/staging/vt6655/dpc.c b/drivers/staging/vt6655/dpc.c index 5810c1a921cd..aaae1e691d01 100644 --- a/drivers/staging/vt6655/dpc.c +++ b/drivers/staging/vt6655/dpc.c @@ -38,61 +38,24 @@ * */ - -#if !defined(__DEVICE_H__) #include "device.h" -#endif -#if !defined(__RXTX_H__) #include "rxtx.h" -#endif -#if !defined(__TETHER_H__) #include "tether.h" -#endif -#if !defined(__CARD_H__) #include "card.h" -#endif -#if !defined(__BSSDB_H__) #include "bssdb.h" -#endif -#if !defined(__MAC_H__) #include "mac.h" -#endif -#if !defined(__BASEBAND_H__) #include "baseband.h" -#endif -#if !defined(__UMEM_H__) #include "umem.h" -#endif -#if !defined(__MICHAEL_H__) #include "michael.h" -#endif -#if !defined(__TKIP_H__) #include "tkip.h" -#endif -#if !defined(__TCRC_H__) #include "tcrc.h" -#endif -#if !defined(__WCTL_H__) #include "wctl.h" -#endif -#if !defined(__WROUTE_H__) #include "wroute.h" -#endif -#if !defined(__TBIT_H__) #include "tbit.h" -#endif -#if !defined(__HOSTAP_H__) #include "hostap.h" -#endif -#if !defined(__RF_H__) #include "rf.h" -#endif -#if !defined(__IOWPA_H__) #include "iowpa.h" -#endif -#if !defined(__AES_H__) #include "aes_ccmp.h" -#endif //#define PLICE_DEBUG diff --git a/drivers/staging/vt6655/dpc.h b/drivers/staging/vt6655/dpc.h index 6295c99902e0..51508b9087ea 100644 --- a/drivers/staging/vt6655/dpc.h +++ b/drivers/staging/vt6655/dpc.h @@ -26,20 +26,12 @@ * */ - #ifndef __DPC_H__ #define __DPC_H__ -#if !defined(__TTYPE_H__) #include "ttype.h" -#endif -#if !defined(__DEVICE_H__) #include "device.h" -#endif -#if !defined(__WCMD_H__) #include "wcmd.h" -#endif - /*--------------------- Export Definitions -------------------------*/ @@ -49,26 +41,14 @@ /*--------------------- Export Functions --------------------------*/ - -#ifdef __cplusplus -extern "C" { /* Assume C declarations for C++ */ -#endif /* __cplusplus */ - - BOOL device_receive_frame ( IN PSDevice pDevice, IN PSRxDesc pCurrRD ); - -#ifdef __cplusplus -} /* End of extern "C" { */ -#endif /* __cplusplus */ - - - VOID MngWorkItem(PVOID Context); + #endif // __RXTX_H__ diff --git a/drivers/staging/vt6655/hostap.c b/drivers/staging/vt6655/hostap.c index 658e1aec8f33..58abf44c76a6 100644 --- a/drivers/staging/vt6655/hostap.c +++ b/drivers/staging/vt6655/hostap.c @@ -30,32 +30,13 @@ * */ - -#if !defined(__HOSTAP_H__) #include "hostap.h" -#endif -#if !defined(__IOCMD_H__) #include "iocmd.h" -#endif -#if !defined(__MAC_H__) #include "mac.h" -#endif -#if !defined(__CARD_H__) #include "card.h" -#endif -#if !defined(__BASEBAND_H__) #include "baseband.h" -#endif -#if !defined(__WPACTL_H__) #include "wpactl.h" -#endif -#if !defined(__KEY_H__) #include "key.h" -#endif -#if !defined(__MAC_H__) -#include "mac.h" -#endif - #define VIAWGET_HOSTAPD_MAX_BUF_SIZE 1024 #define HOSTAP_CRYPT_FLAG_SET_TX_KEY BIT0 diff --git a/drivers/staging/vt6655/hostap.h b/drivers/staging/vt6655/hostap.h index c5ad3494b6e4..8fd667b542be 100644 --- a/drivers/staging/vt6655/hostap.h +++ b/drivers/staging/vt6655/hostap.h @@ -26,14 +26,10 @@ * */ - #ifndef __HOSTAP_H__ #define __HOSTAP_H__ -#if !defined(__DEVICE_H__) #include "device.h" -#endif - /*--------------------- Export Definitions -------------------------*/ @@ -57,11 +53,6 @@ /*--------------------- Export Functions --------------------------*/ - -#ifdef __cplusplus -extern "C" { /* Assume C declarations for C++ */ -#endif /* __cplusplus */ - #ifndef ETH_P_PAE #define ETH_P_PAE 0x888E /* Port Access Entity (IEEE 802.1X) */ #endif /* ETH_P_PAE */ @@ -73,13 +64,6 @@ extern "C" { /* Assume C declarations for C++ */ int hostap_set_hostapd(PSDevice pDevice, int val, int rtnl_locked); int hostap_ioctl(PSDevice pDevice, struct iw_point *p); -#ifdef __cplusplus -} /* End of extern "C" { */ -#endif /* __cplusplus */ - - - - #endif // __HOSTAP_H__ diff --git a/drivers/staging/vt6655/iocmd.h b/drivers/staging/vt6655/iocmd.h index 8676bd6ecf84..60c0a3623613 100644 --- a/drivers/staging/vt6655/iocmd.h +++ b/drivers/staging/vt6655/iocmd.h @@ -29,10 +29,7 @@ #ifndef __IOCMD_H__ #define __IOCMD_H__ -#if !defined(__TTYPE_H__) #include "ttype.h" -#endif - /*--------------------- Export Definitions -------------------------*/ diff --git a/drivers/staging/vt6655/ioctl.c b/drivers/staging/vt6655/ioctl.c index a4b0c939c40b..47a5ff81df25 100644 --- a/drivers/staging/vt6655/ioctl.c +++ b/drivers/staging/vt6655/ioctl.c @@ -30,32 +30,14 @@ * */ - -#if !defined(__IOCTL_H__) #include "ioctl.h" -#endif -#if !defined(__IOCMD_H__) #include "iocmd.h" -#endif -#if !defined(__MAC_H__) #include "mac.h" -#endif -#if !defined(__CARD_H__) #include "card.h" -#endif -#if !defined(__HOSTAP_H__) #include "hostap.h" -#endif -#if !defined(__UMEM_H__) #include "umem.h" -#endif -#if !defined(__WPACTL_H__) #include "wpactl.h" -#endif -#if !defined(__RF_H__) #include "rf.h" -#endif - /*--------------------- Static Definitions -------------------------*/ diff --git a/drivers/staging/vt6655/ioctl.h b/drivers/staging/vt6655/ioctl.h index 9c6816eab46c..07d228399c3c 100644 --- a/drivers/staging/vt6655/ioctl.h +++ b/drivers/staging/vt6655/ioctl.h @@ -26,14 +26,10 @@ * */ - #ifndef __IOCTL_H__ #define __IOCTL_H__ -#if !defined(__DEVICE_H__) #include "device.h" -#endif - /*--------------------- Export Definitions -------------------------*/ @@ -44,12 +40,6 @@ /*--------------------- Export Functions --------------------------*/ - -#ifdef __cplusplus -extern "C" { /* Assume C declarations for C++ */ -#endif /* __cplusplus */ - - int private_ioctl(PSDevice pDevice, struct ifreq *rq); /* @@ -61,13 +51,6 @@ VOID vConfigWEPKey ( ); */ -#ifdef __cplusplus -} /* End of extern "C" { */ -#endif /* __cplusplus */ - - - - #endif // __IOCTL_H__ diff --git a/drivers/staging/vt6655/iowpa.h b/drivers/staging/vt6655/iowpa.h index 15e3eb91ac30..33ae054478dc 100644 --- a/drivers/staging/vt6655/iowpa.h +++ b/drivers/staging/vt6655/iowpa.h @@ -29,7 +29,6 @@ #ifndef __IOWPA_H__ #define __IOWPA_H__ - /*--------------------- Export Definitions -------------------------*/ diff --git a/drivers/staging/vt6655/iwctl.c b/drivers/staging/vt6655/iwctl.c index 5b80639ab8c8..4b1ce8691764 100644 --- a/drivers/staging/vt6655/iwctl.c +++ b/drivers/staging/vt6655/iwctl.c @@ -30,43 +30,20 @@ * */ - -#if !defined(__DEVICE_H__) #include "device.h" -#endif -#if !defined(__IOCTL_H__) #include "ioctl.h" -#endif -#if !defined(__IOCMD_H__) #include "iocmd.h" -#endif -#if !defined(__MAC_H__) #include "mac.h" -#endif -#if !defined(__CARD_H__) #include "card.h" -#endif -#if !defined(__HOSTAP_H__) #include "hostap.h" -#endif -#if !defined(__UMEM_H__) #include "umem.h" -#endif -#if !defined(__POWER_H__) #include "power.h" -#endif -#if !defined(__RF_H__) #include "rf.h" -#endif #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT -#if !defined(__IOWPA_H__) #include "iowpa.h" -#endif -#if !defined(__WPACTL_H__) #include "wpactl.h" #endif -#endif #include <net/iw_handler.h> extern WORD TxRate_iwconfig;//2008-5-8 <add> by chester diff --git a/drivers/staging/vt6655/iwctl.h b/drivers/staging/vt6655/iwctl.h index 962235f2f397..3096de0ba1bd 100644 --- a/drivers/staging/vt6655/iwctl.h +++ b/drivers/staging/vt6655/iwctl.h @@ -26,14 +26,10 @@ * */ - #ifndef __IWCTL_H__ #define __IWCTL_H__ -#if !defined(__DEVICE_H__) #include "device.h" -#endif - /*--------------------- Export Definitions -------------------------*/ @@ -44,12 +40,6 @@ /*--------------------- Export Functions --------------------------*/ - -#ifdef __cplusplus -extern "C" { /* Assume C declarations for C++ */ -#endif /* __cplusplus */ - - struct iw_statistics *iwctl_get_wireless_stats (struct net_device *dev); @@ -233,13 +223,6 @@ int iwctl_siwmlme(struct net_device *dev, extern const struct iw_handler_def iwctl_handler_def; extern const struct iw_priv_args iwctl_private_args; -#ifdef __cplusplus -} /* End of extern "C" { */ -#endif /* __cplusplus */ - - - - #endif // __IWCTL_H__ diff --git a/drivers/staging/vt6655/kcompat.h b/drivers/staging/vt6655/kcompat.h index 7006e8f2ccd3..2cf634ca67d6 100644 --- a/drivers/staging/vt6655/kcompat.h +++ b/drivers/staging/vt6655/kcompat.h @@ -25,6 +25,7 @@ * Date: Apr 8, 2002 * */ + #ifndef _KCOMPAT_H #define _KCOMPAT_H diff --git a/drivers/staging/vt6655/key.c b/drivers/staging/vt6655/key.c index 41be46970f19..e63126f0c60a 100644 --- a/drivers/staging/vt6655/key.c +++ b/drivers/staging/vt6655/key.c @@ -36,23 +36,11 @@ * */ - -#if !defined(__TMACRO_H__) #include "tmacro.h" -#endif -#if !defined(__TBIT_H__) #include "tbit.h" -#endif -#if !defined(__KEY_H__) #include "key.h" -#endif -#if !defined(__UMEM_H__) #include "umem.h" -#endif -#if !defined(__MAC_H__) #include "mac.h" -#endif - /*--------------------- Static Definitions -------------------------*/ diff --git a/drivers/staging/vt6655/key.h b/drivers/staging/vt6655/key.h index 1b39f4fd3250..ba797c7b3c17 100644 --- a/drivers/staging/vt6655/key.h +++ b/drivers/staging/vt6655/key.h @@ -27,21 +27,12 @@ * */ - #ifndef __KEY_H__ #define __KEY_H__ -#if !defined(__TTYPE_H__) #include "ttype.h" -#endif - -#if !defined(__TETHER_H__) #include "tether.h" -#endif - -#if !defined(__80211MGR_H__) #include "80211mgr.h" -#endif /*--------------------- Export Definitions -------------------------*/ #define MAX_GROUP_KEY 4 @@ -109,9 +100,6 @@ typedef struct tagSKeyManagement /*--------------------- Export Variables --------------------------*/ /*--------------------- Export Functions --------------------------*/ -#ifdef __cplusplus -extern "C" { /* Assume C declarations for C++ */ -#endif /* __cplusplus */ VOID KeyvInitTable(PSKeyManagement pTable, DWORD_PTR dwIoBase); @@ -192,11 +180,5 @@ BOOL KeybSetAllGroupKey ( BYTE byLocalID ); -#ifdef __cplusplus -} /* End of extern "C" { */ - -#endif /* __cplusplus */ - - #endif // __KEY_H__ diff --git a/drivers/staging/vt6655/mac.c b/drivers/staging/vt6655/mac.c index 29b0d0ac724a..889866c13c75 100644 --- a/drivers/staging/vt6655/mac.c +++ b/drivers/staging/vt6655/mac.c @@ -68,21 +68,10 @@ * */ - - -#if !defined(__TMACRO_H__) #include "tmacro.h" -#endif -#if !defined(__TBIT_H__) #include "tbit.h" -#endif -#if !defined(__TETHER_H__) #include "tether.h" -#endif -#if !defined(__MAC_H__) #include "mac.h" -#endif - WORD TxRate_iwconfig;//2008-5-8 <add> by chester /*--------------------- Static Definitions -------------------------*/ diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index c92867b16899..3ba87fb64d3c 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -34,15 +34,9 @@ #ifndef __MAC_H__ #define __MAC_H__ -#if !defined(__TTYPE_H__) #include "ttype.h" -#endif -#if !defined(__TMACRO_H__) #include "tmacro.h" -#endif -#if !defined(__UPC_H__) #include "upc.h" -#endif /*--------------------- Export Definitions -------------------------*/ // @@ -1079,9 +1073,6 @@ /*--------------------- Export Variables --------------------------*/ /*--------------------- Export Functions --------------------------*/ -#ifdef __cplusplus -extern "C" { /* Assume C declarations for C++ */ -#endif /* __cplusplus */ extern WORD TxRate_iwconfig;//2008-5-8 <add> by chester VOID MACvReadAllRegs(DWORD_PTR dwIoBase, PBYTE pbyMacRegs); @@ -1156,9 +1147,5 @@ void MACvDisableDefaultKey(DWORD_PTR dwIoBase); void MACvSetDefaultTKIPKeyEntry(DWORD_PTR dwIoBase, UINT uKeyLen, UINT uKeyIdx, PDWORD pdwKey, BYTE byLocalID); void MACvSetDefaultKeyCtl(DWORD_PTR dwIoBase, WORD wKeyCtl, UINT uEntryIdx, BYTE byLocalID); -#ifdef __cplusplus -} /* End of extern "C" { */ -#endif /* __cplusplus */ - #endif // __MAC_H__ diff --git a/drivers/staging/vt6655/mib.c b/drivers/staging/vt6655/mib.c index 2fc54e9dea38..f411aced3281 100644 --- a/drivers/staging/vt6655/mib.c +++ b/drivers/staging/vt6655/mib.c @@ -37,31 +37,14 @@ * */ - -#if !defined(__UPC_H__) #include "upc.h" -#endif -#if !defined(__MAC_H__) #include "mac.h" -#endif -#if !defined(__TBIT_H__) #include "tbit.h" -#endif -#if !defined(__TETHER_H__) #include "tether.h" -#endif -#if !defined(__MIB_H__) #include "mib.h" -#endif -#if !defined(__WCTL_H__) #include "wctl.h" -#endif -#if !defined(__UMEM_H__) #include "umem.h" -#endif -#if !defined(__BASEBAND_H__) #include "baseband.h" -#endif /*--------------------- Static Definitions -------------------------*/ static int msglevel =MSG_LEVEL_INFO; diff --git a/drivers/staging/vt6655/mib.h b/drivers/staging/vt6655/mib.h index fc3675c76eab..69e04f70b6c1 100644 --- a/drivers/staging/vt6655/mib.h +++ b/drivers/staging/vt6655/mib.h @@ -29,19 +29,9 @@ #ifndef __MIB_H__ #define __MIB_H__ -#if !defined(__TTYPE_H__) #include "ttype.h" -#endif -#if !defined(__TETHER_H__) #include "tether.h" -#endif -#if !defined(__DESC_H__) #include "desc.h" -#endif - - - -//#define ULONGLONG ULONG /*--------------------- Export Definitions -------------------------*/ // @@ -351,10 +341,6 @@ typedef struct tagSStatCounter { /*--------------------- Export Variables --------------------------*/ /*--------------------- Export Functions --------------------------*/ -#ifdef __cplusplus -extern "C" { /* Assume C declarations for C++ */ -#endif /* __cplusplus */ - void STAvClearAllCounter(PSStatCounter pStatistic); @@ -386,13 +372,6 @@ void STAvUpdate802_11Counter( void STAvClear802_11Counter(PSDot11Counters p802_11Counter); -#ifdef __cplusplus -} /* End of extern "C" { */ -#endif /* __cplusplus */ - - - - #endif // __MIB_H__ diff --git a/drivers/staging/vt6655/michael.c b/drivers/staging/vt6655/michael.c index 7bda4c19e903..2c8f875659dd 100644 --- a/drivers/staging/vt6655/michael.c +++ b/drivers/staging/vt6655/michael.c @@ -39,15 +39,9 @@ * */ -#if !defined(__TMACRO_H__) #include "tmacro.h" -#endif -#if !defined(__TBIT_H__) #include "tbit.h" -#endif -#if !defined(__MICHAEL_H__) #include "michael.h" -#endif /*--------------------- Static Definitions -------------------------*/ diff --git a/drivers/staging/vt6655/michael.h b/drivers/staging/vt6655/michael.h index 62a24a6083aa..dcce12e5b6cc 100644 --- a/drivers/staging/vt6655/michael.h +++ b/drivers/staging/vt6655/michael.h @@ -28,13 +28,11 @@ * */ - #ifndef __MICHAEL_H__ #define __MICHAEL_H__ -#if !defined(__UMEM_H__) #include "umem.h" -#endif + /*--------------------- Export Definitions -------------------------*/ /*--------------------- Export Types ------------------------------*/ diff --git a/drivers/staging/vt6655/power.c b/drivers/staging/vt6655/power.c index db5c1159a6b6..a0ca66ec1d08 100644 --- a/drivers/staging/vt6655/power.c +++ b/drivers/staging/vt6655/power.c @@ -37,44 +37,17 @@ * */ - - -#if !defined(__TTYPE_H__) #include "ttype.h" -#endif -#if !defined(__TBIT_H__) #include "tbit.h" -#endif -#if !defined(__MAC_H__) #include "mac.h" -#endif -#if !defined(__DEVICE_H__) #include "device.h" -#endif -#if !defined(__WMGR_H__) #include "wmgr.h" -#endif -#if !defined(__POWER_H__) #include "power.h" -#endif -#if !defined(__WCMD_H__) #include "wcmd.h" -#endif -#if !defined(__TBIT_H__) #include "tbit.h" -#endif -#if !defined(__UMEM_H__) #include "umem.h" -#endif -#if !defined(__RXTX_H__) #include "rxtx.h" -#endif -#if !defined(__CARD_H__) #include "card.h" -#endif - - - /*--------------------- Static Definitions -------------------------*/ diff --git a/drivers/staging/vt6655/rc4.c b/drivers/staging/vt6655/rc4.c index 5ad12a3746c0..e6c61312fd28 100644 --- a/drivers/staging/vt6655/rc4.c +++ b/drivers/staging/vt6655/rc4.c @@ -30,9 +30,7 @@ * */ -#if !defined(__RC4_H__) #include "rc4.h" -#endif VOID rc4_init(PRC4Ext pRC4, PBYTE pbyKey, UINT cbKey_len) { diff --git a/drivers/staging/vt6655/rc4.h b/drivers/staging/vt6655/rc4.h index 2344f35ae1d6..bf607c9d446a 100644 --- a/drivers/staging/vt6655/rc4.h +++ b/drivers/staging/vt6655/rc4.h @@ -30,11 +30,7 @@ #ifndef __RC4_H__ #define __RC4_H__ -#if !defined(__TTYPE_H__) #include "ttype.h" -#endif - - /*--------------------- Export Definitions -------------------------*/ /*--------------------- Export Types ------------------------------*/ diff --git a/drivers/staging/vt6655/rf.c b/drivers/staging/vt6655/rf.c index 40c7bb0e12d7..73648ba88a3e 100644 --- a/drivers/staging/vt6655/rf.c +++ b/drivers/staging/vt6655/rf.c @@ -32,21 +32,11 @@ * */ -#if !defined(__MAC_H__) #include "mac.h" -#endif -#if !defined(__SROM_H__) #include "srom.h" -#endif -#if !defined(__TBIT_H__) #include "tbit.h" -#endif -#if !defined(__RF_H__) #include "rf.h" -#endif -#if !defined(__BASEBAND_H__) #include "baseband.h" -#endif /*--------------------- Static Definitions -------------------------*/ diff --git a/drivers/staging/vt6655/rf.h b/drivers/staging/vt6655/rf.h index 974abc3d20d9..f316bcced8e8 100644 --- a/drivers/staging/vt6655/rf.h +++ b/drivers/staging/vt6655/rf.h @@ -27,16 +27,12 @@ * */ - #ifndef __RF_H__ #define __RF_H__ -#if !defined(__TTYPE_H__) #include "ttype.h" -#endif -#if !defined(__DEVICE_H__) #include "device.h" -#endif + /*--------------------- Export Definitions -------------------------*/ // // Baseband RF pair definition in eeprom (Bits 6..0) @@ -79,9 +75,6 @@ /*--------------------- Export Variables --------------------------*/ /*--------------------- Export Functions --------------------------*/ -#ifdef __cplusplus -extern "C" { /* Assume C declarations for C++ */ -#endif /* __cplusplus */ BOOL IFRFbWriteEmbeded(DWORD_PTR dwIoBase, DWORD dwData); BOOL RFbSelectChannel(DWORD_PTR dwIoBase, BYTE byRFType, BYTE byChannel); @@ -107,11 +100,6 @@ RFvRSSITodBm( BOOL RFbAL7230SelectChannelPostProcess(DWORD_PTR dwIoBase, BYTE byOldChannel, BYTE byNewChannel); //}} RobertYu -#ifdef __cplusplus -} /* End of extern "C" { */ -#endif /* __cplusplus */ - - #endif // __RF_H__ diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c index 098a1355aece..eb73fdb801aa 100644 --- a/drivers/staging/vt6655/rxtx.c +++ b/drivers/staging/vt6655/rxtx.c @@ -48,55 +48,22 @@ * */ - -#if !defined(__DEVICE_H__) #include "device.h" -#endif -#if !defined(__RXTX_H__) #include "rxtx.h" -#endif -#if !defined(__TETHER_H__) #include "tether.h" -#endif -#if !defined(__CARD_H__) #include "card.h" -#endif -#if !defined(__BSSDB_H__) #include "bssdb.h" -#endif -#if !defined(__MAC_H__) #include "mac.h" -#endif -#if !defined(__BASEBAND_H__) #include "baseband.h" -#endif -#if !defined(__UMEM_H__) #include "umem.h" -#endif -#if !defined(__MICHAEL_H__) #include "michael.h" -#endif -#if !defined(__TKIP_H__) #include "tkip.h" -#endif -#if !defined(__TCRC_H__) #include "tcrc.h" -#endif -#if !defined(__WCTL_H__) #include "wctl.h" -#endif -#if !defined(__WROUTE_H__) #include "wroute.h" -#endif -#if !defined(__TBIT_H__) #include "tbit.h" -#endif -#if !defined(__HOSTAP_H__) #include "hostap.h" -#endif -#if !defined(__RF_H__) #include "rf.h" -#endif /*--------------------- Static Definitions -------------------------*/ diff --git a/drivers/staging/vt6655/rxtx.h b/drivers/staging/vt6655/rxtx.h index 5320e72a8da7..17bd1b1f40e6 100644 --- a/drivers/staging/vt6655/rxtx.h +++ b/drivers/staging/vt6655/rxtx.h @@ -26,20 +26,12 @@ * */ - #ifndef __RXTX_H__ #define __RXTX_H__ -#if !defined(__TTYPE_H__) #include "ttype.h" -#endif -#if !defined(__DEVICE_H__) #include "device.h" -#endif -#if !defined(__WCMD_H__) #include "wcmd.h" -#endif - /*--------------------- Export Definitions -------------------------*/ diff --git a/drivers/staging/vt6655/srom.c b/drivers/staging/vt6655/srom.c index 655d68593701..81b3934326f4 100644 --- a/drivers/staging/vt6655/srom.c +++ b/drivers/staging/vt6655/srom.c @@ -42,28 +42,12 @@ * */ - -#if !defined(__UPC_H__) #include "upc.h" -#endif -#if !defined(__TMACRO_H__) #include "tmacro.h" -#endif -#if !defined(__TBIT_H__) #include "tbit.h" -#endif -#if !defined(__TETHER_H__) #include "tether.h" -#endif -#if !defined(__MAC_H__) #include "mac.h" -#endif -#if !defined(__SROM_H__) #include "srom.h" -#endif - - - /*--------------------- Static Definitions -------------------------*/ diff --git a/drivers/staging/vt6655/srom.h b/drivers/staging/vt6655/srom.h index 46c0f6a05523..ba123ee61d24 100644 --- a/drivers/staging/vt6655/srom.h +++ b/drivers/staging/vt6655/srom.h @@ -27,16 +27,10 @@ * */ - #ifndef __SROM_H__ #define __SROM_H__ -#if !defined(__TTYPE_H__) #include "ttype.h" -#endif - - - /*--------------------- Export Definitions -------------------------*/ @@ -140,10 +134,6 @@ typedef struct tagSSromReg { /*--------------------- Export Variables --------------------------*/ /*--------------------- Export Functions --------------------------*/ -#ifdef __cplusplus -extern "C" { /* Assume C declarations for C++ */ -#endif /* __cplusplus */ - BYTE SROMbyReadEmbedded(DWORD_PTR dwIoBase, BYTE byContntOffset); BOOL SROMbWriteEmbedded(DWORD_PTR dwIoBase, BYTE byContntOffset, BYTE byData); @@ -164,12 +154,4 @@ VOID SROMvReadSubSysVenId(DWORD_PTR dwIoBase, PDWORD pdwSubSysVenId); BOOL SROMbAutoLoad (DWORD_PTR dwIoBase); - -#ifdef __cplusplus -} /* End of extern "C" { */ -#endif /* __cplusplus */ - - - - #endif // __EEPROM_H__ diff --git a/drivers/staging/vt6655/tbit.h b/drivers/staging/vt6655/tbit.h index 7c3a82e9b608..1850282ce443 100644 --- a/drivers/staging/vt6655/tbit.h +++ b/drivers/staging/vt6655/tbit.h @@ -27,15 +27,10 @@ * */ - #ifndef __TBIT_H__ #define __TBIT_H__ -#if !defined(__TTYPE_H__) #include "ttype.h" -#endif - - /*--------------------- Export Definitions -------------------------*/ diff --git a/drivers/staging/vt6655/tcrc.c b/drivers/staging/vt6655/tcrc.c index b70080c267c8..79347e48369a 100644 --- a/drivers/staging/vt6655/tcrc.c +++ b/drivers/staging/vt6655/tcrc.c @@ -33,16 +33,8 @@ * */ - -#if !defined(__TBIT_H__) #include "tbit.h" -#endif -#if !defined(__TCRC_H__) #include "tcrc.h" -#endif - - - /*--------------------- Static Definitions -------------------------*/ diff --git a/drivers/staging/vt6655/tcrc.h b/drivers/staging/vt6655/tcrc.h index ebea22ed2da6..5faa48b0a748 100644 --- a/drivers/staging/vt6655/tcrc.h +++ b/drivers/staging/vt6655/tcrc.h @@ -26,16 +26,10 @@ * */ - #ifndef __TCRC_H__ #define __TCRC_H__ -#if !defined(__TTYPE_H__) #include "ttype.h" -#endif - - - /*--------------------- Export Definitions -------------------------*/ @@ -48,23 +42,11 @@ /*--------------------- Export Variables --------------------------*/ /*--------------------- Export Functions --------------------------*/ -#ifdef __cplusplus -extern "C" { /* Assume C declarations for C++ */ -#endif /* __cplusplus */ - DWORD CRCdwCrc32(PBYTE pbyData, UINT cbByte, DWORD dwCrcSeed); DWORD CRCdwGetCrc32(PBYTE pbyData, UINT cbByte); DWORD CRCdwGetCrc32Ex(PBYTE pbyData, UINT cbByte, DWORD dwPreCRC); - -#ifdef __cplusplus -} /* End of extern "C" { */ -#endif /* __cplusplus */ - - - - #endif // __TCRC_H__ diff --git a/drivers/staging/vt6655/tether.c b/drivers/staging/vt6655/tether.c index fd69423fe14b..7268735d01ce 100644 --- a/drivers/staging/vt6655/tether.c +++ b/drivers/staging/vt6655/tether.c @@ -32,24 +32,11 @@ * */ -#if !defined(__DEVICE_H__) #include "device.h" -#endif -#if !defined(__TMACRO_H__) #include "tmacro.h" -#endif -#if !defined(__TBIT_H__) #include "tbit.h" -#endif -#if !defined(__TCRC_H__) #include "tcrc.h" -#endif -#if !defined(__TETHER_H__) #include "tether.h" -#endif - - - /*--------------------- Static Definitions -------------------------*/ diff --git a/drivers/staging/vt6655/tether.h b/drivers/staging/vt6655/tether.h index 8f40a74bf3b9..5a3c326436c6 100644 --- a/drivers/staging/vt6655/tether.h +++ b/drivers/staging/vt6655/tether.h @@ -26,18 +26,10 @@ * */ - - #ifndef __TETHER_H__ #define __TETHER_H__ - -#if !defined(__TTYPE_H__) #include "ttype.h" -#endif - - - /*--------------------- Export Definitions -------------------------*/ // @@ -233,23 +225,11 @@ S802_11Header, *PS802_11Header; /*--------------------- Export Variables --------------------------*/ /*--------------------- Export Functions --------------------------*/ -#ifdef __cplusplus -extern "C" { /* Assume C declarations for C++ */ -#endif /* __cplusplus */ - BYTE ETHbyGetHashIndexByCrc32(PBYTE pbyMultiAddr); //BYTE ETHbyGetHashIndexByCrc(PBYTE pbyMultiAddr); BOOL ETHbIsBufferCrc32Ok(PBYTE pbyBuffer, UINT cbFrameLength); - -#ifdef __cplusplus -} /* End of extern "C" { */ -#endif /* __cplusplus */ - - - - #endif // __TETHER_H__ diff --git a/drivers/staging/vt6655/tkip.c b/drivers/staging/vt6655/tkip.c index 2ded8420c390..c02ce6a713d3 100644 --- a/drivers/staging/vt6655/tkip.c +++ b/drivers/staging/vt6655/tkip.c @@ -32,20 +32,10 @@ * */ - -#if !defined(__TMACRO_H__) #include "tmacro.h" -#endif -#if !defined(__TBIT_H__) #include "tbit.h" -#endif -#if !defined(__TKIP_H__) #include "tkip.h" -#endif -#if !defined(__UMEM_H__) #include "umem.h" -#endif - /*--------------------- Static Definitions -------------------------*/ diff --git a/drivers/staging/vt6655/tkip.h b/drivers/staging/vt6655/tkip.h index dc8382b67019..847ecdf97ee8 100644 --- a/drivers/staging/vt6655/tkip.h +++ b/drivers/staging/vt6655/tkip.h @@ -27,19 +27,11 @@ * */ - #ifndef __TKIP_H__ #define __TKIP_H__ -#if !defined(__TTYPE_H__) #include "ttype.h" -#endif - -#if !defined(__TETHER_H__) #include "tether.h" -#endif - - /*--------------------- Export Definitions -------------------------*/ #define TKIP_KEY_LEN 16 @@ -53,9 +45,6 @@ /*--------------------- Export Variables --------------------------*/ /*--------------------- Export Functions --------------------------*/ -#ifdef __cplusplus -extern "C" { /* Assume C declarations for C++ */ -#endif /* __cplusplus */ VOID TKIPvMixKey( PBYTE pbyTKey, @@ -65,11 +54,6 @@ VOID TKIPvMixKey( PBYTE pbyRC4Key ); -#ifdef __cplusplus -} /* End of extern "C" { */ -#endif /* __cplusplus */ - - #endif // __TKIP_H__ diff --git a/drivers/staging/vt6655/tmacro.h b/drivers/staging/vt6655/tmacro.h index d18b01c6a470..e96c140de052 100644 --- a/drivers/staging/vt6655/tmacro.h +++ b/drivers/staging/vt6655/tmacro.h @@ -26,7 +26,6 @@ * */ - #ifndef __TMACRO_H__ #define __TMACRO_H__ diff --git a/drivers/staging/vt6655/tpci.h b/drivers/staging/vt6655/tpci.h index 3a04845cbb51..d1fe2560027b 100644 --- a/drivers/staging/vt6655/tpci.h +++ b/drivers/staging/vt6655/tpci.h @@ -29,16 +29,10 @@ * */ - #ifndef __TPCI_H__ #define __TPCI_H__ -#if !defined(__TTYPE_H__) #include "ttype.h" -#endif - - - /*--------------------- Export Definitions -------------------------*/ #define MAX_PCI_BUS 4 // max. # of PCI bus that we support diff --git a/drivers/staging/vt6655/umem.h b/drivers/staging/vt6655/umem.h index 2c3eafa038e7..916adde864ae 100644 --- a/drivers/staging/vt6655/umem.h +++ b/drivers/staging/vt6655/umem.h @@ -31,11 +31,7 @@ #ifndef __UMEM_H__ #define __UMEM_H__ -#if !defined(__TTYPE_H__) #include "ttype.h" -#endif - - /*--------------------- Export Definitions -------------------------*/ // 4-byte memory tag diff --git a/drivers/staging/vt6655/upc.h b/drivers/staging/vt6655/upc.h index 113fc2c88c11..acd1b661490d 100644 --- a/drivers/staging/vt6655/upc.h +++ b/drivers/staging/vt6655/upc.h @@ -26,16 +26,11 @@ * */ - #ifndef __UPC_H__ #define __UPC_H__ -#if !defined(DEVICE_H) #include "device.h" -#endif -#if !defined(__TTYPE_H__) #include "ttype.h" -#endif /*--------------------- Export Definitions -------------------------*/ diff --git a/drivers/staging/vt6655/vntwifi.c b/drivers/staging/vt6655/vntwifi.c index 58a1ba0eac07..40bb1ccb1a39 100644 --- a/drivers/staging/vt6655/vntwifi.c +++ b/drivers/staging/vt6655/vntwifi.c @@ -31,32 +31,15 @@ * */ -#if !defined(__VNTWIFI_H__) #include "vntwifi.h" -#endif -#if !defined(__UMEM_H__) #include "umem.h" -#endif - - -#if !defined(__TBIT_H__) #include "tbit.h" -#endif -#if !defined(__IEEE11h_H__) #include "IEEE11h.h" -#endif -#if !defined(__COUNTRY_H__) #include "country.h" -#endif -#if !defined(__DEVICE_H__) #include "device.h" -#endif -#if !defined(__WMGR_H__) #include "wmgr.h" -#endif -#if !defined(__DATARATE_H__) #include "datarate.h" -#endif + //#define PLICE_DEBUG /*--------------------- Static Definitions -------------------------*/ diff --git a/drivers/staging/vt6655/vntwifi.h b/drivers/staging/vt6655/vntwifi.h index 9af538bd44e4..2854dfcb19aa 100644 --- a/drivers/staging/vt6655/vntwifi.h +++ b/drivers/staging/vt6655/vntwifi.h @@ -30,15 +30,9 @@ #ifndef __VNTWIFI_H__ #define __VNTWIFI_H__ -#if !defined(__TTYPE_H__) #include "ttype.h" -#endif -#if !defined(__80211MGR_H__) #include "80211mgr.h" -#endif -#if !defined(__CARD_H__) #include "card.h" -#endif #include "wpa2.h" /*--------------------- Export Definitions -------------------------*/ @@ -146,11 +140,6 @@ typedef enum tagWMAC_POWER_MODE { /*--------------------- Export Functions --------------------------*/ -#ifdef __cplusplus -extern "C" { /* Assume C declarations for C++ */ -#endif /* __cplusplus */ - - VOID VNTWIFIvSetIBSSParameter ( IN PVOID pMgmtHandle, @@ -321,9 +310,4 @@ VNTWIFIbRadarPresent( ); */ -#ifdef __cplusplus -} /* End of extern "C" { */ -#endif /* __cplusplus */ - - #endif //__VNTWIFI_H__ diff --git a/drivers/staging/vt6655/wcmd.c b/drivers/staging/vt6655/wcmd.c index 5d7a12b9e75e..39a6988bd34f 100644 --- a/drivers/staging/vt6655/wcmd.c +++ b/drivers/staging/vt6655/wcmd.c @@ -38,58 +38,22 @@ * */ - - - -#if !defined(__TTYPE_H__) #include "ttype.h" -#endif -#if !defined(__TMACRO_H__) #include "tmacro.h" -#endif -#if !defined(__DEVICE_H__) #include "device.h" -#endif -#if !defined(__MAC_H__) #include "mac.h" -#endif -#if !defined(__CARD_H__) #include "card.h" -#endif -#if !defined(__80211HDR_H__) #include "80211hdr.h" -#endif -#if !defined(__WCMD_H__) #include "wcmd.h" -#endif -#if !defined(__WMGR_H__) #include "wmgr.h" -#endif -#if !defined(__POWER_H__) #include "power.h" -#endif -#if !defined(__WCTL_H__) #include "wctl.h" -#endif -#if !defined(__CARD_H__) #include "card.h" -#endif -#if !defined(__BASEBAND_H__) #include "baseband.h" -#endif -#if !defined(__UMEM_H__) #include "umem.h" -#endif -#if !defined(__RXTX_H__) #include "rxtx.h" -#endif -#if !defined(__RF_H__) #include "rf.h" -#endif -//DavidWang -#if !defined(__IOWPA_H__) #include "iowpa.h" -#endif /*--------------------- Static Definitions -------------------------*/ diff --git a/drivers/staging/vt6655/wcmd.h b/drivers/staging/vt6655/wcmd.h index 778208a336e8..af32e57e335f 100644 --- a/drivers/staging/vt6655/wcmd.h +++ b/drivers/staging/vt6655/wcmd.h @@ -29,15 +29,9 @@ #ifndef __WCMD_H__ #define __WCMD_H__ -#if !defined(__TTYPE_H__) #include "ttype.h" -#endif -#if !defined(__80211HDR_H__) #include "80211hdr.h" -#endif -#if !defined(__80211MGR_H__) #include "80211mgr.h" -#endif /*--------------------- Export Definitions -------------------------*/ diff --git a/drivers/staging/vt6655/wctl.c b/drivers/staging/vt6655/wctl.c index 2b41c1999834..4406f8caa555 100644 --- a/drivers/staging/vt6655/wctl.c +++ b/drivers/staging/vt6655/wctl.c @@ -34,16 +34,9 @@ * */ - -#if !defined(__WCTL_H__) #include "wctl.h" -#endif -#if !defined(__DEVICE_H__) #include "device.h" -#endif -#if !defined(__CARD_H__) #include "card.h" -#endif /*--------------------- Static Definitions -------------------------*/ diff --git a/drivers/staging/vt6655/wctl.h b/drivers/staging/vt6655/wctl.h index f75ca59f6c61..a1ac4791bfd3 100644 --- a/drivers/staging/vt6655/wctl.h +++ b/drivers/staging/vt6655/wctl.h @@ -26,21 +26,12 @@ * */ - #ifndef __WCTL_H__ #define __WCTL_H__ -#if !defined(__TTYPE_H__) #include "ttype.h" -#endif -#if !defined(__TETHER_H__) #include "tether.h" -#endif -#if !defined(__DEVICE_H__) #include "device.h" -#endif - - /*--------------------- Export Definitions -------------------------*/ @@ -105,22 +96,12 @@ /*--------------------- Export Variables --------------------------*/ /*--------------------- Export Functions --------------------------*/ -#ifdef __cplusplus -extern "C" { /* Assume C declarations for C++ */ -#endif /* __cplusplus */ BOOL WCTLbIsDuplicate(PSCache pCache, PS802_11Header pMACHeader); BOOL WCTLbHandleFragment(PSDevice pDevice, PS802_11Header pMACHeader, UINT cbFrameLength, BOOL bWEP, BOOL bExtIV); UINT WCTLuSearchDFCB(PSDevice pDevice, PS802_11Header pMACHeader); UINT WCTLuInsertDFCB(PSDevice pDevice, PS802_11Header pMACHeader); -#ifdef __cplusplus -} /* End of extern "C" { */ -#endif /* __cplusplus */ - - - - #endif // __WCTL_H__ diff --git a/drivers/staging/vt6655/wmgr.c b/drivers/staging/vt6655/wmgr.c index fb15367b0fb7..ab845666b0c0 100644 --- a/drivers/staging/vt6655/wmgr.c +++ b/drivers/staging/vt6655/wmgr.c @@ -61,64 +61,25 @@ * */ - -#if !defined(__TMACRO_H__) #include "tmacro.h" -#endif -#if !defined(__TBIT_H__) #include "tbit.h" -#endif -#if !defined(__DESC_H__) #include "desc.h" -#endif -#if !defined(__DEVICE_H__) #include "device.h" -#endif -#if !defined(__CARD_H__) #include "card.h" -#endif -#if !defined(__80211HDR_H__) #include "80211hdr.h" -#endif -#if !defined(__80211MGR_H__) #include "80211mgr.h" -#endif -#if !defined(__WMGR_H__) #include "wmgr.h" -#endif -#if !defined(__WCMD_H__) #include "wcmd.h" -#endif -#if !defined(__MAC_H__) #include "mac.h" -#endif -#if !defined(__BSSDB_H__) #include "bssdb.h" -#endif -#if !defined(__POWER_H__) #include "power.h" -#endif -#if !defined(__DATARATE_H__) #include "datarate.h" -#endif -#if !defined(__BASEBAND_H__) #include "baseband.h" -#endif -#if !defined(__RXTX_H__) #include "rxtx.h" -#endif -#if !defined(__WPA_H__) #include "wpa.h" -#endif -#if !defined(__RF_H__) #include "rf.h" -#endif -#if !defined(__UMEM_H__) #include "umem.h" -#endif -#if !defined(__IOWPA_H__) #include "iowpa.h" -#endif #define PLICE_DEBUG diff --git a/drivers/staging/vt6655/wmgr.h b/drivers/staging/vt6655/wmgr.h index 38c6ef2a8f6f..1c1f2ea5782c 100644 --- a/drivers/staging/vt6655/wmgr.h +++ b/drivers/staging/vt6655/wmgr.h @@ -31,36 +31,17 @@ * */ - #ifndef __WMGR_H__ #define __WMGR_H__ -#if !defined(__TTYPE_H__) #include "ttype.h" -#endif -#if !defined(__80211MGR_H__) #include "80211mgr.h" -#endif -#if !defined(__80211HDR_H__) #include "80211hdr.h" -#endif -#if !defined(__WCMD_H__) #include "wcmd.h" -#endif -#if !defined(__BSSDB_H__) #include "bssdb.h" -#endif -#if !defined(__CARD_H__) -#include "card.h" -#endif -#if !defined(__WPA2_H__) #include "wpa2.h" -#endif -#if !defined(__VNTWIFI_H__) #include "vntwifi.h" -#endif - - +#include "card.h" /*--------------------- Export Definitions -------------------------*/ diff --git a/drivers/staging/vt6655/wpa.c b/drivers/staging/vt6655/wpa.c index 93614a06efed..2e508973c42c 100644 --- a/drivers/staging/vt6655/wpa.c +++ b/drivers/staging/vt6655/wpa.c @@ -32,38 +32,16 @@ * */ - -#if !defined(__TTYPE_H__) #include "ttype.h" -#endif -#if !defined(__UMEM_H__) #include "umem.h" -#endif -#if !defined(__TMACRO_H__) #include "tmacro.h" -#endif -#if !defined(__TETHER_H__) #include "tether.h" -#endif -#if !defined(__DEVICE_H__) #include "device.h" -#endif -#if !defined(__80211HDR_H__) #include "80211hdr.h" -#endif -#if !defined(__BSSDB_H__) #include "bssdb.h" -#endif -#if !defined(__WMGR_H__) #include "wmgr.h" -#endif -#if !defined(__WPA_H__) #include "wpa.h" -#endif -#if !defined(__80211MGR_H__) #include "80211mgr.h" -#endif - /*--------------------- Static Variables --------------------------*/ static int msglevel =MSG_LEVEL_INFO; diff --git a/drivers/staging/vt6655/wpa.h b/drivers/staging/vt6655/wpa.h index 8000a37c6fc3..9d9ce01d0c61 100644 --- a/drivers/staging/vt6655/wpa.h +++ b/drivers/staging/vt6655/wpa.h @@ -31,14 +31,8 @@ #ifndef __WPA_H__ #define __WPA_H__ - -#if !defined(__TTYPE_H__) #include "ttype.h" -#endif -#if !defined(__80211HDR_H__) #include "80211hdr.h" -#endif - /*--------------------- Export Definitions -------------------------*/ @@ -63,9 +57,6 @@ /*--------------------- Export Functions --------------------------*/ -#ifdef __cplusplus -extern "C" { /* Assume C declarations for C++ */ -#endif /* __cplusplus */ VOID WPA_ClearRSN( @@ -90,9 +81,4 @@ WPAb_Is_RSN( IN PWLAN_IE_RSN_EXT pRSN ); -#ifdef __cplusplus -} /* End of extern "C" { */ -#endif /* __cplusplus */ - - #endif // __WPA_H__ diff --git a/drivers/staging/vt6655/wpa2.c b/drivers/staging/vt6655/wpa2.c index 82c972dbfbfe..1e6244fc23a0 100644 --- a/drivers/staging/vt6655/wpa2.c +++ b/drivers/staging/vt6655/wpa2.c @@ -30,19 +30,11 @@ * Date: Oct. 4, 2004 * */ -#if !defined(__WPA2_H__) + #include "wpa2.h" -#endif -#if !defined(__UMEM_H__) #include "umem.h" -#endif -#if !defined(__DEVICE_H__) #include "device.h" -#endif -#if !defined(__WMGR_H__) #include "wmgr.h" -#endif - /*--------------------- Static Definitions -------------------------*/ static int msglevel =MSG_LEVEL_INFO; diff --git a/drivers/staging/vt6655/wpa2.h b/drivers/staging/vt6655/wpa2.h index cd1ea14b586e..e553b3869008 100644 --- a/drivers/staging/vt6655/wpa2.h +++ b/drivers/staging/vt6655/wpa2.h @@ -31,22 +31,10 @@ #ifndef __WPA2_H__ #define __WPA2_H__ - -#if !defined(__TTYPE_H__) #include "ttype.h" -#endif -#if !defined(__80211MGR_H__) #include "80211mgr.h" -#endif -#if !defined(__80211HDR_H__) #include "80211hdr.h" -#endif -#if !defined(__BSSDB_H__) #include "bssdb.h" -#endif - - - /*--------------------- Export Definitions -------------------------*/ #define MAX_PMKID_CACHE 16 @@ -69,9 +57,6 @@ typedef struct tagSPMKIDCache { /*--------------------- Export Types ------------------------------*/ /*--------------------- Export Functions --------------------------*/ -#ifdef __cplusplus -extern "C" { /* Assume C declarations for C++ */ -#endif /* __cplusplus */ VOID WPA2_ClearRSN ( @@ -90,10 +75,4 @@ WPA2uSetIEs( OUT PWLAN_IE_RSN pRSNIEs ); - -#ifdef __cplusplus -} /* End of extern "C" { */ -#endif /* __cplusplus */ - - #endif // __WPA2_H__ diff --git a/drivers/staging/vt6655/wpactl.c b/drivers/staging/vt6655/wpactl.c index 460182c74a3e..574e0b0a9c28 100644 --- a/drivers/staging/vt6655/wpactl.c +++ b/drivers/staging/vt6655/wpactl.c @@ -31,32 +31,14 @@ * */ - -#if !defined(__WPACTL_H__) #include "wpactl.h" -#endif -#if !defined(__KEY_H__) #include "key.h" -#endif -#if !defined(__MAC_H__) #include "mac.h" -#endif -#if !defined(__DEVICE_H__) #include "device.h" -#endif -#if !defined(__WMGR_H__) #include "wmgr.h" -#endif -#if !defined(__IOCMD_H__) #include "iocmd.h" -#endif -#if !defined(__IOWPA_H__) #include "iowpa.h" -#endif -//2008-0717-05, <Add> by James -#if !defined(__RF_H__) #include "rf.h" -#endif /*--------------------- Static Definitions -------------------------*/ diff --git a/drivers/staging/vt6655/wpactl.h b/drivers/staging/vt6655/wpactl.h index b869cfdf42c3..b0d92d51a2a6 100644 --- a/drivers/staging/vt6655/wpactl.h +++ b/drivers/staging/vt6655/wpactl.h @@ -26,19 +26,13 @@ * */ - #ifndef __WPACTL_H__ #define __WPACTL_H__ -#if !defined(__DEVICE_H__) #include "device.h" -#endif - #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT -#if !defined(__IOWPA_H__) #include "iowpa.h" #endif -#endif /*--------------------- Export Definitions -------------------------*/ @@ -68,22 +62,10 @@ typedef ULONGLONG NDIS_802_11_KEY_RSC; /*--------------------- Export Functions --------------------------*/ - -#ifdef __cplusplus -extern "C" { /* Assume C declarations for C++ */ -#endif /* __cplusplus */ - int wpa_set_wpadev(PSDevice pDevice, int val); int wpa_ioctl(PSDevice pDevice, struct iw_point *p); int wpa_set_keys(PSDevice pDevice, void *ctx, BOOL fcpfkernel); -#ifdef __cplusplus -} /* End of extern "C" { */ -#endif /* __cplusplus */ - - - - #endif // __WPACL_H__ diff --git a/drivers/staging/vt6655/wroute.c b/drivers/staging/vt6655/wroute.c index d16771e56d0f..ab991618a298 100644 --- a/drivers/staging/vt6655/wroute.c +++ b/drivers/staging/vt6655/wroute.c @@ -31,25 +31,13 @@ * */ - -#if !defined(__MAC_H__) #include "mac.h" -#endif -#if !defined(__TCRC_H__) #include "tcrc.h" -#endif -#if !defined(__RXTX_H__) #include "rxtx.h" -#endif -#if !defined(__WROUTE_H__) #include "wroute.h" -#endif -#if !defined(__CARD_H__) #include "card.h" -#endif -#if !defined(__BASEBAND_H__) #include "baseband.h" -#endif + /*--------------------- Static Definitions -------------------------*/ /*--------------------- Static Classes ----------------------------*/ diff --git a/drivers/staging/vt6655/wroute.h b/drivers/staging/vt6655/wroute.h index ea5f5896e9ba..295cdc5b8e9d 100644 --- a/drivers/staging/vt6655/wroute.h +++ b/drivers/staging/vt6655/wroute.h @@ -26,16 +26,10 @@ * */ - #ifndef __WROUTE_H__ #define __WROUTE_H__ - -#if !defined(__DEVICE_H__) #include "device.h" -#endif - - /*--------------------- Export Definitions -------------------------*/ @@ -45,20 +39,8 @@ /*--------------------- Export Functions --------------------------*/ - -#ifdef __cplusplus -extern "C" { /* Assume C declarations for C++ */ -#endif /* __cplusplus */ - BOOL ROUTEbRelay (PSDevice pDevice, PBYTE pbySkbData, UINT uDataLen, UINT uNodeIndex); -#ifdef __cplusplus -} /* End of extern "C" { */ -#endif /* __cplusplus */ - - - - #endif // __WROUTE_H__ |