Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 171422
b: refs/heads/master
c: e91fea9
h: refs/heads/master
v: v3
  • Loading branch information
Bartlomiej Zolnierkiewicz authored and John W. Linville committed Nov 6, 2009
1 parent 82bc5dc commit 8454e5f
Show file tree
Hide file tree
Showing 2 changed files with 55 additions and 43 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: 3e2c9df7b940c8d1d0626f61038e10a32d65f27d
refs/heads/master: e91fea9b38b2208113dd540f436ce2aba7ab29fd
96 changes: 54 additions & 42 deletions trunk/drivers/net/wireless/rt2x00/rt2800usb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,18 @@ static void rt2800usb_rfcsr_read(struct rt2x00_dev *rt2x00dev,
mutex_unlock(&rt2x00dev->csr_mutex);
}

static inline void rt2800_rfcsr_write(struct rt2x00_dev *rt2x00dev,
const unsigned int word, const u8 value)
{
rt2800usb_rfcsr_write(rt2x00dev, word, value);
}

static inline void rt2800_rfcsr_read(struct rt2x00_dev *rt2x00dev,
const unsigned int word, u8 *value)
{
rt2800usb_rfcsr_read(rt2x00dev, word, value);
}

static void rt2800usb_rf_write(struct rt2x00_dev *rt2x00dev,
const unsigned int word, const u32 value)
{
Expand Down Expand Up @@ -762,28 +774,28 @@ static void rt2800usb_config_channel_rt3x(struct rt2x00_dev *rt2x00dev,
{
u8 rfcsr;

rt2800usb_rfcsr_write(rt2x00dev, 2, rf->rf1);
rt2800usb_rfcsr_write(rt2x00dev, 2, rf->rf3);
rt2800_rfcsr_write(rt2x00dev, 2, rf->rf1);
rt2800_rfcsr_write(rt2x00dev, 2, rf->rf3);

rt2800usb_rfcsr_read(rt2x00dev, 6, &rfcsr);
rt2800_rfcsr_read(rt2x00dev, 6, &rfcsr);
rt2x00_set_field8(&rfcsr, RFCSR6_R, rf->rf2);
rt2800usb_rfcsr_write(rt2x00dev, 6, rfcsr);
rt2800_rfcsr_write(rt2x00dev, 6, rfcsr);

rt2800usb_rfcsr_read(rt2x00dev, 12, &rfcsr);
rt2800_rfcsr_read(rt2x00dev, 12, &rfcsr);
rt2x00_set_field8(&rfcsr, RFCSR12_TX_POWER,
TXPOWER_G_TO_DEV(info->tx_power1));
rt2800usb_rfcsr_write(rt2x00dev, 12, rfcsr);
rt2800_rfcsr_write(rt2x00dev, 12, rfcsr);

rt2800usb_rfcsr_read(rt2x00dev, 23, &rfcsr);
rt2800_rfcsr_read(rt2x00dev, 23, &rfcsr);
rt2x00_set_field8(&rfcsr, RFCSR23_FREQ_OFFSET, rt2x00dev->freq_offset);
rt2800usb_rfcsr_write(rt2x00dev, 23, rfcsr);
rt2800_rfcsr_write(rt2x00dev, 23, rfcsr);

rt2800usb_rfcsr_write(rt2x00dev, 24,
rt2800_rfcsr_write(rt2x00dev, 24,
rt2x00dev->calibration[conf_is_ht40(conf)]);

rt2800usb_rfcsr_read(rt2x00dev, 23, &rfcsr);
rt2800_rfcsr_read(rt2x00dev, 23, &rfcsr);
rt2x00_set_field8(&rfcsr, RFCSR7_RF_TUNING, 1);
rt2800usb_rfcsr_write(rt2x00dev, 23, rfcsr);
rt2800_rfcsr_write(rt2x00dev, 23, rfcsr);
}

static void rt2800usb_config_channel(struct rt2x00_dev *rt2x00dev,
Expand Down Expand Up @@ -1656,15 +1668,15 @@ static u8 rt2800usb_init_rx_filter(struct rt2x00_dev *rt2x00dev,
u8 stopband;
u8 overtuned = 0;

rt2800usb_rfcsr_write(rt2x00dev, 24, rfcsr24);
rt2800_rfcsr_write(rt2x00dev, 24, rfcsr24);

rt2800_bbp_read(rt2x00dev, 4, &bbp);
rt2x00_set_field8(&bbp, BBP4_BANDWIDTH, 2 * bw40);
rt2800_bbp_write(rt2x00dev, 4, bbp);

rt2800usb_rfcsr_read(rt2x00dev, 22, &rfcsr);
rt2800_rfcsr_read(rt2x00dev, 22, &rfcsr);
rt2x00_set_field8(&rfcsr, RFCSR22_BASEBAND_LOOPBACK, 1);
rt2800usb_rfcsr_write(rt2x00dev, 22, rfcsr);
rt2800_rfcsr_write(rt2x00dev, 22, rfcsr);

/*
* Set power & frequency of passband test tone
Expand Down Expand Up @@ -1697,12 +1709,12 @@ static u8 rt2800usb_init_rx_filter(struct rt2x00_dev *rt2x00dev,
} else
break;

rt2800usb_rfcsr_write(rt2x00dev, 24, rfcsr24);
rt2800_rfcsr_write(rt2x00dev, 24, rfcsr24);
}

rfcsr24 -= !!overtuned;

rt2800usb_rfcsr_write(rt2x00dev, 24, rfcsr24);
rt2800_rfcsr_write(rt2x00dev, 24, rfcsr24);
return rfcsr24;
}

Expand All @@ -1717,33 +1729,33 @@ static int rt2800usb_init_rfcsr(struct rt2x00_dev *rt2x00dev)
/*
* Init RF calibration.
*/
rt2800usb_rfcsr_read(rt2x00dev, 30, &rfcsr);
rt2800_rfcsr_read(rt2x00dev, 30, &rfcsr);
rt2x00_set_field8(&rfcsr, RFCSR30_RF_CALIBRATION, 1);
rt2800usb_rfcsr_write(rt2x00dev, 30, rfcsr);
rt2800_rfcsr_write(rt2x00dev, 30, rfcsr);
msleep(1);
rt2x00_set_field8(&rfcsr, RFCSR30_RF_CALIBRATION, 0);
rt2800usb_rfcsr_write(rt2x00dev, 30, rfcsr);

rt2800usb_rfcsr_write(rt2x00dev, 4, 0x40);
rt2800usb_rfcsr_write(rt2x00dev, 5, 0x03);
rt2800usb_rfcsr_write(rt2x00dev, 6, 0x02);
rt2800usb_rfcsr_write(rt2x00dev, 7, 0x70);
rt2800usb_rfcsr_write(rt2x00dev, 9, 0x0f);
rt2800usb_rfcsr_write(rt2x00dev, 10, 0x71);
rt2800usb_rfcsr_write(rt2x00dev, 11, 0x21);
rt2800usb_rfcsr_write(rt2x00dev, 12, 0x7b);
rt2800usb_rfcsr_write(rt2x00dev, 14, 0x90);
rt2800usb_rfcsr_write(rt2x00dev, 15, 0x58);
rt2800usb_rfcsr_write(rt2x00dev, 16, 0xb3);
rt2800usb_rfcsr_write(rt2x00dev, 17, 0x92);
rt2800usb_rfcsr_write(rt2x00dev, 18, 0x2c);
rt2800usb_rfcsr_write(rt2x00dev, 19, 0x02);
rt2800usb_rfcsr_write(rt2x00dev, 20, 0xba);
rt2800usb_rfcsr_write(rt2x00dev, 21, 0xdb);
rt2800usb_rfcsr_write(rt2x00dev, 24, 0x16);
rt2800usb_rfcsr_write(rt2x00dev, 25, 0x01);
rt2800usb_rfcsr_write(rt2x00dev, 27, 0x03);
rt2800usb_rfcsr_write(rt2x00dev, 29, 0x1f);
rt2800_rfcsr_write(rt2x00dev, 30, rfcsr);

rt2800_rfcsr_write(rt2x00dev, 4, 0x40);
rt2800_rfcsr_write(rt2x00dev, 5, 0x03);
rt2800_rfcsr_write(rt2x00dev, 6, 0x02);
rt2800_rfcsr_write(rt2x00dev, 7, 0x70);
rt2800_rfcsr_write(rt2x00dev, 9, 0x0f);
rt2800_rfcsr_write(rt2x00dev, 10, 0x71);
rt2800_rfcsr_write(rt2x00dev, 11, 0x21);
rt2800_rfcsr_write(rt2x00dev, 12, 0x7b);
rt2800_rfcsr_write(rt2x00dev, 14, 0x90);
rt2800_rfcsr_write(rt2x00dev, 15, 0x58);
rt2800_rfcsr_write(rt2x00dev, 16, 0xb3);
rt2800_rfcsr_write(rt2x00dev, 17, 0x92);
rt2800_rfcsr_write(rt2x00dev, 18, 0x2c);
rt2800_rfcsr_write(rt2x00dev, 19, 0x02);
rt2800_rfcsr_write(rt2x00dev, 20, 0xba);
rt2800_rfcsr_write(rt2x00dev, 21, 0xdb);
rt2800_rfcsr_write(rt2x00dev, 24, 0x16);
rt2800_rfcsr_write(rt2x00dev, 25, 0x01);
rt2800_rfcsr_write(rt2x00dev, 27, 0x03);
rt2800_rfcsr_write(rt2x00dev, 29, 0x1f);

/*
* Set RX Filter calibration for 20MHz and 40MHz
Expand All @@ -1758,9 +1770,9 @@ static int rt2800usb_init_rfcsr(struct rt2x00_dev *rt2x00dev)
*/
rt2800_bbp_write(rt2x00dev, 24, 0);

rt2800usb_rfcsr_read(rt2x00dev, 22, &rfcsr);
rt2800_rfcsr_read(rt2x00dev, 22, &rfcsr);
rt2x00_set_field8(&rfcsr, RFCSR22_BASEBAND_LOOPBACK, 0);
rt2800usb_rfcsr_write(rt2x00dev, 22, rfcsr);
rt2800_rfcsr_write(rt2x00dev, 22, rfcsr);

/*
* set BBP back to BW20
Expand Down

0 comments on commit 8454e5f

Please sign in to comment.