b43: Implement dynamic PHY API

[mirror_ubuntu-artful-kernel.git] / drivers / net / wireless / b43 / b43.h

diff --git a/drivers/net/wireless/b43/b43.h b/drivers/net/wireless/b43/b43.h
index edcdfa366452b7ce34b4acb6e622c3402c7fdb23..fc280157596c891279db8cf2cd159737cbabba80 100644 (file)
--- a/drivers/net/wireless/b43/b43.h
+++ b/drivers/net/wireless/b43/b43.h
@@ -12,7 +12,7 @@
 #include "leds.h"
 #include "rfkill.h"
 #include "lo.h"
-#include "phy.h"
+#include "phy_common.h"
 
 
 /* The unique identifier of the firmware that's officially supported by
@@ -508,122 +508,6 @@ struct b43_iv {
 } __attribute__((__packed__));
 
 
-struct b43_phy {
-       /* Band support flags. */
-       bool supports_2ghz;
-       bool supports_5ghz;
-
-       /* GMODE bit enabled? */
-       bool gmode;
-
-       /* Analog Type */
-       u8 analog;
-       /* B43_PHYTYPE_ */
-       u8 type;
-       /* PHY revision number. */
-       u8 rev;
-
-       /* Radio versioning */
-       u16 radio_manuf;        /* Radio manufacturer */
-       u16 radio_ver;          /* Radio version */
-       u8 radio_rev;           /* Radio revision */
-
-       bool dyn_tssi_tbl;      /* tssi2dbm is kmalloc()ed. */
-
-       /* ACI (adjacent channel interference) flags. */
-       bool aci_enable;
-       bool aci_wlan_automatic;
-       bool aci_hw_rssi;
-
-       /* Radio switched on/off */
-       bool radio_on;
-       struct {
-               /* Values saved when turning the radio off.
-                * They are needed when turning it on again. */
-               bool valid;
-               u16 rfover;
-               u16 rfoverval;
-       } radio_off_context;
-
-       u16 minlowsig[2];
-       u16 minlowsigpos[2];
-
-       /* TSSI to dBm table in use */
-       const s8 *tssi2dbm;
-       /* Target idle TSSI */
-       int tgt_idle_tssi;
-       /* Current idle TSSI */
-       int cur_idle_tssi;
-
-       /* LocalOscillator control values. */
-       struct b43_txpower_lo_control *lo_control;
-       /* Values from b43_calc_loopback_gain() */
-       s16 max_lb_gain;        /* Maximum Loopback gain in hdB */
-       s16 trsw_rx_gain;       /* TRSW RX gain in hdB */
-       s16 lna_lod_gain;       /* LNA lod */
-       s16 lna_gain;           /* LNA */
-       s16 pga_gain;           /* PGA */
-
-       /* Desired TX power level (in dBm).
-        * This is set by the user and adjusted in b43_phy_xmitpower(). */
-       u8 power_level;
-       /* A-PHY TX Power control value. */
-       u16 txpwr_offset;
-
-       /* Current TX power level attenuation control values */
-       struct b43_bbatt bbatt;
-       struct b43_rfatt rfatt;
-       u8 tx_control;          /* B43_TXCTL_XXX */
-
-       /* Hardware Power Control enabled? */
-       bool hardware_power_control;
-
-       /* Current Interference Mitigation mode */
-       int interfmode;
-       /* Stack of saved values from the Interference Mitigation code.
-        * Each value in the stack is layed out as follows:
-        * bit 0-11:  offset
-        * bit 12-15: register ID
-        * bit 16-32: value
-        * register ID is: 0x1 PHY, 0x2 Radio, 0x3 ILT
-        */
-#define B43_INTERFSTACK_SIZE   26
-       u32 interfstack[B43_INTERFSTACK_SIZE];  //FIXME: use a data structure
-
-       /* Saved values from the NRSSI Slope calculation */
-       s16 nrssi[2];
-       s32 nrssislope;
-       /* In memory nrssi lookup table. */
-       s8 nrssi_lt[64];
-
-       /* current channel */
-       u8 channel;
-
-       u16 lofcal;
-
-       u16 initval;            //FIXME rename?
-
-       /* PHY TX errors counter. */
-       atomic_t txerr_cnt;
-
-       /* The device does address auto increment for the OFDM tables.
-        * We cache the previously used address here and omit the address
-        * write on the next table access, if possible. */
-       u16 ofdmtab_addr; /* The address currently set in hardware. */
-       enum { /* The last data flow direction. */
-               B43_OFDMTAB_DIRECTION_UNKNOWN = 0,
-               B43_OFDMTAB_DIRECTION_READ,
-               B43_OFDMTAB_DIRECTION_WRITE,
-       } ofdmtab_addr_direction;
-
-#if B43_DEBUG
-       /* Manual TX-power control enabled? */
-       bool manual_txpower_control;
-       /* PHY registers locked by b43_phy_lock()? */
-       bool phy_locked;
-#endif /* B43_DEBUG */
-};
-
 /* Data structures for DMA transmission, per 80211 core. */
 struct b43_dma {
        struct b43_dmaring *tx_ring_AC_BK; /* Background */
@@ -908,6 +792,15 @@ static inline int b43_is_mode(struct b43_wl *wl, int type)
        return (wl->operating && wl->if_type == type);
 }
 
+/**
+ * b43_current_band - Returns the currently used band.
+ * Returns one of IEEE80211_BAND_2GHZ and IEEE80211_BAND_5GHZ.
+ */
+static inline enum ieee80211_band b43_current_band(struct b43_wl *wl)
+{
+       return wl->hw->conf.channel->band;
+}
+
 static inline u16 b43_read16(struct b43_wldev *dev, u16 offset)
 {
        return ssb_read16(dev->dev, offset);