b43: Implement dynamic PHY API

This patch implements a dynamic "ops" based PHY API.
This is needed in order to conveniently support future PHY types
to avoid the "switch"-hell.

This patch does not change any functionality. It just moves lots
of code from one place to another and adjusts it for the changed
data structures.

Signed-off-by: Michael Buesch <mb@bu3sch.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 22 insertions, 21 deletions

diff --git a/drivers/net/wireless/b43/tables.c b/drivers/net/wireless/b43/tables.c
index 3f5ea06bf13..1ef9a6463ec 100644
--- a/drivers/net/wireless/b43/tables.c
+++ b/drivers/net/wireless/b43/tables.c
@@ -27,7 +27,8 @@
 
 #include "b43.h"
 #include "tables.h"
-#include "phy.h"
+#include "phy_g.h"
+
 
 const u32 b43_tab_rotor[] = {
         0xFEB93FFD, 0xFEC63FFD, /* 0 */
@@ -377,17 +378,17 @@ static inline void assert_sizes(void)
 
 u16 b43_ofdmtab_read16(struct b43_wldev *dev, u16 table, u16 offset)
 {
-        struct b43_phy *phy = &dev->phy;
+        struct b43_phy_g *gphy = dev->phy.g;
         u16 addr;
 
         addr = table + offset;
-        if ((phy->ofdmtab_addr_direction != B43_OFDMTAB_DIRECTION_READ) ||
-            (addr - 1 != phy->ofdmtab_addr)) {
+        if ((gphy->ofdmtab_addr_direction != B43_OFDMTAB_DIRECTION_READ) ||
+            (addr - 1 != gphy->ofdmtab_addr)) {
                 /* The hardware has a different address in memory. Update it. */
                 b43_phy_write(dev, B43_PHY_OTABLECTL, addr);
-                phy->ofdmtab_addr_direction = B43_OFDMTAB_DIRECTION_READ;
+                gphy->ofdmtab_addr_direction = B43_OFDMTAB_DIRECTION_READ;
         }
-        phy->ofdmtab_addr = addr;
+        gphy->ofdmtab_addr = addr;
 
         return b43_phy_read(dev, B43_PHY_OTABLEI);
 
@@ -398,34 +399,34 @@ u16 b43_ofdmtab_read16(struct b43_wldev *dev, u16 table, u16 offset)
 void b43_ofdmtab_write16(struct b43_wldev *dev, u16 table,
                          u16 offset, u16 value)
 {
-        struct b43_phy *phy = &dev->phy;
+        struct b43_phy_g *gphy = dev->phy.g;
         u16 addr;
 
         addr = table + offset;
-        if ((phy->ofdmtab_addr_direction != B43_OFDMTAB_DIRECTION_WRITE) ||
-            (addr - 1 != phy->ofdmtab_addr)) {
+        if ((gphy->ofdmtab_addr_direction != B43_OFDMTAB_DIRECTION_WRITE) ||
+            (addr - 1 != gphy->ofdmtab_addr)) {
                 /* The hardware has a different address in memory. Update it. */
                 b43_phy_write(dev, B43_PHY_OTABLECTL, addr);
-                phy->ofdmtab_addr_direction = B43_OFDMTAB_DIRECTION_WRITE;
+                gphy->ofdmtab_addr_direction = B43_OFDMTAB_DIRECTION_WRITE;
         }
-        phy->ofdmtab_addr = addr;
+        gphy->ofdmtab_addr = addr;
         b43_phy_write(dev, B43_PHY_OTABLEI, value);
 }
 
 u32 b43_ofdmtab_read32(struct b43_wldev *dev, u16 table, u16 offset)
 {
-        struct b43_phy *phy = &dev->phy;
+        struct b43_phy_g *gphy = dev->phy.g;
         u32 ret;
         u16 addr;
 
         addr = table + offset;
-        if ((phy->ofdmtab_addr_direction != B43_OFDMTAB_DIRECTION_READ) ||
-            (addr - 1 != phy->ofdmtab_addr)) {
+        if ((gphy->ofdmtab_addr_direction != B43_OFDMTAB_DIRECTION_READ) ||
+            (addr - 1 != gphy->ofdmtab_addr)) {
                 /* The hardware has a different address in memory. Update it. */
                 b43_phy_write(dev, B43_PHY_OTABLECTL, addr);
-                phy->ofdmtab_addr_direction = B43_OFDMTAB_DIRECTION_READ;
+                gphy->ofdmtab_addr_direction = B43_OFDMTAB_DIRECTION_READ;
         }
-        phy->ofdmtab_addr = addr;
+        gphy->ofdmtab_addr = addr;
         ret = b43_phy_read(dev, B43_PHY_OTABLEQ);
         ret <<= 16;
         ret |= b43_phy_read(dev, B43_PHY_OTABLEI);
@@ -436,17 +437,17 @@ u32 b43_ofdmtab_read32(struct b43_wldev *dev, u16 table, u16 offset)
 void b43_ofdmtab_write32(struct b43_wldev *dev, u16 table,
                          u16 offset, u32 value)
 {
-        struct b43_phy *phy = &dev->phy;
+        struct b43_phy_g *gphy = dev->phy.g;
         u16 addr;
 
         addr = table + offset;
-        if ((phy->ofdmtab_addr_direction != B43_OFDMTAB_DIRECTION_WRITE) ||
-            (addr - 1 != phy->ofdmtab_addr)) {
+        if ((gphy->ofdmtab_addr_direction != B43_OFDMTAB_DIRECTION_WRITE) ||
+            (addr - 1 != gphy->ofdmtab_addr)) {
                 /* The hardware has a different address in memory. Update it. */
                 b43_phy_write(dev, B43_PHY_OTABLECTL, addr);
-                phy->ofdmtab_addr_direction = B43_OFDMTAB_DIRECTION_WRITE;
+                gphy->ofdmtab_addr_direction = B43_OFDMTAB_DIRECTION_WRITE;
         }
-        phy->ofdmtab_addr = addr;
+        gphy->ofdmtab_addr = addr;
 
         b43_phy_write(dev, B43_PHY_OTABLEI, value);
         b43_phy_write(dev, B43_PHY_OTABLEQ, (value >> 16));