aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJim Lieb <lieb@canonical.com>2009-08-12 17:54:08 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2009-09-15 15:02:07 -0400
commit9d26d60f99855056a20ac7c0b68eb5ed04619831 (patch)
tree78c5c3c05f639051eb0be9c38ed4fdf6a9f78fa4
parenta884847a1a30be9a55d975f1e3fe8cf5f922bb79 (diff)
Staging: vt665x: Clean up include files, Part 1
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
-rw-r--r--drivers/staging/vt6656/80211hdr.h5
-rw-r--r--drivers/staging/vt6656/80211mgr.c16
-rw-r--r--drivers/staging/vt6656/80211mgr.h6
-rw-r--r--drivers/staging/vt6656/TODO2
-rw-r--r--drivers/staging/vt6656/aes_ccmp.c7
-rw-r--r--drivers/staging/vt6656/aes_ccmp.h2
-rw-r--r--drivers/staging/vt6656/baseband.c23
-rw-r--r--drivers/staging/vt6656/baseband.h17
-rw-r--r--drivers/staging/vt6656/bssdb.c45
-rw-r--r--drivers/staging/vt6656/bssdb.h11
-rw-r--r--drivers/staging/vt6656/card.c32
-rw-r--r--drivers/staging/vt6656/card.h14
-rw-r--r--drivers/staging/vt6656/channel.c9
-rw-r--r--drivers/staging/vt6656/channel.h3
-rw-r--r--drivers/staging/vt6656/control.c6
-rw-r--r--drivers/staging/vt6656/control.h20
-rw-r--r--drivers/staging/vt6656/datarate.c21
-rw-r--r--drivers/staging/vt6656/desc.h10
-rw-r--r--drivers/staging/vt6656/dpc.c40
-rw-r--r--drivers/staging/vt6656/dpc.h24
-rw-r--r--drivers/staging/vt6656/firmware.c10
-rw-r--r--drivers/staging/vt6656/firmware.h6
-rw-r--r--drivers/staging/vt6656/hostap.c20
-rw-r--r--drivers/staging/vt6656/hostap.h16
-rw-r--r--drivers/staging/vt6656/int.c19
-rw-r--r--drivers/staging/vt6656/int.h18
-rw-r--r--drivers/staging/vt6656/iocmd.h3
-rw-r--r--drivers/staging/vt6656/ioctl.c22
-rw-r--r--drivers/staging/vt6656/ioctl.h17
-rw-r--r--drivers/staging/vt6656/iowpa.h1
-rw-r--r--drivers/staging/vt6656/iwctl.c23
-rw-r--r--drivers/staging/vt6656/iwctl.h17
-rw-r--r--drivers/staging/vt6656/kcompat.h1
-rw-r--r--drivers/staging/vt6656/key.c15
-rw-r--r--drivers/staging/vt6656/key.h19
-rw-r--r--drivers/staging/vt6656/mac.c19
-rw-r--r--drivers/staging/vt6656/mac.h15
-rw-r--r--drivers/staging/vt6656/main_usb.c60
-rw-r--r--drivers/staging/vt6656/mib.c17
-rw-r--r--drivers/staging/vt6656/mib.h22
-rw-r--r--drivers/staging/vt6656/michael.c6
-rw-r--r--drivers/staging/vt6656/michael.h4
-rw-r--r--drivers/staging/vt6656/power.c31
-rw-r--r--drivers/staging/vt6656/rc4.c2
-rw-r--r--drivers/staging/vt6656/rc4.h4
-rw-r--r--drivers/staging/vt6656/rf.c12
-rw-r--r--drivers/staging/vt6656/rf.h14
-rw-r--r--drivers/staging/vt6656/rxtx.c38
-rw-r--r--drivers/staging/vt6656/rxtx.h22
-rw-r--r--drivers/staging/vt6656/srom.h17
-rw-r--r--drivers/staging/vt6656/tbit.h5
-rw-r--r--drivers/staging/vt6656/tcrc.c8
-rw-r--r--drivers/staging/vt6656/tcrc.h18
-rw-r--r--drivers/staging/vt6656/tether.c13
-rw-r--r--drivers/staging/vt6656/tether.h20
-rw-r--r--drivers/staging/vt6656/tkip.c10
-rw-r--r--drivers/staging/vt6656/tkip.h16
-rw-r--r--drivers/staging/vt6656/tmacro.h3
-rw-r--r--drivers/staging/vt6656/tpci.h6
-rw-r--r--drivers/staging/vt6656/umem.h4
-rw-r--r--drivers/staging/vt6656/upc.h5
-rw-r--r--drivers/staging/vt6656/usbpipe.c15
-rw-r--r--drivers/staging/vt6656/usbpipe.h17
-rw-r--r--drivers/staging/vt6656/wcmd.c42
-rw-r--r--drivers/staging/vt6656/wcmd.h6
-rw-r--r--drivers/staging/vt6656/wctl.c9
-rw-r--r--drivers/staging/vt6656/wctl.h19
-rw-r--r--drivers/staging/vt6656/wmgr.c44
-rw-r--r--drivers/staging/vt6656/wmgr.h17
-rw-r--r--drivers/staging/vt6656/wpa.c22
-rw-r--r--drivers/staging/vt6656/wpa.h14
-rw-r--r--drivers/staging/vt6656/wpa2.c10
-rw-r--r--drivers/staging/vt6656/wpa2.h21
-rw-r--r--drivers/staging/vt6656/wpactl.c22
-rw-r--r--drivers/staging/vt6656/wpactl.h18
75 files changed, 10 insertions, 1177 deletions
diff --git a/drivers/staging/vt6656/80211hdr.h b/drivers/staging/vt6656/80211hdr.h
index 84cb1d020cb..e5cee6fd053 100644
--- a/drivers/staging/vt6656/80211hdr.h
+++ b/drivers/staging/vt6656/80211hdr.h
@@ -28,15 +28,10 @@
28 * 28 *
29 */ 29 */
30 30
31
32
33#ifndef __80211HDR_H__ 31#ifndef __80211HDR_H__
34#define __80211HDR_H__ 32#define __80211HDR_H__
35 33
36
37#if !defined(__TTYPE_H__)
38#include "ttype.h" 34#include "ttype.h"
39#endif
40 35
41/*--------------------- Export Definitions -------------------------*/ 36/*--------------------- Export Definitions -------------------------*/
42// bit type 37// bit type
diff --git a/drivers/staging/vt6656/80211mgr.c b/drivers/staging/vt6656/80211mgr.c
index 8b1ffe9f240..8fa1a8e5a21 100644
--- a/drivers/staging/vt6656/80211mgr.c
+++ b/drivers/staging/vt6656/80211mgr.c
@@ -52,28 +52,12 @@
52 * 52 *
53 */ 53 */
54 54
55
56
57#if !defined(__TMACRO_H__)
58#include "tmacro.h" 55#include "tmacro.h"
59#endif
60#if !defined(__TETHER_H__)
61#include "tether.h" 56#include "tether.h"
62#endif
63#if !defined(__80211MGR_H__)
64#include "80211mgr.h" 57#include "80211mgr.h"
65#endif
66#if !defined(__80211HDR_H__)
67#include "80211hdr.h" 58#include "80211hdr.h"
68#endif
69#if !defined(__DEVICE_H__)
70#include "device.h" 59#include "device.h"
71#endif
72#if !defined(__WPA_H__)
73#include "wpa.h" 60#include "wpa.h"
74#endif
75
76
77 61
78/*--------------------- Static Definitions -------------------------*/ 62/*--------------------- Static Definitions -------------------------*/
79 63
diff --git a/drivers/staging/vt6656/80211mgr.h b/drivers/staging/vt6656/80211mgr.h
index d94bfb9e8b1..a4ea8249216 100644
--- a/drivers/staging/vt6656/80211mgr.h
+++ b/drivers/staging/vt6656/80211mgr.h
@@ -28,17 +28,11 @@
28 * 28 *
29 */ 29 */
30 30
31
32#ifndef __80211MGR_H__ 31#ifndef __80211MGR_H__
33#define __80211MGR_H__ 32#define __80211MGR_H__
34 33
35#if !defined(__TTYPE_H__)
36#include "ttype.h" 34#include "ttype.h"
37#endif
38#if !defined(__80211HDR_H__)
39#include "80211hdr.h" 35#include "80211hdr.h"
40#endif
41
42 36
43/*--------------------- Export Definitions -------------------------*/ 37/*--------------------- Export Definitions -------------------------*/
44 38
diff --git a/drivers/staging/vt6656/TODO b/drivers/staging/vt6656/TODO
index fc669194043..17cf50c6735 100644
--- a/drivers/staging/vt6656/TODO
+++ b/drivers/staging/vt6656/TODO
@@ -1,5 +1,5 @@
1TODO: 1TODO:
2- remove __cplusplus ifdefs 2- remove __cplusplus ifdefs -- done
3- remove kernel version compatibility wrappers 3- remove kernel version compatibility wrappers
4- remove support for older wireless extensions 4- remove support for older wireless extensions
5- prepare for merge with vt6655 driver: 5- prepare for merge with vt6655 driver:
diff --git a/drivers/staging/vt6656/aes_ccmp.c b/drivers/staging/vt6656/aes_ccmp.c
index 59cc018d48a..e79a0d16428 100644
--- a/drivers/staging/vt6656/aes_ccmp.c
+++ b/drivers/staging/vt6656/aes_ccmp.c
@@ -33,16 +33,9 @@
33 * 33 *
34 */ 34 */
35 35
36#if !defined(__UMEM_H__)
37#include "umem.h" 36#include "umem.h"
38#endif
39#if !defined(__DEVICE_H__)
40#include "device.h" 37#include "device.h"
41#endif
42#if !defined(__80211HDR_H__)
43#include "80211hdr.h" 38#include "80211hdr.h"
44#endif
45
46 39
47/*--------------------- Static Definitions -------------------------*/ 40/*--------------------- Static Definitions -------------------------*/
48 41
diff --git a/drivers/staging/vt6656/aes_ccmp.h b/drivers/staging/vt6656/aes_ccmp.h
index 2b1920f2860..f2ba1d5aa1e 100644
--- a/drivers/staging/vt6656/aes_ccmp.h
+++ b/drivers/staging/vt6656/aes_ccmp.h
@@ -30,9 +30,7 @@
30#ifndef __AES_H__ 30#ifndef __AES_H__
31#define __AES_H__ 31#define __AES_H__
32 32
33#if !defined(__TTYPE_H__)
34#include "ttype.h" 33#include "ttype.h"
35#endif
36 34
37/*--------------------- Export Definitions -------------------------*/ 35/*--------------------- Export Definitions -------------------------*/
38 36
diff --git a/drivers/staging/vt6656/baseband.c b/drivers/staging/vt6656/baseband.c
index 7057d3e3317..c5430d99b5f 100644
--- a/drivers/staging/vt6656/baseband.c
+++ b/drivers/staging/vt6656/baseband.c
@@ -37,40 +37,17 @@
37 * 37 *
38 */ 38 */
39 39
40
41#if !defined(__TMACRO_H__)
42#include "tmacro.h" 40#include "tmacro.h"
43#endif
44#if !defined(__TBIT_H__)
45#include "tbit.h" 41#include "tbit.h"
46#endif
47#if !defined(__TETHER_H__)
48#include "tether.h" 42#include "tether.h"
49#endif
50#if !defined(__MAC_H__)
51#include "mac.h" 43#include "mac.h"
52#endif
53#if !defined(__BASEBAND_H__)
54#include "baseband.h" 44#include "baseband.h"
55#endif
56#if !defined(__RF_H__)
57#include "rf.h" 45#include "rf.h"
58#endif
59#if !defined(__SROM_H__)
60#include "srom.h" 46#include "srom.h"
61#endif
62#if !defined(__CONTROL_H__)
63#include "control.h" 47#include "control.h"
64#endif
65#if !defined(__DATARATE_H__)
66#include "datarate.h" 48#include "datarate.h"
67#endif
68#if !defined(__RNDIS_H__)
69#include "rndis.h" 49#include "rndis.h"
70#endif
71#if !defined(__CONTROL_H__)
72#include "control.h" 50#include "control.h"
73#endif
74 51
75/*--------------------- Static Definitions -------------------------*/ 52/*--------------------- Static Definitions -------------------------*/
76static int msglevel =MSG_LEVEL_INFO; 53static int msglevel =MSG_LEVEL_INFO;
diff --git a/drivers/staging/vt6656/baseband.h b/drivers/staging/vt6656/baseband.h
index 9cad837aa7e..e991a7e68d4 100644
--- a/drivers/staging/vt6656/baseband.h
+++ b/drivers/staging/vt6656/baseband.h
@@ -33,18 +33,9 @@
33#ifndef __BASEBAND_H__ 33#ifndef __BASEBAND_H__
34#define __BASEBAND_H__ 34#define __BASEBAND_H__
35 35
36#if !defined(__TTYPE_H__)
37#include "ttype.h" 36#include "ttype.h"
38#endif
39
40#if !defined(__TETHER_H__)
41#include "tether.h" 37#include "tether.h"
42#endif
43
44#if !defined(__DEVICE_H__)
45#include "device.h" 38#include "device.h"
46#endif
47
48 39
49/*--------------------- Export Definitions -------------------------*/ 40/*--------------------- Export Definitions -------------------------*/
50 41
@@ -104,9 +95,6 @@
104/*--------------------- Export Variables --------------------------*/ 95/*--------------------- Export Variables --------------------------*/
105 96
106/*--------------------- Export Functions --------------------------*/ 97/*--------------------- Export Functions --------------------------*/
107#ifdef __cplusplus
108extern "C" { /* Assume C declarations for C++ */
109#endif /* __cplusplus */
110 98
111UINT 99UINT
112BBuGetFrameTime( 100BBuGetFrameTime(
@@ -155,9 +143,4 @@ VOID BBvUpdatePreEDThreshold(
155 IN BOOL bScanning 143 IN BOOL bScanning
156 ); 144 );
157 145
158#ifdef __cplusplus
159} /* End of extern "C" { */
160#endif /* __cplusplus */
161
162
163#endif // __BASEBAND_H__ 146#endif // __BASEBAND_H__
diff --git a/drivers/staging/vt6656/bssdb.c b/drivers/staging/vt6656/bssdb.c
index 3b8e38d7907..ef9431eb9c2 100644
--- a/drivers/staging/vt6656/bssdb.c
+++ b/drivers/staging/vt6656/bssdb.c
@@ -39,72 +39,27 @@
39 * 39 *
40 */ 40 */
41 41
42
43
44#if !defined(__TTYPE_H__)
45#include "ttype.h" 42#include "ttype.h"
46#endif
47#if !defined(__TMACRO_H__)
48#include "tmacro.h" 43#include "tmacro.h"
49#endif
50#if !defined(__TETHER_H__)
51#include "tether.h" 44#include "tether.h"
52#endif
53#if !defined(__DEVICE_H__)
54#include "device.h" 45#include "device.h"
55#endif
56#if !defined(__80211HDR_H__)
57#include "80211hdr.h" 46#include "80211hdr.h"
58#endif
59#if !defined(__BSSDB_H__)
60#include "bssdb.h" 47#include "bssdb.h"
61#endif
62#if !defined(__WMGR_H__)
63#include "wmgr.h" 48#include "wmgr.h"
64#endif
65#if !defined(__DATARATE_H__)
66#include "datarate.h" 49#include "datarate.h"
67#endif
68#if !defined(__DESC_H__)
69#include "desc.h" 50#include "desc.h"
70#endif
71#if !defined(__WCMD_H__)
72#include "wcmd.h" 51#include "wcmd.h"
73#endif
74#if !defined(__WPA_H__)
75#include "wpa.h" 52#include "wpa.h"
76#endif
77#if !defined(__BASEBAND_H__)
78#include "baseband.h" 53#include "baseband.h"
79#endif
80#if !defined(__RF_H__)
81#include "rf.h" 54#include "rf.h"
82#endif
83#if !defined(__CARD_H__)
84#include "card.h" 55#include "card.h"
85#endif
86#if !defined(__MAC_H__)
87#include "mac.h" 56#include "mac.h"
88#endif
89#if !defined(__WPA2_H__)
90#include "wpa2.h" 57#include "wpa2.h"
91#endif
92#if !defined(__UMEM_H__)
93#include "umem.h" 58#include "umem.h"
94#endif
95#if !defined(__TBIT_H__)
96#include "tbit.h" 59#include "tbit.h"
97#endif
98#if !defined(__CONTROL_H__)
99#include "control.h" 60#include "control.h"
100#endif
101#if !defined(__RNDIS_H__)
102#include "rndis.h" 61#include "rndis.h"
103#endif
104//DavidWang
105#if !defined(__IOWPA_H__)
106#include "iowpa.h" 62#include "iowpa.h"
107#endif
108 63
109/*--------------------- Static Definitions -------------------------*/ 64/*--------------------- Static Definitions -------------------------*/
110 65
diff --git a/drivers/staging/vt6656/bssdb.h b/drivers/staging/vt6656/bssdb.h
index b9bd1fb436c..f365b6b8bf6 100644
--- a/drivers/staging/vt6656/bssdb.h
+++ b/drivers/staging/vt6656/bssdb.h
@@ -30,22 +30,11 @@
30#ifndef __BSSDB_H__ 30#ifndef __BSSDB_H__
31#define __BSSDB_H__ 31#define __BSSDB_H__
32 32
33
34#include <linux/skbuff.h> 33#include <linux/skbuff.h>
35
36#if !defined(__80211HDR_H__)
37#include "80211hdr.h" 34#include "80211hdr.h"
38#endif
39#if !defined(__80211MGR_H__)
40#include "80211mgr.h" 35#include "80211mgr.h"
41#endif
42#if !defined(__CARD_H__)
43#include "card.h" 36#include "card.h"
44#endif
45#if !defined(__MIB_H__)
46#include "mib.h" 37#include "mib.h"
47#endif
48
49 38
50/*--------------------- Export Definitions -------------------------*/ 39/*--------------------- Export Definitions -------------------------*/
51 40
diff --git a/drivers/staging/vt6656/card.c b/drivers/staging/vt6656/card.c
index f1f5f35aa8e..9900ed41d5a 100644
--- a/drivers/staging/vt6656/card.c
+++ b/drivers/staging/vt6656/card.c
@@ -45,53 +45,21 @@
45 * 45 *
46 */ 46 */
47 47
48#if !defined(__TMACRO_H__)
49#include "tmacro.h" 48#include "tmacro.h"
50#endif
51#if !defined(__CARD_H__)
52#include "card.h" 49#include "card.h"
53#endif
54#if !defined(__TBIT_H__)
55#include "tbit.h" 50#include "tbit.h"
56#endif
57#if !defined(__BASEBAND_H__)
58#include "baseband.h" 51#include "baseband.h"
59#endif
60#if !defined(__MAC_H__)
61#include "mac.h" 52#include "mac.h"
62#endif
63#if !defined(__DESC_H__)
64#include "desc.h" 53#include "desc.h"
65#endif
66#if !defined(__RF_H__)
67#include "rf.h" 54#include "rf.h"
68#endif
69#if !defined(__POWER_H__)
70#include "power.h" 55#include "power.h"
71#endif
72#if !defined(__KEY_H__)
73#include "key.h" 56#include "key.h"
74#endif
75#if !defined(__RC4_H__)
76#include "rc4.h" 57#include "rc4.h"
77#endif
78#if !defined(__COUNTRY_H__)
79#include "country.h" 58#include "country.h"
80#endif
81#if !defined(__UMEM_H__)
82#include "umem.h" 59#include "umem.h"
83#endif
84#if !defined(__DATARATE_H__)
85#include "datarate.h" 60#include "datarate.h"
86#endif
87#if !defined(__RNDIS_H__)
88#include "rndis.h" 61#include "rndis.h"
89#endif
90#if !defined(__CONTROL_H__)
91#include "control.h" 62#include "control.h"
92#endif
93
94
95 63
96/*--------------------- Static Definitions -------------------------*/ 64/*--------------------- Static Definitions -------------------------*/
97 65
diff --git a/drivers/staging/vt6656/card.h b/drivers/staging/vt6656/card.h
index 572db6ce8a7..aa90c2cb446 100644
--- a/drivers/staging/vt6656/card.h
+++ b/drivers/staging/vt6656/card.h
@@ -26,14 +26,10 @@
26 * 26 *
27 */ 27 */
28 28
29
30#ifndef __CARD_H__ 29#ifndef __CARD_H__
31#define __CARD_H__ 30#define __CARD_H__
32 31
33#if !defined(__TTYPE_H__)
34#include "ttype.h" 32#include "ttype.h"
35#endif
36
37 33
38/*--------------------- Export Definitions -------------------------*/ 34/*--------------------- Export Definitions -------------------------*/
39 35
@@ -66,10 +62,6 @@ typedef enum _CARD_OP_MODE {
66/*--------------------- Export Variables --------------------------*/ 62/*--------------------- Export Variables --------------------------*/
67 63
68/*--------------------- Export Functions --------------------------*/ 64/*--------------------- Export Functions --------------------------*/
69#ifdef __cplusplus
70extern "C" { /* Assume C declarations for C++ */
71#endif /* __cplusplus */
72
73 65
74BOOL CARDbSetMediaChannel(PVOID pDeviceHandler, UINT uConnectionChannel); 66BOOL CARDbSetMediaChannel(PVOID pDeviceHandler, UINT uConnectionChannel);
75void CARDvSetRSPINF(PVOID pDeviceHandler, BYTE byBBType); 67void CARDvSetRSPINF(PVOID pDeviceHandler, BYTE byBBType);
@@ -97,12 +89,6 @@ CARDbChannelSwitch (
97 IN BYTE byCount 89 IN BYTE byCount
98 ); 90 );
99 91
100
101#ifdef __cplusplus
102} /* End of extern "C" { */
103#endif /* __cplusplus */
104
105
106#endif // __CARD_H__ 92#endif // __CARD_H__
107 93
108 94
diff --git a/drivers/staging/vt6656/channel.c b/drivers/staging/vt6656/channel.c
index 56308b0df5c..4c688265e86 100644
--- a/drivers/staging/vt6656/channel.c
+++ b/drivers/staging/vt6656/channel.c
@@ -34,19 +34,10 @@
34 * 34 *
35 */ 35 */
36 36
37#if !defined (_COUNTRY_H_)
38#include "country.h" 37#include "country.h"
39#endif
40#if !defined (_CHANNEL_H_)
41#include "channel.h" 38#include "channel.h"
42#endif
43#if !defined(__RF_H__)
44#include "rf.h" 39#include "rf.h"
45#endif
46#if !defined(__UMEM_H__)
47#include "umem.h" 40#include "umem.h"
48#endif
49
50 41
51/*--------------------- Static Definitions -------------------------*/ 42/*--------------------- Static Definitions -------------------------*/
52static int msglevel =MSG_LEVEL_INFO; 43static int msglevel =MSG_LEVEL_INFO;
diff --git a/drivers/staging/vt6656/channel.h b/drivers/staging/vt6656/channel.h
index 972df7d1726..2306b202565 100644
--- a/drivers/staging/vt6656/channel.h
+++ b/drivers/staging/vt6656/channel.h
@@ -30,9 +30,7 @@
30#ifndef _CHANNEL_H_ 30#ifndef _CHANNEL_H_
31#define _CHANNEL_H_ 31#define _CHANNEL_H_
32 32
33#if !defined(__TTYPE_H__)
34#include "ttype.h" 33#include "ttype.h"
35#endif
36 34
37/*--------------------- Export Definitions -------------------------*/ 35/*--------------------- Export Definitions -------------------------*/
38 36
@@ -55,4 +53,5 @@ CHvChannelGetList (
55 IN UINT uCountryCodeIdx, 53 IN UINT uCountryCodeIdx,
56 OUT PBYTE pbyChannelTable 54 OUT PBYTE pbyChannelTable
57 ); 55 );
56
58#endif /* _REGULATE_H_ */ 57#endif /* _REGULATE_H_ */
diff --git a/drivers/staging/vt6656/control.c b/drivers/staging/vt6656/control.c
index ee541256cf9..1f7cb47a874 100644
--- a/drivers/staging/vt6656/control.c
+++ b/drivers/staging/vt6656/control.c
@@ -38,15 +38,9 @@
38 * 38 *
39 */ 39 */
40 40
41#if !defined(__CONTROL_H__)
42#include "control.h" 41#include "control.h"
43#endif
44#if !defined(__UMEM_H__)
45#include "umem.h" 42#include "umem.h"
46#endif
47#if !defined(__RNDIS_H__)
48#include "rndis.h" 43#include "rndis.h"
49#endif
50 44
51/*--------------------- Static Definitions -------------------------*/ 45/*--------------------- Static Definitions -------------------------*/
52//static int msglevel =MSG_LEVEL_INFO; 46//static int msglevel =MSG_LEVEL_INFO;
diff --git a/drivers/staging/vt6656/control.h b/drivers/staging/vt6656/control.h
index c208eb508e8..4d9a777a706 100644
--- a/drivers/staging/vt6656/control.h
+++ b/drivers/staging/vt6656/control.h
@@ -27,21 +27,12 @@
27 * 27 *
28 */ 28 */
29 29
30
31#ifndef __CONTROL_H__ 30#ifndef __CONTROL_H__
32#define __CONTROL_H__ 31#define __CONTROL_H__
33 32
34#if !defined(__TTYPE_H__)
35#include "ttype.h" 33#include "ttype.h"
36#endif
37#if !defined(__DEVICE_H__)
38#include "device.h" 34#include "device.h"
39#endif
40#if !defined(__USBPIPE_H__)
41#include "usbpipe.h" 35#include "usbpipe.h"
42#endif
43
44
45 36
46/*--------------------- Export Definitions -------------------------*/ 37/*--------------------- Export Definitions -------------------------*/
47 38
@@ -61,10 +52,6 @@
61/*--------------------- Export Variables --------------------------*/ 52/*--------------------- Export Variables --------------------------*/
62 53
63/*--------------------- Export Functions --------------------------*/ 54/*--------------------- Export Functions --------------------------*/
64#ifdef __cplusplus
65extern "C" { /* Assume C declarations for C++ */
66#endif /* __cplusplus */
67
68 55
69void ControlvWriteByte( 56void ControlvWriteByte(
70 IN PSDevice pDevice, 57 IN PSDevice pDevice,
@@ -90,13 +77,6 @@ void ControlvMaskByte(
90 IN BYTE byData 77 IN BYTE byData
91 ); 78 );
92 79
93#ifdef __cplusplus
94} /* End of extern "C" { */
95#endif /* __cplusplus */
96
97
98
99
100#endif // __RCV_H__ 80#endif // __RCV_H__
101 81
102 82
diff --git a/drivers/staging/vt6656/datarate.c b/drivers/staging/vt6656/datarate.c
index ad1ed508422..968feb466b0 100644
--- a/drivers/staging/vt6656/datarate.c
+++ b/drivers/staging/vt6656/datarate.c
@@ -33,36 +33,17 @@
33 * 33 *
34 */ 34 */
35 35
36#if !defined(__TTYPE_H__)
37#include "ttype.h" 36#include "ttype.h"
38#endif
39#if !defined(__TMACRO_H__)
40#include "tmacro.h" 37#include "tmacro.h"
41#endif
42#if !defined(__MAC_H__)
43#include "mac.h" 38#include "mac.h"
44#endif
45#if !defined(__80211MGR_H__)
46#include "80211mgr.h" 39#include "80211mgr.h"
47#endif
48#if !defined(__BSSDB_H__)
49#include "bssdb.h" 40#include "bssdb.h"
50#endif
51#if !defined(__DATARATE_H__)
52#include "datarate.h" 41#include "datarate.h"
53#endif
54#if !defined(__CARD_H__)
55#include "card.h" 42#include "card.h"
56#endif
57#if !defined(__BASEBAND_H__)
58#include "baseband.h" 43#include "baseband.h"
59#endif
60#if !defined(__SROM_H__)
61#include "srom.h" 44#include "srom.h"
62#endif
63#if !defined(__RF_H__)
64#include "rf.h" 45#include "rf.h"
65#endif 46
66/*--------------------- Static Definitions -------------------------*/ 47/*--------------------- Static Definitions -------------------------*/
67 48
68 49
diff --git a/drivers/staging/vt6656/desc.h b/drivers/staging/vt6656/desc.h
index 3030e78872b..f10530fcc99 100644
--- a/drivers/staging/vt6656/desc.h
+++ b/drivers/staging/vt6656/desc.h
@@ -28,23 +28,13 @@
28 * 28 *
29 */ 29 */
30 30
31
32#ifndef __DESC_H__ 31#ifndef __DESC_H__
33#define __DESC_H__ 32#define __DESC_H__
34 33
35#include <linux/types.h> 34#include <linux/types.h>
36#include <linux/mm.h> 35#include <linux/mm.h>
37
38#if !defined(__TTYPE_H__)
39#include "ttype.h" 36#include "ttype.h"
40#endif
41#if !defined(__TETHER_H__)
42#include "tether.h" 37#include "tether.h"
43#endif
44
45
46
47
48 38
49/*--------------------- Export Definitions -------------------------*/ 39/*--------------------- Export Definitions -------------------------*/
50 40
diff --git a/drivers/staging/vt6656/dpc.c b/drivers/staging/vt6656/dpc.c
index 811fecb1706..b6deacec0c3 100644
--- a/drivers/staging/vt6656/dpc.c
+++ b/drivers/staging/vt6656/dpc.c
@@ -38,65 +38,25 @@
38 * 38 *
39 */ 39 */
40 40
41
42#if !defined(__DEVICE_H__)
43#include "device.h" 41#include "device.h"
44#endif
45#if !defined(__RXTX_H__)
46#include "rxtx.h" 42#include "rxtx.h"
47#endif
48#if !defined(__TETHER_H__)
49#include "tether.h" 43#include "tether.h"
50#endif
51#if !defined(__CARD_H__)
52#include "card.h" 44#include "card.h"
53#endif
54#if !defined(__BSSDB_H__)
55#include "bssdb.h" 45#include "bssdb.h"
56#endif
57#if !defined(__MAC_H__)
58#include "mac.h" 46#include "mac.h"
59#endif
60#if !defined(__BASEBAND_H__)
61#include "baseband.h" 47#include "baseband.h"
62#endif
63#if !defined(__UMEM_H__)
64#include "umem.h" 48#include "umem.h"
65#endif
66#if !defined(__MICHAEL_H__)
67#include "michael.h" 49#include "michael.h"
68#endif
69#if !defined(__TKIP_H__)
70#include "tkip.h" 50#include "tkip.h"
71#endif
72#if !defined(__TCRC_H__)
73#include "tcrc.h" 51#include "tcrc.h"
74#endif
75#if !defined(__WCTL_H__)
76#include "wctl.h" 52#include "wctl.h"
77#endif
78#if !defined(__TBIT_H__)
79#include "tbit.h" 53#include "tbit.h"
80#endif
81#if !defined(__HOSTAP_H__)
82#include "hostap.h" 54#include "hostap.h"
83#endif
84#if !defined(__RF_H__)
85#include "rf.h" 55#include "rf.h"
86#endif
87#if !defined(__IOWPA_H__)
88#include "iowpa.h" 56#include "iowpa.h"
89#endif
90#if !defined(__AES_H__)
91#include "aes_ccmp.h" 57#include "aes_ccmp.h"
92#endif
93#if !defined(__DATARATE_H__)
94#include "datarate.h" 58#include "datarate.h"
95#endif
96#if !defined(__USBPIPE_H__)
97#include "usbpipe.h" 59#include "usbpipe.h"
98#endif
99
100 60
101/*--------------------- Static Definitions -------------------------*/ 61/*--------------------- Static Definitions -------------------------*/
102 62
diff --git a/drivers/staging/vt6656/dpc.h b/drivers/staging/vt6656/dpc.h
index eb4677f15fe..df148b45396 100644
--- a/drivers/staging/vt6656/dpc.h
+++ b/drivers/staging/vt6656/dpc.h
@@ -26,20 +26,12 @@
26 * 26 *
27 */ 27 */
28 28
29
30#ifndef __DPC_H__ 29#ifndef __DPC_H__
31#define __DPC_H__ 30#define __DPC_H__
32 31
33#if !defined(__TTYPE_H__)
34#include "ttype.h" 32#include "ttype.h"
35#endif
36#if !defined(__DEVICE_H__)
37#include "device.h" 33#include "device.h"
38#endif
39#if !defined(__WCMD_H__)
40#include "wcmd.h" 34#include "wcmd.h"
41#endif
42
43 35
44/*--------------------- Export Definitions -------------------------*/ 36/*--------------------- Export Definitions -------------------------*/
45 37
@@ -49,14 +41,6 @@
49 41
50/*--------------------- Export Functions --------------------------*/ 42/*--------------------- Export Functions --------------------------*/
51 43
52
53#ifdef __cplusplus
54extern "C" { /* Assume C declarations for C++ */
55#endif /* __cplusplus */
56
57
58
59
60VOID 44VOID
61RXvWorkItem( 45RXvWorkItem(
62 PVOID Context 46 PVOID Context
@@ -80,14 +64,6 @@ RXbBulkInProcessData(
80 IN ULONG BytesToIndicate 64 IN ULONG BytesToIndicate
81 ); 65 );
82 66
83
84#ifdef __cplusplus
85} /* End of extern "C" { */
86#endif /* __cplusplus */
87
88
89
90
91#endif // __RXTX_H__ 67#endif // __RXTX_H__
92 68
93 69
diff --git a/drivers/staging/vt6656/firmware.c b/drivers/staging/vt6656/firmware.c
index 4a524e3c15c..b592807513e 100644
--- a/drivers/staging/vt6656/firmware.c
+++ b/drivers/staging/vt6656/firmware.c
@@ -31,20 +31,10 @@
31 * 31 *
32 */ 32 */
33 33
34
35#if !defined(__UMEM_H__)
36#include "umem.h" 34#include "umem.h"
37#endif
38#if !defined(__FIRMWARE_H__)
39#include "firmware.h" 35#include "firmware.h"
40#endif
41#if !defined(__CONTROL_H__)
42#include "control.h" 36#include "control.h"
43#endif
44#if !defined(__RNDIS_H__)
45#include "rndis.h" 37#include "rndis.h"
46#endif
47
48 38
49/*--------------------- Static Definitions -------------------------*/ 39/*--------------------- Static Definitions -------------------------*/
50 40
diff --git a/drivers/staging/vt6656/firmware.h b/drivers/staging/vt6656/firmware.h
index fdc380af59e..97f8559f2a5 100644
--- a/drivers/staging/vt6656/firmware.h
+++ b/drivers/staging/vt6656/firmware.h
@@ -27,17 +27,11 @@
27 * 27 *
28 */ 28 */
29 29
30
31#ifndef __FIRMWARE_H__ 30#ifndef __FIRMWARE_H__
32#define __FIRMWARE_H__ 31#define __FIRMWARE_H__
33 32
34
35#if !defined(__TTYPE_H__)
36#include "ttype.h" 33#include "ttype.h"
37#endif
38#if !defined(__DEVICE_H__)
39#include "device.h" 34#include "device.h"
40#endif
41 35
42/*--------------------- Export Definitions -------------------------*/ 36/*--------------------- Export Definitions -------------------------*/
43 37
diff --git a/drivers/staging/vt6656/hostap.c b/drivers/staging/vt6656/hostap.c
index 02743a62b8f..0c8267a1007 100644
--- a/drivers/staging/vt6656/hostap.c
+++ b/drivers/staging/vt6656/hostap.c
@@ -30,35 +30,15 @@
30 * 30 *
31 */ 31 */
32 32
33
34#if !defined(__HOSTAP_H__)
35#include "hostap.h" 33#include "hostap.h"
36#endif
37#if !defined(__IOCMD_H__)
38#include "iocmd.h" 34#include "iocmd.h"
39#endif
40#if !defined(__MAC_H__)
41#include "mac.h" 35#include "mac.h"
42#endif
43#if !defined(__CARD_H__)
44#include "card.h" 36#include "card.h"
45#endif
46#if !defined(__BASEBAND_H__)
47#include "baseband.h" 37#include "baseband.h"
48#endif
49#if !defined(__WPACTL_H__)
50#include "wpactl.h" 38#include "wpactl.h"
51#endif
52#if !defined(__KEY_H__)
53#include "key.h" 39#include "key.h"
54#endif
55#if !defined(__MAC_H__)
56#include "mac.h" 40#include "mac.h"
57#endif
58#if !defined(__DATARATE_H__)
59#include "datarate.h" 41#include "datarate.h"
60#endif
61
62 42
63#define VIAWGET_HOSTAPD_MAX_BUF_SIZE 1024 43#define VIAWGET_HOSTAPD_MAX_BUF_SIZE 1024
64#define HOSTAP_CRYPT_FLAG_SET_TX_KEY BIT0 44#define HOSTAP_CRYPT_FLAG_SET_TX_KEY BIT0
diff --git a/drivers/staging/vt6656/hostap.h b/drivers/staging/vt6656/hostap.h
index c5ad3494b6e..8fd667b542b 100644
--- a/drivers/staging/vt6656/hostap.h
+++ b/drivers/staging/vt6656/hostap.h
@@ -26,14 +26,10 @@
26 * 26 *
27 */ 27 */
28 28
29
30#ifndef __HOSTAP_H__ 29#ifndef __HOSTAP_H__
31#define __HOSTAP_H__ 30#define __HOSTAP_H__
32 31
33#if !defined(__DEVICE_H__)
34#include "device.h" 32#include "device.h"
35#endif
36
37 33
38/*--------------------- Export Definitions -------------------------*/ 34/*--------------------- Export Definitions -------------------------*/
39 35
@@ -57,11 +53,6 @@
57 53
58/*--------------------- Export Functions --------------------------*/ 54/*--------------------- Export Functions --------------------------*/
59 55
60
61#ifdef __cplusplus
62extern "C" { /* Assume C declarations for C++ */
63#endif /* __cplusplus */
64
65#ifndef ETH_P_PAE 56#ifndef ETH_P_PAE
66#define ETH_P_PAE 0x888E /* Port Access Entity (IEEE 802.1X) */ 57#define ETH_P_PAE 0x888E /* Port Access Entity (IEEE 802.1X) */
67#endif /* ETH_P_PAE */ 58#endif /* ETH_P_PAE */
@@ -73,13 +64,6 @@ extern "C" { /* Assume C declarations for C++ */
73int hostap_set_hostapd(PSDevice pDevice, int val, int rtnl_locked); 64int hostap_set_hostapd(PSDevice pDevice, int val, int rtnl_locked);
74int hostap_ioctl(PSDevice pDevice, struct iw_point *p); 65int hostap_ioctl(PSDevice pDevice, struct iw_point *p);
75 66
76#ifdef __cplusplus
77} /* End of extern "C" { */
78#endif /* __cplusplus */
79
80
81
82
83#endif // __HOSTAP_H__ 67#endif // __HOSTAP_H__
84 68
85 69
diff --git a/drivers/staging/vt6656/int.c b/drivers/staging/vt6656/int.c
index 158a4cc0e90..f9c64ccaa1b 100644
--- a/drivers/staging/vt6656/int.c
+++ b/drivers/staging/vt6656/int.c
@@ -32,34 +32,15 @@
32 * 32 *
33 */ 33 */
34 34
35
36#if !defined(__INT_H__)
37#include "int.h" 35#include "int.h"
38#endif
39#if !defined(__MIB_H__)
40#include "mib.h" 36#include "mib.h"
41#endif
42#if !defined(__TBIT_H__)
43#include "tbit.h" 37#include "tbit.h"
44#endif
45#if !defined(__TMACRO_H__)
46#include "tmacro.h" 38#include "tmacro.h"
47#endif
48#if !defined(__MAC_H__)
49#include "mac.h" 39#include "mac.h"
50#endif
51#if !defined(__POWER_H__)
52#include "power.h" 40#include "power.h"
53#endif
54#if !defined(__BSSDB_H__)
55#include "bssdb.h" 41#include "bssdb.h"
56#endif
57#if !defined(__UMEM_H__)
58#include "umem.h" 42#include "umem.h"
59#endif
60#if !defined(__USBPIPE_H__)
61#include "usbpipe.h" 43#include "usbpipe.h"
62#endif
63 44
64/*--------------------- Static Definitions -------------------------*/ 45/*--------------------- Static Definitions -------------------------*/
65//static int msglevel =MSG_LEVEL_DEBUG; 46//static int msglevel =MSG_LEVEL_DEBUG;
diff --git a/drivers/staging/vt6656/int.h b/drivers/staging/vt6656/int.h
index 4857fce99c1..15e815a3596 100644
--- a/drivers/staging/vt6656/int.h
+++ b/drivers/staging/vt6656/int.h
@@ -27,18 +27,11 @@
27 * 27 *
28 */ 28 */
29 29
30
31#ifndef __INT_H__ 30#ifndef __INT_H__
32#define __INT_H__ 31#define __INT_H__
33 32
34#if !defined(__TTYPE_H__)
35#include "ttype.h" 33#include "ttype.h"
36#endif
37#if !defined(__DEVICE_H__)
38#include "device.h" 34#include "device.h"
39#endif
40
41
42 35
43/*--------------------- Export Definitions -------------------------*/ 36/*--------------------- Export Definitions -------------------------*/
44#pragma pack(1) 37#pragma pack(1)
@@ -73,9 +66,6 @@ SINTData, *PSINTData;
73/*--------------------- Export Variables --------------------------*/ 66/*--------------------- Export Variables --------------------------*/
74 67
75/*--------------------- Export Functions --------------------------*/ 68/*--------------------- Export Functions --------------------------*/
76#ifdef __cplusplus
77extern "C" { /* Assume C declarations for C++ */
78#endif /* __cplusplus */
79 69
80VOID 70VOID
81INTvWorkItem( 71INTvWorkItem(
@@ -87,14 +77,6 @@ INTnsProcessData(
87 IN PSDevice pDevice 77 IN PSDevice pDevice
88 ); 78 );
89 79
90
91#ifdef __cplusplus
92} /* End of extern "C" { */
93#endif /* __cplusplus */
94
95
96
97
98#endif // __INT_H__ 80#endif // __INT_H__
99 81
100 82
diff --git a/drivers/staging/vt6656/iocmd.h b/drivers/staging/vt6656/iocmd.h
index e6090b5785f..49bfe15f133 100644
--- a/drivers/staging/vt6656/iocmd.h
+++ b/drivers/staging/vt6656/iocmd.h
@@ -29,10 +29,7 @@
29#ifndef __IOCMD_H__ 29#ifndef __IOCMD_H__
30#define __IOCMD_H__ 30#define __IOCMD_H__
31 31
32#if !defined(__TTYPE_H__)
33#include "ttype.h" 32#include "ttype.h"
34#endif
35
36 33
37/*--------------------- Export Definitions -------------------------*/ 34/*--------------------- Export Definitions -------------------------*/
38 35
diff --git a/drivers/staging/vt6656/ioctl.c b/drivers/staging/vt6656/ioctl.c
index 8e9762b8cf4..326d7eef954 100644
--- a/drivers/staging/vt6656/ioctl.c
+++ b/drivers/staging/vt6656/ioctl.c
@@ -30,38 +30,16 @@
30 * 30 *
31 */ 31 */
32 32
33
34#if !defined(__IOCTL_H__)
35#include "ioctl.h" 33#include "ioctl.h"
36#endif
37#if !defined(__IOCMD_H__)
38#include "iocmd.h" 34#include "iocmd.h"
39#endif
40#if !defined(__MAC_H__)
41#include "mac.h" 35#include "mac.h"
42#endif
43#if !defined(__CARD_H__)
44#include "card.h" 36#include "card.h"
45#endif
46#if !defined(__HOSTAP_H__)
47#include "hostap.h" 37#include "hostap.h"
48#endif
49#if !defined(__UMEM_H__)
50#include "umem.h" 38#include "umem.h"
51#endif
52#if !defined(__WPACTL_H__)
53#include "wpactl.h" 39#include "wpactl.h"
54#endif
55#if !defined(__CONTROL_H__)
56#include "control.h" 40#include "control.h"
57#endif
58#if !defined(__RNDIS_H__)
59#include "rndis.h" 41#include "rndis.h"
60#endif
61#if !defined(__RF_H__)
62#include "rf.h" 42#include "rf.h"
63#endif
64
65 43
66/*--------------------- Static Definitions -------------------------*/ 44/*--------------------- Static Definitions -------------------------*/
67 45
diff --git a/drivers/staging/vt6656/ioctl.h b/drivers/staging/vt6656/ioctl.h
index 9c6816eab46..07d228399c3 100644
--- a/drivers/staging/vt6656/ioctl.h
+++ b/drivers/staging/vt6656/ioctl.h
@@ -26,14 +26,10 @@
26 * 26 *
27 */ 27 */
28 28
29
30#ifndef __IOCTL_H__ 29#ifndef __IOCTL_H__
31#define __IOCTL_H__ 30#define __IOCTL_H__
32 31
33#if !defined(__DEVICE_H__)
34#include "device.h" 32#include "device.h"
35#endif
36
37 33
38/*--------------------- Export Definitions -------------------------*/ 34/*--------------------- Export Definitions -------------------------*/
39 35
@@ -44,12 +40,6 @@
44 40
45/*--------------------- Export Functions --------------------------*/ 41/*--------------------- Export Functions --------------------------*/
46 42
47
48#ifdef __cplusplus
49extern "C" { /* Assume C declarations for C++ */
50#endif /* __cplusplus */
51
52
53int private_ioctl(PSDevice pDevice, struct ifreq *rq); 43int private_ioctl(PSDevice pDevice, struct ifreq *rq);
54 44
55/* 45/*
@@ -61,13 +51,6 @@ VOID vConfigWEPKey (
61 ); 51 );
62*/ 52*/
63 53
64#ifdef __cplusplus
65} /* End of extern "C" { */
66#endif /* __cplusplus */
67
68
69
70
71#endif // __IOCTL_H__ 54#endif // __IOCTL_H__
72 55
73 56
diff --git a/drivers/staging/vt6656/iowpa.h b/drivers/staging/vt6656/iowpa.h
index 05f391a02fa..5750b5b548e 100644
--- a/drivers/staging/vt6656/iowpa.h
+++ b/drivers/staging/vt6656/iowpa.h
@@ -29,7 +29,6 @@
29#ifndef __IOWPA_H__ 29#ifndef __IOWPA_H__
30#define __IOWPA_H__ 30#define __IOWPA_H__
31 31
32
33/*--------------------- Export Definitions -------------------------*/ 32/*--------------------- Export Definitions -------------------------*/
34 33
35 34
diff --git a/drivers/staging/vt6656/iwctl.c b/drivers/staging/vt6656/iwctl.c
index 96f2a78994b..96c5e1aa1b0 100644
--- a/drivers/staging/vt6656/iwctl.c
+++ b/drivers/staging/vt6656/iwctl.c
@@ -30,43 +30,20 @@
30 * 30 *
31 */ 31 */
32 32
33
34#if !defined(__DEVICE_H__)
35#include "device.h" 33#include "device.h"
36#endif
37#if !defined(__IOCTL_H__)
38#include "ioctl.h" 34#include "ioctl.h"
39#endif
40#if !defined(__IOCMD_H__)
41#include "iocmd.h" 35#include "iocmd.h"
42#endif
43#if !defined(__MAC_H__)
44#include "mac.h" 36#include "mac.h"
45#endif
46#if !defined(__CARD_H__)
47#include "card.h" 37#include "card.h"
48#endif
49#if !defined(__HOSTAP_H__)
50#include "hostap.h" 38#include "hostap.h"
51#endif
52#if !defined(__UMEM_H__)
53#include "umem.h" 39#include "umem.h"
54#endif
55#if !defined(__POWER_H__)
56#include "power.h" 40#include "power.h"
57#endif
58#if !defined(__RF_H__)
59#include "rf.h" 41#include "rf.h"
60#endif
61 42
62#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT 43#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
63#if !defined(__IOWPA_H__)
64#include "iowpa.h" 44#include "iowpa.h"
65#endif
66#if !defined(__WPACTL_H__)
67#include "wpactl.h" 45#include "wpactl.h"
68#endif 46#endif
69#endif
70 47
71#include <net/iw_handler.h> 48#include <net/iw_handler.h>
72 49
diff --git a/drivers/staging/vt6656/iwctl.h b/drivers/staging/vt6656/iwctl.h
index 962235f2f39..3096de0ba1b 100644
--- a/drivers/staging/vt6656/iwctl.h
+++ b/drivers/staging/vt6656/iwctl.h
@@ -26,14 +26,10 @@
26 * 26 *
27 */ 27 */
28 28
29
30#ifndef __IWCTL_H__ 29#ifndef __IWCTL_H__
31#define __IWCTL_H__ 30#define __IWCTL_H__
32 31
33#if !defined(__DEVICE_H__)
34#include "device.h" 32#include "device.h"
35#endif
36
37 33
38/*--------------------- Export Definitions -------------------------*/ 34/*--------------------- Export Definitions -------------------------*/
39 35
@@ -44,12 +40,6 @@
44 40
45/*--------------------- Export Functions --------------------------*/ 41/*--------------------- Export Functions --------------------------*/
46 42
47
48#ifdef __cplusplus
49extern "C" { /* Assume C declarations for C++ */
50#endif /* __cplusplus */
51
52
53struct iw_statistics *iwctl_get_wireless_stats (struct net_device *dev); 43struct iw_statistics *iwctl_get_wireless_stats (struct net_device *dev);
54 44
55 45
@@ -233,13 +223,6 @@ int iwctl_siwmlme(struct net_device *dev,
233extern const struct iw_handler_def iwctl_handler_def; 223extern const struct iw_handler_def iwctl_handler_def;
234extern const struct iw_priv_args iwctl_private_args; 224extern const struct iw_priv_args iwctl_private_args;
235 225
236#ifdef __cplusplus
237} /* End of extern "C" { */
238#endif /* __cplusplus */
239
240
241
242
243#endif // __IWCTL_H__ 226#endif // __IWCTL_H__
244 227
245 228
diff --git a/drivers/staging/vt6656/kcompat.h b/drivers/staging/vt6656/kcompat.h
index ff44cd943f3..74ae952b57e 100644
--- a/drivers/staging/vt6656/kcompat.h
+++ b/drivers/staging/vt6656/kcompat.h
@@ -25,6 +25,7 @@
25 * Date: Apr 8, 2002 25 * Date: Apr 8, 2002
26 * 26 *
27 */ 27 */
28
28#ifndef _KCOMPAT_H 29#ifndef _KCOMPAT_H
29#define _KCOMPAT_H 30#define _KCOMPAT_H
30 31
diff --git a/drivers/staging/vt6656/key.c b/drivers/staging/vt6656/key.c
index bd0f29c2afb..717be27e20c 100644
--- a/drivers/staging/vt6656/key.c
+++ b/drivers/staging/vt6656/key.c
@@ -36,28 +36,13 @@
36 * 36 *
37 */ 37 */
38 38
39
40#if !defined(__TMACRO_H__)
41#include "tmacro.h" 39#include "tmacro.h"
42#endif
43#if !defined(__TBIT_H__)
44#include "tbit.h" 40#include "tbit.h"
45#endif
46#if !defined(__KEY_H__)
47#include "key.h" 41#include "key.h"
48#endif
49#if !defined(__UMEM_H__)
50#include "umem.h" 42#include "umem.h"
51#endif
52#if !defined(__MAC_H__)
53#include "mac.h" 43#include "mac.h"
54#endif
55#if !defined(__RNDIS_H__)
56#include "rndis.h" 44#include "rndis.h"
57#endif
58#if !defined(__CONTROL_H__)
59#include "control.h" 45#include "control.h"
60#endif
61 46
62/*--------------------- Static Definitions -------------------------*/ 47/*--------------------- Static Definitions -------------------------*/
63 48
diff --git a/drivers/staging/vt6656/key.h b/drivers/staging/vt6656/key.h
index 49fdcdbe151..b15a64cb386 100644
--- a/drivers/staging/vt6656/key.h
+++ b/drivers/staging/vt6656/key.h
@@ -27,21 +27,12 @@
27 * 27 *
28 */ 28 */
29 29
30
31#ifndef __KEY_H__ 30#ifndef __KEY_H__
32#define __KEY_H__ 31#define __KEY_H__
33 32
34#if !defined(__TTYPE_H__)
35#include "ttype.h" 33#include "ttype.h"
36#endif
37
38#if !defined(__TETHER_H__)
39#include "tether.h" 34#include "tether.h"
40#endif
41
42#if !defined(__80211MGR_H__)
43#include "80211mgr.h" 35#include "80211mgr.h"
44#endif
45 36
46/*--------------------- Export Definitions -------------------------*/ 37/*--------------------- Export Definitions -------------------------*/
47#define MAX_GROUP_KEY 4 38#define MAX_GROUP_KEY 4
@@ -105,9 +96,6 @@ typedef struct tagSKeyManagement
105/*--------------------- Export Variables --------------------------*/ 96/*--------------------- Export Variables --------------------------*/
106 97
107/*--------------------- Export Functions --------------------------*/ 98/*--------------------- Export Functions --------------------------*/
108#ifdef __cplusplus
109extern "C" { /* Assume C declarations for C++ */
110#endif /* __cplusplus */
111 99
112VOID KeyvInitTable(PVOID pDeviceHandler, PSKeyManagement pTable); 100VOID KeyvInitTable(PVOID pDeviceHandler, PSKeyManagement pTable);
113 101
@@ -185,12 +173,5 @@ BOOL KeybSetAllGroupKey (
185 BYTE byKeyDecMode 173 BYTE byKeyDecMode
186 ); 174 );
187 175
188
189#ifdef __cplusplus
190} /* End of extern "C" { */
191
192#endif /* __cplusplus */
193
194
195#endif // __KEY_H__ 176#endif // __KEY_H__
196 177
diff --git a/drivers/staging/vt6656/mac.c b/drivers/staging/vt6656/mac.c
index ff83ef4afa9..fe37192a427 100644
--- a/drivers/staging/vt6656/mac.c
+++ b/drivers/staging/vt6656/mac.c
@@ -30,32 +30,15 @@
30 * Revision History: 30 * Revision History:
31 */ 31 */
32 32
33
34
35#if !defined(__TMACRO_H__)
36#include "tmacro.h" 33#include "tmacro.h"
37#endif
38#if !defined(__TBIT_H__)
39#include "tbit.h" 34#include "tbit.h"
40#endif
41#if !defined(__TETHER_H__)
42#include "tether.h" 35#include "tether.h"
43#endif
44#if !defined(__DESC_H__)
45#include "desc.h" 36#include "desc.h"
46#endif
47#if !defined(__MAC_H__)
48#include "mac.h" 37#include "mac.h"
49#endif
50#if !defined(__80211hdr_H__)
51#include "80211hdr.h" 38#include "80211hdr.h"
52#endif
53#if !defined(__RNDIS_H__)
54#include "rndis.h" 39#include "rndis.h"
55#endif
56#if !defined(__CONTROL_H__)
57#include "control.h" 40#include "control.h"
58#endif 41
59/*--------------------- Static Definitions -------------------------*/ 42/*--------------------- Static Definitions -------------------------*/
60//static int msglevel =MSG_LEVEL_DEBUG; 43//static int msglevel =MSG_LEVEL_DEBUG;
61static int msglevel =MSG_LEVEL_INFO; 44static int msglevel =MSG_LEVEL_INFO;
diff --git a/drivers/staging/vt6656/mac.h b/drivers/staging/vt6656/mac.h
index 78ba7fcd9d3..920e150e7cc 100644
--- a/drivers/staging/vt6656/mac.h
+++ b/drivers/staging/vt6656/mac.h
@@ -34,18 +34,10 @@
34#ifndef __MAC_H__ 34#ifndef __MAC_H__
35#define __MAC_H__ 35#define __MAC_H__
36 36
37#if !defined(__TTYPE_H__)
38#include "ttype.h" 37#include "ttype.h"
39#endif
40#if !defined(__DEVICE_H__)
41#include "device.h" 38#include "device.h"
42#endif
43#if !defined(__TMACRO_H__)
44#include "tmacro.h" 39#include "tmacro.h"
45#endif
46#if !defined(__UMEM_H__)
47#include "umem.h" 40#include "umem.h"
48#endif
49 41
50/*--------------------- Export Definitions -------------------------*/ 42/*--------------------- Export Definitions -------------------------*/
51 43
@@ -428,9 +420,6 @@
428/*--------------------- Export Variables --------------------------*/ 420/*--------------------- Export Variables --------------------------*/
429 421
430/*--------------------- Export Functions --------------------------*/ 422/*--------------------- Export Functions --------------------------*/
431#ifdef __cplusplus
432extern "C" { /* Assume C declarations for C++ */
433#endif /* __cplusplus */
434 423
435void MACvSetMultiAddrByHash (PSDevice pDevice, BYTE byHashIdx); 424void MACvSetMultiAddrByHash (PSDevice pDevice, BYTE byHashIdx);
436VOID MACvWriteMultiAddr (PSDevice pDevice, UINT uByteIdx, BYTE byData); 425VOID MACvWriteMultiAddr (PSDevice pDevice, UINT uByteIdx, BYTE byData);
@@ -451,8 +440,4 @@ void MACvEnableBarkerPreambleMd(PSDevice pDevice);
451void MACvDisableBarkerPreambleMd(PSDevice pDevice); 440void MACvDisableBarkerPreambleMd(PSDevice pDevice);
452void MACvWriteBeaconInterval(PSDevice pDevice, WORD wInterval); 441void MACvWriteBeaconInterval(PSDevice pDevice, WORD wInterval);
453 442
454#ifdef __cplusplus
455} /* End of extern "C" { */
456#endif /* __cplusplus */
457
458#endif // __MAC_H__ 443#endif // __MAC_H__
diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c
index 6fd894ae5c8..10e151a9590 100644
--- a/drivers/staging/vt6656/main_usb.c
+++ b/drivers/staging/vt6656/main_usb.c
@@ -46,95 +46,35 @@
46 */ 46 */
47#undef __NO_VERSION__ 47#undef __NO_VERSION__
48 48
49#if !defined(__DEVICE_H__)
50#include "device.h" 49#include "device.h"
51#endif
52#if !defined(__CARD_H__)
53#include "card.h" 50#include "card.h"
54#endif
55#if !defined(__TBIT_H__)
56#include "tbit.h" 51#include "tbit.h"
57#endif
58#if !defined(__BASEBAND_H__)
59#include "baseband.h" 52#include "baseband.h"
60#endif
61#if !defined(__MAC_H__)
62#include "mac.h" 53#include "mac.h"
63#endif
64#if !defined(__TETHER_H__)
65#include "tether.h" 54#include "tether.h"
66#endif
67#if !defined(__WMGR_H__)
68#include "wmgr.h" 55#include "wmgr.h"
69#endif
70#if !defined(__WCTL_H__)
71#include "wctl.h" 56#include "wctl.h"
72#endif
73#if !defined(__POWER_H__)
74#include "power.h" 57#include "power.h"
75#endif
76#if !defined(__WCMD_H__)
77#include "wcmd.h" 58#include "wcmd.h"
78#endif
79#if !defined(__IOCMD_H__)
80#include "iocmd.h" 59#include "iocmd.h"
81#endif
82#if !defined(__TCRC_H__)
83#include "tcrc.h" 60#include "tcrc.h"
84#endif
85#if !defined(__RXTX_H__)
86#include "rxtx.h" 61#include "rxtx.h"
87#endif
88#if !defined(__BSSDB_H__)
89#include "bssdb.h" 62#include "bssdb.h"
90#endif
91#if !defined(__HOSTAP_H__)
92#include "hostap.h" 63#include "hostap.h"
93#endif
94#if !defined(__WPACTL_H__)
95#include "wpactl.h" 64#include "wpactl.h"
96#endif
97#if !defined(__IOCTL_H__)
98#include "ioctl.h" 65#include "ioctl.h"
99#endif
100#if !defined(__IWCTL_H__)
101#include "iwctl.h" 66#include "iwctl.h"
102#endif
103#if !defined(__DPC_H__)
104#include "dpc.h" 67#include "dpc.h"
105#endif
106#if !defined(__IOCMD_H__)
107#include "iocmd.h" 68#include "iocmd.h"
108#endif
109#if !defined(__DATARATE_H__)
110#include "datarate.h" 69#include "datarate.h"
111#endif
112#if !defined(__RF_H__)
113#include "rf.h" 70#include "rf.h"
114#endif
115#if !defined(__FIRMWARE_H__)
116#include "firmware.h" 71#include "firmware.h"
117#endif
118
119#if !defined(__MAC_H__)
120#include "mac.h" 72#include "mac.h"
121#endif
122
123#if !defined(__RNDIS_H__)
124#include "rndis.h" 73#include "rndis.h"
125#endif
126#if !defined(__CONTROL_H__)
127#include "control.h" 74#include "control.h"
128#endif
129#if !defined (_CHANNEL_H_)
130#include "channel.h" 75#include "channel.h"
131#endif
132#if !defined(__INT_H__)
133#include "int.h" 76#include "int.h"
134#endif
135#if !defined(__IOWPA_H__)
136#include "iowpa.h" 77#include "iowpa.h"
137#endif
138 78
139/*--------------------- Static Definitions -------------------------*/ 79/*--------------------- Static Definitions -------------------------*/
140//static int msglevel =MSG_LEVEL_DEBUG; 80//static int msglevel =MSG_LEVEL_DEBUG;
diff --git a/drivers/staging/vt6656/mib.c b/drivers/staging/vt6656/mib.c
index 35b6c2be170..dfa89e70b8c 100644
--- a/drivers/staging/vt6656/mib.c
+++ b/drivers/staging/vt6656/mib.c
@@ -37,31 +37,14 @@
37 * 37 *
38 */ 38 */
39 39
40
41#if !defined(__UPC_H__)
42#include "upc.h" 40#include "upc.h"
43#endif
44#if !defined(__MAC_H__)
45#include "mac.h" 41#include "mac.h"
46#endif
47#if !defined(__TBIT_H__)
48#include "tbit.h" 42#include "tbit.h"
49#endif
50#if !defined(__TETHER_H__)
51#include "tether.h" 43#include "tether.h"
52#endif
53#if !defined(__MIB_H__)
54#include "mib.h" 44#include "mib.h"
55#endif
56#if !defined(__WCTL_H__)
57#include "wctl.h" 45#include "wctl.h"
58#endif
59#if !defined(__UMEM_H__)
60#include "umem.h" 46#include "umem.h"
61#endif
62#if !defined(__BASEBAND_H__)
63#include "baseband.h" 47#include "baseband.h"
64#endif
65 48
66/*--------------------- Static Definitions -------------------------*/ 49/*--------------------- Static Definitions -------------------------*/
67static int msglevel =MSG_LEVEL_INFO; 50static int msglevel =MSG_LEVEL_INFO;
diff --git a/drivers/staging/vt6656/mib.h b/drivers/staging/vt6656/mib.h
index 355c894e81a..b806b4d2971 100644
--- a/drivers/staging/vt6656/mib.h
+++ b/drivers/staging/vt6656/mib.h
@@ -29,19 +29,9 @@
29#ifndef __MIB_H__ 29#ifndef __MIB_H__
30#define __MIB_H__ 30#define __MIB_H__
31 31
32#if !defined(__TTYPE_H__)
33#include "ttype.h" 32#include "ttype.h"
34#endif
35#if !defined(__TETHER_H__)
36#include "tether.h" 33#include "tether.h"
37#endif
38#if !defined(__DESC_H__)
39#include "desc.h" 34#include "desc.h"
40#endif
41
42
43
44//#define ULONGLONG ULONG
45 35
46/*--------------------- Export Definitions -------------------------*/ 36/*--------------------- Export Definitions -------------------------*/
47 37
@@ -386,11 +376,6 @@ typedef struct tagSStatCounter {
386/*--------------------- Export Variables --------------------------*/ 376/*--------------------- Export Variables --------------------------*/
387 377
388/*--------------------- Export Functions --------------------------*/ 378/*--------------------- Export Functions --------------------------*/
389#ifdef __cplusplus
390extern "C" { /* Assume C declarations for C++ */
391#endif /* __cplusplus */
392
393
394 379
395void STAvClearAllCounter(PSStatCounter pStatistic); 380void STAvClearAllCounter(PSStatCounter pStatistic);
396 381
@@ -432,13 +417,6 @@ STAvUpdateUSBCounter(
432 NTSTATUS ntStatus 417 NTSTATUS ntStatus
433 ); 418 );
434 419
435#ifdef __cplusplus
436} /* End of extern "C" { */
437#endif /* __cplusplus */
438
439
440
441
442#endif // __MIB_H__ 420#endif // __MIB_H__
443 421
444 422
diff --git a/drivers/staging/vt6656/michael.c b/drivers/staging/vt6656/michael.c
index 7bda4c19e90..2c8f875659d 100644
--- a/drivers/staging/vt6656/michael.c
+++ b/drivers/staging/vt6656/michael.c
@@ -39,15 +39,9 @@
39 * 39 *
40 */ 40 */
41 41
42#if !defined(__TMACRO_H__)
43#include "tmacro.h" 42#include "tmacro.h"
44#endif
45#if !defined(__TBIT_H__)
46#include "tbit.h" 43#include "tbit.h"
47#endif
48#if !defined(__MICHAEL_H__)
49#include "michael.h" 44#include "michael.h"
50#endif
51 45
52/*--------------------- Static Definitions -------------------------*/ 46/*--------------------- Static Definitions -------------------------*/
53 47
diff --git a/drivers/staging/vt6656/michael.h b/drivers/staging/vt6656/michael.h
index 62a24a6083a..dcce12e5b6c 100644
--- a/drivers/staging/vt6656/michael.h
+++ b/drivers/staging/vt6656/michael.h
@@ -28,13 +28,11 @@
28 * 28 *
29 */ 29 */
30 30
31
32#ifndef __MICHAEL_H__ 31#ifndef __MICHAEL_H__
33#define __MICHAEL_H__ 32#define __MICHAEL_H__
34 33
35#if !defined(__UMEM_H__)
36#include "umem.h" 34#include "umem.h"
37#endif 35
38/*--------------------- Export Definitions -------------------------*/ 36/*--------------------- Export Definitions -------------------------*/
39 37
40/*--------------------- Export Types ------------------------------*/ 38/*--------------------- Export Types ------------------------------*/
diff --git a/drivers/staging/vt6656/power.c b/drivers/staging/vt6656/power.c
index b522b21b743..a6d7767a1a9 100644
--- a/drivers/staging/vt6656/power.c
+++ b/drivers/staging/vt6656/power.c
@@ -37,50 +37,19 @@
37 * 37 *
38 */ 38 */
39 39
40
41
42#if !defined(__TTYPE_H__)
43#include "ttype.h" 40#include "ttype.h"
44#endif
45#if !defined(__TBIT_H__)
46#include "tbit.h" 41#include "tbit.h"
47#endif
48#if !defined(__MAC_H__)
49#include "mac.h" 42#include "mac.h"
50#endif
51#if !defined(__DEVICE_H__)
52#include "device.h" 43#include "device.h"
53#endif
54#if !defined(__WMGR_H__)
55#include "wmgr.h" 44#include "wmgr.h"
56#endif
57#if !defined(__POWER_H__)
58#include "power.h" 45#include "power.h"
59#endif
60#if !defined(__WCMD_H__)
61#include "wcmd.h" 46#include "wcmd.h"
62#endif
63#if !defined(__TBIT_H__)
64#include "tbit.h" 47#include "tbit.h"
65#endif
66#if !defined(__UMEM_H__)
67#include "umem.h" 48#include "umem.h"
68#endif
69#if !defined(__RXTX_H__)
70#include "rxtx.h" 49#include "rxtx.h"
71#endif
72#if !defined(__CARD_H__)
73#include "card.h" 50#include "card.h"
74#endif
75#if !defined(__CONTROL_H__)
76#include "control.h" 51#include "control.h"
77#endif
78#if !defined(__RNDIS_H__)
79#include "rndis.h" 52#include "rndis.h"
80#endif
81
82
83
84 53
85/*--------------------- Static Definitions -------------------------*/ 54/*--------------------- Static Definitions -------------------------*/
86 55
diff --git a/drivers/staging/vt6656/rc4.c b/drivers/staging/vt6656/rc4.c
index 5ad12a3746c..e6c61312fd2 100644
--- a/drivers/staging/vt6656/rc4.c
+++ b/drivers/staging/vt6656/rc4.c
@@ -30,9 +30,7 @@
30 * 30 *
31 */ 31 */
32 32
33#if !defined(__RC4_H__)
34#include "rc4.h" 33#include "rc4.h"
35#endif
36 34
37VOID rc4_init(PRC4Ext pRC4, PBYTE pbyKey, UINT cbKey_len) 35VOID rc4_init(PRC4Ext pRC4, PBYTE pbyKey, UINT cbKey_len)
38{ 36{
diff --git a/drivers/staging/vt6656/rc4.h b/drivers/staging/vt6656/rc4.h
index 2344f35ae1d..bf607c9d446 100644
--- a/drivers/staging/vt6656/rc4.h
+++ b/drivers/staging/vt6656/rc4.h
@@ -30,11 +30,7 @@
30#ifndef __RC4_H__ 30#ifndef __RC4_H__
31#define __RC4_H__ 31#define __RC4_H__
32 32
33#if !defined(__TTYPE_H__)
34#include "ttype.h" 33#include "ttype.h"
35#endif
36
37
38 34
39/*--------------------- Export Definitions -------------------------*/ 35/*--------------------- Export Definitions -------------------------*/
40/*--------------------- Export Types ------------------------------*/ 36/*--------------------- Export Types ------------------------------*/
diff --git a/drivers/staging/vt6656/rf.c b/drivers/staging/vt6656/rf.c
index 3436d3bfb39..405c4f71b5f 100644
--- a/drivers/staging/vt6656/rf.c
+++ b/drivers/staging/vt6656/rf.c
@@ -32,24 +32,12 @@
32 * 32 *
33 */ 33 */
34 34
35#if !defined(__MAC_H__)
36#include "mac.h" 35#include "mac.h"
37#endif
38#if !defined(__RF_H__)
39#include "rf.h" 36#include "rf.h"
40#endif
41#if !defined(__BASEBAND_H__)
42#include "baseband.h" 37#include "baseband.h"
43#endif
44#if !defined(__CONTROL_H__)
45#include "control.h" 38#include "control.h"
46#endif
47#if !defined(__RNDIS_H__)
48#include "rndis.h" 39#include "rndis.h"
49#endif
50#if !defined(__DATARATE_H__)
51#include "datarate.h" 40#include "datarate.h"
52#endif
53 41
54static int msglevel =MSG_LEVEL_INFO; 42static int msglevel =MSG_LEVEL_INFO;
55//static int msglevel =MSG_LEVEL_DEBUG; 43//static int msglevel =MSG_LEVEL_DEBUG;
diff --git a/drivers/staging/vt6656/rf.h b/drivers/staging/vt6656/rf.h
index 1d7d3e3f130..55d882f78f2 100644
--- a/drivers/staging/vt6656/rf.h
+++ b/drivers/staging/vt6656/rf.h
@@ -27,16 +27,12 @@
27 * 27 *
28 */ 28 */
29 29
30
31#ifndef __RF_H__ 30#ifndef __RF_H__
32#define __RF_H__ 31#define __RF_H__
33 32
34#if !defined(__TTYPE_H__)
35#include "ttype.h" 33#include "ttype.h"
36#endif
37#if !defined(__DEVICE_H__)
38#include "device.h" 34#include "device.h"
39#endif 35
40/*--------------------- Export Definitions -------------------------*/ 36/*--------------------- Export Definitions -------------------------*/
41// 37//
42// Baseband RF pair definition in eeprom (Bits 6..0) 38// Baseband RF pair definition in eeprom (Bits 6..0)
@@ -66,9 +62,6 @@
66/*--------------------- Export Variables --------------------------*/ 62/*--------------------- Export Variables --------------------------*/
67extern const BYTE RFaby11aChannelIndex[200]; 63extern const BYTE RFaby11aChannelIndex[200];
68/*--------------------- Export Functions --------------------------*/ 64/*--------------------- Export Functions --------------------------*/
69#ifdef __cplusplus
70extern "C" { /* Assume C declarations for C++ */
71#endif /* __cplusplus */
72 65
73BOOL IFRFbWriteEmbeded(PSDevice pDevice, DWORD dwData); 66BOOL IFRFbWriteEmbeded(PSDevice pDevice, DWORD dwData);
74BOOL RFbSetPower ( 67BOOL RFbSetPower (
@@ -101,11 +94,6 @@ BOOL s_bVT3226D0_11bLoCurrentAdjust(
101 IN BOOL b11bMode 94 IN BOOL b11bMode
102 ); 95 );
103 96
104#ifdef __cplusplus
105} /* End of extern "C" { */
106#endif /* __cplusplus */
107
108
109#endif // __RF_H__ 97#endif // __RF_H__
110 98
111 99
diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c
index bde7e29a6bc..648b5db658d 100644
--- a/drivers/staging/vt6656/rxtx.c
+++ b/drivers/staging/vt6656/rxtx.c
@@ -46,64 +46,28 @@
46 * 46 *
47 */ 47 */
48 48
49
50#if !defined(__DEVICE_H__)
51#include "device.h" 49#include "device.h"
52#endif
53#if !defined(__RXTX_H__)
54#include "rxtx.h" 50#include "rxtx.h"
55#endif
56#if !defined(__TETHER_H__)
57#include "tether.h" 51#include "tether.h"
58#endif
59#if !defined(__CARD_H__)
60#include "card.h" 52#include "card.h"
61#endif
62#if !defined(__BSSDB_H__)
63#include "bssdb.h" 53#include "bssdb.h"
64#endif
65#if !defined(__MAC_H__)
66#include "mac.h" 54#include "mac.h"
67#endif
68#if !defined(__BASEBAND_H__)
69#include "baseband.h" 55#include "baseband.h"
70#endif
71#if !defined(__UMEM_H__)
72#include "umem.h" 56#include "umem.h"
73#endif
74#if !defined(__MICHAEL_H__)
75#include "michael.h" 57#include "michael.h"
76#endif
77#if !defined(__TKIP_H__)
78#include "tkip.h" 58#include "tkip.h"
79#endif
80#if !defined(__TCRC_H__)
81#include "tcrc.h" 59#include "tcrc.h"
82#endif
83#if !defined(__WCTL_H__)
84#include "wctl.h" 60#include "wctl.h"
85#endif
86#if !defined(__TBIT_H__)
87#include "tbit.h" 61#include "tbit.h"
88#endif
89#if !defined(__HOSTAP_H__)
90#include "hostap.h" 62#include "hostap.h"
91#endif
92#if !defined(__RF_H__)
93#include "rf.h" 63#include "rf.h"
94#endif
95#if !defined(__DATARATE_H__)
96#include "datarate.h" 64#include "datarate.h"
97#endif
98#if !defined(__USBPIPE_H__)
99#include "usbpipe.h" 65#include "usbpipe.h"
100#endif
101 66
102#ifdef WPA_SM_Transtatus 67#ifdef WPA_SM_Transtatus
103#if !defined(__IOCMD_H__)
104#include "iocmd.h" 68#include "iocmd.h"
105#endif 69#endif
106#endif 70
107/*--------------------- Static Definitions -------------------------*/ 71/*--------------------- Static Definitions -------------------------*/
108 72
109/*--------------------- Static Classes ----------------------------*/ 73/*--------------------- Static Classes ----------------------------*/
diff --git a/drivers/staging/vt6656/rxtx.h b/drivers/staging/vt6656/rxtx.h
index fabea7f11c8..6bc22d371c1 100644
--- a/drivers/staging/vt6656/rxtx.h
+++ b/drivers/staging/vt6656/rxtx.h
@@ -26,20 +26,12 @@
26 * 26 *
27 */ 27 */
28 28
29
30#ifndef __RXTX_H__ 29#ifndef __RXTX_H__
31#define __RXTX_H__ 30#define __RXTX_H__
32 31
33#if !defined(__TTYPE_H__)
34#include "ttype.h" 32#include "ttype.h"
35#endif
36#if !defined(__DEVICE_H__)
37#include "device.h" 33#include "device.h"
38#endif
39#if !defined(__WCMD_H__)
40#include "wcmd.h" 34#include "wcmd.h"
41#endif
42
43 35
44/*--------------------- Export Definitions -------------------------*/ 36/*--------------------- Export Definitions -------------------------*/
45 37
@@ -673,13 +665,6 @@ typedef struct tagSBEACON_BUFFER
673 665
674/*--------------------- Export Functions --------------------------*/ 666/*--------------------- Export Functions --------------------------*/
675 667
676
677#ifdef __cplusplus
678extern "C" { /* Assume C declarations for C++ */
679#endif /* __cplusplus */
680
681
682
683BOOL 668BOOL
684bPacketToWirelessUsb( 669bPacketToWirelessUsb(
685 IN PSDevice pDevice, 670 IN PSDevice pDevice,
@@ -703,13 +688,6 @@ CMD_STATUS csMgmt_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket);
703CMD_STATUS csBeacon_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket); 688CMD_STATUS csBeacon_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket);
704BOOL bRelayPacketSend(PSDevice pDevice, PBYTE pbySkbData, UINT uDataLen, UINT uNodeIndex); 689BOOL bRelayPacketSend(PSDevice pDevice, PBYTE pbySkbData, UINT uDataLen, UINT uNodeIndex);
705 690
706#ifdef __cplusplus
707} /* End of extern "C" { */
708#endif /* __cplusplus */
709
710
711
712
713#endif // __RXTX_H__ 691#endif // __RXTX_H__
714 692
715 693
diff --git a/drivers/staging/vt6656/srom.h b/drivers/staging/vt6656/srom.h
index af208ec9308..4c89e7ad6b4 100644
--- a/drivers/staging/vt6656/srom.h
+++ b/drivers/staging/vt6656/srom.h
@@ -27,16 +27,10 @@
27 * 27 *
28 */ 28 */
29 29
30
31#ifndef __SROM_H__ 30#ifndef __SROM_H__
32#define __SROM_H__ 31#define __SROM_H__
33 32
34#if !defined(__TTYPE_H__)
35#include "ttype.h" 33#include "ttype.h"
36#endif
37
38
39
40 34
41/*--------------------- Export Definitions -------------------------*/ 35/*--------------------- Export Definitions -------------------------*/
42 36
@@ -129,16 +123,5 @@ typedef struct tagSSromReg {
129/*--------------------- Export Variables --------------------------*/ 123/*--------------------- Export Variables --------------------------*/
130 124
131/*--------------------- Export Functions --------------------------*/ 125/*--------------------- Export Functions --------------------------*/
132#ifdef __cplusplus
133extern "C" { /* Assume C declarations for C++ */
134#endif /* __cplusplus */
135
136
137#ifdef __cplusplus
138} /* End of extern "C" { */
139#endif /* __cplusplus */
140
141
142
143 126
144#endif // __EEPROM_H__ 127#endif // __EEPROM_H__
diff --git a/drivers/staging/vt6656/tbit.h b/drivers/staging/vt6656/tbit.h
index 7c3a82e9b60..1850282ce44 100644
--- a/drivers/staging/vt6656/tbit.h
+++ b/drivers/staging/vt6656/tbit.h
@@ -27,15 +27,10 @@
27 * 27 *
28 */ 28 */
29 29
30
31#ifndef __TBIT_H__ 30#ifndef __TBIT_H__
32#define __TBIT_H__ 31#define __TBIT_H__
33 32
34#if !defined(__TTYPE_H__)
35#include "ttype.h" 33#include "ttype.h"
36#endif
37
38
39 34
40/*--------------------- Export Definitions -------------------------*/ 35/*--------------------- Export Definitions -------------------------*/
41 36
diff --git a/drivers/staging/vt6656/tcrc.c b/drivers/staging/vt6656/tcrc.c
index b70080c267c..79347e48369 100644
--- a/drivers/staging/vt6656/tcrc.c
+++ b/drivers/staging/vt6656/tcrc.c
@@ -33,16 +33,8 @@
33 * 33 *
34 */ 34 */
35 35
36
37#if !defined(__TBIT_H__)
38#include "tbit.h" 36#include "tbit.h"
39#endif
40#if !defined(__TCRC_H__)
41#include "tcrc.h" 37#include "tcrc.h"
42#endif
43
44
45
46 38
47/*--------------------- Static Definitions -------------------------*/ 39/*--------------------- Static Definitions -------------------------*/
48 40
diff --git a/drivers/staging/vt6656/tcrc.h b/drivers/staging/vt6656/tcrc.h
index ebea22ed2da..5faa48b0a74 100644
--- a/drivers/staging/vt6656/tcrc.h
+++ b/drivers/staging/vt6656/tcrc.h
@@ -26,16 +26,10 @@
26 * 26 *
27 */ 27 */
28 28
29
30#ifndef __TCRC_H__ 29#ifndef __TCRC_H__
31#define __TCRC_H__ 30#define __TCRC_H__
32 31
33#if !defined(__TTYPE_H__)
34#include "ttype.h" 32#include "ttype.h"
35#endif
36
37
38
39 33
40/*--------------------- Export Definitions -------------------------*/ 34/*--------------------- Export Definitions -------------------------*/
41 35
@@ -48,23 +42,11 @@
48/*--------------------- Export Variables --------------------------*/ 42/*--------------------- Export Variables --------------------------*/
49 43
50/*--------------------- Export Functions --------------------------*/ 44/*--------------------- Export Functions --------------------------*/
51#ifdef __cplusplus
52extern "C" { /* Assume C declarations for C++ */
53#endif /* __cplusplus */
54
55 45
56DWORD CRCdwCrc32(PBYTE pbyData, UINT cbByte, DWORD dwCrcSeed); 46DWORD CRCdwCrc32(PBYTE pbyData, UINT cbByte, DWORD dwCrcSeed);
57DWORD CRCdwGetCrc32(PBYTE pbyData, UINT cbByte); 47DWORD CRCdwGetCrc32(PBYTE pbyData, UINT cbByte);
58DWORD CRCdwGetCrc32Ex(PBYTE pbyData, UINT cbByte, DWORD dwPreCRC); 48DWORD CRCdwGetCrc32Ex(PBYTE pbyData, UINT cbByte, DWORD dwPreCRC);
59 49
60
61#ifdef __cplusplus
62} /* End of extern "C" { */
63#endif /* __cplusplus */
64
65
66
67
68#endif // __TCRC_H__ 50#endif // __TCRC_H__
69 51
70 52
diff --git a/drivers/staging/vt6656/tether.c b/drivers/staging/vt6656/tether.c
index fd69423fe14..7268735d01c 100644
--- a/drivers/staging/vt6656/tether.c
+++ b/drivers/staging/vt6656/tether.c
@@ -32,24 +32,11 @@
32 * 32 *
33 */ 33 */
34 34
35#if !defined(__DEVICE_H__)
36#include "device.h" 35#include "device.h"
37#endif
38#if !defined(__TMACRO_H__)
39#include "tmacro.h" 36#include "tmacro.h"
40#endif
41#if !defined(__TBIT_H__)
42#include "tbit.h" 37#include "tbit.h"
43#endif
44#if !defined(__TCRC_H__)
45#include "tcrc.h" 38#include "tcrc.h"
46#endif
47#if !defined(__TETHER_H__)
48#include "tether.h" 39#include "tether.h"
49#endif
50
51
52
53 40
54/*--------------------- Static Definitions -------------------------*/ 41/*--------------------- Static Definitions -------------------------*/
55 42
diff --git a/drivers/staging/vt6656/tether.h b/drivers/staging/vt6656/tether.h
index 8f40a74bf3b..5a3c326436c 100644
--- a/drivers/staging/vt6656/tether.h
+++ b/drivers/staging/vt6656/tether.h
@@ -26,18 +26,10 @@
26 * 26 *
27 */ 27 */
28 28
29
30
31#ifndef __TETHER_H__ 29#ifndef __TETHER_H__
32#define __TETHER_H__ 30#define __TETHER_H__
33 31
34
35#if !defined(__TTYPE_H__)
36#include "ttype.h" 32#include "ttype.h"
37#endif
38
39
40
41 33
42/*--------------------- Export Definitions -------------------------*/ 34/*--------------------- Export Definitions -------------------------*/
43// 35//
@@ -233,23 +225,11 @@ S802_11Header, *PS802_11Header;
233/*--------------------- Export Variables --------------------------*/ 225/*--------------------- Export Variables --------------------------*/
234 226
235/*--------------------- Export Functions --------------------------*/ 227/*--------------------- Export Functions --------------------------*/
236#ifdef __cplusplus
237extern "C" { /* Assume C declarations for C++ */
238#endif /* __cplusplus */
239
240 228
241BYTE ETHbyGetHashIndexByCrc32(PBYTE pbyMultiAddr); 229BYTE ETHbyGetHashIndexByCrc32(PBYTE pbyMultiAddr);
242//BYTE ETHbyGetHashIndexByCrc(PBYTE pbyMultiAddr); 230//BYTE ETHbyGetHashIndexByCrc(PBYTE pbyMultiAddr);
243BOOL ETHbIsBufferCrc32Ok(PBYTE pbyBuffer, UINT cbFrameLength); 231BOOL ETHbIsBufferCrc32Ok(PBYTE pbyBuffer, UINT cbFrameLength);
244 232
245
246#ifdef __cplusplus
247} /* End of extern "C" { */
248#endif /* __cplusplus */
249
250
251
252
253#endif // __TETHER_H__ 233#endif // __TETHER_H__
254 234
255 235
diff --git a/drivers/staging/vt6656/tkip.c b/drivers/staging/vt6656/tkip.c
index 2ded8420c39..c02ce6a713d 100644
--- a/drivers/staging/vt6656/tkip.c
+++ b/drivers/staging/vt6656/tkip.c
@@ -32,20 +32,10 @@
32 * 32 *
33 */ 33 */
34 34
35
36#if !defined(__TMACRO_H__)
37#include "tmacro.h" 35#include "tmacro.h"
38#endif
39#if !defined(__TBIT_H__)
40#include "tbit.h" 36#include "tbit.h"
41#endif
42#if !defined(__TKIP_H__)
43#include "tkip.h" 37#include "tkip.h"
44#endif
45#if !defined(__UMEM_H__)
46#include "umem.h" 38#include "umem.h"
47#endif
48
49 39
50/*--------------------- Static Definitions -------------------------*/ 40/*--------------------- Static Definitions -------------------------*/
51 41
diff --git a/drivers/staging/vt6656/tkip.h b/drivers/staging/vt6656/tkip.h
index dc8382b6701..847ecdf97ee 100644
--- a/drivers/staging/vt6656/tkip.h
+++ b/drivers/staging/vt6656/tkip.h
@@ -27,19 +27,11 @@
27 * 27 *
28 */ 28 */
29 29
30
31#ifndef __TKIP_H__ 30#ifndef __TKIP_H__
32#define __TKIP_H__ 31#define __TKIP_H__
33 32
34#if !defined(__TTYPE_H__)
35#include "ttype.h" 33#include "ttype.h"
36#endif
37
38#if !defined(__TETHER_H__)
39#include "tether.h" 34#include "tether.h"
40#endif
41
42
43 35
44/*--------------------- Export Definitions -------------------------*/ 36/*--------------------- Export Definitions -------------------------*/
45#define TKIP_KEY_LEN 16 37#define TKIP_KEY_LEN 16
@@ -53,9 +45,6 @@
53/*--------------------- Export Variables --------------------------*/ 45/*--------------------- Export Variables --------------------------*/
54 46
55/*--------------------- Export Functions --------------------------*/ 47/*--------------------- Export Functions --------------------------*/
56#ifdef __cplusplus
57extern "C" { /* Assume C declarations for C++ */
58#endif /* __cplusplus */
59 48
60VOID TKIPvMixKey( 49VOID TKIPvMixKey(
61 PBYTE pbyTKey, 50 PBYTE pbyTKey,
@@ -65,11 +54,6 @@ VOID TKIPvMixKey(
65 PBYTE pbyRC4Key 54 PBYTE pbyRC4Key
66 ); 55 );
67 56
68#ifdef __cplusplus
69} /* End of extern "C" { */
70#endif /* __cplusplus */
71
72
73#endif // __TKIP_H__ 57#endif // __TKIP_H__
74 58
75 59
diff --git a/drivers/staging/vt6656/tmacro.h b/drivers/staging/vt6656/tmacro.h
index c850f9ec8f1..e96c140de05 100644
--- a/drivers/staging/vt6656/tmacro.h
+++ b/drivers/staging/vt6656/tmacro.h
@@ -26,7 +26,6 @@
26 * 26 *
27 */ 27 */
28 28
29
30#ifndef __TMACRO_H__ 29#ifndef __TMACRO_H__
31#define __TMACRO_H__ 30#define __TMACRO_H__
32 31
@@ -51,8 +50,6 @@
51#define LODWORD(q) ((q).u.dwLowDword) 50#define LODWORD(q) ((q).u.dwLowDword)
52#define HIDWORD(q) ((q).u.dwHighDword) 51#define HIDWORD(q) ((q).u.dwHighDword)
53 52
54
55
56#if !defined(MAKEWORD) 53#if !defined(MAKEWORD)
57#define MAKEWORD(lb, hb) ((WORD)(((BYTE)(lb)) | (((WORD)((BYTE)(hb))) << 8))) 54#define MAKEWORD(lb, hb) ((WORD)(((BYTE)(lb)) | (((WORD)((BYTE)(hb))) << 8)))
58#endif 55#endif
diff --git a/drivers/staging/vt6656/tpci.h b/drivers/staging/vt6656/tpci.h
index 3a04845cbb5..d1fe2560027 100644
--- a/drivers/staging/vt6656/tpci.h
+++ b/drivers/staging/vt6656/tpci.h
@@ -29,16 +29,10 @@
29 * 29 *
30 */ 30 */
31 31
32
33#ifndef __TPCI_H__ 32#ifndef __TPCI_H__
34#define __TPCI_H__ 33#define __TPCI_H__
35 34
36#if !defined(__TTYPE_H__)
37#include "ttype.h" 35#include "ttype.h"
38#endif
39
40
41
42 36
43/*--------------------- Export Definitions -------------------------*/ 37/*--------------------- Export Definitions -------------------------*/
44#define MAX_PCI_BUS 4 // max. # of PCI bus that we support 38#define MAX_PCI_BUS 4 // max. # of PCI bus that we support
diff --git a/drivers/staging/vt6656/umem.h b/drivers/staging/vt6656/umem.h
index 2c3eafa038e..916adde864a 100644
--- a/drivers/staging/vt6656/umem.h
+++ b/drivers/staging/vt6656/umem.h
@@ -31,11 +31,7 @@
31#ifndef __UMEM_H__ 31#ifndef __UMEM_H__
32#define __UMEM_H__ 32#define __UMEM_H__
33 33
34#if !defined(__TTYPE_H__)
35#include "ttype.h" 34#include "ttype.h"
36#endif
37
38
39 35
40/*--------------------- Export Definitions -------------------------*/ 36/*--------------------- Export Definitions -------------------------*/
41// 4-byte memory tag 37// 4-byte memory tag
diff --git a/drivers/staging/vt6656/upc.h b/drivers/staging/vt6656/upc.h
index 113fc2c88c1..acd1b661490 100644
--- a/drivers/staging/vt6656/upc.h
+++ b/drivers/staging/vt6656/upc.h
@@ -26,16 +26,11 @@
26 * 26 *
27 */ 27 */
28 28
29
30#ifndef __UPC_H__ 29#ifndef __UPC_H__
31#define __UPC_H__ 30#define __UPC_H__
32 31
33#if !defined(DEVICE_H)
34#include "device.h" 32#include "device.h"
35#endif
36#if !defined(__TTYPE_H__)
37#include "ttype.h" 33#include "ttype.h"
38#endif
39 34
40/*--------------------- Export Definitions -------------------------*/ 35/*--------------------- Export Definitions -------------------------*/
41 36
diff --git a/drivers/staging/vt6656/usbpipe.c b/drivers/staging/vt6656/usbpipe.c
index ee458c492d5..74852eccafd 100644
--- a/drivers/staging/vt6656/usbpipe.c
+++ b/drivers/staging/vt6656/usbpipe.c
@@ -38,28 +38,13 @@
38 * 38 *
39 */ 39 */
40 40
41#if !defined(__UMEM_H__)
42#include "umem.h" 41#include "umem.h"
43#endif
44#if !defined(__INT_H__)
45#include "int.h" 42#include "int.h"
46#endif
47#if !defined(__RXTX_H__)
48#include "rxtx.h" 43#include "rxtx.h"
49#endif
50#if !defined(__DPC_H__)
51#include "dpc.h" 44#include "dpc.h"
52#endif
53#if !defined(__CONTROL_H__)
54#include "control.h" 45#include "control.h"
55#endif
56#if !defined(__DESC_H__)
57#include "desc.h" 46#include "desc.h"
58#endif
59#if !defined(__DEVICE_H__)
60#include "device.h" 47#include "device.h"
61#endif
62
63 48
64/*--------------------- Static Definitions -------------------------*/ 49/*--------------------- Static Definitions -------------------------*/
65//endpoint def 50//endpoint def
diff --git a/drivers/staging/vt6656/usbpipe.h b/drivers/staging/vt6656/usbpipe.h
index 729edadb491..c422d1d0873 100644
--- a/drivers/staging/vt6656/usbpipe.h
+++ b/drivers/staging/vt6656/usbpipe.h
@@ -27,18 +27,11 @@
27 * 27 *
28 */ 28 */
29 29
30
31#ifndef __USBPIPE_H__ 30#ifndef __USBPIPE_H__
32#define __USBPIPE_H__ 31#define __USBPIPE_H__
33 32
34#if !defined(__TTYPE_H__)
35#include "ttype.h" 33#include "ttype.h"
36#endif
37#if !defined(__DEVICE_H__)
38#include "device.h" 34#include "device.h"
39#endif
40
41
42 35
43/*--------------------- Export Definitions -------------------------*/ 36/*--------------------- Export Definitions -------------------------*/
44 37
@@ -47,9 +40,6 @@
47/*--------------------- Export Variables --------------------------*/ 40/*--------------------- Export Variables --------------------------*/
48 41
49/*--------------------- Export Functions --------------------------*/ 42/*--------------------- Export Functions --------------------------*/
50#ifdef __cplusplus
51extern "C" { /* Assume C declarations for C++ */
52#endif /* __cplusplus */
53 43
54NTSTATUS 44NTSTATUS
55PIPEnsControlOut( 45PIPEnsControlOut(
@@ -103,13 +93,6 @@ PIPEnsSendBulkOut(
103 IN PUSB_SEND_CONTEXT pContext 93 IN PUSB_SEND_CONTEXT pContext
104 ); 94 );
105 95
106#ifdef __cplusplus
107} /* End of extern "C" { */
108#endif /* __cplusplus */
109
110
111
112
113#endif // __USBPIPE_H__ 96#endif // __USBPIPE_H__
114 97
115 98
diff --git a/drivers/staging/vt6656/wcmd.c b/drivers/staging/vt6656/wcmd.c
index 899efb1d53f..ce1d25060c0 100644
--- a/drivers/staging/vt6656/wcmd.c
+++ b/drivers/staging/vt6656/wcmd.c
@@ -38,67 +38,25 @@
38 * 38 *
39 */ 39 */
40 40
41
42
43
44#if !defined(__TTYPE_H__)
45#include "ttype.h" 41#include "ttype.h"
46#endif
47#if !defined(__TMACRO_H__)
48#include "tmacro.h" 42#include "tmacro.h"
49#endif
50#if !defined(__DEVICE_H__)
51#include "device.h" 43#include "device.h"
52#endif
53#if !defined(__MAC_H__)
54#include "mac.h" 44#include "mac.h"
55#endif
56#if !defined(__CARD_H__)
57#include "card.h" 45#include "card.h"
58#endif
59#if !defined(__80211HDR_H__)
60#include "80211hdr.h" 46#include "80211hdr.h"
61#endif
62#if !defined(__WCMD_H__)
63#include "wcmd.h" 47#include "wcmd.h"
64#endif
65#if !defined(__WMGR_H__)
66#include "wmgr.h" 48#include "wmgr.h"
67#endif
68#if !defined(__POWER_H__)
69#include "power.h" 49#include "power.h"
70#endif
71#if !defined(__WCTL_H__)
72#include "wctl.h" 50#include "wctl.h"
73#endif
74#if !defined(__CARD_H__)
75#include "card.h" 51#include "card.h"
76#endif
77#if !defined(__BASEBAND_H__)
78#include "baseband.h" 52#include "baseband.h"
79#endif
80#if !defined(__CONTROL_H__)
81#include "control.h" 53#include "control.h"
82#endif
83#if !defined(__UMEM_H__)
84#include "umem.h" 54#include "umem.h"
85#endif
86#if !defined(__RXTX_H__)
87#include "rxtx.h" 55#include "rxtx.h"
88#endif
89#if !defined(__RF_H__)
90#include "rf.h" 56#include "rf.h"
91#endif
92#if !defined(__RNDIS_H__)
93#include "rndis.h" 57#include "rndis.h"
94#endif
95#if !defined (_CHANNEL_H_)
96#include "channel.h" 58#include "channel.h"
97#endif
98//DavidWang
99#if !defined(__IOWPA_H__)
100#include "iowpa.h" 59#include "iowpa.h"
101#endif
102 60
103/*--------------------- Static Definitions -------------------------*/ 61/*--------------------- Static Definitions -------------------------*/
104 62
diff --git a/drivers/staging/vt6656/wcmd.h b/drivers/staging/vt6656/wcmd.h
index 58376c50466..90d672b462b 100644
--- a/drivers/staging/vt6656/wcmd.h
+++ b/drivers/staging/vt6656/wcmd.h
@@ -29,15 +29,9 @@
29#ifndef __WCMD_H__ 29#ifndef __WCMD_H__
30#define __WCMD_H__ 30#define __WCMD_H__
31 31
32#if !defined(__TTYPE_H__)
33#include "ttype.h" 32#include "ttype.h"
34#endif
35#if !defined(__80211HDR_H__)
36#include "80211hdr.h" 33#include "80211hdr.h"
37#endif
38#if !defined(__80211MGR_H__)
39#include "80211mgr.h" 34#include "80211mgr.h"
40#endif
41 35
42/*--------------------- Export Definitions -------------------------*/ 36/*--------------------- Export Definitions -------------------------*/
43 37
diff --git a/drivers/staging/vt6656/wctl.c b/drivers/staging/vt6656/wctl.c
index a318f00441f..40986da1e4a 100644
--- a/drivers/staging/vt6656/wctl.c
+++ b/drivers/staging/vt6656/wctl.c
@@ -34,19 +34,10 @@
34 * 34 *
35 */ 35 */
36 36
37
38#if !defined(__WCTL_H__)
39#include "wctl.h" 37#include "wctl.h"
40#endif
41#if !defined(__DEVICE_H__)
42#include "device.h" 38#include "device.h"
43#endif
44#if !defined(__CARD_H__)
45#include "card.h" 39#include "card.h"
46#endif
47#if !defined(__TMACRO_H__)
48#include "tmacro.h" 40#include "tmacro.h"
49#endif
50 41
51/*--------------------- Static Definitions -------------------------*/ 42/*--------------------- Static Definitions -------------------------*/
52 43
diff --git a/drivers/staging/vt6656/wctl.h b/drivers/staging/vt6656/wctl.h
index f75ca59f6c6..a1ac4791bfd 100644
--- a/drivers/staging/vt6656/wctl.h
+++ b/drivers/staging/vt6656/wctl.h
@@ -26,21 +26,12 @@
26 * 26 *
27 */ 27 */
28 28
29
30#ifndef __WCTL_H__ 29#ifndef __WCTL_H__
31#define __WCTL_H__ 30#define __WCTL_H__
32 31
33#if !defined(__TTYPE_H__)
34#include "ttype.h" 32#include "ttype.h"
35#endif
36#if !defined(__TETHER_H__)
37#include "tether.h" 33#include "tether.h"
38#endif
39#if !defined(__DEVICE_H__)
40#include "device.h" 34#include "device.h"
41#endif
42
43
44 35
45/*--------------------- Export Definitions -------------------------*/ 36/*--------------------- Export Definitions -------------------------*/
46 37
@@ -105,22 +96,12 @@
105/*--------------------- Export Variables --------------------------*/ 96/*--------------------- Export Variables --------------------------*/
106 97
107/*--------------------- Export Functions --------------------------*/ 98/*--------------------- Export Functions --------------------------*/
108#ifdef __cplusplus
109extern "C" { /* Assume C declarations for C++ */
110#endif /* __cplusplus */
111 99
112BOOL WCTLbIsDuplicate(PSCache pCache, PS802_11Header pMACHeader); 100BOOL WCTLbIsDuplicate(PSCache pCache, PS802_11Header pMACHeader);
113BOOL WCTLbHandleFragment(PSDevice pDevice, PS802_11Header pMACHeader, UINT cbFrameLength, BOOL bWEP, BOOL bExtIV); 101BOOL WCTLbHandleFragment(PSDevice pDevice, PS802_11Header pMACHeader, UINT cbFrameLength, BOOL bWEP, BOOL bExtIV);
114UINT WCTLuSearchDFCB(PSDevice pDevice, PS802_11Header pMACHeader); 102UINT WCTLuSearchDFCB(PSDevice pDevice, PS802_11Header pMACHeader);
115UINT WCTLuInsertDFCB(PSDevice pDevice, PS802_11Header pMACHeader); 103UINT WCTLuInsertDFCB(PSDevice pDevice, PS802_11Header pMACHeader);
116 104
117#ifdef __cplusplus
118} /* End of extern "C" { */
119#endif /* __cplusplus */
120
121
122
123
124#endif // __WCTL_H__ 105#endif // __WCTL_H__
125 106
126 107
diff --git a/drivers/staging/vt6656/wmgr.c b/drivers/staging/vt6656/wmgr.c
index b81ddf64dab..cabe8634f5a 100644
--- a/drivers/staging/vt6656/wmgr.c
+++ b/drivers/staging/vt6656/wmgr.c
@@ -61,70 +61,28 @@
61 * 61 *
62 */ 62 */
63 63
64
65#if !defined(__TMACRO_H__)
66#include "tmacro.h" 64#include "tmacro.h"
67#endif
68#if !defined(__TBIT_H__)
69#include "tbit.h" 65#include "tbit.h"
70#endif
71#if !defined(__DESC_H__)
72#include "desc.h" 66#include "desc.h"
73#endif
74#if !defined(__DEVICE_H__)
75#include "device.h" 67#include "device.h"
76#endif
77#if !defined(__CARD_H__)
78#include "card.h" 68#include "card.h"
79#endif
80#if !defined(__80211HDR_H__)
81#include "80211hdr.h" 69#include "80211hdr.h"
82#endif
83#if !defined(__80211MGR_H__)
84#include "80211mgr.h" 70#include "80211mgr.h"
85#endif
86#if !defined(__WMGR_H__)
87#include "wmgr.h" 71#include "wmgr.h"
88#endif
89#if !defined(__WCMD_H__)
90#include "wcmd.h" 72#include "wcmd.h"
91#endif
92#if !defined(__MAC_H__)
93#include "mac.h" 73#include "mac.h"
94#endif
95#if !defined(__BSSDB_H__)
96#include "bssdb.h" 74#include "bssdb.h"
97#endif
98#if !defined(__POWER_H__)
99#include "power.h" 75#include "power.h"
100#endif
101#if !defined(__DATARATE_H__)
102#include "datarate.h" 76#include "datarate.h"
103#endif
104#if !defined(__BASEBAND_H__)
105#include "baseband.h" 77#include "baseband.h"
106#endif
107#if !defined(__RXTX_H__)
108#include "rxtx.h" 78#include "rxtx.h"
109#endif
110#if !defined(__WPA_H__)
111#include "wpa.h" 79#include "wpa.h"
112#endif
113#if !defined(__RF_H__)
114#include "rf.h" 80#include "rf.h"
115#endif
116#if !defined(__UMEM_H__)
117#include "umem.h" 81#include "umem.h"
118#endif
119#if !defined(__IOWPA_H__)
120#include "iowpa.h" 82#include "iowpa.h"
121#endif
122#if !defined(__CONTROL_H__)
123#include "control.h" 83#include "control.h"
124#endif
125#if !defined(__RNDIS_H__)
126#include "rndis.h" 84#include "rndis.h"
127#endif 85
128/*--------------------- Static Definitions -------------------------*/ 86/*--------------------- Static Definitions -------------------------*/
129 87
130 88
diff --git a/drivers/staging/vt6656/wmgr.h b/drivers/staging/vt6656/wmgr.h
index e780db4139d..c682a7fcbef 100644
--- a/drivers/staging/vt6656/wmgr.h
+++ b/drivers/staging/vt6656/wmgr.h
@@ -31,33 +31,16 @@
31 * 31 *
32 */ 32 */
33 33
34
35#ifndef __WMGR_H__ 34#ifndef __WMGR_H__
36#define __WMGR_H__ 35#define __WMGR_H__
37 36
38#if !defined(__TTYPE_H__)
39#include "ttype.h" 37#include "ttype.h"
40#endif
41#if !defined(__80211MGR_H__)
42#include "80211mgr.h" 38#include "80211mgr.h"
43#endif
44#if !defined(__80211HDR_H__)
45#include "80211hdr.h" 39#include "80211hdr.h"
46#endif
47#if !defined(__WCMD_H__)
48#include "wcmd.h" 40#include "wcmd.h"
49#endif
50#if !defined(__BSSDB_H__)
51#include "bssdb.h" 41#include "bssdb.h"
52#endif
53#if !defined(__WPA2_H__)
54#include "wpa2.h" 42#include "wpa2.h"
55#endif
56#if !defined(__CARD_H__)
57#include "card.h" 43#include "card.h"
58#endif
59
60
61 44
62/*--------------------- Export Definitions -------------------------*/ 45/*--------------------- Export Definitions -------------------------*/
63 46
diff --git a/drivers/staging/vt6656/wpa.c b/drivers/staging/vt6656/wpa.c
index 93614a06efe..2e508973c42 100644
--- a/drivers/staging/vt6656/wpa.c
+++ b/drivers/staging/vt6656/wpa.c
@@ -32,38 +32,16 @@
32 * 32 *
33 */ 33 */
34 34
35
36#if !defined(__TTYPE_H__)
37#include "ttype.h" 35#include "ttype.h"
38#endif
39#if !defined(__UMEM_H__)
40#include "umem.h" 36#include "umem.h"
41#endif
42#if !defined(__TMACRO_H__)
43#include "tmacro.h" 37#include "tmacro.h"
44#endif
45#if !defined(__TETHER_H__)
46#include "tether.h" 38#include "tether.h"
47#endif
48#if !defined(__DEVICE_H__)
49#include "device.h" 39#include "device.h"
50#endif
51#if !defined(__80211HDR_H__)
52#include "80211hdr.h" 40#include "80211hdr.h"
53#endif
54#if !defined(__BSSDB_H__)
55#include "bssdb.h" 41#include "bssdb.h"
56#endif
57#if !defined(__WMGR_H__)
58#include "wmgr.h" 42#include "wmgr.h"
59#endif
60#if !defined(__WPA_H__)
61#include "wpa.h" 43#include "wpa.h"
62#endif
63#if !defined(__80211MGR_H__)
64#include "80211mgr.h" 44#include "80211mgr.h"
65#endif
66
67 45
68/*--------------------- Static Variables --------------------------*/ 46/*--------------------- Static Variables --------------------------*/
69static int msglevel =MSG_LEVEL_INFO; 47static int msglevel =MSG_LEVEL_INFO;
diff --git a/drivers/staging/vt6656/wpa.h b/drivers/staging/vt6656/wpa.h
index 8000a37c6fc..9d9ce01d0c6 100644
--- a/drivers/staging/vt6656/wpa.h
+++ b/drivers/staging/vt6656/wpa.h
@@ -31,14 +31,8 @@
31#ifndef __WPA_H__ 31#ifndef __WPA_H__
32#define __WPA_H__ 32#define __WPA_H__
33 33
34
35#if !defined(__TTYPE_H__)
36#include "ttype.h" 34#include "ttype.h"
37#endif
38#if !defined(__80211HDR_H__)
39#include "80211hdr.h" 35#include "80211hdr.h"
40#endif
41
42 36
43/*--------------------- Export Definitions -------------------------*/ 37/*--------------------- Export Definitions -------------------------*/
44 38
@@ -63,9 +57,6 @@
63 57
64 58
65/*--------------------- Export Functions --------------------------*/ 59/*--------------------- Export Functions --------------------------*/
66#ifdef __cplusplus
67extern "C" { /* Assume C declarations for C++ */
68#endif /* __cplusplus */
69 60
70VOID 61VOID
71WPA_ClearRSN( 62WPA_ClearRSN(
@@ -90,9 +81,4 @@ WPAb_Is_RSN(
90 IN PWLAN_IE_RSN_EXT pRSN 81 IN PWLAN_IE_RSN_EXT pRSN
91 ); 82 );
92 83
93#ifdef __cplusplus
94} /* End of extern "C" { */
95#endif /* __cplusplus */
96
97
98#endif // __WPA_H__ 84#endif // __WPA_H__
diff --git a/drivers/staging/vt6656/wpa2.c b/drivers/staging/vt6656/wpa2.c
index 82c972dbfbf..1e6244fc23a 100644
--- a/drivers/staging/vt6656/wpa2.c
+++ b/drivers/staging/vt6656/wpa2.c
@@ -30,19 +30,11 @@
30 * Date: Oct. 4, 2004 30 * Date: Oct. 4, 2004
31 * 31 *
32 */ 32 */
33#if !defined(__WPA2_H__) 33
34#include "wpa2.h" 34#include "wpa2.h"
35#endif
36#if !defined(__UMEM_H__)
37#include "umem.h" 35#include "umem.h"
38#endif
39#if !defined(__DEVICE_H__)
40#include "device.h" 36#include "device.h"
41#endif
42#if !defined(__WMGR_H__)
43#include "wmgr.h" 37#include "wmgr.h"
44#endif
45
46 38
47/*--------------------- Static Definitions -------------------------*/ 39/*--------------------- Static Definitions -------------------------*/
48static int msglevel =MSG_LEVEL_INFO; 40static int msglevel =MSG_LEVEL_INFO;
diff --git a/drivers/staging/vt6656/wpa2.h b/drivers/staging/vt6656/wpa2.h
index cd1ea14b586..e553b386900 100644
--- a/drivers/staging/vt6656/wpa2.h
+++ b/drivers/staging/vt6656/wpa2.h
@@ -31,22 +31,10 @@
31#ifndef __WPA2_H__ 31#ifndef __WPA2_H__
32#define __WPA2_H__ 32#define __WPA2_H__
33 33
34
35#if !defined(__TTYPE_H__)
36#include "ttype.h" 34#include "ttype.h"
37#endif
38#if !defined(__80211MGR_H__)
39#include "80211mgr.h" 35#include "80211mgr.h"
40#endif
41#if !defined(__80211HDR_H__)
42#include "80211hdr.h" 36#include "80211hdr.h"
43#endif
44#if !defined(__BSSDB_H__)
45#include "bssdb.h" 37#include "bssdb.h"
46#endif
47
48
49
50 38
51/*--------------------- Export Definitions -------------------------*/ 39/*--------------------- Export Definitions -------------------------*/
52#define MAX_PMKID_CACHE 16 40#define MAX_PMKID_CACHE 16
@@ -69,9 +57,6 @@ typedef struct tagSPMKIDCache {
69/*--------------------- Export Types ------------------------------*/ 57/*--------------------- Export Types ------------------------------*/
70 58
71/*--------------------- Export Functions --------------------------*/ 59/*--------------------- Export Functions --------------------------*/
72#ifdef __cplusplus
73extern "C" { /* Assume C declarations for C++ */
74#endif /* __cplusplus */
75 60
76VOID 61VOID
77WPA2_ClearRSN ( 62WPA2_ClearRSN (
@@ -90,10 +75,4 @@ WPA2uSetIEs(
90 OUT PWLAN_IE_RSN pRSNIEs 75 OUT PWLAN_IE_RSN pRSNIEs
91 ); 76 );
92 77
93
94#ifdef __cplusplus
95} /* End of extern "C" { */
96#endif /* __cplusplus */
97
98
99#endif // __WPA2_H__ 78#endif // __WPA2_H__
diff --git a/drivers/staging/vt6656/wpactl.c b/drivers/staging/vt6656/wpactl.c
index 37c2900d6d1..4555bc0448b 100644
--- a/drivers/staging/vt6656/wpactl.c
+++ b/drivers/staging/vt6656/wpactl.c
@@ -31,38 +31,16 @@
31 * 31 *
32 */ 32 */
33 33
34
35#if !defined(__WPACTL_H__)
36#include "wpactl.h" 34#include "wpactl.h"
37#endif
38#if !defined(__KEY_H__)
39#include "key.h" 35#include "key.h"
40#endif
41#if !defined(__MAC_H__)
42#include "mac.h" 36#include "mac.h"
43#endif
44#if !defined(__DEVICE_H__)
45#include "device.h" 37#include "device.h"
46#endif
47#if !defined(__WMGR_H__)
48#include "wmgr.h" 38#include "wmgr.h"
49#endif
50#if !defined(__IOCMD_H__)
51#include "iocmd.h" 39#include "iocmd.h"
52#endif
53#if !defined(__IOWPA_H__)
54#include "iowpa.h" 40#include "iowpa.h"
55#endif
56#if !defined(__CONTROL_H__)
57#include "control.h" 41#include "control.h"
58#endif
59#if !defined(__RNDIS_H__)
60#include "rndis.h" 42#include "rndis.h"
61#endif
62//2008-0717-05, <Add> by James
63#if !defined(__RF_H__)
64#include "rf.h" 43#include "rf.h"
65#endif
66 44
67/*--------------------- Static Definitions -------------------------*/ 45/*--------------------- Static Definitions -------------------------*/
68 46
diff --git a/drivers/staging/vt6656/wpactl.h b/drivers/staging/vt6656/wpactl.h
index 2db748bc8f6..56179f01311 100644
--- a/drivers/staging/vt6656/wpactl.h
+++ b/drivers/staging/vt6656/wpactl.h
@@ -26,19 +26,13 @@
26 * 26 *
27 */ 27 */
28 28
29
30#ifndef __WPACTL_H__ 29#ifndef __WPACTL_H__
31#define __WPACTL_H__ 30#define __WPACTL_H__
32 31
33#if !defined(__DEVICE_H__)
34#include "device.h" 32#include "device.h"
35#endif
36
37#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT 33#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
38#if !defined(__IOWPA_H__)
39#include "iowpa.h" 34#include "iowpa.h"
40#endif 35#endif
41#endif
42 36
43/*--------------------- Export Definitions -------------------------*/ 37/*--------------------- Export Definitions -------------------------*/
44 38
@@ -68,22 +62,10 @@ typedef ULONGLONG NDIS_802_11_KEY_RSC;
68 62
69/*--------------------- Export Functions --------------------------*/ 63/*--------------------- Export Functions --------------------------*/
70 64
71
72#ifdef __cplusplus
73extern "C" { /* Assume C declarations for C++ */
74#endif /* __cplusplus */
75
76int wpa_set_wpadev(PSDevice pDevice, int val); 65int wpa_set_wpadev(PSDevice pDevice, int val);
77int wpa_ioctl(PSDevice pDevice, struct iw_point *p); 66int wpa_ioctl(PSDevice pDevice, struct iw_point *p);
78int wpa_set_keys(PSDevice pDevice, void *ctx, BOOL fcpfkernel); 67int wpa_set_keys(PSDevice pDevice, void *ctx, BOOL fcpfkernel);
79 68
80#ifdef __cplusplus
81} /* End of extern "C" { */
82#endif /* __cplusplus */
83
84
85
86
87#endif // __WPACL_H__ 69#endif // __WPACL_H__
88 70
89 71
generated by cgit v1.2.2 (git 2.25.0) at 2024-10-19 19:45:22 -0400