adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 11:46:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

Staging: vt665x: Clean up include files, Part 1

Browse source 
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>
This commit is contained in:
Jim Lieb 2009-08-12 14:54:08 -07:00 committed by Greg Kroah-Hartman
parent a884847a1a
commit 9d26d60f99
75 changed files with 13 additions and 1180 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/staging/vt6656/80211hdr.h
View file

@ -28,15 +28,10 @@
* *
*/ */
#ifndef __80211HDR_H__ #ifndef __80211HDR_H__
#define __80211HDR_H__ #define __80211HDR_H__
#if !defined(__TTYPE_H__)
#include "ttype.h" #include "ttype.h"
#endif
/*--------------------- Export Definitions -------------------------*/ /*--------------------- Export Definitions -------------------------*/
// bit type // bit type

16
drivers/staging/vt6656/80211mgr.c
View file

@ -52,28 +52,12 @@
* *
*/ */
#if !defined(__TMACRO_H__)
#include "tmacro.h" #include "tmacro.h"
#endif
#if !defined(__TETHER_H__)
#include "tether.h" #include "tether.h"
#endif
#if !defined(__80211MGR_H__)
#include "80211mgr.h" #include "80211mgr.h"
#endif
#if !defined(__80211HDR_H__)
#include "80211hdr.h" #include "80211hdr.h"
#endif
#if !defined(__DEVICE_H__)
#include "device.h" #include "device.h"
#endif
#if !defined(__WPA_H__)
#include "wpa.h" #include "wpa.h"
#endif
/*--------------------- Static Definitions -------------------------*/ /*--------------------- Static Definitions -------------------------*/

6
drivers/staging/vt6656/80211mgr.h
View file

@ -28,17 +28,11 @@
* *
*/ */
#ifndef __80211MGR_H__ #ifndef __80211MGR_H__
#define __80211MGR_H__ #define __80211MGR_H__
#if !defined(__TTYPE_H__)
#include "ttype.h" #include "ttype.h"
#endif
#if !defined(__80211HDR_H__)
#include "80211hdr.h" #include "80211hdr.h"
#endif
/*--------------------- Export Definitions -------------------------*/ /*--------------------- Export Definitions -------------------------*/

2
drivers/staging/vt6656/TODO
View file

@ -1,5 +1,5 @@
TODO: TODO:
- remove __cplusplus ifdefs - remove __cplusplus ifdefs -- done
- remove kernel version compatibility wrappers - remove kernel version compatibility wrappers
- remove support for older wireless extensions - remove support for older wireless extensions
- prepare for merge with vt6655 driver: - prepare for merge with vt6655 driver:

7
drivers/staging/vt6656/aes_ccmp.c
View file

@ -33,16 +33,9 @@
* *
*/ */
#if !defined(__UMEM_H__)
#include "umem.h" #include "umem.h"
#endif
#if !defined(__DEVICE_H__)
#include "device.h" #include "device.h"
#endif
#if !defined(__80211HDR_H__)
#include "80211hdr.h" #include "80211hdr.h"
#endif
/*--------------------- Static Definitions -------------------------*/ /*--------------------- Static Definitions -------------------------*/

2
drivers/staging/vt6656/aes_ccmp.h
View file

@ -30,9 +30,7 @@
#ifndef __AES_H__ #ifndef __AES_H__
#define __AES_H__ #define __AES_H__
#if !defined(__TTYPE_H__)
#include "ttype.h" #include "ttype.h"
#endif
/*--------------------- Export Definitions -------------------------*/ /*--------------------- Export Definitions -------------------------*/

23
drivers/staging/vt6656/baseband.c
View file

@ -37,40 +37,17 @@
* *
*/ */
#if !defined(__TMACRO_H__)
#include "tmacro.h" #include "tmacro.h"
#endif
#if !defined(__TBIT_H__)
#include "tbit.h" #include "tbit.h"
#endif
#if !defined(__TETHER_H__)
#include "tether.h" #include "tether.h"
#endif
#if !defined(__MAC_H__)
#include "mac.h" #include "mac.h"
#endif
#if !defined(__BASEBAND_H__)
#include "baseband.h" #include "baseband.h"
#endif
#if !defined(__RF_H__)
#include "rf.h" #include "rf.h"
#endif
#if !defined(__SROM_H__)
#include "srom.h" #include "srom.h"
#endif
#if !defined(__CONTROL_H__)
#include "control.h" #include "control.h"
#endif
#if !defined(__DATARATE_H__)
#include "datarate.h" #include "datarate.h"
#endif
#if !defined(__RNDIS_H__)
#include "rndis.h" #include "rndis.h"
#endif
#if !defined(__CONTROL_H__)
#include "control.h" #include "control.h"
#endif
/*--------------------- Static Definitions -------------------------*/ /*--------------------- Static Definitions -------------------------*/
static int msglevel =MSG_LEVEL_INFO; static int msglevel =MSG_LEVEL_INFO;

17
drivers/staging/vt6656/baseband.h
View file

@ -33,18 +33,9 @@
#ifndef __BASEBAND_H__ #ifndef __BASEBAND_H__
#define __BASEBAND_H__ #define __BASEBAND_H__
#if !defined(__TTYPE_H__)
#include "ttype.h" #include "ttype.h"
#endif
#if !defined(__TETHER_H__)
#include "tether.h" #include "tether.h"
#endif
#if !defined(__DEVICE_H__)
#include "device.h" #include "device.h"
#endif
/*--------------------- Export Definitions -------------------------*/ /*--------------------- Export Definitions -------------------------*/
@ -104,9 +95,6 @@
/*--------------------- Export Variables --------------------------*/ /*--------------------- Export Variables --------------------------*/
/*--------------------- Export Functions --------------------------*/ /*--------------------- Export Functions --------------------------*/
#ifdef __cplusplus
extern "C" { /* Assume C declarations for C++ */
#endif /* __cplusplus */
UINT UINT
BBuGetFrameTime( BBuGetFrameTime(
@ -155,9 +143,4 @@ VOID BBvUpdatePreEDThreshold(
IN BOOL bScanning IN BOOL bScanning
); );
#ifdef __cplusplus
} /* End of extern "C" { */
#endif /* __cplusplus */
#endif // __BASEBAND_H__ #endif // __BASEBAND_H__

45
drivers/staging/vt6656/bssdb.c
View file

@ -39,72 +39,27 @@
* *
*/ */
#if !defined(__TTYPE_H__)
#include "ttype.h" #include "ttype.h"
#endif
#if !defined(__TMACRO_H__)
#include "tmacro.h" #include "tmacro.h"
#endif
#if !defined(__TETHER_H__)
#include "tether.h" #include "tether.h"
#endif
#if !defined(__DEVICE_H__)
#include "device.h" #include "device.h"
#endif
#if !defined(__80211HDR_H__)
#include "80211hdr.h" #include "80211hdr.h"
#endif
#if !defined(__BSSDB_H__)
#include "bssdb.h" #include "bssdb.h"
#endif
#if !defined(__WMGR_H__)
#include "wmgr.h" #include "wmgr.h"
#endif
#if !defined(__DATARATE_H__)
#include "datarate.h" #include "datarate.h"
#endif
#if !defined(__DESC_H__)
#include "desc.h" #include "desc.h"
#endif
#if !defined(__WCMD_H__)
#include "wcmd.h" #include "wcmd.h"
#endif
#if !defined(__WPA_H__)
#include "wpa.h" #include "wpa.h"
#endif
#if !defined(__BASEBAND_H__)
#include "baseband.h" #include "baseband.h"
#endif
#if !defined(__RF_H__)
#include "rf.h" #include "rf.h"
#endif
#if !defined(__CARD_H__)
#include "card.h" #include "card.h"
#endif
#if !defined(__MAC_H__)
#include "mac.h" #include "mac.h"
#endif
#if !defined(__WPA2_H__)
#include "wpa2.h" #include "wpa2.h"
#endif
#if !defined(__UMEM_H__)
#include "umem.h" #include "umem.h"
#endif
#if !defined(__TBIT_H__)
#include "tbit.h" #include "tbit.h"
#endif
#if !defined(__CONTROL_H__)
#include "control.h" #include "control.h"
#endif
#if !defined(__RNDIS_H__)
#include "rndis.h" #include "rndis.h"
#endif
//DavidWang
#if !defined(__IOWPA_H__)
#include "iowpa.h" #include "iowpa.h"
#endif
/*--------------------- Static Definitions -------------------------*/ /*--------------------- Static Definitions -------------------------*/

11
drivers/staging/vt6656/bssdb.h
View file

@ -30,22 +30,11 @@
#ifndef __BSSDB_H__ #ifndef __BSSDB_H__
#define __BSSDB_H__ #define __BSSDB_H__
#include <linux/skbuff.h> #include <linux/skbuff.h>
#if !defined(__80211HDR_H__)
#include "80211hdr.h" #include "80211hdr.h"
#endif
#if !defined(__80211MGR_H__)
#include "80211mgr.h" #include "80211mgr.h"
#endif
#if !defined(__CARD_H__)
#include "card.h" #include "card.h"
#endif
#if !defined(__MIB_H__)
#include "mib.h" #include "mib.h"
#endif
/*--------------------- Export Definitions -------------------------*/ /*--------------------- Export Definitions -------------------------*/

32
drivers/staging/vt6656/card.c
View file

@ -45,53 +45,21 @@
* *
*/ */
#if !defined(__TMACRO_H__)
#include "tmacro.h" #include "tmacro.h"
#endif
#if !defined(__CARD_H__)
#include "card.h" #include "card.h"
#endif
#if !defined(__TBIT_H__)
#include "tbit.h" #include "tbit.h"
#endif
#if !defined(__BASEBAND_H__)
#include "baseband.h" #include "baseband.h"
#endif
#if !defined(__MAC_H__)
#include "mac.h" #include "mac.h"
#endif
#if !defined(__DESC_H__)
#include "desc.h" #include "desc.h"
#endif
#if !defined(__RF_H__)
#include "rf.h" #include "rf.h"
#endif
#if !defined(__POWER_H__)
#include "power.h" #include "power.h"
#endif
#if !defined(__KEY_H__)
#include "key.h" #include "key.h"
#endif
#if !defined(__RC4_H__)
#include "rc4.h" #include "rc4.h"
#endif
#if !defined(__COUNTRY_H__)
#include "country.h" #include "country.h"
#endif
#if !defined(__UMEM_H__)
#include "umem.h" #include "umem.h"
#endif
#if !defined(__DATARATE_H__)
#include "datarate.h" #include "datarate.h"
#endif
#if !defined(__RNDIS_H__)
#include "rndis.h" #include "rndis.h"
#endif
#if !defined(__CONTROL_H__)
#include "control.h" #include "control.h"
#endif
/*--------------------- Static Definitions -------------------------*/ /*--------------------- Static Definitions -------------------------*/

14
drivers/staging/vt6656/card.h
View file

@ -26,14 +26,10 @@
* *
*/ */
#ifndef __CARD_H__ #ifndef __CARD_H__
#define __CARD_H__ #define __CARD_H__
#if !defined(__TTYPE_H__)
#include "ttype.h" #include "ttype.h"
#endif
/*--------------------- Export Definitions -------------------------*/ /*--------------------- Export Definitions -------------------------*/
@ -66,10 +62,6 @@ typedef enum _CARD_OP_MODE {
/*--------------------- Export Variables --------------------------*/ /*--------------------- Export Variables --------------------------*/
/*--------------------- Export Functions --------------------------*/ /*--------------------- Export Functions --------------------------*/
#ifdef __cplusplus
extern "C" { /* Assume C declarations for C++ */
#endif /* __cplusplus */
BOOL CARDbSetMediaChannel(PVOID pDeviceHandler, UINT uConnectionChannel); BOOL CARDbSetMediaChannel(PVOID pDeviceHandler, UINT uConnectionChannel);
void CARDvSetRSPINF(PVOID pDeviceHandler, BYTE byBBType); void CARDvSetRSPINF(PVOID pDeviceHandler, BYTE byBBType);
@ -97,12 +89,6 @@ CARDbChannelSwitch (
IN BYTE byCount IN BYTE byCount
); );
#ifdef __cplusplus
} /* End of extern "C" { */
#endif /* __cplusplus */
#endif // __CARD_H__ #endif // __CARD_H__

9
drivers/staging/vt6656/channel.c
View file

@ -34,19 +34,10 @@
* *
*/ */
#if !defined (_COUNTRY_H_)
#include "country.h" #include "country.h"
#endif
#if !defined (_CHANNEL_H_)
#include "channel.h" #include "channel.h"
#endif
#if !defined(__RF_H__)
#include "rf.h" #include "rf.h"
#endif
#if !defined(__UMEM_H__)
#include "umem.h" #include "umem.h"
#endif
/*--------------------- Static Definitions -------------------------*/ /*--------------------- Static Definitions -------------------------*/
static int msglevel =MSG_LEVEL_INFO; static int msglevel =MSG_LEVEL_INFO;

3
drivers/staging/vt6656/channel.h
View file

@ -30,9 +30,7 @@
#ifndef _CHANNEL_H_ #ifndef _CHANNEL_H_
#define _CHANNEL_H_ #define _CHANNEL_H_
#if !defined(__TTYPE_H__)
#include "ttype.h" #include "ttype.h"
#endif
/*--------------------- Export Definitions -------------------------*/ /*--------------------- Export Definitions -------------------------*/
@ -55,4 +53,5 @@ CHvChannelGetList (
IN UINT uCountryCodeIdx, IN UINT uCountryCodeIdx,
OUT PBYTE pbyChannelTable OUT PBYTE pbyChannelTable
); );
#endif /* _REGULATE_H_ */ #endif /* _REGULATE_H_ */

6
drivers/staging/vt6656/control.c
View file

@ -38,15 +38,9 @@
* *
*/ */
#if !defined(__CONTROL_H__)
#include "control.h" #include "control.h"
#endif
#if !defined(__UMEM_H__)
#include "umem.h" #include "umem.h"
#endif
#if !defined(__RNDIS_H__)
#include "rndis.h" #include "rndis.h"
#endif
/*--------------------- Static Definitions -------------------------*/ /*--------------------- Static Definitions -------------------------*/
//static int msglevel =MSG_LEVEL_INFO; //static int msglevel =MSG_LEVEL_INFO;

20
drivers/staging/vt6656/control.h
View file

@ -27,21 +27,12 @@
* *
*/ */
#ifndef __CONTROL_H__ #ifndef __CONTROL_H__
#define __CONTROL_H__ #define __CONTROL_H__
#if !defined(__TTYPE_H__)
#include "ttype.h" #include "ttype.h"
#endif
#if !defined(__DEVICE_H__)
#include "device.h" #include "device.h"
#endif
#if !defined(__USBPIPE_H__)
#include "usbpipe.h" #include "usbpipe.h"
#endif
/*--------------------- Export Definitions -------------------------*/ /*--------------------- Export Definitions -------------------------*/
@ -61,10 +52,6 @@
/*--------------------- Export Variables --------------------------*/ /*--------------------- Export Variables --------------------------*/
/*--------------------- Export Functions --------------------------*/ /*--------------------- Export Functions --------------------------*/
#ifdef __cplusplus
extern "C" { /* Assume C declarations for C++ */
#endif /* __cplusplus */
void ControlvWriteByte( void ControlvWriteByte(
IN PSDevice pDevice, IN PSDevice pDevice,
@ -90,13 +77,6 @@ void ControlvMaskByte(
IN BYTE byData IN BYTE byData
); );
#ifdef __cplusplus
} /* End of extern "C" { */
#endif /* __cplusplus */
#endif // __RCV_H__ #endif // __RCV_H__

21
drivers/staging/vt6656/datarate.c
View file

@ -33,36 +33,17 @@
* *
*/ */
#if !defined(__TTYPE_H__)
#include "ttype.h" #include "ttype.h"
#endif
#if !defined(__TMACRO_H__)
#include "tmacro.h" #include "tmacro.h"
#endif
#if !defined(__MAC_H__)
#include "mac.h" #include "mac.h"
#endif
#if !defined(__80211MGR_H__)
#include "80211mgr.h" #include "80211mgr.h"
#endif
#if !defined(__BSSDB_H__)
#include "bssdb.h" #include "bssdb.h"
#endif
#if !defined(__DATARATE_H__)
#include "datarate.h" #include "datarate.h"
#endif
#if !defined(__CARD_H__)
#include "card.h" #include "card.h"
#endif
#if !defined(__BASEBAND_H__)
#include "baseband.h" #include "baseband.h"
#endif
#if !defined(__SROM_H__)
#include "srom.h" #include "srom.h"
#endif
#if !defined(__RF_H__)
#include "rf.h" #include "rf.h"
#endif
/*--------------------- Static Definitions -------------------------*/ /*--------------------- Static Definitions -------------------------*/

10
drivers/staging/vt6656/desc.h
View file

@ -28,23 +28,13 @@
* *
*/ */
#ifndef __DESC_H__ #ifndef __DESC_H__
#define __DESC_H__ #define __DESC_H__
#include <linux/types.h> #include <linux/types.h>
#include <linux/mm.h> #include <linux/mm.h>
#if !defined(__TTYPE_H__)
#include "ttype.h" #include "ttype.h"
#endif
#if !defined(__TETHER_H__)
#include "tether.h" #include "tether.h"
#endif
/*--------------------- Export Definitions -------------------------*/ /*--------------------- Export Definitions -------------------------*/

40
drivers/staging/vt6656/dpc.c
View file

@ -38,65 +38,25 @@
* *
*/ */
#if !defined(__DEVICE_H__)
#include "device.h" #include "device.h"
#endif
#if !defined(__RXTX_H__)
#include "rxtx.h" #include "rxtx.h"
#endif
#if !defined(__TETHER_H__)
#include "tether.h" #include "tether.h"
#endif
#if !defined(__CARD_H__)
#include "card.h" #include "card.h"
#endif
#if !defined(__BSSDB_H__)
#include "bssdb.h" #include "bssdb.h"
#endif
#if !defined(__MAC_H__)
#include "mac.h" #include "mac.h"
#endif
#if !defined(__BASEBAND_H__)
#include "baseband.h" #include "baseband.h"
#endif
#if !defined(__UMEM_H__)
#include "umem.h" #include "umem.h"
#endif
#if !defined(__MICHAEL_H__)
#include "michael.h" #include "michael.h"
#endif
#if !defined(__TKIP_H__)
#include "tkip.h" #include "tkip.h"
#endif
#if !defined(__TCRC_H__)
#include "tcrc.h" #include "tcrc.h"
#endif
#if !defined(__WCTL_H__)
#include "wctl.h" #include "wctl.h"
#endif
#if !defined(__TBIT_H__)
#include "tbit.h" #include "tbit.h"
#endif
#if !defined(__HOSTAP_H__)
#include "hostap.h" #include "hostap.h"
#endif
#if !defined(__RF_H__)
#include "rf.h" #include "rf.h"
#endif
#if !defined(__IOWPA_H__)
#include "iowpa.h" #include "iowpa.h"
#endif
#if !defined(__AES_H__)
#include "aes_ccmp.h" #include "aes_ccmp.h"
#endif
#if !defined(__DATARATE_H__)
#include "datarate.h" #include "datarate.h"
#endif
#if !defined(__USBPIPE_H__)
#include "usbpipe.h" #include "usbpipe.h"
#endif
/*--------------------- Static Definitions -------------------------*/ /*--------------------- Static Definitions -------------------------*/

24
drivers/staging/vt6656/dpc.h
View file

@ -26,20 +26,12 @@
* *
*/ */
#ifndef __DPC_H__ #ifndef __DPC_H__
#define __DPC_H__ #define __DPC_H__
#if !defined(__TTYPE_H__)
#include "ttype.h" #include "ttype.h"
#endif
#if !defined(__DEVICE_H__)
#include "device.h" #include "device.h"
#endif
#if !defined(__WCMD_H__)
#include "wcmd.h" #include "wcmd.h"
#endif
/*--------------------- Export Definitions -------------------------*/ /*--------------------- Export Definitions -------------------------*/
@ -49,14 +41,6 @@
/*--------------------- Export Functions --------------------------*/ /*--------------------- Export Functions --------------------------*/
#ifdef __cplusplus
extern "C" { /* Assume C declarations for C++ */
#endif /* __cplusplus */
VOID VOID
RXvWorkItem( RXvWorkItem(
PVOID Context PVOID Context
@ -80,14 +64,6 @@ RXbBulkInProcessData(
IN ULONG BytesToIndicate IN ULONG BytesToIndicate
); );
#ifdef __cplusplus
} /* End of extern "C" { */
#endif /* __cplusplus */
#endif // __RXTX_H__ #endif // __RXTX_H__

10
drivers/staging/vt6656/firmware.c
View file

@ -31,20 +31,10 @@
* *
*/ */
#if !defined(__UMEM_H__)
#include "umem.h" #include "umem.h"
#endif
#if !defined(__FIRMWARE_H__)
#include "firmware.h" #include "firmware.h"
#endif
#if !defined(__CONTROL_H__)
#include "control.h" #include "control.h"
#endif
#if !defined(__RNDIS_H__)
#include "rndis.h" #include "rndis.h"
#endif
/*--------------------- Static Definitions -------------------------*/ /*--------------------- Static Definitions -------------------------*/

6
drivers/staging/vt6656/firmware.h
View file

@ -27,17 +27,11 @@
* *
*/ */
#ifndef __FIRMWARE_H__ #ifndef __FIRMWARE_H__
#define __FIRMWARE_H__ #define __FIRMWARE_H__
#if !defined(__TTYPE_H__)
#include "ttype.h" #include "ttype.h"
#endif
#if !defined(__DEVICE_H__)
#include "device.h" #include "device.h"
#endif
/*--------------------- Export Definitions -------------------------*/ /*--------------------- Export Definitions -------------------------*/

20
drivers/staging/vt6656/hostap.c
View file

@ -30,35 +30,15 @@
* *
*/ */
#if !defined(__HOSTAP_H__)
#include "hostap.h" #include "hostap.h"
#endif
#if !defined(__IOCMD_H__)
#include "iocmd.h" #include "iocmd.h"
#endif
#if !defined(__MAC_H__)
#include "mac.h" #include "mac.h"
#endif
#if !defined(__CARD_H__)
#include "card.h" #include "card.h"
#endif
#if !defined(__BASEBAND_H__)
#include "baseband.h" #include "baseband.h"
#endif
#if !defined(__WPACTL_H__)
#include "wpactl.h" #include "wpactl.h"
#endif
#if !defined(__KEY_H__)
#include "key.h" #include "key.h"
#endif
#if !defined(__MAC_H__)
#include "mac.h" #include "mac.h"
#endif
#if !defined(__DATARATE_H__)
#include "datarate.h" #include "datarate.h"
#endif
#define VIAWGET_HOSTAPD_MAX_BUF_SIZE 1024 #define VIAWGET_HOSTAPD_MAX_BUF_SIZE 1024
#define HOSTAP_CRYPT_FLAG_SET_TX_KEY BIT0 #define HOSTAP_CRYPT_FLAG_SET_TX_KEY BIT0

16
drivers/staging/vt6656/hostap.h
View file

@ -26,14 +26,10 @@
* *
*/ */
#ifndef __HOSTAP_H__ #ifndef __HOSTAP_H__
#define __HOSTAP_H__ #define __HOSTAP_H__
#if !defined(__DEVICE_H__)
#include "device.h" #include "device.h"
#endif
/*--------------------- Export Definitions -------------------------*/ /*--------------------- Export Definitions -------------------------*/
@ -57,11 +53,6 @@
/*--------------------- Export Functions --------------------------*/ /*--------------------- Export Functions --------------------------*/
#ifdef __cplusplus
extern "C" { /* Assume C declarations for C++ */
#endif /* __cplusplus */
#ifndef ETH_P_PAE #ifndef ETH_P_PAE
#define ETH_P_PAE 0x888E /* Port Access Entity (IEEE 802.1X) */ #define ETH_P_PAE 0x888E /* Port Access Entity (IEEE 802.1X) */
#endif /* ETH_P_PAE */ #endif /* ETH_P_PAE */
@ -73,13 +64,6 @@ extern "C" { /* Assume C declarations for C++ */
int hostap_set_hostapd(PSDevice pDevice, int val, int rtnl_locked); int hostap_set_hostapd(PSDevice pDevice, int val, int rtnl_locked);
int hostap_ioctl(PSDevice pDevice, struct iw_point *p); int hostap_ioctl(PSDevice pDevice, struct iw_point *p);
#ifdef __cplusplus
} /* End of extern "C" { */
#endif /* __cplusplus */
#endif // __HOSTAP_H__ #endif // __HOSTAP_H__

19
drivers/staging/vt6656/int.c
View file

@ -32,34 +32,15 @@
* *
*/ */
#if !defined(__INT_H__)
#include "int.h" #include "int.h"
#endif
#if !defined(__MIB_H__)
#include "mib.h" #include "mib.h"
#endif
#if !defined(__TBIT_H__)
#include "tbit.h" #include "tbit.h"
#endif
#if !defined(__TMACRO_H__)
#include "tmacro.h" #include "tmacro.h"
#endif
#if !defined(__MAC_H__)
#include "mac.h" #include "mac.h"
#endif
#if !defined(__POWER_H__)
#include "power.h" #include "power.h"
#endif
#if !defined(__BSSDB_H__)
#include "bssdb.h" #include "bssdb.h"
#endif
#if !defined(__UMEM_H__)
#include "umem.h" #include "umem.h"
#endif
#if !defined(__USBPIPE_H__)
#include "usbpipe.h" #include "usbpipe.h"
#endif
/*--------------------- Static Definitions -------------------------*/ /*--------------------- Static Definitions -------------------------*/
//static int msglevel =MSG_LEVEL_DEBUG; //static int msglevel =MSG_LEVEL_DEBUG;

18
drivers/staging/vt6656/int.h
View file

@ -27,18 +27,11 @@
* *
*/ */
#ifndef __INT_H__ #ifndef __INT_H__
#define __INT_H__ #define __INT_H__
#if !defined(__TTYPE_H__)
#include "ttype.h" #include "ttype.h"
#endif
#if !defined(__DEVICE_H__)
#include "device.h" #include "device.h"
#endif
/*--------------------- Export Definitions -------------------------*/ /*--------------------- Export Definitions -------------------------*/
#pragma pack(1) #pragma pack(1)
@ -73,9 +66,6 @@ SINTData, *PSINTData;
/*--------------------- Export Variables --------------------------*/ /*--------------------- Export Variables --------------------------*/
/*--------------------- Export Functions --------------------------*/ /*--------------------- Export Functions --------------------------*/
#ifdef __cplusplus
extern "C" { /* Assume C declarations for C++ */
#endif /* __cplusplus */
VOID VOID
INTvWorkItem( INTvWorkItem(
@ -87,14 +77,6 @@ INTnsProcessData(
IN PSDevice pDevice IN PSDevice pDevice
); );
#ifdef __cplusplus
} /* End of extern "C" { */
#endif /* __cplusplus */
#endif // __INT_H__ #endif // __INT_H__

3
drivers/staging/vt6656/iocmd.h
View file

@ -29,10 +29,7 @@
#ifndef __IOCMD_H__ #ifndef __IOCMD_H__
#define __IOCMD_H__ #define __IOCMD_H__
#if !defined(__TTYPE_H__)
#include "ttype.h" #include "ttype.h"
#endif
/*--------------------- Export Definitions -------------------------*/ /*--------------------- Export Definitions -------------------------*/

22
drivers/staging/vt6656/ioctl.c
View file

@ -30,38 +30,16 @@
* *
*/ */
#if !defined(__IOCTL_H__)
#include "ioctl.h" #include "ioctl.h"
#endif
#if !defined(__IOCMD_H__)
#include "iocmd.h" #include "iocmd.h"
#endif
#if !defined(__MAC_H__)
#include "mac.h" #include "mac.h"
#endif
#if !defined(__CARD_H__)
#include "card.h" #include "card.h"
#endif
#if !defined(__HOSTAP_H__)
#include "hostap.h" #include "hostap.h"
#endif
#if !defined(__UMEM_H__)
#include "umem.h" #include "umem.h"
#endif
#if !defined(__WPACTL_H__)
#include "wpactl.h" #include "wpactl.h"
#endif
#if !defined(__CONTROL_H__)
#include "control.h" #include "control.h"
#endif
#if !defined(__RNDIS_H__)
#include "rndis.h" #include "rndis.h"
#endif
#if !defined(__RF_H__)
#include "rf.h" #include "rf.h"
#endif
/*--------------------- Static Definitions -------------------------*/ /*--------------------- Static Definitions -------------------------*/

17
drivers/staging/vt6656/ioctl.h
View file

@ -26,14 +26,10 @@
* *
*/ */
#ifndef __IOCTL_H__ #ifndef __IOCTL_H__
#define __IOCTL_H__ #define __IOCTL_H__
#if !defined(__DEVICE_H__)
#include "device.h" #include "device.h"
#endif
/*--------------------- Export Definitions -------------------------*/ /*--------------------- Export Definitions -------------------------*/
@ -44,12 +40,6 @@
/*--------------------- Export Functions --------------------------*/ /*--------------------- Export Functions --------------------------*/
#ifdef __cplusplus
extern "C" { /* Assume C declarations for C++ */
#endif /* __cplusplus */
int private_ioctl(PSDevice pDevice, struct ifreq *rq); int private_ioctl(PSDevice pDevice, struct ifreq *rq);
/* /*
@ -61,13 +51,6 @@ VOID vConfigWEPKey (
); );
*/ */
#ifdef __cplusplus
} /* End of extern "C" { */
#endif /* __cplusplus */
#endif // __IOCTL_H__ #endif // __IOCTL_H__

1
drivers/staging/vt6656/iowpa.h
View file

@ -29,7 +29,6 @@
#ifndef __IOWPA_H__ #ifndef __IOWPA_H__
#define __IOWPA_H__ #define __IOWPA_H__
/*--------------------- Export Definitions -------------------------*/ /*--------------------- Export Definitions -------------------------*/

23
drivers/staging/vt6656/iwctl.c
View file

@ -30,43 +30,20 @@
* *
*/ */
#if !defined(__DEVICE_H__)
#include "device.h" #include "device.h"
#endif
#if !defined(__IOCTL_H__)
#include "ioctl.h" #include "ioctl.h"
#endif
#if !defined(__IOCMD_H__)
#include "iocmd.h" #include "iocmd.h"
#endif
#if !defined(__MAC_H__)
#include "mac.h" #include "mac.h"
#endif
#if !defined(__CARD_H__)
#include "card.h" #include "card.h"
#endif
#if !defined(__HOSTAP_H__)
#include "hostap.h" #include "hostap.h"
#endif
#if !defined(__UMEM_H__)
#include "umem.h" #include "umem.h"
#endif
#if !defined(__POWER_H__)
#include "power.h" #include "power.h"
#endif
#if !defined(__RF_H__)
#include "rf.h" #include "rf.h"
#endif
#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
#if !defined(__IOWPA_H__)
#include "iowpa.h" #include "iowpa.h"
#endif
#if !defined(__WPACTL_H__)
#include "wpactl.h" #include "wpactl.h"
#endif #endif
#endif
#include <net/iw_handler.h> #include <net/iw_handler.h>

17
drivers/staging/vt6656/iwctl.h
View file

@ -26,14 +26,10 @@
* *
*/ */
#ifndef __IWCTL_H__ #ifndef __IWCTL_H__
#define __IWCTL_H__ #define __IWCTL_H__
#if !defined(__DEVICE_H__)
#include "device.h" #include "device.h"
#endif
/*--------------------- Export Definitions -------------------------*/ /*--------------------- Export Definitions -------------------------*/
@ -44,12 +40,6 @@
/*--------------------- Export Functions --------------------------*/ /*--------------------- Export Functions --------------------------*/
#ifdef __cplusplus
extern "C" { /* Assume C declarations for C++ */
#endif /* __cplusplus */
struct iw_statistics *iwctl_get_wireless_stats (struct net_device *dev); struct iw_statistics *iwctl_get_wireless_stats (struct net_device *dev);
@ -233,13 +223,6 @@ int iwctl_siwmlme(struct net_device *dev,
extern const struct iw_handler_def iwctl_handler_def; extern const struct iw_handler_def iwctl_handler_def;
extern const struct iw_priv_args iwctl_private_args; extern const struct iw_priv_args iwctl_private_args;
#ifdef __cplusplus
} /* End of extern "C" { */
#endif /* __cplusplus */
#endif // __IWCTL_H__ #endif // __IWCTL_H__

1
drivers/staging/vt6656/kcompat.h
View file

@ -25,6 +25,7 @@
* Date: Apr 8, 2002 * Date: Apr 8, 2002
* *
*/ */
#ifndef _KCOMPAT_H #ifndef _KCOMPAT_H
#define _KCOMPAT_H #define _KCOMPAT_H

15
drivers/staging/vt6656/key.c
View file

@ -36,28 +36,13 @@
* *
*/ */
#if !defined(__TMACRO_H__)
#include "tmacro.h" #include "tmacro.h"
#endif
#if !defined(__TBIT_H__)
#include "tbit.h" #include "tbit.h"
#endif
#if !defined(__KEY_H__)
#include "key.h" #include "key.h"
#endif
#if !defined(__UMEM_H__)
#include "umem.h" #include "umem.h"
#endif
#if !defined(__MAC_H__)
#include "mac.h" #include "mac.h"
#endif
#if !defined(__RNDIS_H__)
#include "rndis.h" #include "rndis.h"
#endif
#if !defined(__CONTROL_H__)
#include "control.h" #include "control.h"
#endif
/*--------------------- Static Definitions -------------------------*/ /*--------------------- Static Definitions -------------------------*/

19
drivers/staging/vt6656/key.h
View file

@ -27,21 +27,12 @@
* *
*/ */
#ifndef __KEY_H__ #ifndef __KEY_H__
#define __KEY_H__ #define __KEY_H__
#if !defined(__TTYPE_H__)
#include "ttype.h" #include "ttype.h"
#endif
#if !defined(__TETHER_H__)
#include "tether.h" #include "tether.h"
#endif
#if !defined(__80211MGR_H__)
#include "80211mgr.h" #include "80211mgr.h"
#endif
/*--------------------- Export Definitions -------------------------*/ /*--------------------- Export Definitions -------------------------*/
#define MAX_GROUP_KEY 4 #define MAX_GROUP_KEY 4
@ -105,9 +96,6 @@ typedef struct tagSKeyManagement
/*--------------------- Export Variables --------------------------*/ /*--------------------- Export Variables --------------------------*/
/*--------------------- Export Functions --------------------------*/ /*--------------------- Export Functions --------------------------*/
#ifdef __cplusplus
extern "C" { /* Assume C declarations for C++ */
#endif /* __cplusplus */
VOID KeyvInitTable(PVOID pDeviceHandler, PSKeyManagement pTable); VOID KeyvInitTable(PVOID pDeviceHandler, PSKeyManagement pTable);
@ -185,12 +173,5 @@ BOOL KeybSetAllGroupKey (
BYTE byKeyDecMode BYTE byKeyDecMode
); );
#ifdef __cplusplus
} /* End of extern "C" { */
#endif /* __cplusplus */
#endif // __KEY_H__ #endif // __KEY_H__

19
drivers/staging/vt6656/mac.c
View file

@ -30,32 +30,15 @@
* Revision History: * Revision History:
*/ */
#if !defined(__TMACRO_H__)
#include "tmacro.h" #include "tmacro.h"
#endif
#if !defined(__TBIT_H__)
#include "tbit.h" #include "tbit.h"
#endif
#if !defined(__TETHER_H__)
#include "tether.h" #include "tether.h"
#endif
#if !defined(__DESC_H__)
#include "desc.h" #include "desc.h"
#endif
#if !defined(__MAC_H__)
#include "mac.h" #include "mac.h"
#endif
#if !defined(__80211hdr_H__)
#include "80211hdr.h" #include "80211hdr.h"
#endif
#if !defined(__RNDIS_H__)
#include "rndis.h" #include "rndis.h"
#endif
#if !defined(__CONTROL_H__)
#include "control.h" #include "control.h"
#endif
/*--------------------- Static Definitions -------------------------*/ /*--------------------- Static Definitions -------------------------*/
//static int msglevel =MSG_LEVEL_DEBUG; //static int msglevel =MSG_LEVEL_DEBUG;
static int msglevel =MSG_LEVEL_INFO; static int msglevel =MSG_LEVEL_INFO;

15
drivers/staging/vt6656/mac.h
View file

@ -34,18 +34,10 @@
#ifndef __MAC_H__ #ifndef __MAC_H__
#define __MAC_H__ #define __MAC_H__
#if !defined(__TTYPE_H__)
#include "ttype.h" #include "ttype.h"
#endif
#if !defined(__DEVICE_H__)
#include "device.h" #include "device.h"
#endif
#if !defined(__TMACRO_H__)
#include "tmacro.h" #include "tmacro.h"
#endif
#if !defined(__UMEM_H__)
#include "umem.h" #include "umem.h"
#endif
/*--------------------- Export Definitions -------------------------*/ /*--------------------- Export Definitions -------------------------*/
@ -428,9 +420,6 @@
/*--------------------- Export Variables --------------------------*/ /*--------------------- Export Variables --------------------------*/
/*--------------------- Export Functions --------------------------*/ /*--------------------- Export Functions --------------------------*/
#ifdef __cplusplus
extern "C" { /* Assume C declarations for C++ */
#endif /* __cplusplus */
void MACvSetMultiAddrByHash (PSDevice pDevice, BYTE byHashIdx); void MACvSetMultiAddrByHash (PSDevice pDevice, BYTE byHashIdx);
VOID MACvWriteMultiAddr (PSDevice pDevice, UINT uByteIdx, BYTE byData); VOID MACvWriteMultiAddr (PSDevice pDevice, UINT uByteIdx, BYTE byData);
@ -451,8 +440,4 @@ void MACvEnableBarkerPreambleMd(PSDevice pDevice);
void MACvDisableBarkerPreambleMd(PSDevice pDevice); void MACvDisableBarkerPreambleMd(PSDevice pDevice);
void MACvWriteBeaconInterval(PSDevice pDevice, WORD wInterval); void MACvWriteBeaconInterval(PSDevice pDevice, WORD wInterval);
#ifdef __cplusplus
} /* End of extern "C" { */
#endif /* __cplusplus */
#endif // __MAC_H__ #endif // __MAC_H__

60
drivers/staging/vt6656/main_usb.c
View file

@ -46,95 +46,35 @@
*/ */
#undef __NO_VERSION__ #undef __NO_VERSION__
#if !defined(__DEVICE_H__)
#include "device.h" #include "device.h"
#endif
#if !defined(__CARD_H__)
#include "card.h" #include "card.h"
#endif
#if !defined(__TBIT_H__)
#include "tbit.h" #include "tbit.h"
#endif
#if !defined(__BASEBAND_H__)
#include "baseband.h" #include "baseband.h"
#endif
#if !defined(__MAC_H__)
#include "mac.h" #include "mac.h"
#endif
#if !defined(__TETHER_H__)
#include "tether.h" #include "tether.h"
#endif
#if !defined(__WMGR_H__)
#include "wmgr.h" #include "wmgr.h"
#endif
#if !defined(__WCTL_H__)
#include "wctl.h" #include "wctl.h"
#endif
#if !defined(__POWER_H__)
#include "power.h" #include "power.h"
#endif
#if !defined(__WCMD_H__)
#include "wcmd.h" #include "wcmd.h"
#endif
#if !defined(__IOCMD_H__)
#include "iocmd.h" #include "iocmd.h"
#endif
#if !defined(__TCRC_H__)
#include "tcrc.h" #include "tcrc.h"
#endif
#if !defined(__RXTX_H__)
#include "rxtx.h" #include "rxtx.h"
#endif
#if !defined(__BSSDB_H__)
#include "bssdb.h" #include "bssdb.h"
#endif
#if !defined(__HOSTAP_H__)
#include "hostap.h" #include "hostap.h"
#endif
#if !defined(__WPACTL_H__)
#include "wpactl.h" #include "wpactl.h"
#endif
#if !defined(__IOCTL_H__)
#include "ioctl.h" #include "ioctl.h"
#endif
#if !defined(__IWCTL_H__)
#include "iwctl.h" #include "iwctl.h"
#endif
#if !defined(__DPC_H__)
#include "dpc.h" #include "dpc.h"
#endif
#if !defined(__IOCMD_H__)
#include "iocmd.h" #include "iocmd.h"
#endif
#if !defined(__DATARATE_H__)
#include "datarate.h" #include "datarate.h"
#endif
#if !defined(__RF_H__)
#include "rf.h" #include "rf.h"
#endif
#if !defined(__FIRMWARE_H__)
#include "firmware.h" #include "firmware.h"
#endif
#if !defined(__MAC_H__)
#include "mac.h" #include "mac.h"
#endif
#if !defined(__RNDIS_H__)
#include "rndis.h" #include "rndis.h"
#endif
#if !defined(__CONTROL_H__)
#include "control.h" #include "control.h"
#endif
#if !defined (_CHANNEL_H_)
#include "channel.h" #include "channel.h"
#endif
#if !defined(__INT_H__)
#include "int.h" #include "int.h"
#endif
#if !defined(__IOWPA_H__)
#include "iowpa.h" #include "iowpa.h"
#endif
/*--------------------- Static Definitions -------------------------*/ /*--------------------- Static Definitions -------------------------*/
//static int msglevel =MSG_LEVEL_DEBUG; //static int msglevel =MSG_LEVEL_DEBUG;

17
drivers/staging/vt6656/mib.c
View file

@ -37,31 +37,14 @@
* *
*/ */
#if !defined(__UPC_H__)
#include "upc.h" #include "upc.h"
#endif
#if !defined(__MAC_H__)
#include "mac.h" #include "mac.h"
#endif
#if !defined(__TBIT_H__)
#include "tbit.h" #include "tbit.h"
#endif
#if !defined(__TETHER_H__)
#include "tether.h" #include "tether.h"
#endif
#if !defined(__MIB_H__)
#include "mib.h" #include "mib.h"
#endif
#if !defined(__WCTL_H__)
#include "wctl.h" #include "wctl.h"
#endif
#if !defined(__UMEM_H__)
#include "umem.h" #include "umem.h"
#endif
#if !defined(__BASEBAND_H__)
#include "baseband.h" #include "baseband.h"
#endif
/*--------------------- Static Definitions -------------------------*/ /*--------------------- Static Definitions -------------------------*/
static int msglevel =MSG_LEVEL_INFO; static int msglevel =MSG_LEVEL_INFO;

22
drivers/staging/vt6656/mib.h
View file

@ -29,19 +29,9 @@
#ifndef __MIB_H__ #ifndef __MIB_H__
#define __MIB_H__ #define __MIB_H__
#if !defined(__TTYPE_H__)
#include "ttype.h" #include "ttype.h"
#endif
#if !defined(__TETHER_H__)
#include "tether.h" #include "tether.h"
#endif
#if !defined(__DESC_H__)
#include "desc.h" #include "desc.h"
#endif
//#define ULONGLONG ULONG
/*--------------------- Export Definitions -------------------------*/ /*--------------------- Export Definitions -------------------------*/
@ -386,11 +376,6 @@ typedef struct tagSStatCounter {
/*--------------------- Export Variables --------------------------*/ /*--------------------- Export Variables --------------------------*/
/*--------------------- Export Functions --------------------------*/ /*--------------------- Export Functions --------------------------*/
#ifdef __cplusplus
extern "C" { /* Assume C declarations for C++ */
#endif /* __cplusplus */
void STAvClearAllCounter(PSStatCounter pStatistic); void STAvClearAllCounter(PSStatCounter pStatistic);
@ -432,13 +417,6 @@ STAvUpdateUSBCounter(
NTSTATUS ntStatus NTSTATUS ntStatus
); );
#ifdef __cplusplus
} /* End of extern "C" { */
#endif /* __cplusplus */
#endif // __MIB_H__ #endif // __MIB_H__

6
drivers/staging/vt6656/michael.c
View file

@ -39,15 +39,9 @@
* *
*/ */
#if !defined(__TMACRO_H__)
#include "tmacro.h" #include "tmacro.h"
#endif
#if !defined(__TBIT_H__)
#include "tbit.h" #include "tbit.h"
#endif
#if !defined(__MICHAEL_H__)
#include "michael.h" #include "michael.h"
#endif
/*--------------------- Static Definitions -------------------------*/ /*--------------------- Static Definitions -------------------------*/

4
drivers/staging/vt6656/michael.h
View file

@ -28,13 +28,11 @@
* *
*/ */
#ifndef __MICHAEL_H__ #ifndef __MICHAEL_H__
#define __MICHAEL_H__ #define __MICHAEL_H__
#if !defined(__UMEM_H__)
#include "umem.h" #include "umem.h"
#endif
/*--------------------- Export Definitions -------------------------*/ /*--------------------- Export Definitions -------------------------*/
/*--------------------- Export Types ------------------------------*/ /*--------------------- Export Types ------------------------------*/

31
drivers/staging/vt6656/power.c
View file

@ -37,50 +37,19 @@
* *
*/ */
#if !defined(__TTYPE_H__)
#include "ttype.h" #include "ttype.h"
#endif
#if !defined(__TBIT_H__)
#include "tbit.h" #include "tbit.h"
#endif
#if !defined(__MAC_H__)
#include "mac.h" #include "mac.h"
#endif
#if !defined(__DEVICE_H__)
#include "device.h" #include "device.h"
#endif
#if !defined(__WMGR_H__)
#include "wmgr.h" #include "wmgr.h"
#endif
#if !defined(__POWER_H__)
#include "power.h" #include "power.h"
#endif
#if !defined(__WCMD_H__)
#include "wcmd.h" #include "wcmd.h"
#endif
#if !defined(__TBIT_H__)
#include "tbit.h" #include "tbit.h"
#endif
#if !defined(__UMEM_H__)
#include "umem.h" #include "umem.h"
#endif
#if !defined(__RXTX_H__)
#include "rxtx.h" #include "rxtx.h"
#endif
#if !defined(__CARD_H__)
#include "card.h" #include "card.h"
#endif
#if !defined(__CONTROL_H__)
#include "control.h" #include "control.h"
#endif
#if !defined(__RNDIS_H__)
#include "rndis.h" #include "rndis.h"
#endif
/*--------------------- Static Definitions -------------------------*/ /*--------------------- Static Definitions -------------------------*/

2
drivers/staging/vt6656/rc4.c
View file

@ -30,9 +30,7 @@
* *
*/ */
#if !defined(__RC4_H__)
#include "rc4.h" #include "rc4.h"
#endif
VOID rc4_init(PRC4Ext pRC4, PBYTE pbyKey, UINT cbKey_len) VOID rc4_init(PRC4Ext pRC4, PBYTE pbyKey, UINT cbKey_len)
{ {

4
drivers/staging/vt6656/rc4.h
View file

@ -30,11 +30,7 @@
#ifndef __RC4_H__ #ifndef __RC4_H__
#define __RC4_H__ #define __RC4_H__
#if !defined(__TTYPE_H__)
#include "ttype.h" #include "ttype.h"
#endif
/*--------------------- Export Definitions -------------------------*/ /*--------------------- Export Definitions -------------------------*/
/*--------------------- Export Types ------------------------------*/ /*--------------------- Export Types ------------------------------*/

12
drivers/staging/vt6656/rf.c
View file

@ -32,24 +32,12 @@
* *
*/ */
#if !defined(__MAC_H__)
#include "mac.h" #include "mac.h"
#endif
#if !defined(__RF_H__)
#include "rf.h" #include "rf.h"
#endif
#if !defined(__BASEBAND_H__)
#include "baseband.h" #include "baseband.h"
#endif
#if !defined(__CONTROL_H__)
#include "control.h" #include "control.h"
#endif
#if !defined(__RNDIS_H__)
#include "rndis.h" #include "rndis.h"
#endif
#if !defined(__DATARATE_H__)
#include "datarate.h" #include "datarate.h"
#endif
static int msglevel =MSG_LEVEL_INFO; static int msglevel =MSG_LEVEL_INFO;
//static int msglevel =MSG_LEVEL_DEBUG; //static int msglevel =MSG_LEVEL_DEBUG;

14
drivers/staging/vt6656/rf.h
View file

@ -27,16 +27,12 @@
* *
*/ */
#ifndef __RF_H__ #ifndef __RF_H__
#define __RF_H__ #define __RF_H__
#if !defined(__TTYPE_H__)
#include "ttype.h" #include "ttype.h"
#endif
#if !defined(__DEVICE_H__)
#include "device.h" #include "device.h"
#endif
/*--------------------- Export Definitions -------------------------*/ /*--------------------- Export Definitions -------------------------*/
// //
// Baseband RF pair definition in eeprom (Bits 6..0) // Baseband RF pair definition in eeprom (Bits 6..0)
@ -66,9 +62,6 @@
/*--------------------- Export Variables --------------------------*/ /*--------------------- Export Variables --------------------------*/
extern const BYTE RFaby11aChannelIndex[200]; extern const BYTE RFaby11aChannelIndex[200];
/*--------------------- Export Functions --------------------------*/ /*--------------------- Export Functions --------------------------*/
#ifdef __cplusplus
extern "C" { /* Assume C declarations for C++ */
#endif /* __cplusplus */
BOOL IFRFbWriteEmbeded(PSDevice pDevice, DWORD dwData); BOOL IFRFbWriteEmbeded(PSDevice pDevice, DWORD dwData);
BOOL RFbSetPower ( BOOL RFbSetPower (
@ -101,11 +94,6 @@ BOOL s_bVT3226D0_11bLoCurrentAdjust(
IN BOOL b11bMode IN BOOL b11bMode
); );
#ifdef __cplusplus
} /* End of extern "C" { */
#endif /* __cplusplus */
#endif // __RF_H__ #endif // __RF_H__

38
drivers/staging/vt6656/rxtx.c
View file

@ -46,64 +46,28 @@
* *
*/ */
#if !defined(__DEVICE_H__)
#include "device.h" #include "device.h"
#endif
#if !defined(__RXTX_H__)
#include "rxtx.h" #include "rxtx.h"
#endif
#if !defined(__TETHER_H__)
#include "tether.h" #include "tether.h"
#endif
#if !defined(__CARD_H__)
#include "card.h" #include "card.h"
#endif
#if !defined(__BSSDB_H__)
#include "bssdb.h" #include "bssdb.h"
#endif
#if !defined(__MAC_H__)
#include "mac.h" #include "mac.h"
#endif
#if !defined(__BASEBAND_H__)
#include "baseband.h" #include "baseband.h"
#endif
#if !defined(__UMEM_H__)
#include "umem.h" #include "umem.h"
#endif
#if !defined(__MICHAEL_H__)
#include "michael.h" #include "michael.h"
#endif
#if !defined(__TKIP_H__)
#include "tkip.h" #include "tkip.h"
#endif
#if !defined(__TCRC_H__)
#include "tcrc.h" #include "tcrc.h"
#endif
#if !defined(__WCTL_H__)
#include "wctl.h" #include "wctl.h"
#endif
#if !defined(__TBIT_H__)
#include "tbit.h" #include "tbit.h"
#endif
#if !defined(__HOSTAP_H__)
#include "hostap.h" #include "hostap.h"
#endif
#if !defined(__RF_H__)
#include "rf.h" #include "rf.h"
#endif
#if !defined(__DATARATE_H__)
#include "datarate.h" #include "datarate.h"
#endif
#if !defined(__USBPIPE_H__)
#include "usbpipe.h" #include "usbpipe.h"
#endif
#ifdef WPA_SM_Transtatus #ifdef WPA_SM_Transtatus
#if !defined(__IOCMD_H__)
#include "iocmd.h" #include "iocmd.h"
#endif #endif
#endif
/*--------------------- Static Definitions -------------------------*/ /*--------------------- Static Definitions -------------------------*/
/*--------------------- Static Classes ----------------------------*/ /*--------------------- Static Classes ----------------------------*/

22
drivers/staging/vt6656/rxtx.h
View file

@ -26,20 +26,12 @@
* *
*/ */
#ifndef __RXTX_H__ #ifndef __RXTX_H__
#define __RXTX_H__ #define __RXTX_H__
#if !defined(__TTYPE_H__)
#include "ttype.h" #include "ttype.h"
#endif
#if !defined(__DEVICE_H__)
#include "device.h" #include "device.h"
#endif
#if !defined(__WCMD_H__)
#include "wcmd.h" #include "wcmd.h"
#endif
/*--------------------- Export Definitions -------------------------*/ /*--------------------- Export Definitions -------------------------*/
@ -673,13 +665,6 @@ typedef struct tagSBEACON_BUFFER
/*--------------------- Export Functions --------------------------*/ /*--------------------- Export Functions --------------------------*/
#ifdef __cplusplus
extern "C" { /* Assume C declarations for C++ */
#endif /* __cplusplus */
BOOL BOOL
bPacketToWirelessUsb( bPacketToWirelessUsb(
IN PSDevice pDevice, IN PSDevice pDevice,
@ -703,13 +688,6 @@ CMD_STATUS csMgmt_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket);
CMD_STATUS csBeacon_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket); CMD_STATUS csBeacon_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket);
BOOL bRelayPacketSend(PSDevice pDevice, PBYTE pbySkbData, UINT uDataLen, UINT uNodeIndex); BOOL bRelayPacketSend(PSDevice pDevice, PBYTE pbySkbData, UINT uDataLen, UINT uNodeIndex);
#ifdef __cplusplus
} /* End of extern "C" { */
#endif /* __cplusplus */
#endif // __RXTX_H__ #endif // __RXTX_H__

17
drivers/staging/vt6656/srom.h
View file

@ -27,16 +27,10 @@
* *
*/ */
#ifndef __SROM_H__ #ifndef __SROM_H__
#define __SROM_H__ #define __SROM_H__
#if !defined(__TTYPE_H__)
#include "ttype.h" #include "ttype.h"
#endif
/*--------------------- Export Definitions -------------------------*/ /*--------------------- Export Definitions -------------------------*/
@ -129,16 +123,5 @@ typedef struct tagSSromReg {
/*--------------------- Export Variables --------------------------*/ /*--------------------- Export Variables --------------------------*/
/*--------------------- Export Functions --------------------------*/ /*--------------------- Export Functions --------------------------*/
#ifdef __cplusplus
extern "C" { /* Assume C declarations for C++ */
#endif /* __cplusplus */
#ifdef __cplusplus
} /* End of extern "C" { */
#endif /* __cplusplus */
#endif // __EEPROM_H__ #endif // __EEPROM_H__

5
drivers/staging/vt6656/tbit.h
View file

@ -27,15 +27,10 @@
* *
*/ */
#ifndef __TBIT_H__ #ifndef __TBIT_H__
#define __TBIT_H__ #define __TBIT_H__
#if !defined(__TTYPE_H__)
#include "ttype.h" #include "ttype.h"
#endif
/*--------------------- Export Definitions -------------------------*/ /*--------------------- Export Definitions -------------------------*/

8
drivers/staging/vt6656/tcrc.c
View file

@ -33,16 +33,8 @@
* *
*/ */
#if !defined(__TBIT_H__)
#include "tbit.h" #include "tbit.h"
#endif
#if !defined(__TCRC_H__)
#include "tcrc.h" #include "tcrc.h"
#endif
/*--------------------- Static Definitions -------------------------*/ /*--------------------- Static Definitions -------------------------*/

18
drivers/staging/vt6656/tcrc.h
View file

@ -26,16 +26,10 @@
* *
*/ */
#ifndef __TCRC_H__ #ifndef __TCRC_H__
#define __TCRC_H__ #define __TCRC_H__
#if !defined(__TTYPE_H__)
#include "ttype.h" #include "ttype.h"
#endif
/*--------------------- Export Definitions -------------------------*/ /*--------------------- Export Definitions -------------------------*/
@ -48,23 +42,11 @@
/*--------------------- Export Variables --------------------------*/ /*--------------------- Export Variables --------------------------*/
/*--------------------- Export Functions --------------------------*/ /*--------------------- Export Functions --------------------------*/
#ifdef __cplusplus
extern "C" { /* Assume C declarations for C++ */
#endif /* __cplusplus */
DWORD CRCdwCrc32(PBYTE pbyData, UINT cbByte, DWORD dwCrcSeed); DWORD CRCdwCrc32(PBYTE pbyData, UINT cbByte, DWORD dwCrcSeed);
DWORD CRCdwGetCrc32(PBYTE pbyData, UINT cbByte); DWORD CRCdwGetCrc32(PBYTE pbyData, UINT cbByte);
DWORD CRCdwGetCrc32Ex(PBYTE pbyData, UINT cbByte, DWORD dwPreCRC); DWORD CRCdwGetCrc32Ex(PBYTE pbyData, UINT cbByte, DWORD dwPreCRC);
#ifdef __cplusplus
} /* End of extern "C" { */
#endif /* __cplusplus */
#endif // __TCRC_H__ #endif // __TCRC_H__

13
drivers/staging/vt6656/tether.c
View file

@ -32,24 +32,11 @@
* *
*/ */
#if !defined(__DEVICE_H__)
#include "device.h" #include "device.h"
#endif
#if !defined(__TMACRO_H__)
#include "tmacro.h" #include "tmacro.h"
#endif
#if !defined(__TBIT_H__)
#include "tbit.h" #include "tbit.h"
#endif
#if !defined(__TCRC_H__)
#include "tcrc.h" #include "tcrc.h"
#endif
#if !defined(__TETHER_H__)
#include "tether.h" #include "tether.h"
#endif
/*--------------------- Static Definitions -------------------------*/ /*--------------------- Static Definitions -------------------------*/

20
drivers/staging/vt6656/tether.h
View file

@ -26,18 +26,10 @@
* *
*/ */
#ifndef __TETHER_H__ #ifndef __TETHER_H__
#define __TETHER_H__ #define __TETHER_H__
#if !defined(__TTYPE_H__)
#include "ttype.h" #include "ttype.h"
#endif
/*--------------------- Export Definitions -------------------------*/ /*--------------------- Export Definitions -------------------------*/
// //
@ -233,23 +225,11 @@ S802_11Header, *PS802_11Header;
/*--------------------- Export Variables --------------------------*/ /*--------------------- Export Variables --------------------------*/
/*--------------------- Export Functions --------------------------*/ /*--------------------- Export Functions --------------------------*/
#ifdef __cplusplus
extern "C" { /* Assume C declarations for C++ */
#endif /* __cplusplus */
BYTE ETHbyGetHashIndexByCrc32(PBYTE pbyMultiAddr); BYTE ETHbyGetHashIndexByCrc32(PBYTE pbyMultiAddr);
//BYTE ETHbyGetHashIndexByCrc(PBYTE pbyMultiAddr); //BYTE ETHbyGetHashIndexByCrc(PBYTE pbyMultiAddr);
BOOL ETHbIsBufferCrc32Ok(PBYTE pbyBuffer, UINT cbFrameLength); BOOL ETHbIsBufferCrc32Ok(PBYTE pbyBuffer, UINT cbFrameLength);
#ifdef __cplusplus
} /* End of extern "C" { */
#endif /* __cplusplus */
#endif // __TETHER_H__ #endif // __TETHER_H__

10
drivers/staging/vt6656/tkip.c
View file

@ -32,20 +32,10 @@
* *
*/ */
#if !defined(__TMACRO_H__)
#include "tmacro.h" #include "tmacro.h"
#endif
#if !defined(__TBIT_H__)
#include "tbit.h" #include "tbit.h"
#endif
#if !defined(__TKIP_H__)
#include "tkip.h" #include "tkip.h"
#endif
#if !defined(__UMEM_H__)
#include "umem.h" #include "umem.h"
#endif
/*--------------------- Static Definitions -------------------------*/ /*--------------------- Static Definitions -------------------------*/

16
drivers/staging/vt6656/tkip.h
View file

@ -27,19 +27,11 @@
* *
*/ */
#ifndef __TKIP_H__ #ifndef __TKIP_H__
#define __TKIP_H__ #define __TKIP_H__
#if !defined(__TTYPE_H__)
#include "ttype.h" #include "ttype.h"
#endif
#if !defined(__TETHER_H__)
#include "tether.h" #include "tether.h"
#endif
/*--------------------- Export Definitions -------------------------*/ /*--------------------- Export Definitions -------------------------*/
#define TKIP_KEY_LEN 16 #define TKIP_KEY_LEN 16
@ -53,9 +45,6 @@
/*--------------------- Export Variables --------------------------*/ /*--------------------- Export Variables --------------------------*/
/*--------------------- Export Functions --------------------------*/ /*--------------------- Export Functions --------------------------*/
#ifdef __cplusplus
extern "C" { /* Assume C declarations for C++ */
#endif /* __cplusplus */
VOID TKIPvMixKey( VOID TKIPvMixKey(
PBYTE pbyTKey, PBYTE pbyTKey,
@ -65,11 +54,6 @@ VOID TKIPvMixKey(
PBYTE pbyRC4Key PBYTE pbyRC4Key
); );
#ifdef __cplusplus
} /* End of extern "C" { */
#endif /* __cplusplus */
#endif // __TKIP_H__ #endif // __TKIP_H__

3
drivers/staging/vt6656/tmacro.h
View file

@ -26,7 +26,6 @@
* *
*/ */
#ifndef __TMACRO_H__ #ifndef __TMACRO_H__
#define __TMACRO_H__ #define __TMACRO_H__
@ -51,8 +50,6 @@
#define LODWORD(q) ((q).u.dwLowDword) #define LODWORD(q) ((q).u.dwLowDword)
#define HIDWORD(q) ((q).u.dwHighDword) #define HIDWORD(q) ((q).u.dwHighDword)
#if !defined(MAKEWORD) #if !defined(MAKEWORD)
#define MAKEWORD(lb, hb) ((WORD)(((BYTE)(lb)) | (((WORD)((BYTE)(hb))) << 8))) #define MAKEWORD(lb, hb) ((WORD)(((BYTE)(lb)) | (((WORD)((BYTE)(hb))) << 8)))
#endif #endif

6
drivers/staging/vt6656/tpci.h
View file

@ -29,16 +29,10 @@
* *
*/ */
#ifndef __TPCI_H__ #ifndef __TPCI_H__
#define __TPCI_H__ #define __TPCI_H__
#if !defined(__TTYPE_H__)
#include "ttype.h" #include "ttype.h"
#endif
/*--------------------- Export Definitions -------------------------*/ /*--------------------- Export Definitions -------------------------*/
#define MAX_PCI_BUS 4 // max. # of PCI bus that we support #define MAX_PCI_BUS 4 // max. # of PCI bus that we support

4
drivers/staging/vt6656/umem.h
View file

@ -31,11 +31,7 @@
#ifndef __UMEM_H__ #ifndef __UMEM_H__
#define __UMEM_H__ #define __UMEM_H__
#if !defined(__TTYPE_H__)
#include "ttype.h" #include "ttype.h"
#endif
/*--------------------- Export Definitions -------------------------*/ /*--------------------- Export Definitions -------------------------*/
// 4-byte memory tag // 4-byte memory tag

5
drivers/staging/vt6656/upc.h
View file

@ -26,16 +26,11 @@
* *
*/ */
#ifndef __UPC_H__ #ifndef __UPC_H__
#define __UPC_H__ #define __UPC_H__
#if !defined(DEVICE_H)
#include "device.h" #include "device.h"
#endif
#if !defined(__TTYPE_H__)
#include "ttype.h" #include "ttype.h"
#endif
/*--------------------- Export Definitions -------------------------*/ /*--------------------- Export Definitions -------------------------*/

15
drivers/staging/vt6656/usbpipe.c
View file

@ -38,28 +38,13 @@
* *
*/ */
#if !defined(__UMEM_H__)
#include "umem.h" #include "umem.h"
#endif
#if !defined(__INT_H__)
#include "int.h" #include "int.h"
#endif
#if !defined(__RXTX_H__)
#include "rxtx.h" #include "rxtx.h"
#endif
#if !defined(__DPC_H__)
#include "dpc.h" #include "dpc.h"
#endif
#if !defined(__CONTROL_H__)
#include "control.h" #include "control.h"
#endif
#if !defined(__DESC_H__)
#include "desc.h" #include "desc.h"
#endif
#if !defined(__DEVICE_H__)
#include "device.h" #include "device.h"
#endif
/*--------------------- Static Definitions -------------------------*/ /*--------------------- Static Definitions -------------------------*/
//endpoint def //endpoint def

17
drivers/staging/vt6656/usbpipe.h
View file

@ -27,18 +27,11 @@
* *
*/ */
#ifndef __USBPIPE_H__ #ifndef __USBPIPE_H__
#define __USBPIPE_H__ #define __USBPIPE_H__
#if !defined(__TTYPE_H__)
#include "ttype.h" #include "ttype.h"
#endif
#if !defined(__DEVICE_H__)
#include "device.h" #include "device.h"
#endif
/*--------------------- Export Definitions -------------------------*/ /*--------------------- Export Definitions -------------------------*/
@ -47,9 +40,6 @@
/*--------------------- Export Variables --------------------------*/ /*--------------------- Export Variables --------------------------*/
/*--------------------- Export Functions --------------------------*/ /*--------------------- Export Functions --------------------------*/
#ifdef __cplusplus
extern "C" { /* Assume C declarations for C++ */
#endif /* __cplusplus */
NTSTATUS NTSTATUS
PIPEnsControlOut( PIPEnsControlOut(
@ -103,13 +93,6 @@ PIPEnsSendBulkOut(
IN PUSB_SEND_CONTEXT pContext IN PUSB_SEND_CONTEXT pContext
); );
#ifdef __cplusplus
} /* End of extern "C" { */
#endif /* __cplusplus */
#endif // __USBPIPE_H__ #endif // __USBPIPE_H__

42
drivers/staging/vt6656/wcmd.c
View file

@ -38,67 +38,25 @@
* *
*/ */
#if !defined(__TTYPE_H__)
#include "ttype.h" #include "ttype.h"
#endif
#if !defined(__TMACRO_H__)
#include "tmacro.h" #include "tmacro.h"
#endif
#if !defined(__DEVICE_H__)
#include "device.h" #include "device.h"
#endif
#if !defined(__MAC_H__)
#include "mac.h" #include "mac.h"
#endif
#if !defined(__CARD_H__)
#include "card.h" #include "card.h"
#endif
#if !defined(__80211HDR_H__)
#include "80211hdr.h" #include "80211hdr.h"
#endif
#if !defined(__WCMD_H__)
#include "wcmd.h" #include "wcmd.h"
#endif
#if !defined(__WMGR_H__)
#include "wmgr.h" #include "wmgr.h"
#endif
#if !defined(__POWER_H__)
#include "power.h" #include "power.h"
#endif
#if !defined(__WCTL_H__)
#include "wctl.h" #include "wctl.h"
#endif
#if !defined(__CARD_H__)
#include "card.h" #include "card.h"
#endif
#if !defined(__BASEBAND_H__)
#include "baseband.h" #include "baseband.h"
#endif
#if !defined(__CONTROL_H__)
#include "control.h" #include "control.h"
#endif
#if !defined(__UMEM_H__)
#include "umem.h" #include "umem.h"
#endif
#if !defined(__RXTX_H__)
#include "rxtx.h" #include "rxtx.h"
#endif
#if !defined(__RF_H__)
#include "rf.h" #include "rf.h"
#endif
#if !defined(__RNDIS_H__)
#include "rndis.h" #include "rndis.h"
#endif
#if !defined (_CHANNEL_H_)
#include "channel.h" #include "channel.h"
#endif
//DavidWang
#if !defined(__IOWPA_H__)
#include "iowpa.h" #include "iowpa.h"
#endif
/*--------------------- Static Definitions -------------------------*/ /*--------------------- Static Definitions -------------------------*/

6
drivers/staging/vt6656/wcmd.h
View file

@ -29,15 +29,9 @@
#ifndef __WCMD_H__ #ifndef __WCMD_H__
#define __WCMD_H__ #define __WCMD_H__
#if !defined(__TTYPE_H__)
#include "ttype.h" #include "ttype.h"
#endif
#if !defined(__80211HDR_H__)
#include "80211hdr.h" #include "80211hdr.h"
#endif
#if !defined(__80211MGR_H__)
#include "80211mgr.h" #include "80211mgr.h"
#endif
/*--------------------- Export Definitions -------------------------*/ /*--------------------- Export Definitions -------------------------*/

9
drivers/staging/vt6656/wctl.c
View file

@ -34,19 +34,10 @@
* *
*/ */
#if !defined(__WCTL_H__)
#include "wctl.h" #include "wctl.h"
#endif
#if !defined(__DEVICE_H__)
#include "device.h" #include "device.h"
#endif
#if !defined(__CARD_H__)
#include "card.h" #include "card.h"
#endif
#if !defined(__TMACRO_H__)
#include "tmacro.h" #include "tmacro.h"
#endif
/*--------------------- Static Definitions -------------------------*/ /*--------------------- Static Definitions -------------------------*/

19
drivers/staging/vt6656/wctl.h
View file

@ -26,21 +26,12 @@
* *
*/ */
#ifndef __WCTL_H__ #ifndef __WCTL_H__
#define __WCTL_H__ #define __WCTL_H__
#if !defined(__TTYPE_H__)
#include "ttype.h" #include "ttype.h"
#endif
#if !defined(__TETHER_H__)
#include "tether.h" #include "tether.h"
#endif
#if !defined(__DEVICE_H__)
#include "device.h" #include "device.h"
#endif
/*--------------------- Export Definitions -------------------------*/ /*--------------------- Export Definitions -------------------------*/
@ -105,22 +96,12 @@
/*--------------------- Export Variables --------------------------*/ /*--------------------- Export Variables --------------------------*/
/*--------------------- Export Functions --------------------------*/ /*--------------------- Export Functions --------------------------*/
#ifdef __cplusplus
extern "C" { /* Assume C declarations for C++ */
#endif /* __cplusplus */
BOOL WCTLbIsDuplicate(PSCache pCache, PS802_11Header pMACHeader); BOOL WCTLbIsDuplicate(PSCache pCache, PS802_11Header pMACHeader);
BOOL WCTLbHandleFragment(PSDevice pDevice, PS802_11Header pMACHeader, UINT cbFrameLength, BOOL bWEP, BOOL bExtIV); BOOL WCTLbHandleFragment(PSDevice pDevice, PS802_11Header pMACHeader, UINT cbFrameLength, BOOL bWEP, BOOL bExtIV);
UINT WCTLuSearchDFCB(PSDevice pDevice, PS802_11Header pMACHeader); UINT WCTLuSearchDFCB(PSDevice pDevice, PS802_11Header pMACHeader);
UINT WCTLuInsertDFCB(PSDevice pDevice, PS802_11Header pMACHeader); UINT WCTLuInsertDFCB(PSDevice pDevice, PS802_11Header pMACHeader);
#ifdef __cplusplus
} /* End of extern "C" { */
#endif /* __cplusplus */
#endif // __WCTL_H__ #endif // __WCTL_H__

44
drivers/staging/vt6656/wmgr.c
View file

@ -61,70 +61,28 @@
* *
*/ */
#if !defined(__TMACRO_H__)
#include "tmacro.h" #include "tmacro.h"
#endif
#if !defined(__TBIT_H__)
#include "tbit.h" #include "tbit.h"
#endif
#if !defined(__DESC_H__)
#include "desc.h" #include "desc.h"
#endif
#if !defined(__DEVICE_H__)
#include "device.h" #include "device.h"
#endif
#if !defined(__CARD_H__)
#include "card.h" #include "card.h"
#endif
#if !defined(__80211HDR_H__)
#include "80211hdr.h" #include "80211hdr.h"
#endif
#if !defined(__80211MGR_H__)
#include "80211mgr.h" #include "80211mgr.h"
#endif
#if !defined(__WMGR_H__)
#include "wmgr.h" #include "wmgr.h"
#endif
#if !defined(__WCMD_H__)
#include "wcmd.h" #include "wcmd.h"
#endif
#if !defined(__MAC_H__)
#include "mac.h" #include "mac.h"
#endif
#if !defined(__BSSDB_H__)
#include "bssdb.h" #include "bssdb.h"
#endif
#if !defined(__POWER_H__)
#include "power.h" #include "power.h"
#endif
#if !defined(__DATARATE_H__)
#include "datarate.h" #include "datarate.h"
#endif
#if !defined(__BASEBAND_H__)
#include "baseband.h" #include "baseband.h"
#endif
#if !defined(__RXTX_H__)
#include "rxtx.h" #include "rxtx.h"
#endif
#if !defined(__WPA_H__)
#include "wpa.h" #include "wpa.h"
#endif
#if !defined(__RF_H__)
#include "rf.h" #include "rf.h"
#endif
#if !defined(__UMEM_H__)
#include "umem.h" #include "umem.h"
#endif
#if !defined(__IOWPA_H__)
#include "iowpa.h" #include "iowpa.h"
#endif
#if !defined(__CONTROL_H__)
#include "control.h" #include "control.h"
#endif
#if !defined(__RNDIS_H__)
#include "rndis.h" #include "rndis.h"
#endif
/*--------------------- Static Definitions -------------------------*/ /*--------------------- Static Definitions -------------------------*/

17
drivers/staging/vt6656/wmgr.h
View file

@ -31,33 +31,16 @@
* *
*/ */
#ifndef __WMGR_H__ #ifndef __WMGR_H__
#define __WMGR_H__ #define __WMGR_H__
#if !defined(__TTYPE_H__)
#include "ttype.h" #include "ttype.h"
#endif
#if !defined(__80211MGR_H__)
#include "80211mgr.h" #include "80211mgr.h"
#endif
#if !defined(__80211HDR_H__)
#include "80211hdr.h" #include "80211hdr.h"
#endif
#if !defined(__WCMD_H__)
#include "wcmd.h" #include "wcmd.h"
#endif
#if !defined(__BSSDB_H__)
#include "bssdb.h" #include "bssdb.h"
#endif
#if !defined(__WPA2_H__)
#include "wpa2.h" #include "wpa2.h"
#endif
#if !defined(__CARD_H__)
#include "card.h" #include "card.h"
#endif
/*--------------------- Export Definitions -------------------------*/ /*--------------------- Export Definitions -------------------------*/

22
drivers/staging/vt6656/wpa.c
View file

@ -32,38 +32,16 @@
* *
*/ */
#if !defined(__TTYPE_H__)
#include "ttype.h" #include "ttype.h"
#endif
#if !defined(__UMEM_H__)
#include "umem.h" #include "umem.h"
#endif
#if !defined(__TMACRO_H__)
#include "tmacro.h" #include "tmacro.h"
#endif
#if !defined(__TETHER_H__)
#include "tether.h" #include "tether.h"
#endif
#if !defined(__DEVICE_H__)
#include "device.h" #include "device.h"
#endif
#if !defined(__80211HDR_H__)
#include "80211hdr.h" #include "80211hdr.h"
#endif
#if !defined(__BSSDB_H__)
#include "bssdb.h" #include "bssdb.h"
#endif
#if !defined(__WMGR_H__)
#include "wmgr.h" #include "wmgr.h"
#endif
#if !defined(__WPA_H__)
#include "wpa.h" #include "wpa.h"
#endif
#if !defined(__80211MGR_H__)
#include "80211mgr.h" #include "80211mgr.h"
#endif
/*--------------------- Static Variables --------------------------*/ /*--------------------- Static Variables --------------------------*/
static int msglevel =MSG_LEVEL_INFO; static int msglevel =MSG_LEVEL_INFO;

14
drivers/staging/vt6656/wpa.h
View file

@ -31,14 +31,8 @@
#ifndef __WPA_H__ #ifndef __WPA_H__
#define __WPA_H__ #define __WPA_H__
#if !defined(__TTYPE_H__)
#include "ttype.h" #include "ttype.h"
#endif
#if !defined(__80211HDR_H__)
#include "80211hdr.h" #include "80211hdr.h"
#endif
/*--------------------- Export Definitions -------------------------*/ /*--------------------- Export Definitions -------------------------*/
@ -63,9 +57,6 @@
/*--------------------- Export Functions --------------------------*/ /*--------------------- Export Functions --------------------------*/
#ifdef __cplusplus
extern "C" { /* Assume C declarations for C++ */
#endif /* __cplusplus */
VOID VOID
WPA_ClearRSN( WPA_ClearRSN(
@ -90,9 +81,4 @@ WPAb_Is_RSN(
IN PWLAN_IE_RSN_EXT pRSN IN PWLAN_IE_RSN_EXT pRSN
); );
#ifdef __cplusplus
} /* End of extern "C" { */
#endif /* __cplusplus */
#endif // __WPA_H__ #endif // __WPA_H__

16
drivers/staging/vt6656/wpa2.c
View file

@ -30,19 +30,11 @@
* Date: Oct. 4, 2004 * Date: Oct. 4, 2004
* *
*/ */
#if !defined(__WPA2_H__)
#include "wpa2.h"
#endif
#if !defined(__UMEM_H__)
#include "umem.h"
#endif
#if !defined(__DEVICE_H__)
#include "device.h"
#endif
#if !defined(__WMGR_H__)
#include "wmgr.h"
#endif
#include "wpa2.h"
#include "umem.h"
#include "device.h"
#include "wmgr.h"
/*--------------------- Static Definitions -------------------------*/ /*--------------------- Static Definitions -------------------------*/
static int msglevel =MSG_LEVEL_INFO; static int msglevel =MSG_LEVEL_INFO;

21
drivers/staging/vt6656/wpa2.h
View file

@ -31,22 +31,10 @@
#ifndef __WPA2_H__ #ifndef __WPA2_H__
#define __WPA2_H__ #define __WPA2_H__
#if !defined(__TTYPE_H__)
#include "ttype.h" #include "ttype.h"
#endif
#if !defined(__80211MGR_H__)
#include "80211mgr.h" #include "80211mgr.h"
#endif
#if !defined(__80211HDR_H__)
#include "80211hdr.h" #include "80211hdr.h"
#endif
#if !defined(__BSSDB_H__)
#include "bssdb.h" #include "bssdb.h"
#endif
/*--------------------- Export Definitions -------------------------*/ /*--------------------- Export Definitions -------------------------*/
#define MAX_PMKID_CACHE 16 #define MAX_PMKID_CACHE 16
@ -69,9 +57,6 @@ typedef struct tagSPMKIDCache {
/*--------------------- Export Types ------------------------------*/ /*--------------------- Export Types ------------------------------*/
/*--------------------- Export Functions --------------------------*/ /*--------------------- Export Functions --------------------------*/
#ifdef __cplusplus
extern "C" { /* Assume C declarations for C++ */
#endif /* __cplusplus */
VOID VOID
WPA2_ClearRSN ( WPA2_ClearRSN (
@ -90,10 +75,4 @@ WPA2uSetIEs(
OUT PWLAN_IE_RSN pRSNIEs OUT PWLAN_IE_RSN pRSNIEs
); );
#ifdef __cplusplus
} /* End of extern "C" { */
#endif /* __cplusplus */
#endif // __WPA2_H__ #endif // __WPA2_H__

22
drivers/staging/vt6656/wpactl.c
View file

@ -31,38 +31,16 @@
* *
*/ */
#if !defined(__WPACTL_H__)
#include "wpactl.h" #include "wpactl.h"
#endif
#if !defined(__KEY_H__)
#include "key.h" #include "key.h"
#endif
#if !defined(__MAC_H__)
#include "mac.h" #include "mac.h"
#endif
#if !defined(__DEVICE_H__)
#include "device.h" #include "device.h"
#endif
#if !defined(__WMGR_H__)
#include "wmgr.h" #include "wmgr.h"
#endif
#if !defined(__IOCMD_H__)
#include "iocmd.h" #include "iocmd.h"
#endif
#if !defined(__IOWPA_H__)
#include "iowpa.h" #include "iowpa.h"
#endif
#if !defined(__CONTROL_H__)
#include "control.h" #include "control.h"
#endif
#if !defined(__RNDIS_H__)
#include "rndis.h" #include "rndis.h"
#endif
//2008-0717-05, <Add> by James
#if !defined(__RF_H__)
#include "rf.h" #include "rf.h"
#endif
/*--------------------- Static Definitions -------------------------*/ /*--------------------- Static Definitions -------------------------*/

18
drivers/staging/vt6656/wpactl.h
View file

@ -26,19 +26,13 @@
* *
*/ */
#ifndef __WPACTL_H__ #ifndef __WPACTL_H__
#define __WPACTL_H__ #define __WPACTL_H__
#if !defined(__DEVICE_H__)
#include "device.h" #include "device.h"
#endif
#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
#if !defined(__IOWPA_H__)
#include "iowpa.h" #include "iowpa.h"
#endif #endif
#endif
/*--------------------- Export Definitions -------------------------*/ /*--------------------- Export Definitions -------------------------*/
@ -68,22 +62,10 @@ typedef ULONGLONG NDIS_802_11_KEY_RSC;
/*--------------------- Export Functions --------------------------*/ /*--------------------- Export Functions --------------------------*/
#ifdef __cplusplus
extern "C" { /* Assume C declarations for C++ */
#endif /* __cplusplus */
int wpa_set_wpadev(PSDevice pDevice, int val); int wpa_set_wpadev(PSDevice pDevice, int val);
int wpa_ioctl(PSDevice pDevice, struct iw_point *p); int wpa_ioctl(PSDevice pDevice, struct iw_point *p);
int wpa_set_keys(PSDevice pDevice, void *ctx, BOOL fcpfkernel); int wpa_set_keys(PSDevice pDevice, void *ctx, BOOL fcpfkernel);
#ifdef __cplusplus
} /* End of extern "C" { */
#endif /* __cplusplus */
#endif // __WPACL_H__ #endif // __WPACL_H__