[PATCH] Staging: vt6655: removed redundant comments from power.h
Removed redundant comments from power.h header file. Signed-off-by: Igor Bezukh --- drivers/staging/vt6655/power.h |9 - 1 file changed, 9 deletions(-) diff --git a/drivers/staging/vt6655/power.h b/drivers/staging/vt6655/power.h index ce56124..936f171 100644 --- a/drivers/staging/vt6655/power.h +++ b/drivers/staging/vt6655/power.h @@ -29,19 +29,10 @@ #ifndef __POWER_H__ #define __POWER_H__ -/*- Export Definitions -*/ #define C_PWBT 1000 // micro sec. power up before TBTT #define PS_FAST_INTERVAL 1 // Fast power saving listen interval #define PS_MAX_INTERVAL 4 // MAX power saving listen interval -/*- Export Classes */ - -/*- Export Variables --*/ - -/*- Export Types --*/ - -/*- Export Functions --*/ - bool PSbConsiderPowerDown( void *hDeviceContext, -- 1.7.9.5 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] Staging: vt6655: removed redundant comments from michael.h
Removed redundant comments from michael.h header file. Signed-off-by: Igor Bezukh --- drivers/staging/vt6655/michael.h |6 -- 1 file changed, 6 deletions(-) diff --git a/drivers/staging/vt6655/michael.h b/drivers/staging/vt6655/michael.h index f6c2c15..86cb140 100644 --- a/drivers/staging/vt6655/michael.h +++ b/drivers/staging/vt6655/michael.h @@ -33,10 +33,6 @@ #include -/*- Export Definitions -*/ - -/*- Export Types --*/ - void MIC_vInit(u32 dwK0, u32 dwK1); void MIC_vUnInit(void); @@ -48,8 +44,6 @@ void MIC_vAppend(unsigned char *src, unsigned int nBytes); /* This also resets the message to empty. */ void MIC_vGetMIC(u32 *pdwL, u32 *pdwR); -/*- Export Macros --*/ - /* Rotation functions on 32 bit values */ #define ROL32(A, n)\ (((A) << (n)) | (((A)>>(32-(n))) & ((1UL << (n)) - 1))) -- 1.7.9.5 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] Staging: vt6655: removed redundant comments from mib.h
Removed redundant comments from mib.h header file. Signed-off-by: Igor Bezukh --- drivers/staging/vt6655/mib.h | 45 +++--- 1 file changed, 16 insertions(+), 29 deletions(-) diff --git a/drivers/staging/vt6655/mib.h b/drivers/staging/vt6655/mib.h index c0a5948..732bdda 100644 --- a/drivers/staging/vt6655/mib.h +++ b/drivers/staging/vt6655/mib.h @@ -33,13 +33,12 @@ #include "tether.h" #include "desc.h" -/*- Export Definitions -*/ // // 802.11 counter // typedef struct tagSDot11Counters { - unsigned long Length; // Length of structure + unsigned long Length; unsigned long long TransmittedFragmentCount; unsigned long long MulticastTransmittedFrameCount; unsigned long long FailedCount; @@ -68,8 +67,7 @@ typedef struct tagSDot11Counters { // typedef struct tagSMib2Counter { longifIndex; - charifDescr[256]; // max size 255 plus zero ending - // e.g. "interface 1" + charifDescr[256]; longifType; longifMtu; unsigned long ifSpeed; @@ -93,12 +91,12 @@ typedef struct tagSMib2Counter { } SMib2Counter, *PSMib2Counter; // Value in the ifType entry -#define WIRELESSLANIEEE80211b 6 // +#define WIRELESSLANIEEE80211b 6 // Value in the ifAdminStatus/ifOperStatus entry -#define UP 1 // -#define DOWN2 // -#define TESTING 3 // +#define UP 1 +#define DOWN2 +#define TESTING 3 // // RMON counter @@ -182,7 +180,7 @@ typedef struct tagSISRCounters { unsigned long dwIsrMIBNearfull; unsigned long dwIsrRxNoBuf; - unsigned long dwIsrUnknown; // unknown interrupt count + unsigned long dwIsrUnknown; unsigned long dwIsrRx1OK; unsigned long dwIsrATIMTxOK; @@ -191,23 +189,18 @@ typedef struct tagSISRCounters { unsigned long dwIsrATIMEnd; unsigned long dwIsrSYNCFlushOK; unsigned long dwIsrSTIMER1Int; - / } SISRCounters, *PSISRCounters; // Value in the etherStatsStatus entry -#define VALID 1 // -#define CREATE_REQUEST 2 // -#define UNDER_CREATION 3 // -#define INVALID 4 // +#define VALID 1 +#define CREATE_REQUEST 2 +#define UNDER_CREATION 3 +#define INVALID 4 // // statistic counter // typedef struct tagSStatCounter { - // - // ISR status count - // - // RSR status count // unsigned long dwRsrFrmAlgnErr; @@ -306,24 +299,18 @@ typedef struct tagSStatCounter { #ifdef Calcu_LinkQual //Tx count: - unsigned long TxNoRetryOkCount; //success tx no retry ! - unsigned long TxRetryOkCount; //success tx but retry ! - unsigned long TxFailCount; //fail tx ? + unsigned long TxNoRetryOkCount; + unsigned long TxRetryOkCount; + unsigned long TxFailCount; //Rx count: - unsigned long RxOkCnt; //success rx ! - unsigned long RxFcsErrCnt;//fail rx ? + unsigned long RxOkCnt; + unsigned long RxFcsErrCnt; //statistic unsigned long SignalStren; unsigned long LinkQuality; #endif } SStatCounter, *PSStatCounter; -/*- Export Classes */ - -/*- Export Variables --*/ - -/*- Export Functions --*/ - void STAvClearAllCounter(PSStatCounter pStatistic); void STAvUpdateIsrStatCounter(PSStatCounter pStatistic, unsigned long dwIsr); -- 1.7.9.5 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] Staging: vt6655: removed redundant comments from mac.h
Removed redundant comments from mac.h header file. Signed-off-by: Igor Bezukh --- drivers/staging/vt6655/mac.h | 388 -- 1 file changed, 188 insertions(+), 200 deletions(-) diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index 7333b8b..e417742 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -38,7 +38,6 @@ #include "tmacro.h" #include "upc.h" -/*- Export Definitions -*/ // // Registers in the MAC // @@ -72,14 +71,14 @@ #define MAC_REG_TMCTL1 0x19 #define MAC_REG_TMDATA0 0x1C // MAC Parameter related -#define MAC_REG_LRT 0x20// -#define MAC_REG_SRT 0x21// -#define MAC_REG_SIFS0x22// -#define MAC_REG_DIFS0x23// -#define MAC_REG_EIFS0x24// -#define MAC_REG_SLOT0x25// -#define MAC_REG_BI 0x26// -#define MAC_REG_CWMAXMIN0 0x28// +#define MAC_REG_LRT 0x20 +#define MAC_REG_SRT 0x21 +#define MAC_REG_SIFS0x22 +#define MAC_REG_DIFS0x23 +#define MAC_REG_EIFS0x24 +#define MAC_REG_SLOT0x25 +#define MAC_REG_BI 0x26 +#define MAC_REG_CWMAXMIN0 0x28 #define MAC_REG_LINKOFFTOTM 0x2A #define MAC_REG_SWTMOT 0x2B #define MAC_REG_MIBCNTR 0x2C @@ -88,25 +87,25 @@ #define MAC_REG_ACKFAILCNT 0x2E #define MAC_REG_FCSERRCNT 0x2F // TSF Related -#define MAC_REG_TSFCNTR 0x30// -#define MAC_REG_NEXTTBTT0x38// -#define MAC_REG_TSFOFST 0x40// -#define MAC_REG_TFTCTL 0x48// +#define MAC_REG_TSFCNTR 0x30 +#define MAC_REG_NEXTTBTT0x38 +#define MAC_REG_TSFOFST 0x40 +#define MAC_REG_TFTCTL 0x48 // WMAC Control/Status Related -#define MAC_REG_ENCFG 0x4C// -#define MAC_REG_PAGE1SEL0x4F// -#define MAC_REG_CFG 0x50// -#define MAC_REG_TEST0x52// -#define MAC_REG_HOSTCR 0x54// -#define MAC_REG_MACCR 0x55// -#define MAC_REG_RCR 0x56// -#define MAC_REG_TCR 0x57// -#define MAC_REG_IMR 0x58// +#define MAC_REG_ENCFG 0x4C +#define MAC_REG_PAGE1SEL0x4F +#define MAC_REG_CFG 0x50 +#define MAC_REG_TEST0x52 +#define MAC_REG_HOSTCR 0x54 +#define MAC_REG_MACCR 0x55 +#define MAC_REG_RCR 0x56 +#define MAC_REG_TCR 0x57 +#define MAC_REG_IMR 0x58 #define MAC_REG_ISR 0x5C // Power Saving Related -#define MAC_REG_PSCFG 0x60// -#define MAC_REG_PSCTL 0x61// -#define MAC_REG_PSPWRSIG0x62// +#define MAC_REG_PSCFG 0x60 +#define MAC_REG_PSCTL 0x61 +#define MAC_REG_PSPWRSIG0x62 #define MAC_REG_BBCR13 0x63 #define MAC_REG_AIDATIM 0x64 #define MAC_REG_PWBT0x66 @@ -115,30 +114,30 @@ #define MAC_REG_SYNSPACCNT 0x6A #define MAC_REG_WAKSYNOPT 0x6B // Baseband/IF Control Group -#define MAC_REG_BBREGCTL0x6C// +#define MAC_REG_BBREGCTL0x6C #define MAC_REG_CHANNEL 0x6D #define MAC_REG_BBREGADR0x6E #define MAC_REG_BBREGDATA 0x6F -#define MAC_REG_IFREGCTL0x70// -#define MAC_REG_IFDATA 0x71// -#define MAC_REG_ITRTMSET0x74// +#define MAC_REG_IFREGCTL0x70 +#define MAC_REG_IFDATA 0x71 +#define MAC_REG_ITRTMSET0x74 #define MAC_REG_PAPEDELAY 0x77 -#define MAC_REG_SOFTPWRCTL 0x78// -#define MAC_REG_GPIOCTL00x7A// -#define MAC_REG_GPIOCTL10x7B// +#define MAC_REG_SOFTPWRCTL 0x78 +#define MAC_REG_GPIOCTL00x7A +#define MAC_REG_GPIOCTL10x7B // MAC DMA Related Group -#define MAC_REG_TXDMACTL0 0x7C// -#define MAC_REG_TXDMAPTR0 0x80// -#define MAC_REG_AC0DMACTL 0x84// -#define MAC_REG_AC0DMAPTR 0x88// -#define MAC_REG_BCNDMACTL 0x8C// -#define MAC_REG_BCNDMAPTR 0x90// -#define MAC_REG_RXDMACTL0 0x94// -#define MAC_REG_RXDMAPTR0 0x98// -#define MAC_REG_RXDMACTL1 0x9C// -#define MAC_REG_RXDMAPTR1 0xA0// -#define MAC_REG_SYNCDMACTL 0xA4// +#define MAC_REG_TXDMACTL0 0x7C +#define MAC_REG_TXDMAPTR0 0x80 +#define MAC_REG_AC0DMACTL 0x84 +#define MAC_REG_AC0DMAPTR 0x88 +#define MAC_REG_BCNDMACTL 0x8C +#define MAC_REG_BCNDMAPTR 0x90 +#define MAC_REG_RXDMACTL0 0x94 +#define MAC_REG_RXDMAPTR0 0x98 +#define MAC_REG_RXDMACTL1 0x9C +#define MAC_REG_RXDMAPTR1 0xA0 +#define MAC_REG_SYNCDMACTL 0xA4 #define MAC_REG_SYNCDMAPTR 0xA8 #define MAC_REG_ATIMDMACTL 0xAC #define MAC_REG_ATIMDMAPTR 0xB0 @@ -158,7 +157,6 @@ #define MAC_REG_WAKE128_2 0xE4 #define MAC_REG_WAKE128_3 0xF4 -/// Page 1 /// #define MAC_REG_CRC_128_0 0x04 #define MAC_REG_CRC_128_1 0x06 #define MAC_REG_CRC_128_2 0x08 @@ -219,20
[PATCH] Staging: vt6655: removed redundant comments from key.h
Removed redundant comments from key.h header file. Signed-off-by: Igor Bezukh --- drivers/staging/vt6655/key.h | 26 +++--- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/drivers/staging/vt6655/key.h b/drivers/staging/vt6655/key.h index 4b8b4b6..f0cbd75 100644 --- a/drivers/staging/vt6655/key.h +++ b/drivers/staging/vt6655/key.h @@ -34,7 +34,6 @@ #include "tether.h" #include "80211mgr.h" -/*- Export Definitions -*/ #define MAX_GROUP_KEY 4 #define MAX_KEY_TABLE 11 #define MAX_KEY_LEN 32 @@ -65,38 +64,27 @@ typedef struct tagSKeyItem unsigned char byReserved0; unsigned long dwKeyIndex; void *pvKeyTable; -} SKeyItem, *PSKeyItem; //64 +} SKeyItem, *PSKeyItem; typedef struct tagSKeyTable { - unsigned char abyBSSID[ETH_ALEN]; //6 - unsigned char byReserved0[2]; //8 + unsigned char abyBSSID[ETH_ALEN]; + unsigned char byReserved0[2]; SKeyItemPairwiseKey; - SKeyItemGroupKey[MAX_GROUP_KEY]; //64*5 = 320, 320+8=328 - unsigned long dwGTKeyIndex;// GroupTransmitKey Index + SKeyItemGroupKey[MAX_GROUP_KEY]; + unsigned long dwGTKeyIndex; bool bInUse; - //2006-1116-01, by NomadZhao bool bSoftWEP; - unsigned short wKeyCtl; // for address of wKeyCtl at align 4 + unsigned short wKeyCtl; unsigned char byReserved1[6]; -} SKeyTable, *PSKeyTable; //348 +} SKeyTable, *PSKeyTable; typedef struct tagSKeyManagement { SKeyTable KeyTable[MAX_KEY_TABLE]; } SKeyManagement, *PSKeyManagement; -/*- Export Types --*/ - -/*- Export Macros --*/ - -/*- Export Classes */ - -/*- Export Variables --*/ - -/*- Export Functions --*/ - void KeyvInitTable(PSKeyManagement pTable, unsigned long dwIoBase); bool KeybGetKey( -- 1.7.9.5 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] Staging: vt6655: removed redundant comments from iwctl.h
Removed redundant comments from iwctl.h header file. Signed-off-by: Igor Bezukh --- drivers/staging/vt6655/iwctl.h | 12 +--- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/drivers/staging/vt6655/iwctl.h b/drivers/staging/vt6655/iwctl.h index 871bd7c..83a5a2d 100644 --- a/drivers/staging/vt6655/iwctl.h +++ b/drivers/staging/vt6655/iwctl.h @@ -31,14 +31,6 @@ #include "device.h" -/*- Export Definitions -*/ - -/*- Export Classes */ - -/*- Export Variables --*/ - -/*- Export Functions --*/ - struct iw_statistics *iwctl_get_wireless_stats(struct net_device *dev); int iwctl_siwap(struct net_device *dev, @@ -171,7 +163,6 @@ int iwctl_siwscan(struct net_device *dev, struct iw_param *wrq, char *extra); -//2008-0409-07, by Einsn Liu #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT int iwctl_siwauth(struct net_device *dev, struct iw_request_info *info, @@ -207,8 +198,7 @@ int iwctl_siwmlme(struct net_device *dev, struct iw_request_info *info, struct iw_point *wrq, char *extra); -#endif // #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT -//End Add -- //2008-0409-07, by Einsn Liu +#endif extern const struct iw_handler_def iwctl_handler_def; extern const struct iw_priv_args iwctl_private_args; -- 1.7.9.5 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] Staging: vt6655: removed redundant comments from iowpa.h
Removed redundant comments from iowpa.h header file. Signed-off-by: Igor Bezukh --- drivers/staging/vt6655/iowpa.h | 10 -- 1 file changed, 10 deletions(-) diff --git a/drivers/staging/vt6655/iowpa.h b/drivers/staging/vt6655/iowpa.h index b7bd190..772bc4c 100644 --- a/drivers/staging/vt6655/iowpa.h +++ b/drivers/staging/vt6655/iowpa.h @@ -29,8 +29,6 @@ #ifndef __IOWPA_H__ #define __IOWPA_H__ -/*- Export Definitions -*/ - #define WPA_IE_LEN 64 //WPA related @@ -127,14 +125,6 @@ struct viawget_scan_result { int maxrate; }; -//2006-1116-01, by NomadZhao #pragma pack() -/*- Export Classes */ - -/*- Export Variables --*/ - -/*- Export Types --*/ - -/*- Export Functions --*/ #endif //__IOWPA_H__ -- 1.7.9.5 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] Staging: vt6655: removed redundant comments from ioctl.h
Removed redundant comments from ioctl.h header file. Signed-off-by: Igor Bezukh --- drivers/staging/vt6655/ioctl.h |8 1 file changed, 8 deletions(-) diff --git a/drivers/staging/vt6655/ioctl.h b/drivers/staging/vt6655/ioctl.h index 2f0db92..187fc91 100644 --- a/drivers/staging/vt6655/ioctl.h +++ b/drivers/staging/vt6655/ioctl.h @@ -31,14 +31,6 @@ #include "device.h" -/*- Export Definitions -*/ - -/*- Export Classes */ - -/*- Export Variables --*/ - -/*- Export Functions --*/ - int private_ioctl(PSDevice pDevice, struct ifreq *rq); #endif // __IOCTL_H__ -- 1.7.9.5 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] Staging: vt6655: removed redundant comments from iocmd.h
Removed redundant comments from iocmd.h header file. Signed-off-by: Igor Bezukh --- drivers/staging/vt6655/iocmd.h | 23 +-- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/drivers/staging/vt6655/iocmd.h b/drivers/staging/vt6655/iocmd.h index e499f1b..ae037ec 100644 --- a/drivers/staging/vt6655/iocmd.h +++ b/drivers/staging/vt6655/iocmd.h @@ -31,12 +31,6 @@ #include "ttype.h" -/*- Export Definitions -*/ - -//typedef uint32_t u32; -//typedef uint16_t u16; -//typedef uint8_t u8; - // ioctl Command code #define MAGIC_CODE 0x3142 #define IOCTL_CMD_TEST (SIOCDEVPRIVATE + 0) @@ -167,10 +161,6 @@ typedef struct tagSBSSIDItem { u32 uChannel; u8 abyBSSID[BSSID_LEN]; u8 abySSID[SSID_MAXLEN + 1]; - //2006-1116-01, by NomadZhao - //u16 wBeaconInterval; - //u16 wCapInfo; - //u8 byNetType; u8 byNetType; u16 wBeaconInterval; u16 wCapInfo;// for address of byNetType at align 4 @@ -228,9 +218,8 @@ typedef struct tagSStatMIBCount { u32 dwIsrUnrecoverableError; u32 dwIsrSoftInterrupt; u32 dwIsrRxNoBuf; - / - u32 dwIsrUnknown; // unknown interrupt count + u32 dwIsrUnknown; // RSR status count // @@ -349,7 +338,6 @@ typedef struct tagSCmdValue { // hostapd & viawget ioctl related // -// VIAGWET_IOCTL_HOSTAPD ioctl() cmd: enum { VIAWGET_HOSTAPD_FLUSH = 1, VIAWGET_HOSTAPD_ADD_STA = 2, @@ -415,15 +403,6 @@ struct viawget_hostapd_param { } u; }; -//2006-1116-01, by NomadZhao #pragma pack() -/*- Export Classes */ - -/*- Export Variables --*/ - -/*- Export Types --*/ - -/*- Export Functions --*/ - #endif //__IOCMD_H__ -- 1.7.9.5 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] Staging: vt6655: removed redundant comments from IEEE11h.h
Removed redundant comments from IEEE11h.h header file. Signed-off-by: Igor Bezukh --- drivers/staging/vt6655/IEEE11h.h | 10 -- 1 file changed, 10 deletions(-) diff --git a/drivers/staging/vt6655/IEEE11h.h b/drivers/staging/vt6655/IEEE11h.h index 8819fa1..5519220 100644 --- a/drivers/staging/vt6655/IEEE11h.h +++ b/drivers/staging/vt6655/IEEE11h.h @@ -35,16 +35,6 @@ #include "80211hdr.h" #include "80211mgr.h" -/*- Export Definitions -*/ - -/*- Export Classes */ - -/*- Export Variables --*/ - -/*- Export Types --*/ - -/*- Export Functions --*/ - bool IEEE11hbMSRRepTx( void *pMgmtHandle ); -- 1.7.9.5 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] Staging: vt6655: removed redundant comments from hostap.h
Removed redundant comments from hostap.h header file. Signed-off-by: Igor Bezukh --- drivers/staging/vt6655/hostap.h |8 1 file changed, 8 deletions(-) diff --git a/drivers/staging/vt6655/hostap.h b/drivers/staging/vt6655/hostap.h index f1a4f2ef..6e801a4 100644 --- a/drivers/staging/vt6655/hostap.h +++ b/drivers/staging/vt6655/hostap.h @@ -31,8 +31,6 @@ #include "device.h" -/*- Export Definitions -*/ - #define WLAN_RATE_1MBIT0 #define WLAN_RATE_2MBIT1 #define WLAN_RATE_5M5 BIT2 @@ -46,12 +44,6 @@ #define WLAN_RATE_48M BIT10 #define WLAN_RATE_54M BIT11 -/*- Export Classes */ - -/*- Export Variables --*/ - -/*- Export Functions --*/ - #ifndef ETH_P_PAE #define ETH_P_PAE 0x888E /* Port Access Entity (IEEE 802.1X) */ #endif /* ETH_P_PAE */ -- 1.7.9.5 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] Staging: vt6655: removed redundant comments from dpc.h
Removed redundant comments from dpc.h header file. Signed-off-by: Igor Bezukh --- drivers/staging/vt6655/dpc.h |8 1 file changed, 8 deletions(-) diff --git a/drivers/staging/vt6655/dpc.h b/drivers/staging/vt6655/dpc.h index 0ce3155..0c7e0e7 100644 --- a/drivers/staging/vt6655/dpc.h +++ b/drivers/staging/vt6655/dpc.h @@ -33,14 +33,6 @@ #include "device.h" #include "wcmd.h" -/*- Export Definitions -*/ - -/*- Export Classes */ - -/*- Export Variables --*/ - -/*- Export Functions --*/ - bool device_receive_frame( PSDevice pDevice, -- 1.7.9.5 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] Staging: vt6655: removed redundant comments from device.h
Removed redundant comments from device.h header file. Signed-off-by: Igor Bezukh --- drivers/staging/vt6655/device.h | 82 ++- 1 file changed, 21 insertions(+), 61 deletions(-) diff --git a/drivers/staging/vt6655/device.h b/drivers/staging/vt6655/device.h index 45fc8a0..201f5cd 100644 --- a/drivers/staging/vt6655/device.h +++ b/drivers/staging/vt6655/device.h @@ -49,7 +49,6 @@ #include #include #include -//#include #include #include #include @@ -60,11 +59,9 @@ #else #undef DEVICE_ETHTOOL_IOCTL_SUPPORT #endif -/* Include Wireless Extension definition and check version - Jean II */ #include -#include // New driver API +#include -//2008-0409-07, by Einsn Liu #ifndef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT #define WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT #endif @@ -86,8 +83,6 @@ #include "key.h" #include "mac.h" -/*- Export Definitions -*/ - #define MAC_MAX_CONTEXT_REG (256+128) #define MAX_MULTICAST_ADDRESS_NUM 32 @@ -136,18 +131,12 @@ // DMA related #define RESERV_AC0DMA 4 -// BUILD OBJ mode - #defineAVAIL_TD(p, q) ((p)->sOpts.nTxDescs[(q)] - ((p)->iTDUsed[(q)])) -//PLICE_DEBUG -> #defineNUM 64 -//PLICE_DEUBG <- #define PRIVATE_Message 0 -/*- Export Types --*/ - #define DBG_PRT(l, p, args...) \ do { \ if (l <= msglevel) \ @@ -160,7 +149,6 @@ do {\ printk(p, ##args); \ } while (0) -//0:11A 1:11B 2:11G typedef enum _VIA_BB_TYPE { BB_TYPE_11A = 0, @@ -168,7 +156,6 @@ typedef enum _VIA_BB_TYPE BB_TYPE_11G } VIA_BB_TYPE, *PVIA_BB_TYPE; -//0:11a,1:11b,2:11gb(only CCK in BasicRate),3:11ga(OFDM in Basic Rate) typedef enum _VIA_PKT_TYPE { PK_TYPE_11A = 0, @@ -178,21 +165,19 @@ typedef enum _VIA_PKT_TYPE } VIA_PKT_TYPE, *PVIA_PKT_TYPE; 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, + MSG_LEVEL_NOTICE = 1, + MSG_LEVEL_INFO = 2, + MSG_LEVEL_VERBOSE = 3, + MSG_LEVEL_DEBUG = 4 } 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, + DEVICE_INIT_RESET, + DEVICE_INIT_DXPL } DEVICE_INIT_TYPE, *PDEVICE_INIT_TYPE; -//++ NDIS related - #define MAX_BSSIDINFO_4_PMKID 16 #define MAX_PMKIDLIST 5 //Flags for PMKID Candidate list structure @@ -246,14 +231,11 @@ typedef struct tagSPMKID { typedef struct tagSPMKIDCandidateEvent { NDIS_802_11_STATUS_TYPE StatusType; - unsigned long Version; // Version of the structure - unsigned long NumCandidates; // No. of pmkid candidates + unsigned long Version; + unsigned long NumCandidates; PMKID_CANDIDATE CandidateList[MAX_PMKIDLIST]; } SPMKIDCandidateEvent, *PSPMKIDCandidateEvent; -//-- - -//++ 802.11h related #define MAX_QUIET_COUNT 8 typedef struct tagSQuietControl { @@ -263,7 +245,6 @@ typedef struct tagSQuietControl { unsigned short wDuration; } SQuietControl, *PSQuietControl; -//-- typedef struct __chip_info_tbl { CHIP_TYPE chip_id; char *name; @@ -287,7 +268,7 @@ typedef struct tagSCache { /* The receive cache is updated circularly. The next entry to be written is * indexed by the "InPtr". */ - unsigned int uInPtr; // Place to use next + unsigned int uInPtr; SCacheEntry asCacheEntry[DUPLICATE_RX_CACHE_LENGTH]; } SCache, *PSCache; @@ -332,8 +313,6 @@ typedef struct tagSDeFragControlBlock //for device_set_media_duplex #define DEVICE_LINK_CHANGE 0x0001UL -//PLICE_DEBUG-> - typedefstruct _RxManagementQueue { int packet_num; @@ -341,14 +320,12 @@ typedef struct _RxManagementQueue PSRxMgmtPacket Q[NUM]; } RxManagementQueue, *PSRxManagementQueue; -//PLICE_DEBUG<- - typedef struct __device_opt { - int nRxDescs0;//Number of RX descriptors0 - int nRxDescs1;//Number of RX descriptors1 - int nTxDescs[2]; //Number of TX descriptors 0, 1 - int int_works;//interrupt limits - int rts_thresh; //rts t
[PATCH] Staging: vt6655: removed redundant comments from device_cfg.h
Removed redundant comments from device_cfg.h header file. Signed-off-by: Igor Bezukh --- drivers/staging/vt6655/device_cfg.h |3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/staging/vt6655/device_cfg.h b/drivers/staging/vt6655/device_cfg.h index 1137ade..6adc0dd 100644 --- a/drivers/staging/vt6655/device_cfg.h +++ b/drivers/staging/vt6655/device_cfg.h @@ -27,7 +27,6 @@ #ifndef __DEVICE_CONFIG_H #define __DEVICE_CONFIG_H -//#include #include #include "ttype.h" @@ -60,14 +59,12 @@ struct _version { #define DEVICE_VERSION "1.19.12" #endif -//config file #include #include #ifndef CONFIG_PATH #define CONFIG_PATH"/etc/vntconfiguration.dat" #endif -//Max: 2378=2312Payload + 30HD +4CRC + 2Padding + 4Len + 8TSF + 4RSR #define PKT_BUF_SZ 2390 #define MAX_UINTS 8 -- 1.7.9.5 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] Staging: vt6655: removed redundant comments from desc.h
Removed redundant comments from desc.h header file. Signed-off-by: Igor Bezukh C99 style comments will be fixed in further patches. --- drivers/staging/vt6655/desc.h | 185 +++-- 1 file changed, 87 insertions(+), 98 deletions(-) diff --git a/drivers/staging/vt6655/desc.h b/drivers/staging/vt6655/desc.h index c620cbfb..05efa4e 100644 --- a/drivers/staging/vt6655/desc.h +++ b/drivers/staging/vt6655/desc.h @@ -36,79 +36,77 @@ #include "ttype.h" #include "tether.h" -/*- Export Definitions -*/ - -#define B_OWNED_BY_CHIP 1 // -#define B_OWNED_BY_HOST 0 // +#define B_OWNED_BY_CHIP 1 +#define B_OWNED_BY_HOST 0 // // Bits in the RSR register // -#define RSR_ADDRBROAD 0x80// 1000 -#define RSR_ADDRMULTI 0x40// 0100 -#define RSR_ADDRUNI 0x00// -#define RSR_IVLDTYP 0x20// 0010 , invalid packet type -#define RSR_IVLDLEN 0x10// 0001 , invalid len (> 2312 byte) -#define RSR_BSSIDOK 0x08// 1000 -#define RSR_CRCOK 0x04// 0100 -#define RSR_BCNSSIDOK 0x02// 0010 -#define RSR_ADDROK 0x01// 0001 +#define RSR_ADDRBROAD 0x80 +#define RSR_ADDRMULTI 0x40 +#define RSR_ADDRUNI 0x00 +#define RSR_IVLDTYP 0x20 +#define RSR_IVLDLEN 0x10// invalid len (> 2312 byte) +#define RSR_BSSIDOK 0x08 +#define RSR_CRCOK 0x04 +#define RSR_BCNSSIDOK 0x02 +#define RSR_ADDROK 0x01 // // Bits in the new RSR register // -#define NEWRSR_DECRYPTOK0x10// 0001 -#define NEWRSR_CFPIND 0x08// 1000 -#define NEWRSR_HWUTSF 0x04// 0100 -#define NEWRSR_BCNHITAID0x02// 0010 -#define NEWRSR_BCNHITAID0 0x01// 0001 +#define NEWRSR_DECRYPTOK0x10 +#define NEWRSR_CFPIND 0x08 +#define NEWRSR_HWUTSF 0x04 +#define NEWRSR_BCNHITAID0x02 +#define NEWRSR_BCNHITAID0 0x01 // // Bits in the TSR0 register // -#define TSR0_PWRSTS1_2 0xC0// 1100 -#define TSR0_PWRSTS70x20// 0010 -#define TSR0_NCR0x1F// 0001 +#define TSR0_PWRSTS1_2 0xC0 +#define TSR0_PWRSTS70x20 +#define TSR0_NCR0x1F // // Bits in the TSR1 register // -#define TSR1_TERR 0x80// 1000 -#define TSR1_PWRSTS4_6 0x70// 0111 -#define TSR1_RETRYTMO 0x08// 1000 -#define TSR1_TMO0x04// 0100 -#define TSR1_PWRSTS30x02// 0010 -#define ACK_DATA0x01// +#define TSR1_TERR 0x80 +#define TSR1_PWRSTS4_6 0x70 +#define TSR1_RETRYTMO 0x08 +#define TSR1_TMO0x04 +#define TSR1_PWRSTS30x02 +#define ACK_DATA0x01 // // Bits in the TCR register // -#define EDMSDU 0x04// 0100 end of sdu -#define TCR_EDP 0x02// 0010 end of packet -#define TCR_STP 0x01// 0001 start of packet +#define EDMSDU 0x04// end of sdu +#define TCR_EDP 0x02// end of packet +#define TCR_STP 0x01// start of packet // max transmit or receive buffer size -#define CB_MAX_BUF_SIZE 2900U // max buffer size +#define CB_MAX_BUF_SIZE 2900U // NOTE: must be multiple of 4 -#define CB_MAX_TX_BUF_SIZE CB_MAX_BUF_SIZE // max Tx buffer size -#define CB_MAX_RX_BUF_SIZE_NORMAL CB_MAX_BUF_SIZE // max Rx buffer size when not use Multi-RD +#define CB_MAX_TX_BUF_SIZE CB_MAX_BUF_SIZE +#define CB_MAX_RX_BUF_SIZE_NORMAL CB_MAX_BUF_SIZE -#define CB_BEACON_BUF_SIZE 512U// default beacon buffer size +#define CB_BEACON_BUF_SIZE 512U -#define CB_MAX_RX_DESC 128 // max # of descriptor -#define CB_MIN_RX_DESC 16 // min # of rx descriptor -#define CB_MAX_TX_DESC 64 // max # of descriptor -#define CB_MIN_TX_DESC 16 // min # of tx descriptor +#define CB_MAX_RX_DESC 128 +#define CB_MIN_RX_DESC 16 +#define CB_MAX_TX_DESC 64 +#define CB_MIN_TX_DESC 16 -#define CB_MAX_RECEIVED_PACKETS 16 // max # of received packets at one time +#define CB_MAX_RECEIVED_PACKETS 16 // limit our receive routine to indicating // this many at a time for 2 reasons: // 1. driver flow control to protocol layer // 2. limit the time used in ISR routine -#define CB_EXTRA_RD_NUM 32 // default # of Extra RD -#define CB_RD_NUM 32
[PATCH] Staging: vt6655: removed redundant comments from datarate.h
Removed redundant comments from datarate.h header file. Signed-off-by: Igor Bezukh --- drivers/staging/vt6655/datarate.h | 28 +--- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/drivers/staging/vt6655/datarate.h b/drivers/staging/vt6655/datarate.h index e4fad05..0509c4f 100644 --- a/drivers/staging/vt6655/datarate.h +++ b/drivers/staging/vt6655/datarate.h @@ -29,25 +29,15 @@ #ifndef __DATARATE_H__ #define __DATARATE_H__ -/*- Export Definitions -*/ - -#define FALLBACK_PKT_COLLECT_TR_H 50 // pkts -#define FALLBACK_PKT_COLLECT_TR_L 10 // pkts -#define FALLBACK_POLL_SECOND 5// 5 sec -#define FALLBACK_RECOVER_SECOND30 // 30 sec -#define FALLBACK_THRESHOLD 15 // percent -#define UPGRADE_THRESHOLD 5// percent -#define UPGRADE_CNT_THRD 3// times -#define RETRY_TIMES_THRD_H 2// times -#define RETRY_TIMES_THRD_L 1// times - -/*- Export Classes */ - -/*- Export Variables --*/ - -/*- Export Types --*/ - -/*- Export Functions --*/ +#define FALLBACK_PKT_COLLECT_TR_H 50 +#define FALLBACK_PKT_COLLECT_TR_L 10 +#define FALLBACK_POLL_SECOND 5 +#define FALLBACK_RECOVER_SECOND30 +#define FALLBACK_THRESHOLD 15 +#define UPGRADE_THRESHOLD 5 +#define UPGRADE_CNT_THRD 3 +#define RETRY_TIMES_THRD_H 2 +#define RETRY_TIMES_THRD_L 1 void RATEvParseMaxRate( -- 1.7.9.5 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] Staging: vt6655: removed redundant comments from country.h
Removed redundant comments from country.h header file Signed-off-by: Igor Bezukh --- drivers/staging/vt6655/country.h |1 - 1 file changed, 1 deletion(-) diff --git a/drivers/staging/vt6655/country.h b/drivers/staging/vt6655/country.h index 415e767..2365fb1 100644 --- a/drivers/staging/vt6655/country.h +++ b/drivers/staging/vt6655/country.h @@ -32,7 +32,6 @@ #include "ttype.h" -/*- Export Definitions -*/ / * The definition here should be complied with the INF country order * Please check with VNWL.inf/VNWL64.inf/VNWL*.inf -- 1.7.9.5 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] Staging: vt6655: removed redundant comments from channel.h
Removed redundant comments from channel.h header file. Signed-off-by: Igor Bezukh --- drivers/staging/vt6655/channel.h |4 1 file changed, 4 deletions(-) diff --git a/drivers/staging/vt6655/channel.h b/drivers/staging/vt6655/channel.h index c9931d7..4f44c8a 100644 --- a/drivers/staging/vt6655/channel.h +++ b/drivers/staging/vt6655/channel.h @@ -26,8 +26,6 @@ #include "ttype.h" #include "card.h" -/*- Export Classes */ - typedef struct tagSChannelTblElement { unsigned char byChannelNumber; unsigned int uFrequency; @@ -35,8 +33,6 @@ typedef struct tagSChannelTblElement { unsigned char byMAP; } SChannelTblElement, *PSChannelTblElement; -/*- Export Functions --*/ - bool is_channel_valid(unsigned int CountryCode); void init_channel_table(void *pDeviceHandler); unsigned char get_channel_mapping(void *pDeviceHandler, unsigned char byChannelNumber, CARD_PHY_TYPE ePhyType); -- 1.7.9.5 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCHv2] Staging: vt6655: remove redundant comments from card.h
Removed redundant comments from card.h header file. Signed-off-by: Igor Bezukh --- v2 changes: fixed diffstat output and fixed the diff itself. drivers/staging/vt6655/card.h | 10 +- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/drivers/staging/vt6655/card.h b/drivers/staging/vt6655/card.h index 829be92..443461d 100644 --- a/drivers/staging/vt6655/card.h +++ b/drivers/staging/vt6655/card.h @@ -32,7 +32,6 @@ #include "ttype.h" #include -/*- Export Definitions -*/ // // Loopback mode // @@ -48,7 +47,7 @@ #define DEFAULT_MGN_LIFETIME_RES_64us 125 // 64us #define CB_MAX_CHANNEL_24G 14 -#define CB_MAX_CHANNEL_5G 42 //[20050104] add channel9(5045MHz), 41==>42 +#define CB_MAX_CHANNEL_5G 42 #define CB_MAX_CHANNEL (CB_MAX_CHANNEL_24G+CB_MAX_CHANNEL_5G) typedef enum _CARD_PHY_TYPE { @@ -78,12 +77,6 @@ typedef enum _CARD_OP_MODE { OP_MODE_UNKNOWN } CARD_OP_MODE, *PCARD_OP_MODE; -/*- Export Classes */ - -/*- Export Variables --*/ - -/*- Export Functions --*/ - void CARDvSetRSPINF(void *pDeviceHandler, CARD_PHY_TYPE ePHYType); void vUpdateIFS(void *pDeviceHandler); void CARDvUpdateBasicTopRate(void *pDeviceHandler); @@ -101,7 +94,6 @@ unsigned char CARDbyGetPktType(void *pDeviceHandler); void CARDvSafeResetTx(void *pDeviceHandler); void CARDvSafeResetRx(void *pDeviceHandler); -//xxx bool CARDbRadioPowerOff(void *pDeviceHandler); bool CARDbRadioPowerOn(void *pDeviceHandler); bool CARDbIsShortPreamble(void *pDeviceHandler); -- 1.7.9.5 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] Staging: vt6655: remove redundant comments from card.h
Removed redundant comments from card.h header file. Signed-off-by: Igor Bezukh --- drivers/staging/vt6655/80211hdr.h |7 --- drivers/staging/vt6655/80211mgr.h | 38 - drivers/staging/vt6655/aes_ccmp.h |9 - drivers/staging/vt6655/baseband.h | 12 drivers/staging/vt6655/bssdb.h| 25 ++-- drivers/staging/vt6655/card.h | 10 +- 6 files changed, 3 insertions(+), 98 deletions(-) diff --git a/drivers/staging/vt6655/80211hdr.h b/drivers/staging/vt6655/80211hdr.h index ba155cd..e05d135 100644 --- a/drivers/staging/vt6655/80211hdr.h +++ b/drivers/staging/vt6655/80211hdr.h @@ -33,7 +33,6 @@ #include "ttype.h" -/*- Export Definitions -*/ /* bit type */ #define BIT0 0x0001 #define BIT1 0x0002 @@ -315,10 +314,4 @@ typedef union tagUWLAN_80211HDR { WLAN_80211HDR_A4sA4; } UWLAN_80211HDR, *PUWLAN_80211HDR; -/*- Export Classes */ - -/*- Export Variables --*/ - -/*- Export Functions --*/ - #endif /* __80211HDR_H__ */ diff --git a/drivers/staging/vt6655/80211mgr.h b/drivers/staging/vt6655/80211mgr.h index 065238b..8b126bb 100644 --- a/drivers/staging/vt6655/80211mgr.h +++ b/drivers/staging/vt6655/80211mgr.h @@ -34,8 +34,6 @@ #include "ttype.h" #include "80211hdr.h" -/*- Export Definitions -*/ - #define WLAN_MIN_ARRAY 1 /* Information Element ID value */ @@ -202,12 +200,6 @@ #define MEASURE_MODE_INCAPABLE 0x02 #define MEASURE_MODE_REFUSED0x04 -/*- Export Classes */ - -/*- Export Variables --*/ - -/*- Export Types --*/ - /* Information Element Types */ #pragma pack(1) @@ -472,14 +464,11 @@ typedef struct tagWLAN_FR_BEACON { unsigned intlen; unsigned char *pBuf; PUWLAN_80211HDR pHdr; - /* fixed fields */ PQWORD pqwTimestamp; unsigned short *pwBeaconInterval; unsigned short *pwCapInfo; - /*-- info elements --*/ PWLAN_IE_SSID pSSID; PWLAN_IE_SUPP_RATES pSuppRates; -/* PWLAN_IE_FH_PARMS pFHParms; */ PWLAN_IE_DS_PARMS pDSParms; PWLAN_IE_CF_PARMS pCFParms; PWLAN_IE_TIMpTIM; @@ -501,10 +490,6 @@ typedef struct tagWLAN_FR_IBSSATIM { unsigned intlen; unsigned char *pBuf; PUWLAN_80211HDR pHdr; - - /* fixed fields */ - /* info elements */ - /* this frame type has a null body */ } WLAN_FR_IBSSATIM, *PWLAN_FR_IBSSATIM; /* Disassociation */ @@ -513,9 +498,7 @@ typedef struct tagWLAN_FR_DISASSOC { unsigned intlen; unsigned char *pBuf; PUWLAN_80211HDR pHdr; - /*-- fixed fields ---*/ unsigned short *pwReason; - /*-- info elements --*/ } WLAN_FR_DISASSOC, *PWLAN_FR_DISASSOC; /* Association Request */ @@ -524,10 +507,8 @@ typedef struct tagWLAN_FR_ASSOCREQ { unsigned intlen; unsigned char *pBuf; PUWLAN_80211HDR pHdr; - /*-- fixed fields ---*/ unsigned short *pwCapInfo; unsigned short *pwListenInterval; - /*-- info elements --*/ PWLAN_IE_SSID pSSID; PWLAN_IE_SUPP_RATES pSuppRates; PWLAN_IE_RSNpRSN; @@ -543,11 +524,9 @@ typedef struct tagWLAN_FR_ASSOCRESP { unsigned intlen; unsigned char *pBuf; PUWLAN_80211HDR pHdr; - /*-- fixed fields ---*/ unsigned short *pwCapInfo; unsigned short *pwStatus; unsigned short *pwAid; - /*-- info elements --*/ PWLAN_IE_SUPP_RATES pSuppRates; PWLAN_IE_SUPP_RATES pExtSuppRates; } WLAN_FR_ASSOCRESP, *PWLAN_FR_ASSOCRESP; @@ -558,13 +537,9 @@ typedef struct tagWLAN_FR_REASSOCREQ { unsigned intlen; unsigned char *pBuf; PUWLAN_80211HDR pHdr; - - /*-- fixed fields ---*/ unsigned short *pwCapInfo; unsigned short *pwListenInterval; PIEEE_ADDR pAddrCurrAP; - - /*-- info elements --*/ PWLAN_IE_SSID pSSID; PWLAN_IE_SUPP_RATES pSuppRates; PWLAN_IE_RSNpRSN; @@ -578,11 +553,9 @@ typedef struct tagWLAN_FR_REASSOCRESP { unsigned intlen; unsigned char *pBuf; PUWLAN_80211HDR pHdr; - /*-- fixed fields ---*/ unsigned short *pwCapInfo; unsigned short *pwStatus; unsigned short *pwA
[PATCH] Staging: vt6655: remove redundant comments from bssdb.h
Removed redundant comments from bssdb.h header file. Signed-off-by: Igor Bezukh --- drivers/staging/vt6655/bssdb.h | 25 ++--- 1 file changed, 2 insertions(+), 23 deletions(-) diff --git a/drivers/staging/vt6655/bssdb.h b/drivers/staging/vt6655/bssdb.h index a0938b7..9337afe 100644 --- a/drivers/staging/vt6655/bssdb.h +++ b/drivers/staging/vt6655/bssdb.h @@ -35,8 +35,6 @@ #include "80211mgr.h" #include "card.h" -/*- Export Definitions -*/ - #define MAX_NODE_NUM 64 #define MAX_BSS_NUM 42 #define LOST_BEACON_COUNT10 // 10 sec, XP defined @@ -67,12 +65,6 @@ #define MAX_WPA_IE_LEN 64 -/*- Export Classes */ - -/*- Export Variables --*/ - -/*- Export Types --*/ - // // IEEE 802.11 Structures and definitions // @@ -99,7 +91,6 @@ typedef struct tagSRSNCapObject { // BSS info(AP) #pragma pack(1) typedef struct tagKnownBSS { - // BSS info bool bActive; unsigned char abyBSSID[WLAN_BSSID_LEN]; unsigned intuChannel; @@ -116,10 +107,8 @@ typedef struct tagKnownBSS { longldBmMAX; longldBmAverage[RSSI_STAT_COUNT]; longldBmAverRange; - //For any BSSID selection improvment bool bSelected; - //++ WPA informations bool bWPAValid; unsigned char byGKType; unsigned char abyPKType[4]; @@ -128,9 +117,7 @@ typedef struct tagKnownBSS { unsigned short wAuthCount; unsigned char byDefaultK_as_PK; unsigned char byReplayIdx; - //-- - //++ WPA2 informations bool bWPA2Valid; unsigned char byCSSGK; unsigned short wCSSPKCount; @@ -138,28 +125,24 @@ typedef struct tagKnownBSS { unsigned short wAKMSSAuthCount; unsigned char abyAKMSSAuthType[4]; - //++ wpactl unsigned char byWPAIE[MAX_WPA_IE_LEN]; unsigned char byRSNIE[MAX_WPA_IE_LEN]; unsigned short wWPALen; unsigned short wRSNLen; - // Clear count unsigned intuClearCount; unsigned intuIELength; QWORD qwBSSTimestamp; - QWORD qwLocalTSF; // local TSF timer + QWORD qwLocalTSF; -//NDIS_802_11_NETWORK_TYPENetworkTypeInUse; CARD_PHY_TYPE eNetworkTypeInUse; ERPObject sERP; SRSNCapObject sRSNCapObj; - unsigned char abyIEs[1024]; // don't move this field !! + unsigned char abyIEs[1024]; } __attribute__ ((__packed__)) KnownBSS , *PKnownBSS; -//2006-1116-01, by NomadZhao #pragma pack() typedef enum tagNODE_STATE { @@ -172,7 +155,6 @@ typedef enum tagNODE_STATE { // STA node info typedef struct tagKnownNodeDB { - // STA info bool bActive; unsigned char abyMACAddr[WLAN_ADDR_LEN]; unsigned char abyCurrSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN]; @@ -211,7 +193,6 @@ typedef struct tagKnownNodeDB { unsigned short wTSC15_0; unsigned intuWepKeyLength; unsigned char abyWepKey[WLAN_WEPMAX_KEYLEN]; - // // Auto rate fallback vars bool bIsInFallback; unsigned intuAverageRSSI; @@ -228,8 +209,6 @@ typedef struct tagKnownNodeDB { unsigned intuTimeCount; } KnownNodeDB, *PKnownNodeDB; -/*- Export Functions --*/ - PKnownBSS BSSpSearchBSSList( void *hDeviceContext, -- 1.7.9.5 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] Staging: vt6655: remove redundant comments from baseband.h
Removed redundant comments in baseband.h header file. Signed-off-by: Igor Bezukh --- drivers/staging/vt6655/baseband.h | 12 1 file changed, 12 deletions(-) diff --git a/drivers/staging/vt6655/baseband.h b/drivers/staging/vt6655/baseband.h index e31bb76..d90c7f9 100644 --- a/drivers/staging/vt6655/baseband.h +++ b/drivers/staging/vt6655/baseband.h @@ -34,8 +34,6 @@ #include "tether.h" #include "device.h" -/*- Export Definitions -*/ - // // Registers in the BASEBAND // @@ -64,22 +62,12 @@ #define TOP_RATE_2M 0x0020 #define TOP_RATE_1M 0x0010 -/*- Export Types --*/ - -/*- Export Macros --*/ - #define BBvClearFOE(dwIoBase) \ BBbWriteEmbedded(dwIoBase, 0xB1, 0) #define BBvSetFOE(dwIoBase)\ BBbWriteEmbedded(dwIoBase, 0xB1, 0x0C) -/*- Export Classes */ - -/*- Export Variables --*/ - -/*- Export Functions --*/ - unsigned int BBuGetFrameTime( unsigned char byPreambleType, -- 1.7.9.5 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] Staging: vt6655: removed redundant comments from aes_ccmp.h
Removed redundant comments from aes_ccmp.h header file Signed-off-by: Igor Bezukh --- drivers/staging/vt6655/aes_ccmp.h |9 - 1 file changed, 9 deletions(-) diff --git a/drivers/staging/vt6655/aes_ccmp.h b/drivers/staging/vt6655/aes_ccmp.h index cc02e64..fe0c506 100644 --- a/drivers/staging/vt6655/aes_ccmp.h +++ b/drivers/staging/vt6655/aes_ccmp.h @@ -32,15 +32,6 @@ #include "ttype.h" -/*- Export Definitions -*/ - -/*- Export Types --*/ - -/*- Export Classes */ - -/*- Export Variables --*/ - -/*- Export Functions --*/ bool AESbGenCCMP(unsigned char *pbyRxKey, unsigned char *pbyFrame, unsigned short wFrameSize); #endif /* __AES_H__ */ -- 1.7.9.5 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] Staging: vt6655: Removed redundant comments and newlines
Removed redundant comments and newlines from 80211mgr.h header file. Signed-off-by: Igor Bezukh --- drivers/staging/vt6655/80211mgr.h | 38 - 1 file changed, 38 deletions(-) diff --git a/drivers/staging/vt6655/80211mgr.h b/drivers/staging/vt6655/80211mgr.h index 065238b..8b126bb 100644 --- a/drivers/staging/vt6655/80211mgr.h +++ b/drivers/staging/vt6655/80211mgr.h @@ -34,8 +34,6 @@ #include "ttype.h" #include "80211hdr.h" -/*- Export Definitions -*/ - #define WLAN_MIN_ARRAY 1 /* Information Element ID value */ @@ -202,12 +200,6 @@ #define MEASURE_MODE_INCAPABLE 0x02 #define MEASURE_MODE_REFUSED0x04 -/*- Export Classes */ - -/*- Export Variables --*/ - -/*- Export Types --*/ - /* Information Element Types */ #pragma pack(1) @@ -472,14 +464,11 @@ typedef struct tagWLAN_FR_BEACON { unsigned intlen; unsigned char *pBuf; PUWLAN_80211HDR pHdr; - /* fixed fields */ PQWORD pqwTimestamp; unsigned short *pwBeaconInterval; unsigned short *pwCapInfo; - /*-- info elements --*/ PWLAN_IE_SSID pSSID; PWLAN_IE_SUPP_RATES pSuppRates; -/* PWLAN_IE_FH_PARMS pFHParms; */ PWLAN_IE_DS_PARMS pDSParms; PWLAN_IE_CF_PARMS pCFParms; PWLAN_IE_TIMpTIM; @@ -501,10 +490,6 @@ typedef struct tagWLAN_FR_IBSSATIM { unsigned intlen; unsigned char *pBuf; PUWLAN_80211HDR pHdr; - - /* fixed fields */ - /* info elements */ - /* this frame type has a null body */ } WLAN_FR_IBSSATIM, *PWLAN_FR_IBSSATIM; /* Disassociation */ @@ -513,9 +498,7 @@ typedef struct tagWLAN_FR_DISASSOC { unsigned intlen; unsigned char *pBuf; PUWLAN_80211HDR pHdr; - /*-- fixed fields ---*/ unsigned short *pwReason; - /*-- info elements --*/ } WLAN_FR_DISASSOC, *PWLAN_FR_DISASSOC; /* Association Request */ @@ -524,10 +507,8 @@ typedef struct tagWLAN_FR_ASSOCREQ { unsigned intlen; unsigned char *pBuf; PUWLAN_80211HDR pHdr; - /*-- fixed fields ---*/ unsigned short *pwCapInfo; unsigned short *pwListenInterval; - /*-- info elements --*/ PWLAN_IE_SSID pSSID; PWLAN_IE_SUPP_RATES pSuppRates; PWLAN_IE_RSNpRSN; @@ -543,11 +524,9 @@ typedef struct tagWLAN_FR_ASSOCRESP { unsigned intlen; unsigned char *pBuf; PUWLAN_80211HDR pHdr; - /*-- fixed fields ---*/ unsigned short *pwCapInfo; unsigned short *pwStatus; unsigned short *pwAid; - /*-- info elements --*/ PWLAN_IE_SUPP_RATES pSuppRates; PWLAN_IE_SUPP_RATES pExtSuppRates; } WLAN_FR_ASSOCRESP, *PWLAN_FR_ASSOCRESP; @@ -558,13 +537,9 @@ typedef struct tagWLAN_FR_REASSOCREQ { unsigned intlen; unsigned char *pBuf; PUWLAN_80211HDR pHdr; - - /*-- fixed fields ---*/ unsigned short *pwCapInfo; unsigned short *pwListenInterval; PIEEE_ADDR pAddrCurrAP; - - /*-- info elements --*/ PWLAN_IE_SSID pSSID; PWLAN_IE_SUPP_RATES pSuppRates; PWLAN_IE_RSNpRSN; @@ -578,11 +553,9 @@ typedef struct tagWLAN_FR_REASSOCRESP { unsigned intlen; unsigned char *pBuf; PUWLAN_80211HDR pHdr; - /*-- fixed fields ---*/ unsigned short *pwCapInfo; unsigned short *pwStatus; unsigned short *pwAid; - /*-- info elements --*/ PWLAN_IE_SUPP_RATES pSuppRates; PWLAN_IE_SUPP_RATES pExtSuppRates; } WLAN_FR_REASSOCRESP, *PWLAN_FR_REASSOCRESP; @@ -593,8 +566,6 @@ typedef struct tagWLAN_FR_PROBEREQ { unsigned intlen; unsigned char *pBuf; PUWLAN_80211HDR pHdr; - /*-- fixed fields ---*/ - /*-- info elements --*/ PWLAN_IE_SSID pSSID; PWLAN_IE_SUPP_RATES pSuppRates; PWLAN_IE_SUPP_RATES pExtSuppRates; @@ -606,11 +577,9 @@ typedef struct tagWLAN_FR_PROBERESP { unsigned intlen; unsigned char *pBuf; PUWLAN_80211HDR pHdr; - /*-- fixed fields ---*/ PQWORD pqwTimestamp; unsigned short *pwBeaconInterval; unsigned short *pwCapInfo; - /*-- info elements --*/ PWLAN_IE_SSID pSSID; PWLAN_IE_SUPP_RATES pSuppRates; PWLAN_IE_DS_PARMS pDSParms; @@ -633,11 +602
[PATCH] Staging: vt6655: remove redundant comments from 80211hdr.h
Removed redundant comments from 80211hdr.h header file Signed-off-by: Igor Bezukh --- drivers/staging/vt6655/80211hdr.h |7 --- 1 file changed, 7 deletions(-) diff --git a/drivers/staging/vt6655/80211hdr.h b/drivers/staging/vt6655/80211hdr.h index ba155cd..e05d135 100644 --- a/drivers/staging/vt6655/80211hdr.h +++ b/drivers/staging/vt6655/80211hdr.h @@ -33,7 +33,6 @@ #include "ttype.h" -/*- Export Definitions -*/ /* bit type */ #define BIT0 0x0001 #define BIT1 0x0002 @@ -315,10 +314,4 @@ typedef union tagUWLAN_80211HDR { WLAN_80211HDR_A4sA4; } UWLAN_80211HDR, *PUWLAN_80211HDR; -/*- Export Classes */ - -/*- Export Variables --*/ - -/*- Export Functions --*/ - #endif /* __80211HDR_H__ */ -- 1.7.9.5 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCHv2] Staging: vt6655: Remove redundant comments in wcmd.h
Removed redundant comments in the header file wcmd.h Signed-off-by: Igor Bezukh --- Changes v2: I've missed another redundant comment "//ms" so I've deleted it and added "vt6655" to the patch subject drivers/staging/vt6655/wcmd.h | 15 ++- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/drivers/staging/vt6655/wcmd.h b/drivers/staging/vt6655/wcmd.h index 2844476..126b61c 100644 --- a/drivers/staging/vt6655/wcmd.h +++ b/drivers/staging/vt6655/wcmd.h @@ -33,12 +33,9 @@ #include "80211hdr.h" #include "80211mgr.h" -/*- Export Definitions -*/ +#define AUTHENTICATE_TIMEOUT 1000 +#define ASSOCIATE_TIMEOUT 1000 -#define AUTHENTICATE_TIMEOUT 1000 //ms -#define ASSOCIATE_TIMEOUT 1000 //ms - -// Command code typedef enum tagCMD_CODE { WLAN_CMD_BSSID_SCAN, WLAN_CMD_SSID, @@ -76,7 +73,6 @@ typedef struct tagCMD_ITEM { bool bForceSCAN; } CMD_ITEM, *PCMD_ITEM; -// Command state typedef enum tagCMD_STATE { WLAN_CMD_SCAN_START, WLAN_CMD_SCAN_END, @@ -92,13 +88,6 @@ typedef enum tagCMD_STATE { WLAN_CMD_IDLE } CMD_STATE, *PCMD_STATE; -/*- Export Classes */ - -/*- Export Variables --*/ - -/*- Export Types --*/ - -/*- Export Functions --*/ void vResetCommandTimer( void *hDeviceContext -- 1.7.9.5 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 2/2] Staging: Remove redundant comments in wcmd.h file
Removed redundant comments in the header file wcmd.h Signed-off-by: Igor Bezukh --- drivers/staging/vt6655/wcmd.h | 11 --- 1 file changed, 11 deletions(-) diff --git a/drivers/staging/vt6655/wcmd.h b/drivers/staging/vt6655/wcmd.h index 2844476..696916c 100644 --- a/drivers/staging/vt6655/wcmd.h +++ b/drivers/staging/vt6655/wcmd.h @@ -33,12 +33,9 @@ #include "80211hdr.h" #include "80211mgr.h" -/*- Export Definitions -*/ - #define AUTHENTICATE_TIMEOUT 1000 //ms #define ASSOCIATE_TIMEOUT 1000 //ms -// Command code typedef enum tagCMD_CODE { WLAN_CMD_BSSID_SCAN, WLAN_CMD_SSID, @@ -76,7 +73,6 @@ typedef struct tagCMD_ITEM { bool bForceSCAN; } CMD_ITEM, *PCMD_ITEM; -// Command state typedef enum tagCMD_STATE { WLAN_CMD_SCAN_START, WLAN_CMD_SCAN_END, @@ -92,13 +88,6 @@ typedef enum tagCMD_STATE { WLAN_CMD_IDLE } CMD_STATE, *PCMD_STATE; -/*- Export Classes */ - -/*- Export Variables --*/ - -/*- Export Types --*/ - -/*- Export Functions --*/ void vResetCommandTimer( void *hDeviceContext -- 1.7.9.5 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] Staging: vt6655: remove redundant comments
Clean redundant comments in the code. Since I perform single fix type per patch, I've ignored the 80 line warning when checking the patch against checkpatch. I will fix the 80 line warnings on further patches. Signed-off-by: Igor Bezukh --- drivers/staging/vt6655/wcmd.c | 46 - 1 file changed, 13 insertions(+), 33 deletions(-) diff --git a/drivers/staging/vt6655/wcmd.c b/drivers/staging/vt6655/wcmd.c index a689645..2456b30 100644 --- a/drivers/staging/vt6655/wcmd.c +++ b/drivers/staging/vt6655/wcmd.c @@ -54,13 +54,7 @@ #include "iowpa.h" #include "channel.h" -/*- Static Definitions -*/ - -/*- Static Classes */ - -/*- Static Variables --*/ static int msglevel = MSG_LEVEL_INFO; -/*- Static Functions --*/ static void @@ -85,10 +79,6 @@ s_bCommandComplete( PSDevice pDevice ); -/*- Export Variables --*/ - -/*- Export Functions --*/ - /* * Description: * Stop AdHoc beacon during scan process @@ -134,7 +124,7 @@ vAdHocBeaconStop(PSDevice pDevice) if (bStop) MACvRegBitsOff(pDevice->PortOffset, MAC_REG_TCR, TCR_AUTOBCNTX); -} /* vAdHocBeaconStop */ +} /* * Description: @@ -167,7 +157,7 @@ vAdHocBeaconRestart(PSDevice pDevice) } } -/*+ +/* * * Routine Description: * Prepare and send probe request management frames. @@ -176,7 +166,7 @@ vAdHocBeaconRestart(PSDevice pDevice) * Return Value: *none. * - -*/ + */ static void @@ -223,7 +213,7 @@ s_vProbeChannel( } } -/*+ +/* * * Routine Description: * Constructs an probe request frame @@ -232,7 +222,7 @@ s_vProbeChannel( * Return Value: *A ptr to Tx frame or NULL on allocation failure * - -*/ + */ PSTxMgmtPacket s_MgrMakeProbeRequest( @@ -292,7 +282,6 @@ vCommandTimerWait( init_timer(&pDevice->sTimerCommand); pDevice->sTimerCommand.data = (unsigned long) pDevice; pDevice->sTimerCommand.function = (TimerFunction)vCommandTimer; - // RUN_AT :1 msec ~= (HZ/1024) pDevice->sTimerCommand.expires = (unsigned int)RUN_AT((MSecond * HZ) >> 10); add_timer(&pDevice->sTimerCommand); return; @@ -366,9 +355,8 @@ vCommandTimer( s_bCommandComplete(pDevice); } else { -//2008-8-4 by chester if (!is_channel_valid(pMgmt->uScanChannel)) { - DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Invalid channel pMgmt->uScanChannel = %d \n", pMgmt->uScanChannel); + DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Invalid channel pMgmt->uScanChannel = %d\n", pMgmt->uScanChannel); s_bCommandComplete(pDevice); spin_unlock_irq(&pDevice->lock); return; @@ -394,7 +382,6 @@ vCommandTimer( CARDbSetBSSID(pMgmt->pAdapter, pMgmt->abyCurrBSSID, OP_MODE_UNKNOWN); pMgmt->uScanChannel++; -//2008-8-4 by chester if (!is_channel_valid(pMgmt->uScanChannel) && pMgmt->uScanChannel <= pDevice->byMaxChannel) { pMgmt->uScanChannel = pDevice->byMaxChannel + 1; @@ -431,7 +418,6 @@ vCommandTimer( pMgmt->eScanState = WMAC_NO_SCANNING; vAdHocBeaconRestart(pDevice); -//2008-0409-07, by Einsn Liu #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT if (pMgmt->eScanType == WMAC_SCAN_PASSIVE) {//send scan event to wpa_Supplicant @@ -471,7 +457,6 @@ vCommandTimer( return; } DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " CARDbRadioPowerOff\n"); - //2008-09-02 by chester s_bCommandComplete(pDevice); break; @@ -482,7 +467,6 @@ vCommandTimer( spin_unlock_irq(&pDevice->lock); return; } -//2008-09-02 by chester s_bCommandComplete(pDevice); break; @@ -615,7 +599,7 @@ vCommandTimer( else if (pMgmt->eCurrState < WMAC_STATE_AUTHPENDING) { printk("WLAN_AUTHENTICATE_WAIT:Authen Fail???\n"); - } else if (pDevice->byLinkWaitCount <= 4) {//mike add:wait another 2 sec if authenticated_frame delay! + } else if (pDevice->byLinkWaitCount <= 4) { pDevice->byLinkWaitCount++;
[PATCH] Staging: vt6655: apply kernel coding style to wCommandTimerWait function
Since there is a lot of stuff that need to be changed in order to meet the kernel coding style in wcmd.c file, I've decided to fix function-per-patch. The following changes were made in vCommandTimerWait function: - Camel case change: - MSecond ---> msec - hDdeviceContext ---> private - pDevice ---> priv - Removed redundant return - Removed redndant comment In future patches, I will also change the function name itself. Signed-off-by: Igor Bezukh --- drivers/staging/vt6655/wcmd.c | 20 +++- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/drivers/staging/vt6655/wcmd.c b/drivers/staging/vt6655/wcmd.c index a689645..e5073d9 100644 --- a/drivers/staging/vt6655/wcmd.c +++ b/drivers/staging/vt6655/wcmd.c @@ -281,21 +281,15 @@ s_MgrMakeProbeRequest( return pTxPacket; } -void -vCommandTimerWait( - void *hDeviceContext, - unsigned int MSecond -) +void vCommandTimerWait(void *private, unsigned int msec) { - PSDevicepDevice = (PSDevice)hDeviceContext; + PSDevice priv = (PSDevice)private; - init_timer(&pDevice->sTimerCommand); - pDevice->sTimerCommand.data = (unsigned long) pDevice; - pDevice->sTimerCommand.function = (TimerFunction)vCommandTimer; - // RUN_AT :1 msec ~= (HZ/1024) - pDevice->sTimerCommand.expires = (unsigned int)RUN_AT((MSecond * HZ) >> 10); - add_timer(&pDevice->sTimerCommand); - return; + init_timer(&priv->sTimerCommand); + priv->sTimerCommand.data = (unsigned long)priv; + priv->sTimerCommand.function = (TimerFunction)vCommandTimer; + priv->sTimerCommand.expires = (unsigned int)RUN_AT((msec * HZ) >> 10); + add_timer(&priv->sTimerCommand); } void -- 1.7.9.5 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] Staging: vt6655: fix missing blank line after variable declaration
From: Igor bezukh Checkpatch fix - Add missing blank line after variable declaration Signed-off-by: Igor Bezukh --- drivers/staging/vt6655/card.c |3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c index e21abd8..0b2ca2f 100644 --- a/drivers/staging/vt6655/card.c +++ b/drivers/staging/vt6655/card.c @@ -351,6 +351,7 @@ s_vSetRSPINF(PSDevice pDevice, CARD_PHY_TYPE ePHYType, void *pvSupportRateIEs, v bool CARDbIsShortPreamble(void *pDeviceHandler) { PSDevicepDevice = (PSDevice) pDeviceHandler; + if (pDevice->byPreambleType == 0) return false; @@ -372,6 +373,7 @@ bool CARDbIsShortPreamble(void *pDeviceHandler) bool CARDbIsShorSlotTime(void *pDeviceHandler) { PSDevicepDevice = (PSDevice) pDeviceHandler; + return pDevice->bShortSlotTime; } @@ -929,6 +931,7 @@ bool CARDbRadioPowerOn(void *pDeviceHandler) { PSDevicepDevice = (PSDevice) pDeviceHandler; bool bResult = true; + printk("chester power on\n"); if (pDevice->bRadioControlOff == true) { if (pDevice->bHWRadioOff == true) printk("chester bHWRadioOff\n"); -- 1.7.9.5 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel