From b91de23158cce7ac8bffc322f2c3e97dee1912e0 Mon Sep 17 00:00:00 2001 From: Andrea Gelmini Date: Mon, 1 Mar 2010 00:28:51 +0100 Subject: [PATCH] --- yaml --- r: 196899 b: refs/heads/master c: ecd9fe1deddaf0cc0b8e6625659ad7e368ab5557 h: refs/heads/master i: 196897: 9651328402d1ddc711858419376716592b62ed23 196895: bf1bbcdbe89ec68a46f120809f7ff606eec2cff8 v: v3 --- [refs] | 2 +- trunk/drivers/staging/otus/hal/hpani.h | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 6e52cc6ef82c..3d9e3609a243 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 52628626dfcb996a5d12996a15255fbe970d6e6e +refs/heads/master: ecd9fe1deddaf0cc0b8e6625659ad7e368ab5557 diff --git a/trunk/drivers/staging/otus/hal/hpani.h b/trunk/drivers/staging/otus/hal/hpani.h index 96e69af3c685..b89241371ab1 100644 --- a/trunk/drivers/staging/otus/hal/hpani.h +++ b/trunk/drivers/staging/otus/hal/hpani.h @@ -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 @@ -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 @@ -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