Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 354333
b: refs/heads/master
c: 74ecdc5
h: refs/heads/master
i:
  354331: 6d98033
v: v3
  • Loading branch information
Andres More authored and Greg Kroah-Hartman committed Feb 4, 2013
1 parent 35bffa3 commit 6f95f69
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 13 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 77970254b0b8f93fbd6bffe8e669133461ed99c7
refs/heads/master: 74ecdc5e4bbd6a7f399e4a3cb61270b46d2e62d3
23 changes: 11 additions & 12 deletions trunk/drivers/staging/vt6656/baseband.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,31 +42,30 @@
#define PREAMBLE_LONG 0
#define PREAMBLE_SHORT 1

//
// Registers in the BASEBAND
//
/*
* Registers in the BASEBAND
*/
#define BB_MAX_CONTEXT_SIZE 256

#define C_SIFS_A 16 // micro sec.
#define C_SIFS_A 16 /* usec */
#define C_SIFS_BG 10

#define C_EIFS 80 // micro sec.

#define C_EIFS 80 /* usec */

#define C_SLOT_SHORT 9 // micro sec.
#define C_SLOT_SHORT 9 /* usec */
#define C_SLOT_LONG 20

#define C_CWMIN_A 15 // slot time
#define C_CWMIN_A 15 /* slot time */
#define C_CWMIN_B 31

#define C_CWMAX 1023 // slot time
#define C_CWMAX 1023 /* slot time */

//0:11A 1:11B 2:11G
/* 0:11A 1:11B 2:11G */
#define BB_TYPE_11A 0
#define BB_TYPE_11B 1
#define BB_TYPE_11G 2

//0:11a,1:11b,2:11gb(only CCK in BasicRate),3:11ga(OFDM in Basic Rate)
/* 0:11a, 1:11b, 2:11gb (only CCK in BasicRate), 3:11ga (OFDM in BasicRate) */
#define PK_TYPE_11A 0
#define PK_TYPE_11B 1
#define PK_TYPE_11GB 2
Expand Down Expand Up @@ -108,7 +107,7 @@ void BBvCalculateParameter(struct vnt_private *, u32 cbFrameLength,
u16 wRate, u8 byPacketType, u16 *pwPhyLen, u8 *pbyPhySrv,
u8 *pbyPhySgn);

// timer for antenna diversity
/* timer for antenna diversity */

void TimerSQ3CallBack(struct vnt_private *);
void TimerSQ3Tmax3CallBack(struct vnt_private *);
Expand Down

0 comments on commit 6f95f69

Please sign in to comment.