diff options
author | Rafał Miłecki <zajec5@gmail.com> | 2011-06-27 18:08:52 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-06-29 15:11:01 -0400 |
commit | e8dec1e99aee468c6fb19f07a2660f9205a70f2c (patch) | |
tree | 3ea94d87e2f52e20ee4b583f3d564a3f15b81a56 /drivers/net | |
parent | b4d38db121c19fe94862357763b374e44fc23ebb (diff) |
b43: HT-PHY: replace radio routing magic numbers
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/wireless/b43/phy_ht.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/b43/radio_2059.h | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/drivers/net/wireless/b43/phy_ht.c b/drivers/net/wireless/b43/phy_ht.c index f09bb6e6307f..8df92e12799a 100644 --- a/drivers/net/wireless/b43/phy_ht.c +++ b/drivers/net/wireless/b43/phy_ht.c | |||
@@ -57,7 +57,7 @@ static void b43_radio_2059_channel_setup(struct b43_wldev *dev, | |||
57 | b43_radio_write(dev, 0x98, e->radio_syn98); | 57 | b43_radio_write(dev, 0x98, e->radio_syn98); |
58 | 58 | ||
59 | for (i = 0; i < 2; i++) { | 59 | for (i = 0; i < 2; i++) { |
60 | routing = i ? 0x800 : 0x400; | 60 | routing = i ? R2059_RXRX1 : R2059_TXRX0; |
61 | b43_radio_write(dev, routing | 0x4a, e->radio_rxtx4a); | 61 | b43_radio_write(dev, routing | 0x4a, e->radio_rxtx4a); |
62 | b43_radio_write(dev, routing | 0x58, e->radio_rxtx58); | 62 | b43_radio_write(dev, routing | 0x58, e->radio_rxtx58); |
63 | b43_radio_write(dev, routing | 0x5a, e->radio_rxtx5a); | 63 | b43_radio_write(dev, routing | 0x5a, e->radio_rxtx5a); |
diff --git a/drivers/net/wireless/b43/radio_2059.h b/drivers/net/wireless/b43/radio_2059.h index c2874b145266..e4d69e55e9fe 100644 --- a/drivers/net/wireless/b43/radio_2059.h +++ b/drivers/net/wireless/b43/radio_2059.h | |||
@@ -5,6 +5,11 @@ | |||
5 | 5 | ||
6 | #include "phy_ht.h" | 6 | #include "phy_ht.h" |
7 | 7 | ||
8 | #define R2059_SYN 0x000 | ||
9 | #define R2059_TXRX0 0x400 | ||
10 | #define R2059_RXRX1 0x800 | ||
11 | #define R2059_ALL 0xC00 | ||
12 | |||
8 | /* Values for various registers uploaded on channel switching */ | 13 | /* Values for various registers uploaded on channel switching */ |
9 | struct b43_phy_ht_channeltab_e_radio2059 { | 14 | struct b43_phy_ht_channeltab_e_radio2059 { |
10 | /* The channel frequency in MHz */ | 15 | /* The channel frequency in MHz */ |