---

yaml --- r: 162325 b: refs/heads/master c: a7ad322 h: refs/heads/master i: 162323: 561a8db v: v3
git-mirror · Sep 15, 2009 · 9e7a642 · 9e7a642
1 parent d920bbc
commit 9e7a642
Show file tree

Hide file tree

Showing 75 changed files with 12 additions and 1,133 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9d26d60f99855056a20ac7c0b68eb5ed04619831
+refs/heads/master: a7ad322a46663755718a214a9a34e5cfe64d07f7
diff --git a/trunk/drivers/staging/vt6655/80211hdr.h b/trunk/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/trunk/drivers/staging/vt6655/80211mgr.c b/trunk/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/trunk/drivers/staging/vt6655/80211mgr.h b/trunk/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/trunk/drivers/staging/vt6655/IEEE11h.c b/trunk/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/trunk/drivers/staging/vt6655/IEEE11h.h b/trunk/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/trunk/drivers/staging/vt6655/TODO b/trunk/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/trunk/drivers/staging/vt6655/aes_ccmp.c b/trunk/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/trunk/drivers/staging/vt6655/aes_ccmp.h b/trunk/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/trunk/drivers/staging/vt6655/baseband.c b/trunk/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/trunk/drivers/staging/vt6655/baseband.h b/trunk/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/trunk/drivers/staging/vt6655/bssdb.c b/trunk/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/trunk/drivers/staging/vt6655/bssdb.h b/trunk/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/trunk/drivers/staging/vt6655/card.c b/trunk/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 -------------------------*/