Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 183864
b: refs/heads/master
c: 9145834
h: refs/heads/master
v: v3
  • Loading branch information
Rafał Miłecki authored and John W. Linville committed Jan 19, 2010
1 parent e079816 commit 3449c5b
Show file tree
Hide file tree
Showing 4 changed files with 49 additions and 20 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c643a66ef5ccfd4d359327fb8afa9949f1abbfdd
refs/heads/master: 9145834e84805f5efcca4706edfd641047af1d55
30 changes: 11 additions & 19 deletions trunk/drivers/net/wireless/b43/phy_n.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -829,8 +829,7 @@ static void b43_nphy_tx_pwr_ctrl_coef_setup(struct b43_wldev *dev)
if (nphy->hang_avoid)
b43_nphy_stay_in_carrier_search(dev, true);

/* TODO: Read an N PHY Table with ID 15, length 7, offset 80,
width 16, and data pointer buffer */
b43_ntab_read_bulk(dev, B43_NTAB16(15, 80), 7, buffer);

for (i = 0; i < 2; i++) {
tmp = ((buffer[i * 2] & 0x3FF) << 10) |
Expand Down Expand Up @@ -1507,8 +1506,7 @@ static struct nphy_txgains b43_nphy_get_tx_gains(struct b43_wldev *dev)

if (nphy->hang_avoid)
b43_nphy_stay_in_carrier_search(dev, true);
/* TODO: Read an N PHY Table with ID 7, length 2,
offset 0x110, width 16, and curr_gain */
b43_ntab_read_bulk(dev, B43_NTAB16(7, 0x110), 2, curr_gain);
if (nphy->hang_avoid)
b43_nphy_stay_in_carrier_search(dev, false);

Expand Down Expand Up @@ -1768,8 +1766,7 @@ static int b43_nphy_cal_tx_iq_lo(struct b43_wldev *dev,
nphy->hang_avoid = 0;
}

/* TODO: Read an N PHY Table with ID 7, length 2, offset 0x110,
width 16, and data pointer save */
b43_ntab_read_bulk(dev, B43_NTAB16(7, 0x110), 2, save);

for (i = 0; i < 2; i++) {
b43_nphy_iq_cal_gain_params(dev, i, target, &params[i]);
Expand Down Expand Up @@ -1890,9 +1887,8 @@ static int b43_nphy_cal_tx_iq_lo(struct b43_wldev *dev,
udelay(10);
}

/* TODO: Read an N PHY Table with ID 15,
length table_length, offset 96, width 16,
and data pointer buffer */
b43_ntab_read_bulk(dev, B43_NTAB16(15, 96), length,
buffer);
b43_ntab_write_bulk(dev, B43_NTAB16(15, 64), length,
buffer);

Expand All @@ -1907,8 +1903,7 @@ static int b43_nphy_cal_tx_iq_lo(struct b43_wldev *dev,

if (!mphase || nphy->mphase_cal_phase_id == last) {
b43_ntab_write_bulk(dev, B43_NTAB16(15, 96), 4, buffer);
/* TODO: Read an N PHY Table with ID 15, length 4,
offset 80, width 16, and data pointer buffer */
b43_ntab_read_bulk(dev, B43_NTAB16(15, 80), 4, buffer);
if (dev->phy.rev < 3) {
buffer[0] = 0;
buffer[1] = 0;
Expand All @@ -1926,19 +1921,17 @@ static int b43_nphy_cal_tx_iq_lo(struct b43_wldev *dev,
length = 11;
if (dev->phy.rev < 3)
length -= 2;
/* TODO: Read an N PHY Table with ID 15, length length,
offset 96, width 16, and data pointer
nphy->txiqlocal_bestc */
b43_ntab_read_bulk(dev, B43_NTAB16(15, 96), length,
nphy->txiqlocal_bestc);
nphy->txiqlocal_coeffsvalid = true;
/* TODO: Set nphy->txiqlocal_chanspec to
the current channel */
} else {
length = 11;
if (dev->phy.rev < 3)
length -= 2;
/* TODO: Read an N PHY Table with ID 5, length length,
offset 96, width 16, and data pointer
nphy->mphase_txcal_bestcoeffs */
b43_ntab_read_bulk(dev, B43_NTAB16(15, 96), length,
nphy->mphase_txcal_bestcoeffs);
}

b43_nphy_stop_playback(dev);
Expand Down Expand Up @@ -1990,8 +1983,7 @@ static int b43_nphy_rev2_cal_rx_iq(struct b43_wldev *dev,

if (dev->phy.rev < 2)
;/* TODO: Call N PHY Reapply TX Cal Coeffs */
/* TODO: Read an N PHY Table with ID 7, length 2, offset 0x110,
width 16, and data gain_save */
b43_ntab_read_bulk(dev, B43_NTAB16(7, 0x110), 2, gain_save);
for (i = 0; i < 2; i++) {
b43_nphy_iq_cal_gain_params(dev, i, target, &cal_params[i]);
cal_gain[i] = cal_params[i].cal_gain;
Expand Down
35 changes: 35 additions & 0 deletions trunk/drivers/net/wireless/b43/tables_nphy.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2950,6 +2950,41 @@ u32 b43_ntab_read(struct b43_wldev *dev, u32 offset)
return value;
}

void b43_ntab_read_bulk(struct b43_wldev *dev, u32 offset,
unsigned int nr_elements, void *_data)
{
u32 type;
u8 *data = _data;
unsigned int i;

type = offset & B43_NTAB_TYPEMASK;
offset &= ~B43_NTAB_TYPEMASK;
B43_WARN_ON(offset > 0xFFFF);

b43_phy_write(dev, B43_NPHY_TABLE_ADDR, offset);

for (i = 0; i < nr_elements; i++) {
switch (type) {
case B43_NTAB_8BIT:
*data = b43_phy_read(dev, B43_NPHY_TABLE_DATALO) & 0xFF;
data++;
break;
case B43_NTAB_16BIT:
*((u16 *)data) = b43_phy_read(dev, B43_NPHY_TABLE_DATALO);
data += 2;
break;
case B43_NTAB_32BIT:
*((u32 *)data) = b43_phy_read(dev, B43_NPHY_TABLE_DATAHI);
*((u32 *)data) <<= 16;
*((u32 *)data) |= b43_phy_read(dev, B43_NPHY_TABLE_DATALO);
data += 4;
break;
default:
B43_WARN_ON(1);
}
}
}

void b43_ntab_write(struct b43_wldev *dev, u32 offset, u32 value)
{
u32 type;
Expand Down
2 changes: 2 additions & 0 deletions trunk/drivers/net/wireless/b43/tables_nphy.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,8 @@ b43_nphy_get_chantabent(struct b43_wldev *dev, u8 channel);
#define B43_NTAB_TX_IQLO_CAL_CMDS_FULLCAL_REV3 12

u32 b43_ntab_read(struct b43_wldev *dev, u32 offset);
void b43_ntab_read_bulk(struct b43_wldev *dev, u32 offset,
unsigned int nr_elements, void *_data);
void b43_ntab_write(struct b43_wldev *dev, u32 offset, u32 value);
void b43_ntab_write_bulk(struct b43_wldev *dev, u32 offset,
unsigned int nr_elements, const void *_data);
Expand Down

0 comments on commit 3449c5b

Please sign in to comment.