apfs/linux-apfs
0
0
Fork 0
mirror of https://github.com/linux-apfs/linux-apfs.git synced 2026-05-01 15:00:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

Staging: vt665x: Clean up include files, Part 2

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:09 -07:00
committed by Greg Kroah-Hartman
parent 9d26d60f99
commit a7ad322a46
74 changed files with 14 additions and 1135 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/staging/vt6655/80211hdr.h
-5
View File
@@ -28,15 +28,10 @@
*
*/
#ifndef __80211HDR_H__
#define __80211HDR_H__
#if !defined(__TTYPE_H__)
#include "ttype.h"
#endif
/*--------------------- Export Definitions -------------------------*/
// bit type
drivers/staging/vt6655/80211mgr.c
-16
View File
@@ -52,28 +52,12 @@
*
*/
#if !defined(__TMACRO_H__)
#include "tmacro.h"
#endif
#if !defined(__TETHER_H__)
#include "tether.h"
#endif
#if !defined(__80211MGR_H__)
#include "80211mgr.h"
#endif
#if !defined(__80211HDR_H__)
#include "80211hdr.h"
#endif
#if !defined(__DEVICE_H__)
#include "device.h"
#endif
#if !defined(__WPA_H__)
#include "wpa.h"
#endif
/*--------------------- Static Definitions -------------------------*/
drivers/staging/vt6655/80211mgr.h
+1 -6
View File
@@ -28,17 +28,11 @@
*
*/
#ifndef __80211MGR_H__
#define __80211MGR_H__
#if !defined(__TTYPE_H__)
#include "ttype.h"
#endif
#if !defined(__80211HDR_H__)
#include "80211hdr.h"
#endif
/*--------------------- Export Definitions -------------------------*/
@@ -719,6 +713,7 @@ typedef struct tagWLAN_FR_DEAUTHEN {
} WLAN_FR_DEAUTHEN, *PWLAN_FR_DEAUTHEN;
/*--------------------- Export Functions --------------------------*/
VOID
vMgrEncodeBeacon(
IN PWLAN_FR_BEACON pFrame
drivers/staging/vt6655/IEEE11h.c
-20
View File
@@ -31,34 +31,14 @@
*
*/
#if !defined(__TTYPE_H__)
#include "ttype.h"
#endif
#if !defined(__UMEM_H__)
#include "umem.h"
#endif
#if !defined(__TMACRO_H__)
#include "tmacro.h"
#endif
#if !defined(__TETHER_H__)
#include "tether.h"
#endif
#if !defined(__IEEE11h_H__)
#include "IEEE11h.h"
#endif
#if !defined(__DEVICE_H__)
#include "device.h"
#endif
#if !defined(__WMGR_H__)
#include "wmgr.h"
#endif
#if !defined(__RXTX_H__)
#include "rxtx.h"
#endif
/*--------------------- Static Definitions -------------------------*/
static int msglevel =MSG_LEVEL_INFO;
drivers/staging/vt6655/IEEE11h.h
-16
View File
@@ -31,17 +31,9 @@
#ifndef __IEEE11h_H__
#define __IEEE11h_H__
#if !defined(__TTYPE_H__)
#include "ttype.h"
#endif
#if !defined(__80211HDR_H__)
#include "80211hdr.h"
#endif
#if !defined(__80211MGR_H__)
#include "80211mgr.h"
#endif
/*--------------------- Export Definitions -------------------------*/
@@ -52,17 +44,9 @@
/*--------------------- Export Types ------------------------------*/
/*--------------------- Export Functions --------------------------*/
#ifdef __cplusplus
extern "C" { /* Assume C declarations for C++ */
#endif /* __cplusplus */
BOOL IEEE11hbMSRRepTx (
IN PVOID pMgmtHandle
);
#ifdef __cplusplus
} /* End of extern "C" { */
#endif /* __cplusplus */
#endif // __IEEE11h_H__
drivers/staging/vt6655/TODO
+2 -2
View File
@@ -1,7 +1,7 @@
TODO:
- remove __cplusplus ifdefs
- remove __cplusplus ifdefs -- done
- prepare for merge with vt6656 driver:
- rename DEVICE_PRT() to DBG_PRT()
- rename DEVICE_PRT() to DBG_PRT() -- done
- share 80211*.h includes
- move code for channel mapping from card.c to channel.c
- split rf.c
drivers/staging/vt6655/aes_ccmp.c
-7
View File
@@ -33,16 +33,9 @@
*
*/
#if !defined(__UMEM_H__)
#include "umem.h"
#endif
#if !defined(__DEVICE_H__)
#include "device.h"
#endif
#if !defined(__80211HDR_H__)
#include "80211hdr.h"
#endif
/*--------------------- Static Definitions -------------------------*/
drivers/staging/vt6655/aes_ccmp.h
-2
View File
@@ -30,9 +30,7 @@
#ifndef __AES_H__
#define __AES_H__
#if !defined(__TTYPE_H__)
#include "ttype.h"
#endif
/*--------------------- Export Definitions -------------------------*/
drivers/staging/vt6655/baseband.c
-17
View File
@@ -49,31 +49,14 @@
*
*/
#if !defined(__TMACRO_H__)
#include "tmacro.h"
#endif
#if !defined(__TBIT_H__)
#include "tbit.h"
#endif
#if !defined(__TETHER_H__)
#include "tether.h"
#endif
#if !defined(__MAC_H__)
#include "mac.h"
#endif
#if !defined(__BASEBAND_H__)
#include "baseband.h"
#endif
#if !defined(__SROM_H__)
#include "srom.h"
#endif
#if !defined(__UMEM_H__)
#include "umem.h"
#endif
#if !defined(__RF_H__)
#include "rf.h"
#endif
/*--------------------- Static Definitions -------------------------*/
//static int msglevel =MSG_LEVEL_DEBUG;
drivers/staging/vt6655/baseband.h
-18
View File
@@ -30,18 +30,9 @@
#ifndef __BASEBAND_H__
#define __BASEBAND_H__
#if !defined(__TTYPE_H__)
#include "ttype.h"
#endif
#if !defined(__TETHER_H__)
#include "tether.h"
#endif
#if !defined(__DEVICE_H__)
#include "device.h"
#endif
/*--------------------- Export Definitions -------------------------*/
@@ -126,9 +117,6 @@
/*--------------------- Export Variables --------------------------*/
/*--------------------- Export Functions --------------------------*/
#ifdef __cplusplus
extern "C" { /* Assume C declarations for C++ */
#endif /* __cplusplus */
UINT
BBuGetFrameTime(
@@ -186,10 +174,4 @@ void BBvAntennaDiversity(PSDevice pDevice, BYTE byRxRate, BYTE bySQ3);
VOID
BBvClearAntDivSQ3Value (PSDevice pDevice);
#ifdef __cplusplus
} /* End of extern "C" { */
#endif /* __cplusplus */
#endif // __BASEBAND_H__
drivers/staging/vt6655/bssdb.c
-40
View File
@@ -39,65 +39,25 @@
*
*/
#if !defined(__TBIT_H__)
#include "tbit.h"
#endif//chester
#if !defined(__TTYPE_H__)
#include "ttype.h"
#endif
#if !defined(__TMACRO_H__)
#include "tmacro.h"
#endif
#if !defined(__TETHER_H__)
#include "tether.h"
#endif
#if !defined(__DEVICE_H__)
#include "device.h"
#endif
#if !defined(__80211HDR_H__)
#include "80211hdr.h"
#endif
#if !defined(__BSSDB_H__)
#include "bssdb.h"
#endif
#if !defined(__WMGR_H__)
#include "wmgr.h"
#endif
#if !defined(__DATARATE_H__)
#include "datarate.h"
#endif
#if !defined(__DESC_H__)
#include "desc.h"
#endif
#if !defined(__WCMD_H__)
#include "wcmd.h"
#endif
#if !defined(__WPA_H__)
#include "wpa.h"
#endif
#if !defined(__BASEBAND_H__)
#include "baseband.h"
#endif
#if !defined(__RF_H__)
#include "rf.h"
#endif
#if !defined(__CARD_H__)
#include "card.h"
#endif
#if !defined(__MAC_H__)
#include "mac.h"
#endif
#if !defined(__WPA2_H__)
#include "wpa2.h"
#endif
#if !defined(__UMEM_H__)
#include "umem.h"
#endif
//DavidWang
#if !defined(__IOWPA_H__)
#include "iowpa.h"
#endif
//#define PLICE_DEBUG
/*--------------------- Static Definitions -------------------------*/
drivers/staging/vt6655/bssdb.h
-13
View File
@@ -30,23 +30,10 @@
#ifndef __BSSDB_H__
#define __BSSDB_H__
//#if !defined(__DEVICE_H__)
//#include "device.h"
//#endif
#include <linux/skbuff.h>
#if !defined(__80211HDR_H__)
#include "80211hdr.h"
#endif
#if !defined(__80211MGR_H__)
#include "80211mgr.h"
#endif
#if !defined(__CARD_H__)
#include "card.h"
#endif
/*--------------------- Export Definitions -------------------------*/
drivers/staging/vt6655/card.c
-28
View File
@@ -45,47 +45,19 @@
*
*/
#if !defined(__TMACRO_H__)
#include "tmacro.h"
#endif
#if !defined(__CARD_H__)
#include "card.h"
#endif
#if !defined(__TBIT_H__)
#include "tbit.h"
#endif
#if !defined(__BASEBAND_H__)
#include "baseband.h"
#endif
#if !defined(__MAC_H__)
#include "mac.h"
#endif
#if !defined(__DESC_H__)
#include "desc.h"
#endif
#if !defined(__RF_H__)
#include "rf.h"
#endif
#if !defined(__VNTWIFI_H__)
#include "vntwifi.h"
#endif
#if !defined(__POWER_H__)
#include "power.h"
#endif
#if !defined(__KEY_H__)
#include "key.h"
#endif
#if !defined(__RC4_H__)
#include "rc4.h"
#endif
#if !defined(__COUNTRY_H__)
#include "country.h"
#endif
#if !defined(__UMEM_H__)
#include "umem.h"
#endif
/*--------------------- Static Definitions -------------------------*/
drivers/staging/vt6655/card.h
-17
View File
@@ -26,19 +26,10 @@
*
*/
#ifndef __CARD_H__
#define __CARD_H__
//#if !defined(__DEVICE_H__)
//#include "device.h"
//#endif
#if !defined(__TTYPE_H__)
#include "ttype.h"
#endif
/*--------------------- Export Definitions -------------------------*/
//
@@ -94,9 +85,6 @@ typedef enum _CARD_OP_MODE {
/*--------------------- Export Variables --------------------------*/
/*--------------------- Export Functions --------------------------*/
#ifdef __cplusplus
extern "C" { /* Assume C declarations for C++ */
#endif /* __cplusplus */
BOOL ChannelValid(UINT CountryCode, UINT ChannelIndex);
void CARDvSetRSPINF(PVOID pDeviceHandler, CARD_PHY_TYPE ePHYType);
@@ -262,11 +250,6 @@ CARDbyAutoChannelSelect(
BYTE CARDbyGetChannelNumber(PVOID pDeviceHandler, BYTE byChannelIndex);
#ifdef __cplusplus
} /* End of extern "C" { */
#endif /* __cplusplus */
#endif // __CARD_H__
drivers/staging/vt6655/country.h
-15
View File
@@ -30,10 +30,7 @@
#ifndef __COUNTRY_H__
#define __COUNTRY_H__
#if !defined(__TTYPE_H__)
#include "ttype.h"
#endif
/*--------------------- Export Definitions -------------------------*/
/************************************************************************
@@ -176,17 +173,5 @@ typedef struct tagSCountryTable
extern SCountryTable ChannelRuleTab[CCODE_MAX+1];
/*--------------------- Export Functions --------------------------*/
#ifdef __cplusplus
extern "C" { /* Assume C declarations for C++ */
#endif /* __cplusplus */
#ifdef __cplusplus
} /* End of extern "C" { */
#endif /* __cplusplus */
/************************************************************************
* Function prototype
************************************************************************/
#endif /* __COUNTRY_H__ */
drivers/staging/vt6655/datarate.c
-18
View File
@@ -33,33 +33,15 @@
*
*/
#if !defined(__TTYPE_H__)
#include "ttype.h"
#endif
#if !defined(__TMACRO_H__)
#include "tmacro.h"
#endif
#if !defined(__MAC_H__)
#include "mac.h"
#endif
#if !defined(__80211MGR_H__)
#include "80211mgr.h"
#endif
#if !defined(__BSSDB_H__)
#include "bssdb.h"
#endif
#if !defined(__DATARATE_H__)
#include "datarate.h"
#endif
#if !defined(__CARD_H__)
#include "card.h"
#endif
#if !defined(__BASEBAND_H__)
#include "baseband.h"
#endif
#if !defined(__SROM_H__)
#include "srom.h"
#endif
/*--------------------- Static Definitions -------------------------*/
drivers/staging/vt6655/desc.h
-10
View File
@@ -28,23 +28,13 @@
*
*/
#ifndef __DESC_H__
#define __DESC_H__
#include <linux/types.h>
#include <linux/mm.h>
#if !defined(__TTYPE_H__)
#include "ttype.h"
#endif
#if !defined(__TETHER_H__)
#include "tether.h"
#endif
/*--------------------- Export Definitions -------------------------*/
drivers/staging/vt6655/device.h
-30
View File
@@ -85,50 +85,20 @@
// device specific
//
#if !defined(_KCOMPAT_H)
#include "kcompat.h"
#endif
#if !defined(__DEVICE_CONFIG_H)
#include "device_cfg.h"
#endif
#if !defined(__TTYPE_H__)
#include "ttype.h"
#endif
#if !defined(__80211HDR_H__)
#include "80211hdr.h"
#endif
#if !defined(__TETHER_H__)
#include "tether.h"
#endif
#if !defined(__WMGR_H__)
#include "wmgr.h"
#endif
#if !defined(__WCMD_H__)
#include "wcmd.h"
#endif
#if !defined(__MIB_H__)
#include "mib.h"
#endif
#if !defined(__SROM_H__)
#include "srom.h"
#endif
#if !defined(__RC4_H__)
#include "rc4.h"
#endif
#if !defined(__TPCI_H__)
#include "tpci.h"
#endif
#if !defined(__DESC_H__)
#include "desc.h"
#endif
#if !defined(__KEY_H__)
#include "key.h"
#endif
#if !defined(__MAC_H__)
#include "mac.h"
#endif
//PLICE_DEBUG->
//#define THREAD
drivers/staging/vt6655/device_main.c
-48
View File
@@ -60,80 +60,32 @@
*/
#undef __NO_VERSION__
#if !defined(__DEVICE_H__)
#include "device.h"
#endif
#if !defined(__CARD_H__)
#include "card.h"
#endif
#if !defined(__TBIT_H__)
#include "tbit.h"
#endif
#if !defined(__BASEBAND_H__)
#include "baseband.h"
#endif
#if !defined(__MAC_H__)
#include "mac.h"
#endif
#if !defined(__TETHER_H__)
#include "tether.h"
#endif
#if !defined(__WMGR_H__)
#include "wmgr.h"
#endif
#if !defined(__WCTL_H__)
#include "wctl.h"
#endif
#if !defined(__POWER_H__)
#include "power.h"
#endif
#if !defined(__WCMD_H__)
#include "wcmd.h"
#endif
#if !defined(__IOCMD_H__)
#include "iocmd.h"
#endif
#if !defined(__TCRC_H__)
#include "tcrc.h"
#endif
#if !defined(__RXTX_H__)
#include "rxtx.h"
#endif
#if !defined(__WROUTE_H__)
#include "wroute.h"
#endif
#if !defined(__BSSDB_H__)
#include "bssdb.h"
#endif
#if !defined(__HOSTAP_H__)
#include "hostap.h"
#endif
#if !defined(__WPACTL_H__)
#include "wpactl.h"
#endif
#if !defined(__IOCTL_H__)
#include "ioctl.h"
#endif
#if !defined(__IWCTL_H__)
#include "iwctl.h"
#endif
#if !defined(__DPC_H__)
#include "dpc.h"
#endif
#if !defined(__DATARATE_H__)
#include "datarate.h"
#endif
#if !defined(__RF_H__)
#include "rf.h"
#endif
#if !defined(__IOWPA_H__)
#include "iowpa.h"
#endif
#include <linux/delay.h>
#include <linux/kthread.h>
//#define DEBUG
/*--------------------- Static Definitions -------------------------*/
//static int msglevel =MSG_LEVEL_DEBUG;
drivers/staging/vt6655/dpc.c
-37
View File
@@ -38,61 +38,24 @@
*
*/
#if !defined(__DEVICE_H__)
#include "device.h"
#endif
#if !defined(__RXTX_H__)
#include "rxtx.h"
#endif
#if !defined(__TETHER_H__)
#include "tether.h"
#endif
#if !defined(__CARD_H__)
#include "card.h"
#endif
#if !defined(__BSSDB_H__)
#include "bssdb.h"
#endif
#if !defined(__MAC_H__)
#include "mac.h"
#endif
#if !defined(__BASEBAND_H__)
#include "baseband.h"
#endif
#if !defined(__UMEM_H__)
#include "umem.h"
#endif
#if !defined(__MICHAEL_H__)
#include "michael.h"
#endif
#if !defined(__TKIP_H__)
#include "tkip.h"
#endif
#if !defined(__TCRC_H__)
#include "tcrc.h"
#endif
#if !defined(__WCTL_H__)
#include "wctl.h"
#endif
#if !defined(__WROUTE_H__)
#include "wroute.h"
#endif
#if !defined(__TBIT_H__)
#include "tbit.h"
#endif
#if !defined(__HOSTAP_H__)
#include "hostap.h"
#endif
#if !defined(__RF_H__)
#include "rf.h"
#endif
#if !defined(__IOWPA_H__)
#include "iowpa.h"
#endif
#if !defined(__AES_H__)
#include "aes_ccmp.h"
#endif
//#define PLICE_DEBUG

Some files were not shown because too many files have changed in this diff Show More