Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=aa93c85d09295dcb269fc1a0690d9ddfb58f46cc
Commit:     aa93c85d09295dcb269fc1a0690d9ddfb58f46cc
Parent:     aec91028db71cae7efa1101cf2e38c407096f023
Author:     Larry Finger <[EMAIL PROTECTED]>
AuthorDate: Wed Mar 14 15:06:22 2007 -0500
Committer:  Jeff Garzik <[EMAIL PROTECTED]>
CommitDate: Sat Apr 28 11:00:59 2007 -0400

    [PATCH] bcm43xx:Eliminate some 'G Mode Enable' magic numbers
    
    In code manipulating the TM State Low register of 802.11 cores, two
    different magic numbers are used to reference the 'G Mode Enable' bit.
    One of these, 0x20000000, is clear, but the other, (0x800 << 18), is not.
    This patch replaces both types with a defined constant. In addition, two
    bits in the TM State High registers are given definitions to help in
    following the code.
    
    Signed-off-by: Larry Finger <[EMAIL PROTECTED]>
    Signed-off-by: John W. Linville <[EMAIL PROTECTED]>
---
 drivers/net/wireless/bcm43xx/bcm43xx.h      |    3 +++
 drivers/net/wireless/bcm43xx/bcm43xx_main.c |    4 ++--
 drivers/net/wireless/bcm43xx/bcm43xx_phy.c  |    8 ++++----
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/drivers/net/wireless/bcm43xx/bcm43xx.h 
b/drivers/net/wireless/bcm43xx/bcm43xx.h
index 95ff175..f8483c1 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx.h
+++ b/drivers/net/wireless/bcm43xx/bcm43xx.h
@@ -277,11 +277,14 @@
 #define BCM43xx_SBTMSTATELOW_REJECT            0x02
 #define BCM43xx_SBTMSTATELOW_CLOCK             0x10000
 #define BCM43xx_SBTMSTATELOW_FORCE_GATE_CLOCK  0x20000
+#define BCM43xx_SBTMSTATELOW_G_MODE_ENABLE     0x20000000
 
 /* sbtmstatehigh state flags */
 #define BCM43xx_SBTMSTATEHIGH_SERROR           0x00000001
 #define BCM43xx_SBTMSTATEHIGH_BUSY             0x00000004
 #define BCM43xx_SBTMSTATEHIGH_TIMEOUT          0x00000020
+#define BCM43xx_SBTMSTATEHIGH_G_PHY_AVAIL      0x00010000
+#define BCM43xx_SBTMSTATEHIGH_A_PHY_AVAIL      0x00020000
 #define BCM43xx_SBTMSTATEHIGH_COREFLAGS                0x1FFF0000
 #define BCM43xx_SBTMSTATEHIGH_DMA64BIT         0x10000000
 #define BCM43xx_SBTMSTATEHIGH_GATEDCLK         0x20000000
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_main.c 
b/drivers/net/wireless/bcm43xx/bcm43xx_main.c
index a38e7ee..5e96bca 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_main.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_main.c
@@ -1407,7 +1407,7 @@ void bcm43xx_wireless_core_reset(struct bcm43xx_private 
*bcm, int connect_phy)
                                & ~(BCM43xx_SBF_MAC_ENABLED | 0x00000002));
        } else {
                if (connect_phy)
-                       flags |= 0x20000000;
+                       flags |= BCM43xx_SBTMSTATELOW_G_MODE_ENABLE;
                bcm43xx_phy_connect(bcm, connect_phy);
                bcm43xx_core_enable(bcm, flags);
                bcm43xx_write16(bcm, 0x03E6, 0x0000);
@@ -3604,7 +3604,7 @@ int bcm43xx_select_wireless_core(struct bcm43xx_private 
*bcm,
                u32 sbtmstatelow;
 
                sbtmstatelow = bcm43xx_read32(bcm, BCM43xx_CIR_SBTMSTATELOW);
-               sbtmstatelow |= 0x20000000;
+               sbtmstatelow |= BCM43xx_SBTMSTATELOW_G_MODE_ENABLE;
                bcm43xx_write32(bcm, BCM43xx_CIR_SBTMSTATELOW, sbtmstatelow);
        }
        err = wireless_core_up(bcm, 1);
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_phy.c 
b/drivers/net/wireless/bcm43xx/bcm43xx_phy.c
index 72529a4..c47e19a 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_phy.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_phy.c
@@ -168,16 +168,16 @@ int bcm43xx_phy_connect(struct bcm43xx_private *bcm, int 
connect)
 
        flags = bcm43xx_read32(bcm, BCM43xx_CIR_SBTMSTATEHIGH);
        if (connect) {
-               if (!(flags & 0x00010000))
+               if (!(flags & BCM43xx_SBTMSTATEHIGH_G_PHY_AVAIL))
                        return -ENODEV;
                flags = bcm43xx_read32(bcm, BCM43xx_CIR_SBTMSTATELOW);
-               flags |= (0x800 << 18);
+               flags |= BCM43xx_SBTMSTATELOW_G_MODE_ENABLE;
                bcm43xx_write32(bcm, BCM43xx_CIR_SBTMSTATELOW, flags);
        } else {
-               if (!(flags & 0x00020000))
+               if (!(flags & BCM43xx_SBTMSTATEHIGH_A_PHY_AVAIL))
                        return -ENODEV;
                flags = bcm43xx_read32(bcm, BCM43xx_CIR_SBTMSTATELOW);
-               flags &= ~(0x800 << 18);
+               flags &= ~BCM43xx_SBTMSTATELOW_G_MODE_ENABLE;
                bcm43xx_write32(bcm, BCM43xx_CIR_SBTMSTATELOW, flags);
        }
 out:
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to