staging: rtl8192u: rename *BitMask variables in r819xU_phy.c

This patch renames BitMask and dwBitMask variables into bitmask to remove camel case. dwBitMask in the given context can be renamed into simply bitmask since its number of bits (dw->32) can be deduced by its type which is u32. Signed-off-by: Xenia Ragiadakou <burzalodowa@gmail.com> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
author: Xenia Ragiadakou <burzalodowa@gmail.com> 2013-06-17 22:29:40 -0400
committer: Greg Kroah-Hartman <gregkh@linuxfoundation.org> 2013-06-18 14:32:39 -0400
commit: 9f66ddb5f7e30cb91e0ba44a2307768c2eacff68 (patch)
tree: 4813dd7a1c33d133d9cf7aa675cac479f00fcb47
parent: 07ecbbf1a39dfa75712367c14beb1033062c47f8 (diff)
1 files changed, 41 insertions, 41 deletions
diff --git a/drivers/staging/rtl8192u/r819xU_phy.c b/drivers/staging/rtl8192u/r819xU_phy.c
index c1ab59e336fc..787090adfa46 100644
--- a/drivers/staging/rtl8192u/r819xU_phy.c
+++ b/drivers/staging/rtl8192u/r819xU_phy.c
@@ -40,14 +40,14 @@ static u32 RF_CHANNEL_TABLE_ZEBRA[] = {
 /******************************************************************************
 *function:  This function read BB parameters from Header file we gen,
 *           and do register read/write
- *   input:  u32        dwBitMask  //taget bit pos in the addr to be modified
+ *   input:  u32        bitmask  //taget bit pos in the addr to be modified
 *  output:  none
 *  return:  u32        return the shift bit position of the mask
 * ****************************************************************************/
-u32 rtl8192_CalculateBitShift(u32 dwBitMask)
+u32 rtl8192_CalculateBitShift(u32 bitmask)
 {
        u32 i;
-        i = ffs(dwBitMask) - 1;
+        i = ffs(bitmask) - 1;
        return i;
 }
 /******************************************************************************
@@ -74,22 +74,22 @@ u8 rtl8192_phy_CheckIsLegalRFPath(struct net_device *dev, u32 eRFPath)
 *function:  This function set specific bits to BB register
 *   input:  net_device dev
 *           u32        dwRegAddr  //target addr to be modified
- *           u32        dwBitMask  //taget bit pos in the addr to be modified
+ *           u32        bitmask    //taget bit pos in the addr to be modified
 *           u32        dwData     //value to be write
 *  output:  none
 *  return:  none
 *  notice:
 * ****************************************************************************/
-void rtl8192_setBBreg(struct net_device *dev, u32 dwRegAddr, u32 dwBitMask,
+void rtl8192_setBBreg(struct net_device *dev, u32 dwRegAddr, u32 bitmask,
                      u32 dwData)
 {
        u32 reg, BitShift;
-        if (dwBitMask != bMaskDWord) { //if not "double word" write
+        if (bitmask != bMaskDWord) { //if not "double word" write
                read_nic_dword(dev, dwRegAddr, &reg);
-                BitShift = rtl8192_CalculateBitShift(dwBitMask);
+                BitShift = rtl8192_CalculateBitShift(bitmask);
-                reg &= ~dwBitMask;
+                reg &= ~bitmask;
                reg |= dwData << BitShift;
                write_nic_dword(dev, dwRegAddr, reg);
        } else {
@@ -101,18 +101,18 @@ void rtl8192_setBBreg(struct net_device *dev, u32 dwRegAddr, u32 dwBitMask,
 *function:  This function reads specific bits from BB register
 *   input:  net_device dev
 *           u32        dwRegAddr  //target addr to be readback
- *           u32        dwBitMask  //taget bit pos in the addr to be readback
+ *           u32        bitmask    //taget bit pos in the addr to be readback
 *  output:  none
 *  return:  u32        Data    //the readback register value
 *  notice:
 * ****************************************************************************/
-u32 rtl8192_QueryBBReg(struct net_device *dev, u32 dwRegAddr, u32 dwBitMask)
+u32 rtl8192_QueryBBReg(struct net_device *dev, u32 dwRegAddr, u32 bitmask)
 {
        u32 Ret = 0, reg, BitShift;
        read_nic_dword(dev, dwRegAddr, &reg);
-        BitShift = rtl8192_CalculateBitShift(dwBitMask);
+        BitShift = rtl8192_CalculateBitShift(bitmask);
-        Ret = (reg & dwBitMask) >> BitShift;
+        Ret = (reg & bitmask) >> BitShift;
        return Ret;
 }
@@ -270,14 +270,14 @@ void rtl8192_phy_RFSerialWrite(struct net_device *dev,
 *   input:  net_device dev
 *           RF90_RADIO_PATH_E eRFPath //radio path of A/B/C/D
 *           u32        RegAddr  //target addr to be modified
- *           u32        BitMask  //taget bit pos in the addr to be modified
+ *           u32        bitmask  //taget bit pos in the addr to be modified
 *           u32        Data     //value to be write
 *  output:  none
 *  return:  none
 *  notice:
 * ****************************************************************************/
 void rtl8192_phy_SetRFReg(struct net_device *dev, RF90_RADIO_PATH_E eRFPath,
-                          u32 RegAddr, u32 BitMask, u32 Data)
+                          u32 RegAddr, u32 bitmask, u32 Data)
 {
        struct r8192_priv *priv = ieee80211_priv(dev);
        u32 reg, BitShift;
@@ -286,10 +286,10 @@ void rtl8192_phy_SetRFReg(struct net_device *dev, RF90_RADIO_PATH_E eRFPath,
                return;
        if (priv->Rf_Mode == RF_OP_By_FW) {
-                if (BitMask != bMask12Bits) { // RF data is 12 bits only
+                if (bitmask != bMask12Bits) { // RF data is 12 bits only
                        reg = phy_FwRFSerialRead(dev, eRFPath, RegAddr);
-                        BitShift =  rtl8192_CalculateBitShift(BitMask);
+                        BitShift =  rtl8192_CalculateBitShift(bitmask);
-                        reg &= ~BitMask;
+                        reg &= ~bitmask;
                        reg |= Data << BitShift;
                        phy_FwRFSerialWrite(dev, eRFPath, RegAddr, reg);
@@ -300,10 +300,10 @@ void rtl8192_phy_SetRFReg(struct net_device *dev, RF90_RADIO_PATH_E eRFPath,
                udelay(200);
        } else {
-                if (BitMask != bMask12Bits) { // RF data is 12 bits only
+                if (bitmask != bMask12Bits) { // RF data is 12 bits only
                        reg = rtl8192_phy_RFSerialRead(dev, eRFPath, RegAddr);
-                        BitShift =  rtl8192_CalculateBitShift(BitMask);
+                        BitShift =  rtl8192_CalculateBitShift(bitmask);
-                        reg &= ~BitMask;
+                        reg &= ~bitmask;
                        reg |= Data << BitShift;
                        rtl8192_phy_RFSerialWrite(dev, eRFPath, RegAddr, reg);
@@ -318,13 +318,13 @@ void rtl8192_phy_SetRFReg(struct net_device *dev, RF90_RADIO_PATH_E eRFPath,
 *function:  This function reads specific bits from RF register
 *   input:  net_device dev
 *           u32        RegAddr  //target addr to be readback
- *           u32        BitMask  //taget bit pos in the addr to be readback
+ *           u32        bitmask  //taget bit pos in the addr to be readback
 *  output:  none
 *  return:  u32        Data    //the readback register value
 *  notice:
 * ****************************************************************************/
 u32 rtl8192_phy_QueryRFReg(struct net_device *dev, RF90_RADIO_PATH_E eRFPath,
-                           u32 RegAddr, u32 BitMask)
+                           u32 RegAddr, u32 bitmask)
 {
        u32 reg, BitShift;
        struct r8192_priv *priv = ieee80211_priv(dev);
@@ -334,14 +334,14 @@ u32 rtl8192_phy_QueryRFReg(struct net_device *dev, RF90_RADIO_PATH_E eRFPath,
                return 0;
        if (priv->Rf_Mode == RF_OP_By_FW) {
                reg = phy_FwRFSerialRead(dev, eRFPath, RegAddr);
-                BitShift =  rtl8192_CalculateBitShift(BitMask);
+                BitShift =  rtl8192_CalculateBitShift(bitmask);
-                reg = (reg & BitMask) >> BitShift;
+                reg = (reg & bitmask) >> BitShift;
                udelay(200);
                return reg;
        } else {
                reg = rtl8192_phy_RFSerialRead(dev, eRFPath, RegAddr);
-                BitShift =  rtl8192_CalculateBitShift(BitMask);
+                BitShift =  rtl8192_CalculateBitShift(bitmask);
-                reg = (reg & BitMask) >> BitShift;
+                reg = (reg & bitmask) >> BitShift;
                return reg;
        }
 }
@@ -1563,7 +1563,7 @@ extern void InitialGainOperateWorkItemCallBack(struct work_struct *work)
       struct net_device *dev = priv->ieee80211->dev;
 #define SCAN_RX_INITIAL_GAIN    0x17
 #define POWER_DETECTION_TH      0x08
-        u32     BitMask;
+        u32     bitmask;
        u8      initial_gain;
        u8      Operation;
@@ -1573,15 +1573,15 @@ extern void InitialGainOperateWorkItemCallBack(struct work_struct *work)
                case IG_Backup:
                        RT_TRACE(COMP_SCAN, "IG_Backup, backup the initial gain.\n");
                        initial_gain = SCAN_RX_INITIAL_GAIN;
-                        BitMask = bMaskByte0;
+                        bitmask = bMaskByte0;
                        if (dm_digtable.dig_algorithm == DIG_ALGO_BY_FALSE_ALARM)
                                rtl8192_setBBreg(dev, UFWP, bMaskByte1, 0x8);   // FW DIG OFF
-                        priv->initgain_backup.xaagccore1 = (u8)rtl8192_QueryBBReg(dev, rOFDM0_XAAGCCore1, BitMask);
+                        priv->initgain_backup.xaagccore1 = (u8)rtl8192_QueryBBReg(dev, rOFDM0_XAAGCCore1, bitmask);
-                        priv->initgain_backup.xbagccore1 = (u8)rtl8192_QueryBBReg(dev, rOFDM0_XBAGCCore1, BitMask);
+                        priv->initgain_backup.xbagccore1 = (u8)rtl8192_QueryBBReg(dev, rOFDM0_XBAGCCore1, bitmask);
-                        priv->initgain_backup.xcagccore1 = (u8)rtl8192_QueryBBReg(dev, rOFDM0_XCAGCCore1, BitMask);
+                        priv->initgain_backup.xcagccore1 = (u8)rtl8192_QueryBBReg(dev, rOFDM0_XCAGCCore1, bitmask);
-                        priv->initgain_backup.xdagccore1 = (u8)rtl8192_QueryBBReg(dev, rOFDM0_XDAGCCore1, BitMask);
+                        priv->initgain_backup.xdagccore1 = (u8)rtl8192_QueryBBReg(dev, rOFDM0_XDAGCCore1, bitmask);
-                        BitMask  = bMaskByte2;
+                        bitmask = bMaskByte2;
-                        priv->initgain_backup.cca               = (u8)rtl8192_QueryBBReg(dev, rCCK0_CCA, BitMask);
+                        priv->initgain_backup.cca               = (u8)rtl8192_QueryBBReg(dev, rCCK0_CCA, bitmask);
                        RT_TRACE(COMP_SCAN, "Scan InitialGainBackup 0xc50 is %x\n",priv->initgain_backup.xaagccore1);
                        RT_TRACE(COMP_SCAN, "Scan InitialGainBackup 0xc58 is %x\n",priv->initgain_backup.xbagccore1);
@@ -1599,16 +1599,16 @@ extern void InitialGainOperateWorkItemCallBack(struct work_struct *work)
                        break;
                case IG_Restore:
                        RT_TRACE(COMP_SCAN, "IG_Restore, restore the initial gain.\n");
-                        BitMask = 0x7f; //Bit0~ Bit6
+                        bitmask = 0x7f; //Bit0~ Bit6
                        if (dm_digtable.dig_algorithm == DIG_ALGO_BY_FALSE_ALARM)
                                rtl8192_setBBreg(dev, UFWP, bMaskByte1, 0x8);   // FW DIG OFF
-                        rtl8192_setBBreg(dev, rOFDM0_XAAGCCore1, BitMask, (u32)priv->initgain_backup.xaagccore1);
+                        rtl8192_setBBreg(dev, rOFDM0_XAAGCCore1, bitmask, (u32)priv->initgain_backup.xaagccore1);
-                        rtl8192_setBBreg(dev, rOFDM0_XBAGCCore1, BitMask, (u32)priv->initgain_backup.xbagccore1);
+                        rtl8192_setBBreg(dev, rOFDM0_XBAGCCore1, bitmask, (u32)priv->initgain_backup.xbagccore1);
-                        rtl8192_setBBreg(dev, rOFDM0_XCAGCCore1, BitMask, (u32)priv->initgain_backup.xcagccore1);
+                        rtl8192_setBBreg(dev, rOFDM0_XCAGCCore1, bitmask, (u32)priv->initgain_backup.xcagccore1);
-                        rtl8192_setBBreg(dev, rOFDM0_XDAGCCore1, BitMask, (u32)priv->initgain_backup.xdagccore1);
+                        rtl8192_setBBreg(dev, rOFDM0_XDAGCCore1, bitmask, (u32)priv->initgain_backup.xdagccore1);
-                        BitMask  = bMaskByte2;
+                        bitmask  = bMaskByte2;
-                        rtl8192_setBBreg(dev, rCCK0_CCA, BitMask, (u32)priv->initgain_backup.cca);
+                        rtl8192_setBBreg(dev, rCCK0_CCA, bitmask, (u32)priv->initgain_backup.cca);
                        RT_TRACE(COMP_SCAN, "Scan BBInitialGainRestore 0xc50 is %x\n",priv->initgain_backup.xaagccore1);
                        RT_TRACE(COMP_SCAN, "Scan BBInitialGainRestore 0xc58 is %x\n",priv->initgain_backup.xbagccore1);
author	Xenia Ragiadakou <burzalodowa@gmail.com>	2013-06-17 22:29:40 -0400
committer	Greg Kroah-Hartman <gregkh@linuxfoundation.org>	2013-06-18 14:32:39 -0400
commit	9f66ddb5f7e30cb91e0ba44a2307768c2eacff68 (patch)
tree	4813dd7a1c33d133d9cf7aa675cac479f00fcb47
parent	07ecbbf1a39dfa75712367c14beb1033062c47f8 (diff)

diff --git a/drivers/staging/rtl8192u/r819xU_phy.c b/drivers/staging/rtl8192u/r819xU_phy.c index c1ab59e336fc..787090adfa46 100644 --- a/drivers/staging/rtl8192u/r819xU_phy.c +++ b/drivers/staging/rtl8192u/r819xU_phy.c
@@ -40,14 +40,14 @@ static u32 RF_CHANNEL_TABLE_ZEBRA[] = {
40	/******************************************************************************	40	/******************************************************************************
41	*function: This function read BB parameters from Header file we gen,	41	*function: This function read BB parameters from Header file we gen,
42	* and do register read/write	42	* and do register read/write
43	* input: u32 dwBitMask //taget bit pos in the addr to be modified	43	* input: u32 bitmask //taget bit pos in the addr to be modified
44	* output: none	44	* output: none
45	* return: u32 return the shift bit position of the mask	45	* return: u32 return the shift bit position of the mask
46	* ****************************************************************************/	46	* ****************************************************************************/
47	u32 rtl8192_CalculateBitShift(u32 dwBitMask)	47	u32 rtl8192_CalculateBitShift(u32 bitmask)
48	{	48	{
49	u32 i;	49	u32 i;
50	i = ffs(dwBitMask) - 1;	50	i = ffs(bitmask) - 1;
51	return i;	51	return i;
52	}	52	}
53	/******************************************************************************	53	/******************************************************************************
@@ -74,22 +74,22 @@ u8 rtl8192_phy_CheckIsLegalRFPath(struct net_device *dev, u32 eRFPath)
74	*function: This function set specific bits to BB register	74	*function: This function set specific bits to BB register
75	* input: net_device dev	75	* input: net_device dev
76	* u32 dwRegAddr //target addr to be modified	76	* u32 dwRegAddr //target addr to be modified
77	* u32 dwBitMask //taget bit pos in the addr to be modified	77	* u32 bitmask //taget bit pos in the addr to be modified
78	* u32 dwData //value to be write	78	* u32 dwData //value to be write
79	* output: none	79	* output: none
80	* return: none	80	* return: none
81	* notice:	81	* notice:
82	* ****************************************************************************/	82	* ****************************************************************************/
83	void rtl8192_setBBreg(struct net_device *dev, u32 dwRegAddr, u32 dwBitMask,	83	void rtl8192_setBBreg(struct net_device *dev, u32 dwRegAddr, u32 bitmask,
84	u32 dwData)	84	u32 dwData)
85	{	85	{
86		86
87	u32 reg, BitShift;	87	u32 reg, BitShift;
88		88
89	if (dwBitMask != bMaskDWord) { //if not "double word" write	89	if (bitmask != bMaskDWord) { //if not "double word" write
90	read_nic_dword(dev, dwRegAddr, &reg);	90	read_nic_dword(dev, dwRegAddr, &reg);
91	BitShift = rtl8192_CalculateBitShift(dwBitMask);	91	BitShift = rtl8192_CalculateBitShift(bitmask);
92	reg &= ~dwBitMask;	92	reg &= ~bitmask;
93	reg \|= dwData << BitShift;	93	reg \|= dwData << BitShift;
94	write_nic_dword(dev, dwRegAddr, reg);	94	write_nic_dword(dev, dwRegAddr, reg);
95	} else {	95	} else {
@@ -101,18 +101,18 @@ void rtl8192_setBBreg(struct net_device *dev, u32 dwRegAddr, u32 dwBitMask,
101	*function: This function reads specific bits from BB register	101	*function: This function reads specific bits from BB register
102	* input: net_device dev	102	* input: net_device dev
103	* u32 dwRegAddr //target addr to be readback	103	* u32 dwRegAddr //target addr to be readback
104	* u32 dwBitMask //taget bit pos in the addr to be readback	104	* u32 bitmask //taget bit pos in the addr to be readback
105	* output: none	105	* output: none
106	* return: u32 Data //the readback register value	106	* return: u32 Data //the readback register value
107	* notice:	107	* notice:
108	* ****************************************************************************/	108	* ****************************************************************************/
109	u32 rtl8192_QueryBBReg(struct net_device *dev, u32 dwRegAddr, u32 dwBitMask)	109	u32 rtl8192_QueryBBReg(struct net_device *dev, u32 dwRegAddr, u32 bitmask)
110	{	110	{
111	u32 Ret = 0, reg, BitShift;	111	u32 Ret = 0, reg, BitShift;
112		112
113	read_nic_dword(dev, dwRegAddr, &reg);	113	read_nic_dword(dev, dwRegAddr, &reg);
114	BitShift = rtl8192_CalculateBitShift(dwBitMask);	114	BitShift = rtl8192_CalculateBitShift(bitmask);
115	Ret = (reg & dwBitMask) >> BitShift;	115	Ret = (reg & bitmask) >> BitShift;
116		116
117	return Ret;	117	return Ret;
118	}	118	}
@@ -270,14 +270,14 @@ void rtl8192_phy_RFSerialWrite(struct net_device *dev,
270	* input: net_device dev	270	* input: net_device dev
271	* RF90_RADIO_PATH_E eRFPath //radio path of A/B/C/D	271	* RF90_RADIO_PATH_E eRFPath //radio path of A/B/C/D
272	* u32 RegAddr //target addr to be modified	272	* u32 RegAddr //target addr to be modified
273	* u32 BitMask //taget bit pos in the addr to be modified	273	* u32 bitmask //taget bit pos in the addr to be modified
274	* u32 Data //value to be write	274	* u32 Data //value to be write
275	* output: none	275	* output: none
276	* return: none	276	* return: none
277	* notice:	277	* notice:
278	* ****************************************************************************/	278	* ****************************************************************************/
279	void rtl8192_phy_SetRFReg(struct net_device *dev, RF90_RADIO_PATH_E eRFPath,	279	void rtl8192_phy_SetRFReg(struct net_device *dev, RF90_RADIO_PATH_E eRFPath,
280	u32 RegAddr, u32 BitMask, u32 Data)	280	u32 RegAddr, u32 bitmask, u32 Data)
281	{	281	{
282	struct r8192_priv *priv = ieee80211_priv(dev);	282	struct r8192_priv *priv = ieee80211_priv(dev);
283	u32 reg, BitShift;	283	u32 reg, BitShift;
@@ -286,10 +286,10 @@ void rtl8192_phy_SetRFReg(struct net_device *dev, RF90_RADIO_PATH_E eRFPath,
286	return;	286	return;
287		287
288	if (priv->Rf_Mode == RF_OP_By_FW) {	288	if (priv->Rf_Mode == RF_OP_By_FW) {
289	if (BitMask != bMask12Bits) { // RF data is 12 bits only	289	if (bitmask != bMask12Bits) { // RF data is 12 bits only
290	reg = phy_FwRFSerialRead(dev, eRFPath, RegAddr);	290	reg = phy_FwRFSerialRead(dev, eRFPath, RegAddr);
291	BitShift = rtl8192_CalculateBitShift(BitMask);	291	BitShift = rtl8192_CalculateBitShift(bitmask);
292	reg &= ~BitMask;	292	reg &= ~bitmask;
293	reg \|= Data << BitShift;	293	reg \|= Data << BitShift;
294		294
295	phy_FwRFSerialWrite(dev, eRFPath, RegAddr, reg);	295	phy_FwRFSerialWrite(dev, eRFPath, RegAddr, reg);
@@ -300,10 +300,10 @@ void rtl8192_phy_SetRFReg(struct net_device *dev, RF90_RADIO_PATH_E eRFPath,
300	udelay(200);	300	udelay(200);
301		301
302	} else {	302	} else {
303	if (BitMask != bMask12Bits) { // RF data is 12 bits only	303	if (bitmask != bMask12Bits) { // RF data is 12 bits only
304	reg = rtl8192_phy_RFSerialRead(dev, eRFPath, RegAddr);	304	reg = rtl8192_phy_RFSerialRead(dev, eRFPath, RegAddr);
305	BitShift = rtl8192_CalculateBitShift(BitMask);	305	BitShift = rtl8192_CalculateBitShift(bitmask);
306	reg &= ~BitMask;	306	reg &= ~bitmask;
307	reg \|= Data << BitShift;	307	reg \|= Data << BitShift;
308		308
309	rtl8192_phy_RFSerialWrite(dev, eRFPath, RegAddr, reg);	309	rtl8192_phy_RFSerialWrite(dev, eRFPath, RegAddr, reg);
@@ -318,13 +318,13 @@ void rtl8192_phy_SetRFReg(struct net_device *dev, RF90_RADIO_PATH_E eRFPath,
318	*function: This function reads specific bits from RF register	318	*function: This function reads specific bits from RF register
319	* input: net_device dev	319	* input: net_device dev
320	* u32 RegAddr //target addr to be readback	320	* u32 RegAddr //target addr to be readback
321	* u32 BitMask //taget bit pos in the addr to be readback	321	* u32 bitmask //taget bit pos in the addr to be readback
322	* output: none	322	* output: none
323	* return: u32 Data //the readback register value	323	* return: u32 Data //the readback register value
324	* notice:	324	* notice:
325	* ****************************************************************************/	325	* ****************************************************************************/
326	u32 rtl8192_phy_QueryRFReg(struct net_device *dev, RF90_RADIO_PATH_E eRFPath,	326	u32 rtl8192_phy_QueryRFReg(struct net_device *dev, RF90_RADIO_PATH_E eRFPath,
327	u32 RegAddr, u32 BitMask)	327	u32 RegAddr, u32 bitmask)
328	{	328	{
329	u32 reg, BitShift;	329	u32 reg, BitShift;
330	struct r8192_priv *priv = ieee80211_priv(dev);	330	struct r8192_priv *priv = ieee80211_priv(dev);
@@ -334,14 +334,14 @@ u32 rtl8192_phy_QueryRFReg(struct net_device *dev, RF90_RADIO_PATH_E eRFPath,
334	return 0;	334	return 0;
335	if (priv->Rf_Mode == RF_OP_By_FW) {	335	if (priv->Rf_Mode == RF_OP_By_FW) {
336	reg = phy_FwRFSerialRead(dev, eRFPath, RegAddr);	336	reg = phy_FwRFSerialRead(dev, eRFPath, RegAddr);
337	BitShift = rtl8192_CalculateBitShift(BitMask);	337	BitShift = rtl8192_CalculateBitShift(bitmask);
338	reg = (reg & BitMask) >> BitShift;	338	reg = (reg & bitmask) >> BitShift;
339	udelay(200);	339	udelay(200);
340	return reg;	340	return reg;
341	} else {	341	} else {
342	reg = rtl8192_phy_RFSerialRead(dev, eRFPath, RegAddr);	342	reg = rtl8192_phy_RFSerialRead(dev, eRFPath, RegAddr);
343	BitShift = rtl8192_CalculateBitShift(BitMask);	343	BitShift = rtl8192_CalculateBitShift(bitmask);
344	reg = (reg & BitMask) >> BitShift;	344	reg = (reg & bitmask) >> BitShift;
345	return reg;	345	return reg;
346	}	346	}
347	}	347	}
@@ -1563,7 +1563,7 @@ extern void InitialGainOperateWorkItemCallBack(struct work_struct *work)
1563	struct net_device *dev = priv->ieee80211->dev;	1563	struct net_device *dev = priv->ieee80211->dev;
1564	#define SCAN_RX_INITIAL_GAIN 0x17	1564	#define SCAN_RX_INITIAL_GAIN 0x17
1565	#define POWER_DETECTION_TH 0x08	1565	#define POWER_DETECTION_TH 0x08
1566	u32 BitMask;	1566	u32 bitmask;
1567	u8 initial_gain;	1567	u8 initial_gain;
1568	u8 Operation;	1568	u8 Operation;
1569		1569
@@ -1573,15 +1573,15 @@ extern void InitialGainOperateWorkItemCallBack(struct work_struct *work)
1573	case IG_Backup:	1573	case IG_Backup:
1574	RT_TRACE(COMP_SCAN, "IG_Backup, backup the initial gain.\n");	1574	RT_TRACE(COMP_SCAN, "IG_Backup, backup the initial gain.\n");
1575	initial_gain = SCAN_RX_INITIAL_GAIN;	1575	initial_gain = SCAN_RX_INITIAL_GAIN;
1576	BitMask = bMaskByte0;	1576	bitmask = bMaskByte0;
1577	if (dm_digtable.dig_algorithm == DIG_ALGO_BY_FALSE_ALARM)	1577	if (dm_digtable.dig_algorithm == DIG_ALGO_BY_FALSE_ALARM)
1578	rtl8192_setBBreg(dev, UFWP, bMaskByte1, 0x8); // FW DIG OFF	1578	rtl8192_setBBreg(dev, UFWP, bMaskByte1, 0x8); // FW DIG OFF
1579	priv->initgain_backup.xaagccore1 = (u8)rtl8192_QueryBBReg(dev, rOFDM0_XAAGCCore1, BitMask);	1579	priv->initgain_backup.xaagccore1 = (u8)rtl8192_QueryBBReg(dev, rOFDM0_XAAGCCore1, bitmask);
1580	priv->initgain_backup.xbagccore1 = (u8)rtl8192_QueryBBReg(dev, rOFDM0_XBAGCCore1, BitMask);	1580	priv->initgain_backup.xbagccore1 = (u8)rtl8192_QueryBBReg(dev, rOFDM0_XBAGCCore1, bitmask);
1581	priv->initgain_backup.xcagccore1 = (u8)rtl8192_QueryBBReg(dev, rOFDM0_XCAGCCore1, BitMask);	1581	priv->initgain_backup.xcagccore1 = (u8)rtl8192_QueryBBReg(dev, rOFDM0_XCAGCCore1, bitmask);
1582	priv->initgain_backup.xdagccore1 = (u8)rtl8192_QueryBBReg(dev, rOFDM0_XDAGCCore1, BitMask);	1582	priv->initgain_backup.xdagccore1 = (u8)rtl8192_QueryBBReg(dev, rOFDM0_XDAGCCore1, bitmask);
1583	BitMask = bMaskByte2;	1583	bitmask = bMaskByte2;
1584	priv->initgain_backup.cca = (u8)rtl8192_QueryBBReg(dev, rCCK0_CCA, BitMask);	1584	priv->initgain_backup.cca = (u8)rtl8192_QueryBBReg(dev, rCCK0_CCA, bitmask);
1585		1585
1586	RT_TRACE(COMP_SCAN, "Scan InitialGainBackup 0xc50 is %x\n",priv->initgain_backup.xaagccore1);	1586	RT_TRACE(COMP_SCAN, "Scan InitialGainBackup 0xc50 is %x\n",priv->initgain_backup.xaagccore1);
1587	RT_TRACE(COMP_SCAN, "Scan InitialGainBackup 0xc58 is %x\n",priv->initgain_backup.xbagccore1);	1587	RT_TRACE(COMP_SCAN, "Scan InitialGainBackup 0xc58 is %x\n",priv->initgain_backup.xbagccore1);
@@ -1599,16 +1599,16 @@ extern void InitialGainOperateWorkItemCallBack(struct work_struct *work)
1599	break;	1599	break;
1600	case IG_Restore:	1600	case IG_Restore:
1601	RT_TRACE(COMP_SCAN, "IG_Restore, restore the initial gain.\n");	1601	RT_TRACE(COMP_SCAN, "IG_Restore, restore the initial gain.\n");
1602	BitMask = 0x7f; //Bit0~ Bit6	1602	bitmask = 0x7f; //Bit0~ Bit6
1603	if (dm_digtable.dig_algorithm == DIG_ALGO_BY_FALSE_ALARM)	1603	if (dm_digtable.dig_algorithm == DIG_ALGO_BY_FALSE_ALARM)
1604	rtl8192_setBBreg(dev, UFWP, bMaskByte1, 0x8); // FW DIG OFF	1604	rtl8192_setBBreg(dev, UFWP, bMaskByte1, 0x8); // FW DIG OFF
1605		1605
1606	rtl8192_setBBreg(dev, rOFDM0_XAAGCCore1, BitMask, (u32)priv->initgain_backup.xaagccore1);	1606	rtl8192_setBBreg(dev, rOFDM0_XAAGCCore1, bitmask, (u32)priv->initgain_backup.xaagccore1);
1607	rtl8192_setBBreg(dev, rOFDM0_XBAGCCore1, BitMask, (u32)priv->initgain_backup.xbagccore1);	1607	rtl8192_setBBreg(dev, rOFDM0_XBAGCCore1, bitmask, (u32)priv->initgain_backup.xbagccore1);
1608	rtl8192_setBBreg(dev, rOFDM0_XCAGCCore1, BitMask, (u32)priv->initgain_backup.xcagccore1);	1608	rtl8192_setBBreg(dev, rOFDM0_XCAGCCore1, bitmask, (u32)priv->initgain_backup.xcagccore1);
1609	rtl8192_setBBreg(dev, rOFDM0_XDAGCCore1, BitMask, (u32)priv->initgain_backup.xdagccore1);	1609	rtl8192_setBBreg(dev, rOFDM0_XDAGCCore1, bitmask, (u32)priv->initgain_backup.xdagccore1);
1610	BitMask = bMaskByte2;	1610	bitmask = bMaskByte2;
1611	rtl8192_setBBreg(dev, rCCK0_CCA, BitMask, (u32)priv->initgain_backup.cca);	1611	rtl8192_setBBreg(dev, rCCK0_CCA, bitmask, (u32)priv->initgain_backup.cca);
1612		1612
1613	RT_TRACE(COMP_SCAN, "Scan BBInitialGainRestore 0xc50 is %x\n",priv->initgain_backup.xaagccore1);	1613	RT_TRACE(COMP_SCAN, "Scan BBInitialGainRestore 0xc50 is %x\n",priv->initgain_backup.xaagccore1);
1614	RT_TRACE(COMP_SCAN, "Scan BBInitialGainRestore 0xc58 is %x\n",priv->initgain_backup.xbagccore1);	1614	RT_TRACE(COMP_SCAN, "Scan BBInitialGainRestore 0xc58 is %x\n",priv->initgain_backup.xbagccore1);