From: Christian Lamparter Date: Mon, 13 Sep 2010 21:03:01 +0000 (+0200) Subject: carl9170 firmware: update shared headers X-Git-Tag: 1.8.8.2~2 X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=4fd5657eedb8a315915d33e6d2e0bbba3fd5b1cf;p=carl9170fw.git carl9170 firmware: update shared headers * add SET_CONSTVAL helper * cosmetic changes Signed-off-by: Christian Lamparter --- diff --git a/include/shared/hw.h b/include/shared/hw.h index b1292ac..2f471b3 100644 --- a/include/shared/hw.h +++ b/include/shared/hw.h @@ -731,6 +731,9 @@ struct ar9170_stream { #define SET_VAL(reg, value, newvalue) \ (value = ((value) & ~reg) | (((newvalue) << reg##_S) & reg)) +#define SET_CONSTVAL(reg, newvalue) \ + (((newvalue) << reg##_S) & reg) + #define MOD_VAL(reg, value, newvalue) \ (((value) & ~reg) | (((newvalue) << reg##_S) & reg)) #endif /* __CARL9170_SHARED_HW_H */ diff --git a/include/shared/phy.h b/include/shared/phy.h index 53c18d3..02c34eb 100644 --- a/include/shared/phy.h +++ b/include/shared/phy.h @@ -423,8 +423,8 @@ #define AR9170_PHY_CCK_DETECT_BB_ENABLE_ANT_FAST_DIV 0x2000 #define AR9170_PHY_CCK_DETECT_BB_ENABLE_ANT_FAST_DIV_S 13 -#define AR9170_PHY_REG_GAIN_2GHZ_CHAIN_2 (AR9170_PHY_REG_BASE + 0x2a0c) #define AR9170_PHY_REG_GAIN_2GHZ (AR9170_PHY_REG_BASE + 0x0a0c) +#define AR9170_PHY_REG_GAIN_2GHZ_CHAIN_2 (AR9170_PHY_REG_BASE + 0x2a0c) #define AR9170_PHY_GAIN_2GHZ_RXTX_MARGIN 0x00fc0000 #define AR9170_PHY_GAIN_2GHZ_RXTX_MARGIN_S 18 #define AR9170_PHY_GAIN_2GHZ_BSW_MARGIN 0x00003c00 @@ -561,7 +561,4 @@ #define AR9170_PHY_CH2_EXT_MINCCA_PWR 0xff800000 #define AR9170_PHY_CH2_EXT_MINCCA_PWR_S 23 -#define REDUCE_CHAIN_0 0x00000050 -#define REDUCE_CHAIN_1 0x00000051 - #endif /* __CARL9170_SHARED_PHY_H */