Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 256099
b: refs/heads/master
c: e5b6100
h: refs/heads/master
i:
  256097: 0be64a5
  256095: 4108992
v: v3
  • Loading branch information
Rafał Miłecki authored and John W. Linville committed Jun 29, 2011
1 parent b909190 commit f2ddd1f
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: bdb2dfb237997babac7b32c7a94dcfa18507a055
refs/heads/master: e5b61007bc15b34fe78d4100dbe1be209b761d9b
19 changes: 19 additions & 0 deletions trunk/drivers/net/wireless/b43/phy_ht.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@

#include "b43.h"
#include "phy_ht.h"
#include "tables_phy_ht.h"
#include "radio_2059.h"
#include "main.h"

Expand Down Expand Up @@ -83,6 +84,7 @@ static void b43_phy_ht_channel_setup(struct b43_wldev *dev,
struct ieee80211_channel *new_channel)
{
bool old_band_5ghz;
u8 i;

old_band_5ghz = b43_phy_read(dev, B43_PHY_HT_BANDCTL) & 0; /* FIXME */
if (new_channel->band == IEEE80211_BAND_5GHZ && !old_band_5ghz) {
Expand All @@ -97,6 +99,23 @@ static void b43_phy_ht_channel_setup(struct b43_wldev *dev,
b43_phy_write(dev, B43_PHY_HT_BW4, e->bw4);
b43_phy_write(dev, B43_PHY_HT_BW5, e->bw5);
b43_phy_write(dev, B43_PHY_HT_BW6, e->bw6);

/* TODO: some ops on PHY regs 0x0B0 and 0xC0A */

/* TODO: separated function? */
for (i = 0; i < 3; i++) {
u32 tmp = b43_httab_read(dev, B43_HTTAB32(26, 0xE8));

/* TODO: some op on PHY reg 0x908 */

b43_httab_write(dev, B43_HTTAB16(7, 0x110 + i), tmp >> 16);
b43_httab_write(dev, B43_HTTAB8(13, 0x63 + (i * 4)),
tmp & 0xFF);
b43_httab_write(dev, B43_HTTAB8(13, 0x73 + (i * 4)),
tmp & 0xFF);
}

b43_phy_write(dev, 0x017e, 0x3830);
}

static int b43_phy_ht_set_channel(struct b43_wldev *dev,
Expand Down

0 comments on commit f2ddd1f

Please sign in to comment.