Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 196899
b: refs/heads/master
c: ecd9fe1
h: refs/heads/master
i:
  196897: 9651328
  196895: bf1bbcd
v: v3
  • Loading branch information
Andrea Gelmini authored and Greg Kroah-Hartman committed May 11, 2010
1 parent c27b251 commit b91de23
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 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: 52628626dfcb996a5d12996a15255fbe970d6e6e
refs/heads/master: ecd9fe1deddaf0cc0b8e6625659ad7e368ab5557
7 changes: 3 additions & 4 deletions trunk/drivers/staging/otus/hal/hpani.h
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,8 @@ typedef enum {
ZM_HAL_ANI_PHYERR_RESET, /* reset phy error stats */
} ZM_HAL_ANI_CMD;

#define AR_PHY_COUNTMAX (3 << 22) // Max counted before intr
#define ZM_HAL_PROCESS_ANI 0x00000001 /* ANI state setup */
#define AR_PHY_COUNTMAX (3 << 22) /* Max counted before intr */
#define ZM_HAL_PROCESS_ANI 0x00000001 /* ANI state setup */
#define ZM_RSSI_DUMMY_MARKER 0x127

/* PHY registers in ar5416, related base and register offsets
Expand Down Expand Up @@ -353,7 +353,7 @@ typedef enum {
#define AR_PHY_CCK_DETECT 0x1C6208
#define AR_PHY_CCK_DETECT_WEAK_SIG_THR_CCK 0x0000003F
#define AR_PHY_CCK_DETECT_WEAK_SIG_THR_CCK_S 0
#define AR_PHY_CCK_DETECT_ANT_SWITCH_TIME 0x00001FC0 // [12:6] settling time for antenna switch
#define AR_PHY_CCK_DETECT_ANT_SWITCH_TIME 0x00001FC0 /* [12:6] settling time for antenna switch */
#define AR_PHY_CCK_DETECT_ANT_SWITCH_TIME_S 6
#define AR_PHY_CCK_DETECT_BB_ENABLE_ANT_FAST_DIV 0x2000

Expand Down Expand Up @@ -392,7 +392,6 @@ typedef enum {
#define AR_PHY_TPCRG1_PD_GAIN_2_S 18
#define AR_PHY_TPCRG1_PD_GAIN_3 0x00300000
#define AR_PHY_TPCRG1_PD_GAIN_3_S 20
//

#define AR_PHY_ANALOG_SWAP 0xa268
#define AR_PHY_SWAP_ALT_CHAIN 0x00000040
Expand Down

0 comments on commit b91de23

Please sign in to comment.