iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Staging: vt6656: code cleanup, resolved checkpatch findings in headers

Browse Source 
Resolved whitespace-related checkpatch findings in .h files

Signed-off-by: Andres More <more.andres@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Andres More 2010-05-26 20:00:36 -03:00 committed by Greg Kroah-Hartman
parent 33d33e42b6
commit d9d1ccb51f
21 changed files with 136 additions and 229 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/staging/vt6656/80211mgr.h
View File

@ -222,15 +222,12 @@
#define MEASURE_MODE_INCAPABLE 0x02
#define MEASURE_MODE_REFUSED 0x04
/*--------------------- Export Classes ----------------------------*/
/*--------------------- Export Variables --------------------------*/
/*--------------------- Export Types ------------------------------*/
// Information Element Types
#pragma pack(1)
@ -240,7 +237,6 @@ typedef struct tagWLAN_IE {
} __attribute__ ((__packed__))
WLAN_IE, *PWLAN_IE;
// Service Set Identity (SSID)
#pragma pack(1)
typedef struct tagWLAN_IE_SSID {
@ -250,7 +246,6 @@ typedef struct tagWLAN_IE_SSID {
} __attribute__ ((__packed__))
WLAN_IE_SSID, *PWLAN_IE_SSID;
// Supported Rates
#pragma pack(1)
typedef struct tagWLAN_IE_SUPP_RATES {
@ -260,8 +255,6 @@ typedef struct tagWLAN_IE_SUPP_RATES {
} __attribute__ ((__packed__))
WLAN_IE_SUPP_RATES, *PWLAN_IE_SUPP_RATES;
// FH Parameter Set
#pragma pack(1)
typedef struct _WLAN_IE_FH_PARMS {
@ -282,7 +275,6 @@ typedef struct tagWLAN_IE_DS_PARMS {
} __attribute__ ((__packed__))
WLAN_IE_DS_PARMS, *PWLAN_IE_DS_PARMS;
// CF Parameter Set
#pragma pack(1)
typedef struct tagWLAN_IE_CF_PARMS {
@ -295,7 +287,6 @@ typedef struct tagWLAN_IE_CF_PARMS {
} __attribute__ ((__packed__))
WLAN_IE_CF_PARMS, *PWLAN_IE_CF_PARMS;
// TIM
#pragma pack(1)
typedef struct tagWLAN_IE_TIM {
@ -308,7 +299,6 @@ typedef struct tagWLAN_IE_TIM {
} __attribute__ ((__packed__))
WLAN_IE_TIM, *PWLAN_IE_TIM;
// IBSS Parameter Set
#pragma pack(1)
typedef struct tagWLAN_IE_IBSS_PARMS {
@ -318,7 +308,6 @@ typedef struct tagWLAN_IE_IBSS_PARMS {
} __attribute__ ((__packed__))
WLAN_IE_IBSS_PARMS, *PWLAN_IE_IBSS_PARMS;
// Challenge Text
#pragma pack(1)
typedef struct tagWLAN_IE_CHALLENGE {
@ -328,7 +317,6 @@ typedef struct tagWLAN_IE_CHALLENGE {
} __attribute__ ((__packed__))
WLAN_IE_CHALLENGE, *PWLAN_IE_CHALLENGE;
#pragma pack(1)
typedef struct tagWLAN_IE_RSN_EXT {
BYTE byElementID;
@ -394,7 +382,6 @@ typedef struct tagWLAN_IE_ERP {
} __attribute__ ((__packed__))
WLAN_IE_ERP, *PWLAN_IE_ERP;
#pragma pack(1)
typedef struct _MEASEURE_REQ {
BYTE byChannel;

7
drivers/staging/vt6656/baseband.h
View File

@ -104,16 +104,13 @@ BBuGetFrameTime(
WORD wRate
);
void
BBvCaculateParameter (
PSDevice pDevice,
void BBvCaculateParameter(PSDevice pDevice,
unsigned int cbFrameLength,
WORD wRate,
BYTE byPacketType,
PWORD pwPhyLen,
PBYTE pbyPhySrv,
PBYTE pbyPhySgn
);
PBYTE pbyPhySgn);
// timer for antenna diversity

2
drivers/staging/vt6656/bssdb.h
View File

@ -40,7 +40,7 @@
#define MAX_NODE_NUM 64
#define MAX_BSS_NUM 42
#define LOST_BEACON_COUNT 10 // 10 sec, XP defined
#define LOST_BEACON_COUNT 10 /* 10 sec, XP defined */
#define MAX_PS_TX_BUF 32 // sta max power saving tx buf
#define ADHOC_LOST_BEACON_COUNT 30 // 30 sec, beacon lost for adhoc only
#define MAX_INACTIVE_COUNT 300 // 300 sec, inactive STA node refresh

10
drivers/staging/vt6656/channel.h
View File

@ -35,6 +35,7 @@
/*--------------------- Export Definitions -------------------------*/
/*--------------------- Export Classes ----------------------------*/
typedef struct tagSChannelTblElement {
BYTE byChannelNumber;
unsigned int uFrequency;
@ -44,14 +45,11 @@ typedef struct tagSChannelTblElement {
/*--------------------- Export Variables --------------------------*/
/*--------------------- Export Functions --------------------------*/
BOOL ChannelValid(unsigned int CountryCode, unsigned int ChannelNum);
void CHvInitChannelTable(void *pDeviceHandler);
BYTE CHbyGetChannelMapping(BYTE byChannelNumber);
BOOL
CHvChannelGetList (
unsigned int uCountryCodeIdx,
PBYTE pbyChannelTable
);
BOOL CHvChannelGetList(unsigned int uCountryCodeIdx, PBYTE pbyChannelTable);
#endif /* _REGULATE_H_ */
#endif /* _CHANNEL_H_ */

2
drivers/staging/vt6656/control.h
View File

@ -36,7 +36,6 @@
/*--------------------- Export Definitions -------------------------*/
#define CONTROLnsRequestOut(Device, Request, Value, Index, Length, Buffer) \
PIPEnsControlOut(Device, Request, Value, Index, Length, Buffer)
@ -46,7 +45,6 @@
#define CONTROLnsRequestIn(Device, Request, Value, Index, Length, Buffer) \
PIPEnsControlIn(Device, Request, Value, Index, Length, Buffer)
/*--------------------- Export Classes ----------------------------*/
/*--------------------- Export Variables --------------------------*/

31
drivers/staging/vt6656/desc.h
View File

@ -51,7 +51,6 @@
#define MAX_INTERRUPT_SIZE 32
#define RX_BLOCKS 64 // form 0x60 to 0xA0
#define TX_BLOCKS 32 // from 0xA0 to 0xC0
@ -63,8 +62,6 @@
#define CB_RD_NUM 64 // default # of RD
#define CB_TD_NUM 64 // default # of TD
//
// Bits in the RSR register
//
@ -87,7 +84,6 @@
#define NEWRSR_BCNHITAID 0x02 // 0000 0010
#define NEWRSR_BCNHITAID0 0x01 // 0000 0001
//
// Bits in the TSR register
//
@ -96,17 +92,13 @@
#define TSR_ACKDATA 0x02 // 0000 0010
#define TSR_VALID 0x01 // 0000 0001
#define CB_PROTOCOL_RESERVED_SECTION 16
// if retrys excess 15 times , tx will abort, and
// if tx fifo underflow, tx will fail
// we should try to resend it
#define CB_MAX_TX_ABORT_RETRY 3
#define FIFOCTL_AUTO_FB_1 0x1000 // 0001 0000 0000 0000
#define FIFOCTL_AUTO_FB_0 0x0800 // 0000 1000 0000 0000
#define FIFOCTL_GRPACK 0x0400 // 0000 0100 0000 0000
@ -137,7 +129,6 @@
#define FRAGCTL_STAFRAG 0x0001 // 0000 0000 0000 0001
#define FRAGCTL_NONFRAG 0x0000 // 0000 0000 0000 0000
//#define TYPE_AC0DMA 0
//#define TYPE_TXDMA0 1
#define TYPE_TXDMA0 0
@ -152,8 +143,6 @@
#define TYPE_RXDMA1 1
#define TYPE_MAXRD 2
// TD_INFO flags control bit
#define TD_FLAGS_NETIF_SKB 0x01 // check if need release skb
#define TD_FLAGS_PRIV_SKB 0x02 // check if called from private skb(hostap)
@ -162,7 +151,6 @@
/*--------------------- Export Types ------------------------------*/
//
// RsvTime buffer header
//
@ -175,6 +163,7 @@ typedef struct tagSRrvTime_gRTS {
WORD wTxRrvTime_a;
} __attribute__ ((__packed__))
SRrvTime_gRTS, *PSRrvTime_gRTS;
typedef const SRrvTime_gRTS *PCSRrvTime_gRTS;
typedef struct tagSRrvTime_gCTS {
@ -184,6 +173,7 @@ typedef struct tagSRrvTime_gCTS {
WORD wTxRrvTime_a;
} __attribute__ ((__packed__))
SRrvTime_gCTS, *PSRrvTime_gCTS;
typedef const SRrvTime_gCTS *PCSRrvTime_gCTS;
typedef struct tagSRrvTime_ab {
@ -191,6 +181,7 @@ typedef struct tagSRrvTime_ab {
WORD wTxRrvTime;
} __attribute__ ((__packed__))
SRrvTime_ab, *PSRrvTime_ab;
typedef const SRrvTime_ab *PCSRrvTime_ab;
typedef struct tagSRrvTime_atim {
@ -198,6 +189,7 @@ typedef struct tagSRrvTime_atim {
WORD wTxRrvTime_a;
} __attribute__ ((__packed__))
SRrvTime_atim, *PSRrvTime_atim;
typedef const SRrvTime_atim *PCSRrvTime_atim;
//
@ -210,6 +202,7 @@ typedef struct tagSRTSData {
BYTE abyTA[ETH_ALEN];
} __attribute__ ((__packed__))
SRTSData, *PSRTSData;
typedef const SRTSData *PCSRTSData;
typedef struct tagSRTS_g {
@ -228,7 +221,6 @@ typedef struct tagSRTS_g {
SRTS_g, *PSRTS_g;
typedef const SRTS_g *PCSRTS_g;
typedef struct tagSRTS_g_FB {
BYTE bySignalField_b;
BYTE byServiceField_b;
@ -247,8 +239,8 @@ typedef struct tagSRTS_g_FB {
SRTSData Data;
} __attribute__ ((__packed__))
SRTS_g_FB, *PSRTS_g_FB;
typedef const SRTS_g_FB *PCSRTS_g_FB;
typedef const SRTS_g_FB *PCSRTS_g_FB;
typedef struct tagSRTS_ab {
BYTE bySignalField;
@ -259,8 +251,8 @@ typedef struct tagSRTS_ab {
SRTSData Data;
} __attribute__ ((__packed__))
SRTS_ab, *PSRTS_ab;
typedef const SRTS_ab *PCSRTS_ab;
typedef const SRTS_ab *PCSRTS_ab;
typedef struct tagSRTS_a_FB {
BYTE bySignalField;
@ -273,6 +265,7 @@ typedef struct tagSRTS_a_FB {
SRTSData Data;
} __attribute__ ((__packed__))
SRTS_a_FB, *PSRTS_a_FB;
typedef const SRTS_a_FB *PCSRTS_a_FB;
@ -296,6 +289,7 @@ typedef struct tagSCTS {
SCTSData Data;
} __attribute__ ((__packed__))
SCTS, *PSCTS;
typedef const SCTS *PCSCTS;
typedef struct tagSCTS_FB {
@ -309,8 +303,8 @@ typedef struct tagSCTS_FB {
SCTSData Data;
} __attribute__ ((__packed__))
SCTS_FB, *PSCTS_FB;
typedef const SCTS_FB *PCSCTS_FB;
typedef const SCTS_FB *PCSCTS_FB;
//
// Tx FIFO header
@ -348,6 +342,7 @@ typedef struct tagSTxDataHead_g {
WORD wTimeStampOff_a;
} __attribute__ ((__packed__))
STxDataHead_g, *PSTxDataHead_g;
typedef const STxDataHead_g *PCSTxDataHead_g;
typedef struct tagSTxDataHead_g_FB {
@ -367,7 +362,6 @@ typedef struct tagSTxDataHead_g_FB {
STxDataHead_g_FB, *PSTxDataHead_g_FB;
typedef const STxDataHead_g_FB *PCSTxDataHead_g_FB;
typedef struct tagSTxDataHead_ab {
BYTE bySignalField;
BYTE byServiceField;
@ -378,7 +372,6 @@ typedef struct tagSTxDataHead_ab {
STxDataHead_ab, *PSTxDataHead_ab;
typedef const STxDataHead_ab *PCSTxDataHead_ab;
typedef struct tagSTxDataHead_a_FB {
BYTE bySignalField;
BYTE byServiceField;
@ -400,6 +393,7 @@ typedef struct tagSMICHDRHead {
DWORD adwHDR2[4];
} __attribute__ ((__packed__))
SMICHDRHead, *PSMICHDRHead;
typedef const SMICHDRHead *PCSMICHDRHead;
typedef struct tagSBEACONCtl {
@ -410,7 +404,6 @@ typedef struct tagSBEACONCtl {
} __attribute__ ((__packed__))
SBEACONCtl;
typedef struct tagSSecretKey {
DWORD dwLowDword;
BYTE byHighByte;

32
drivers/staging/vt6656/device.h
View File

@ -109,7 +109,6 @@
#define MAX_MULTICAST_ADDRESS_NUM 32
#define MULTICAST_ADDRESS_LIST_SIZE (MAX_MULTICAST_ADDRESS_NUM * ETH_ALEN)
//#define OP_MODE_INFRASTRUCTURE 0
//#define OP_MODE_ADHOC 1
//#define OP_MODE_AP 2
@ -130,8 +129,6 @@
#define KEYSEL_TKIP 2
#define KEYSEL_CCMP 3
#define AUTO_FB_NONE 0
#define AUTO_FB_0 1
#define AUTO_FB_1 2
@ -162,8 +159,6 @@
#define BB_VGA_LEVEL 4
#define BB_VGA_CHANGE_THRESHOLD 3
#ifndef RUN_AT
#define RUN_AT(x) (jiffies+(x))
#endif
@ -179,20 +174,19 @@
#define PRINT_K(p, args...) { if (PRIVATE_Message) printk(p, ##args); }
typedef enum __device_msg_level {
MSG_LEVEL_ERR=0, //Errors that will cause abnormal operation.
MSG_LEVEL_NOTICE=1, //Some errors need users to be notified.
MSG_LEVEL_INFO=2, //Normal message.
MSG_LEVEL_VERBOSE=3, //Will report all trival errors.
MSG_LEVEL_DEBUG=4 //Only for debug purpose.
MSG_LEVEL_ERR = 0, /* Errors causing abnormal operation */
MSG_LEVEL_NOTICE = 1, /* Errors needing user notification */
MSG_LEVEL_INFO = 2, /* Normal message. */
MSG_LEVEL_VERBOSE = 3, /* Will report all trival errors. */
MSG_LEVEL_DEBUG = 4 /* Only for debug purpose. */
} DEVICE_MSG_LEVEL, *PDEVICE_MSG_LEVEL;
typedef enum __device_init_type {
DEVICE_INIT_COLD=0, // cold init
DEVICE_INIT_RESET, // reset init or Dx to D0 power remain init
DEVICE_INIT_DXPL // Dx to D0 power lost init
DEVICE_INIT_COLD = 0, /* cold init */
DEVICE_INIT_RESET, /* reset init or Dx to D0 power remain */
DEVICE_INIT_DXPL /* Dx to D0 power lost init */
} DEVICE_INIT_TYPE, *PDEVICE_INIT_TYPE;
//USB
//
@ -203,9 +197,6 @@ typedef enum _CONTEXT_TYPE {
CONTEXT_MGMT_PACKET
} CONTEXT_TYPE;
// RCB (Receive Control Block)
typedef struct _RCB
{
@ -219,7 +210,6 @@ typedef struct _RCB
} RCB, *PRCB;
// used to track bulk out irps
typedef struct _USB_SEND_CONTEXT {
void *pDevice;
@ -233,7 +223,6 @@ typedef struct _USB_SEND_CONTEXT {
unsigned char Data[MAX_TOTAL_SIZE_WITH_ALL_HEADERS];
} USB_SEND_CONTEXT, *PUSB_SEND_CONTEXT;
/* structure got from configuration file as user-desired default settings */
typedef struct _DEFAULT_CONFIG {
signed int ZoneType;
@ -254,8 +243,6 @@ typedef struct {
BOOL bInUse;
} INT_BUFFER, *PINT_BUFFER;
//0:11A 1:11B 2:11G
typedef enum _VIA_BB_TYPE
{
@ -273,9 +260,6 @@ typedef enum _VIA_PKT_TYPE
PK_TYPE_11GA
} VIA_PKT_TYPE, *PVIA_PKT_TYPE;
//++ NDIS related
#define NDIS_STATUS int

6
drivers/staging/vt6656/device_cfg.h
View File

@ -77,18 +77,13 @@ struct _version {
//Max: 2378=2312Payload + 30HD +4CRC + 2Padding + 4Len + 8TSF + 4RSR
#define PKT_BUF_SZ 2390
#define MAX_UINTS 8
#define OPTION_DEFAULT { [0 ... MAX_UINTS-1] = -1}
typedef enum _chip_type {
VT3184 = 1
} CHIP_TYPE, *PCHIP_TYPE;
#ifdef VIAWET_DEBUG
#define ASSERT(x) { \
if (!(x)) { \
@ -103,5 +98,4 @@ typedef enum _chip_type{
#define DBG_PORT80(value)
#endif
#endif

15
drivers/staging/vt6656/iowpa.h
View File

@ -31,10 +31,8 @@
/*--------------------- Export Definitions -------------------------*/
#define WPA_IE_LEN 64
//WPA related
/*
typedef enum { WPA_ALG_NONE, WPA_ALG_WEP, WPA_ALG_TKIP, WPA_ALG_CCMP } wpa_alg;
@ -76,8 +74,6 @@ typedef struct viawget_wpa_header {
u16 resp_ie_len;
} viawget_wpa_header;
struct viawget_wpa_param {
u32 cmd;
u8 addr[6];
@ -86,7 +82,6 @@ struct viawget_wpa_param {
u8 len;
u8 data[0];
} generic_elem;
struct {
u8 bssid[6];
u8 ssid[32];
@ -98,9 +93,8 @@ struct viawget_wpa_param {
int key_mgmt_suite;
int auth_alg;
int mode;
u8 roam_dbm; //DavidWang
u8 roam_dbm;
} wpa_associate;
struct {
int alg_name;
u16 key_index;
@ -110,19 +104,15 @@ struct viawget_wpa_param {
u8 *key;
u16 key_len;
} wpa_key;
struct {
u8 ssid_len;
u8 ssid[32];
} scan_req;
struct {
u16 scan_count;
u8 *buf;
} scan_results;
} u;
};
#pragma pack(1)
@ -142,15 +132,12 @@ struct viawget_scan_result {
int maxrate;
};
/*--------------------- Export Classes ----------------------------*/
/*--------------------- Export Variables --------------------------*/
/*--------------------- Export Types ------------------------------*/
/*--------------------- Export Functions --------------------------*/
#endif /* __IOWPA_H__ */

2
drivers/staging/vt6656/iwctl.h
View File

@ -33,7 +33,6 @@
/*--------------------- Export Definitions -------------------------*/
/*--------------------- Export Classes ----------------------------*/
/*--------------------- Export Variables --------------------------*/
@ -42,7 +41,6 @@
struct iw_statistics *iwctl_get_wireless_stats(struct net_device *dev);
int iwctl_siwap(struct net_device *dev,
struct iw_request_info *info,
struct sockaddr *wrq,

2
drivers/staging/vt6656/mac.h
View File

@ -422,7 +422,7 @@
void MACvSetMultiAddrByHash(PSDevice pDevice, BYTE byHashIdx);
void MACvWriteMultiAddr(PSDevice pDevice, unsigned int uByteIdx, BYTE byData);
BOOL MACbShutdown(PSDevice pDevice);;
BOOL MACbShutdown(PSDevice pDevice);
void MACvSetBBType(PSDevice pDevice, BYTE byType);
void MACvSetMISCFifo(PSDevice pDevice, WORD wOffset, DWORD dwData);
void MACvDisableKeyEntry(PSDevice pDevice, unsigned int uEntryIdx);

14
drivers/staging/vt6656/mib.h
View File

@ -381,7 +381,9 @@ typedef struct tagSStatCounter {
void STAvClearAllCounter(PSStatCounter pStatistic);
void STAvUpdateIsrStatCounter (PSStatCounter pStatistic, BYTE byIsr0, BYTE byIsr1);
void STAvUpdateIsrStatCounter(PSStatCounter pStatistic,
BYTE byIsr0,
BYTE byIsr1);
void STAvUpdateRDStatCounter(PSStatCounter pStatistic,
BYTE byRSR, BYTE byNewRSR, BYTE byRxSts,
@ -393,14 +395,8 @@ void STAvUpdateRDStatCounterEx(PSStatCounter pStatistic,
BYTE byRxRate, PBYTE pbyBuffer,
unsigned int cbFrameLength);
void
STAvUpdateTDStatCounter (
PSStatCounter pStatistic,
BYTE byPktNum,
BYTE byRate,
BYTE byTSR
);
void STAvUpdateTDStatCounter(PSStatCounter pStatistic, BYTE byPktNum,
BYTE byRate, BYTE byTSR);
void
STAvUpdate802_11Counter(

19
drivers/staging/vt6656/rf.h
View File

@ -64,11 +64,7 @@ extern const BYTE RFaby11aChannelIndex[200];
/*--------------------- Export Functions --------------------------*/
BOOL IFRFbWriteEmbeded(PSDevice pDevice, DWORD dwData);
BOOL RFbSetPower (
PSDevice pDevice,
unsigned int uRATE,
unsigned int uCH
);
BOOL RFbSetPower(PSDevice pDevice, unsigned int uRATE, unsigned int uCH);
BOOL RFbRawSetPower(
PSDevice pDevice,
@ -76,17 +72,8 @@ BOOL RFbRawSetPower(
unsigned int uRATE
);
void
RFvRSSITodBm (
PSDevice pDevice,
BYTE byCurrRSSI,
long * pldBm
);
void
RFbRFTableDownload (
PSDevice pDevice
);
void RFvRSSITodBm(PSDevice pDevice, BYTE byCurrRSSI, long *pldBm);
void RFbRFTableDownload(PSDevice pDevice);
BOOL s_bVT3226D0_11bLoCurrentAdjust(
PSDevice pDevice,

18
drivers/staging/vt6656/wpa2.h
View File

@ -58,21 +58,9 @@ typedef struct tagSPMKIDCache {
/*--------------------- Export Functions --------------------------*/
void
WPA2_ClearRSN (
PKnownBSS pBSSNode
);
void WPA2_ClearRSN(PKnownBSS pBSSNode);
void WPA2vParseRSN(PKnownBSS pBSSNode, PWLAN_IE_RSN pRSN);
void
WPA2vParseRSN (
PKnownBSS pBSSNode,
PWLAN_IE_RSN pRSN
);
unsigned int
WPA2uSetIEs(
void *pMgmtHandle,
PWLAN_IE_RSN pRSNIEs
);
unsigned int WPA2uSetIEs(void *pMgmtHandle, PWLAN_IE_RSN pRSNIEs);
#endif /* __WPA2_H__ */