Skip to content

L
linux
Commit b69c0bfd authored by Veronika Kabatova's avatar Veronika Kabatova Committed by Greg Kroah-Hartman
Browse files
Options

staging: vt6655: desc.h: Comments fixes 

Replace C99 "//" comments by "/* */", remove blank
commented lines
Signed-off-by: default avatarVeronika Kabatova <veronicca114@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1d39fe04
Hide whitespace changes
Inline Side-by-side
Showing with 45 additions and 56 deletions
drivers/staging/vt6655/desc.h
View file @ b69c0bfd
...@@ -40,38 +40,30 @@ ...@@ -40,38 +40,30 @@
#define B_OWNED_BY_CHIP 1 #define B_OWNED_BY_CHIP 1
#define B_OWNED_BY_HOST 0 #define B_OWNED_BY_HOST 0
// /* Bits in the RSR register */
// Bits in the RSR register
//
#define RSR_ADDRBROAD 0x80 #define RSR_ADDRBROAD 0x80
#define RSR_ADDRMULTI 0x40 #define RSR_ADDRMULTI 0x40
#define RSR_ADDRUNI 0x00 #define RSR_ADDRUNI 0x00
#define RSR_IVLDTYP 0x20 #define RSR_IVLDTYP 0x20
#define RSR_IVLDLEN 0x10 // invalid len (> 2312 byte) #define RSR_IVLDLEN 0x10 /* invalid len (> 2312 byte) */
#define RSR_BSSIDOK 0x08 #define RSR_BSSIDOK 0x08
#define RSR_CRCOK 0x04 #define RSR_CRCOK 0x04
#define RSR_BCNSSIDOK 0x02 #define RSR_BCNSSIDOK 0x02
#define RSR_ADDROK 0x01 #define RSR_ADDROK 0x01
// /* Bits in the new RSR register */
// Bits in the new RSR register
//
#define NEWRSR_DECRYPTOK 0x10 #define NEWRSR_DECRYPTOK 0x10
#define NEWRSR_CFPIND 0x08 #define NEWRSR_CFPIND 0x08
#define NEWRSR_HWUTSF 0x04 #define NEWRSR_HWUTSF 0x04
#define NEWRSR_BCNHITAID 0x02 #define NEWRSR_BCNHITAID 0x02
#define NEWRSR_BCNHITAID0 0x01 #define NEWRSR_BCNHITAID0 0x01
// /* Bits in the TSR0 register */
// Bits in the TSR0 register
//
#define TSR0_PWRSTS1_2 0xC0 #define TSR0_PWRSTS1_2 0xC0
#define TSR0_PWRSTS7 0x20 #define TSR0_PWRSTS7 0x20
#define TSR0_NCR 0x1F #define TSR0_NCR 0x1F
// /* Bits in the TSR1 register */
// Bits in the TSR1 register
//
#define TSR1_TERR 0x80 #define TSR1_TERR 0x80
#define TSR1_PWRSTS4_6 0x70 #define TSR1_PWRSTS4_6 0x70
#define TSR1_RETRYTMO 0x08 #define TSR1_RETRYTMO 0x08
...@@ -79,16 +71,14 @@ ...@@ -79,16 +71,14 @@
#define TSR1_PWRSTS3 0x02 #define TSR1_PWRSTS3 0x02
#define ACK_DATA 0x01 #define ACK_DATA 0x01
// /* Bits in the TCR register */
// Bits in the TCR register #define EDMSDU 0x04 /* end of sdu */
// #define TCR_EDP 0x02 /* end of packet */
#define EDMSDU 0x04 // end of sdu #define TCR_STP 0x01 /* start of packet */
#define TCR_EDP 0x02 // end of packet
#define TCR_STP 0x01 // start of packet
// max transmit or receive buffer size /* max transmit or receive buffer size */
#define CB_MAX_BUF_SIZE 2900U #define CB_MAX_BUF_SIZE 2900U
// NOTE: must be multiple of 4 /* NOTE: must be multiple of 4 */
#define CB_MAX_TX_BUF_SIZE CB_MAX_BUF_SIZE #define CB_MAX_TX_BUF_SIZE CB_MAX_BUF_SIZE
#define CB_MAX_RX_BUF_SIZE_NORMAL CB_MAX_BUF_SIZE #define CB_MAX_RX_BUF_SIZE_NORMAL CB_MAX_BUF_SIZE
...@@ -100,18 +90,21 @@ ...@@ -100,18 +90,21 @@
#define CB_MIN_TX_DESC 16 #define CB_MIN_TX_DESC 16
#define CB_MAX_RECEIVED_PACKETS 16 #define CB_MAX_RECEIVED_PACKETS 16
// limit our receive routine to indicating /*
// this many at a time for 2 reasons: * limit our receive routine to indicating
// 1. driver flow control to protocol layer * this many at a time for 2 reasons:
// 2. limit the time used in ISR routine * 1. driver flow control to protocol layer
* 2. limit the time used in ISR routine
*/
#define CB_EXTRA_RD_NUM 32 #define CB_EXTRA_RD_NUM 32
#define CB_RD_NUM 32 #define CB_RD_NUM 32
#define CB_TD_NUM 32 #define CB_TD_NUM 32
// max number of physical segments /*
// in a single NDIS packet. Above this threshold, the packet * max number of physical segments in a single NDIS packet. Above this
// is copied into a single physically contiguous buffer * threshold, the packet is copied into a single physically contiguous buffer
*/
#define CB_MAX_SEGMENT 4 #define CB_MAX_SEGMENT 4
#define CB_MIN_MAP_REG_NUM 4 #define CB_MIN_MAP_REG_NUM 4
...@@ -119,14 +112,15 @@ ...@@ -119,14 +112,15 @@
#define CB_PROTOCOL_RESERVED_SECTION 16 #define CB_PROTOCOL_RESERVED_SECTION 16
// if retrys excess 15 times , tx will abort, and /*
// if tx fifo underflow, tx will fail * if retrys excess 15 times , tx will abort, and if tx fifo underflow,
// we should try to resend it * tx will fail, we should try to resend it
*/
#define CB_MAX_TX_ABORT_RETRY 3 #define CB_MAX_TX_ABORT_RETRY 3
#ifdef __BIG_ENDIAN #ifdef __BIG_ENDIAN
// WMAC definition FIFO Control /* WMAC definition FIFO Control */
#define FIFOCTL_AUTO_FB_1 0x0010 #define FIFOCTL_AUTO_FB_1 0x0010
#define FIFOCTL_AUTO_FB_0 0x0008 #define FIFOCTL_AUTO_FB_0 0x0008
#define FIFOCTL_GRPACK 0x0004 #define FIFOCTL_GRPACK 0x0004
...@@ -143,7 +137,7 @@ ...@@ -143,7 +137,7 @@
#define FIFOCTL_NEEDACK 0x0200 #define FIFOCTL_NEEDACK 0x0200
#define FIFOCTL_LHEAD 0x0100 #define FIFOCTL_LHEAD 0x0100
//WMAC definition Frag Control /* WMAC definition Frag Control */
#define FRAGCTL_AES 0x0003 #define FRAGCTL_AES 0x0003
#define FRAGCTL_TKIP 0x0002 #define FRAGCTL_TKIP 0x0002
#define FRAGCTL_LEGACY 0x0001 #define FRAGCTL_LEGACY 0x0001
...@@ -171,7 +165,7 @@ ...@@ -171,7 +165,7 @@
#define FIFOCTL_NEEDACK 0x0002 #define FIFOCTL_NEEDACK 0x0002
#define FIFOCTL_LHEAD 0x0001 #define FIFOCTL_LHEAD 0x0001
//WMAC definition Frag Control /* WMAC definition Frag Control */
#define FRAGCTL_AES 0x0300 #define FRAGCTL_AES 0x0300
#define FRAGCTL_TKIP 0x0200 #define FRAGCTL_TKIP 0x0200
#define FRAGCTL_LEGACY 0x0100 #define FRAGCTL_LEGACY 0x0100
...@@ -195,14 +189,17 @@ ...@@ -195,14 +189,17 @@
#define TYPE_RXDMA1 1 #define TYPE_RXDMA1 1
#define TYPE_MAXRD 2 #define TYPE_MAXRD 2
// TD_INFO flags control bit /* TD_INFO flags control bit */
#define TD_FLAGS_NETIF_SKB 0x01 // check if need release skb #define TD_FLAGS_NETIF_SKB 0x01 /* check if need release skb */
#define TD_FLAGS_PRIV_SKB 0x02 // check if called from private skb(hostap) #define TD_FLAGS_PRIV_SKB 0x02 /* check if called from private skb (hostap) */
#define TD_FLAGS_PS_RETRY 0x04 // check if PS STA frame re-transmit #define TD_FLAGS_PS_RETRY 0x04 /* check if PS STA frame re-transmit */
// ref_sk_buff is used for mapping the skb structure between pre-built driver-obj & running kernel. /*
// Since different kernel version (2.4x) may change skb structure, i.e. pre-built driver-obj * ref_sk_buff is used for mapping the skb structure between pre-built
// may link to older skb that leads error. * driver-obj & running kernel. Since different kernel version (2.4x) may
* change skb structure, i.e. pre-built driver-obj may link to older skb that
* leads error.
*/
typedef struct tagDEVICE_RD_INFO { typedef struct tagDEVICE_RD_INFO {
struct sk_buff *skb; struct sk_buff *skb;
...@@ -242,9 +239,7 @@ typedef struct tagRDES1 { ...@@ -242,9 +239,7 @@ typedef struct tagRDES1 {
} __attribute__ ((__packed__)) } __attribute__ ((__packed__))
SRDES1; SRDES1;
// /* Rx descriptor*/
// Rx descriptor
//
typedef struct tagSRxDesc { typedef struct tagSRxDesc {
volatile SRDES0 m_rd0RD0; volatile SRDES0 m_rd0RD0;
volatile SRDES1 m_rd1RD1; volatile SRDES1 m_rd1RD1;
...@@ -302,9 +297,7 @@ typedef struct tagDEVICE_TD_INFO { ...@@ -302,9 +297,7 @@ typedef struct tagDEVICE_TD_INFO {
unsigned char byFlags; unsigned char byFlags;
} DEVICE_TD_INFO, *PDEVICE_TD_INFO; } DEVICE_TD_INFO, *PDEVICE_TD_INFO;
// /* transmit descriptor */
// transmit descriptor
//
typedef struct tagSTxDesc { typedef struct tagSTxDesc {
volatile STDES0 m_td0TD0; volatile STDES0 m_td0TD0;
volatile STDES1 m_td1TD1; volatile STDES1 m_td1TD1;
...@@ -319,8 +312,8 @@ typedef const STxDesc *PCSTxDesc; ...@@ -319,8 +312,8 @@ typedef const STxDesc *PCSTxDesc;
typedef struct tagSTxSyncDesc { typedef struct tagSTxSyncDesc {
volatile STDES0 m_td0TD0; volatile STDES0 m_td0TD0;
volatile STDES1 m_td1TD1; volatile STDES1 m_td1TD1;
volatile u32 buff_addr; // pointer to logical buffer volatile u32 buff_addr; /* pointer to logical buffer */
volatile u32 next_desc; // pointer to next logical descriptor volatile u32 next_desc; /* pointer to next logical descriptor */
volatile unsigned short m_wFIFOCtl; volatile unsigned short m_wFIFOCtl;
volatile unsigned short m_wTimeStamp; volatile unsigned short m_wTimeStamp;
struct tagSTxSyncDesc *next __aligned(8); struct tagSTxSyncDesc *next __aligned(8);
...@@ -329,9 +322,7 @@ typedef struct tagSTxSyncDesc { ...@@ -329,9 +322,7 @@ typedef struct tagSTxSyncDesc {
STxSyncDesc, *PSTxSyncDesc; STxSyncDesc, *PSTxSyncDesc;
typedef const STxSyncDesc *PCSTxSyncDesc; typedef const STxSyncDesc *PCSTxSyncDesc;
// /* RsvTime buffer header */
// RsvTime buffer header
//
typedef struct tagSRrvTime_atim { typedef struct tagSRrvTime_atim {
unsigned short wCTSTxRrvTime_ba; unsigned short wCTSTxRrvTime_ba;
unsigned short wTxRrvTime_a; unsigned short wTxRrvTime_a;
...@@ -352,9 +343,7 @@ union vnt_phy_field_swap { ...@@ -352,9 +343,7 @@ union vnt_phy_field_swap {
u32 field_write; u32 field_write;
}; };
// /* Tx FIFO header */
// Tx FIFO header
//
typedef struct tagSTxBufHead { typedef struct tagSTxBufHead {
u32 adwTxKey[4]; u32 adwTxKey[4];
unsigned short wFIFOCtl; unsigned short wFIFOCtl;
...@@ -392,4 +381,4 @@ typedef struct tagSKeyEntry { ...@@ -392,4 +381,4 @@ typedef struct tagSKeyEntry {
} __attribute__ ((__packed__)) } __attribute__ ((__packed__))
SKeyEntry; SKeyEntry;
#endif // __DESC_H__ #endif /* __DESC_H__ */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7