Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 171424
b: refs/heads/master
c: 5c70e5b
h: refs/heads/master
v: v3
  • Loading branch information
Bartlomiej Zolnierkiewicz authored and John W. Linville committed Nov 6, 2009
1 parent 87a6414 commit 244e472
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 14 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 1af68f75a808d02997ad0c6dde9e37f43b7dfcb4
refs/heads/master: 5c70e5bb36584a1c1d5be85e40aabac3a8f68d83
32 changes: 19 additions & 13 deletions trunk/drivers/net/wireless/rt2x00/rt2800usb.c
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,12 @@ static void rt2800usb_rf_write(struct rt2x00_dev *rt2x00dev,
mutex_unlock(&rt2x00dev->csr_mutex);
}

static inline void rt2800_rf_write(struct rt2x00_dev *rt2x00dev,
const unsigned int word, const u32 value)
{
rt2800usb_rf_write(rt2x00dev, word, value);
}

static void rt2800usb_mcu_request(struct rt2x00_dev *rt2x00dev,
const u8 command, const u8 token,
const u8 arg0, const u8 arg1)
Expand Down Expand Up @@ -280,7 +286,7 @@ static const struct rt2x00debug rt2800usb_rt2x00debug = {
},
.rf = {
.read = rt2x00_rf_read,
.write = rt2800usb_rf_write,
.write = rt2800_rf_write,
.word_base = RF_BASE,
.word_size = sizeof(u32),
.word_count = RF_SIZE / sizeof(u32),
Expand Down Expand Up @@ -747,24 +753,24 @@ static void rt2800usb_config_channel_rt2x(struct rt2x00_dev *rt2x00dev,

rt2x00_set_field32(&rf->rf4, RF4_HT40, conf_is_ht40(conf));

rt2800usb_rf_write(rt2x00dev, 1, rf->rf1);
rt2800usb_rf_write(rt2x00dev, 2, rf->rf2);
rt2800usb_rf_write(rt2x00dev, 3, rf->rf3 & ~0x00000004);
rt2800usb_rf_write(rt2x00dev, 4, rf->rf4);
rt2800_rf_write(rt2x00dev, 1, rf->rf1);
rt2800_rf_write(rt2x00dev, 2, rf->rf2);
rt2800_rf_write(rt2x00dev, 3, rf->rf3 & ~0x00000004);
rt2800_rf_write(rt2x00dev, 4, rf->rf4);

udelay(200);

rt2800usb_rf_write(rt2x00dev, 1, rf->rf1);
rt2800usb_rf_write(rt2x00dev, 2, rf->rf2);
rt2800usb_rf_write(rt2x00dev, 3, rf->rf3 | 0x00000004);
rt2800usb_rf_write(rt2x00dev, 4, rf->rf4);
rt2800_rf_write(rt2x00dev, 1, rf->rf1);
rt2800_rf_write(rt2x00dev, 2, rf->rf2);
rt2800_rf_write(rt2x00dev, 3, rf->rf3 | 0x00000004);
rt2800_rf_write(rt2x00dev, 4, rf->rf4);

udelay(200);

rt2800usb_rf_write(rt2x00dev, 1, rf->rf1);
rt2800usb_rf_write(rt2x00dev, 2, rf->rf2);
rt2800usb_rf_write(rt2x00dev, 3, rf->rf3 & ~0x00000004);
rt2800usb_rf_write(rt2x00dev, 4, rf->rf4);
rt2800_rf_write(rt2x00dev, 1, rf->rf1);
rt2800_rf_write(rt2x00dev, 2, rf->rf2);
rt2800_rf_write(rt2x00dev, 3, rf->rf3 & ~0x00000004);
rt2800_rf_write(rt2x00dev, 4, rf->rf4);
}

static void rt2800usb_config_channel_rt3x(struct rt2x00_dev *rt2x00dev,
Expand Down

0 comments on commit 244e472

Please sign in to comment.