Skip to content

Commit

Permalink
replace mt76 prefix with mt76x2 in preparation for splitting the driv…
Browse files Browse the repository at this point in the history 
…er for more chipset support

Signed-off-by: Felix Fietkau <[email protected]>
  • Loading branch information
Felix Fietkau committed Dec 6, 2015
1 parent 2e4443a commit 31c11fd
Show file tree
Hide file tree
Showing 21 changed files with 1,155 additions and 1,155 deletions.
44 changes: 22 additions & 22 deletions core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@
#include "mt76.h"
#include "trace.h"

bool mt76_poll(struct mt76_dev *dev, u32 offset, u32 mask, u32 val,
bool mt76x2_poll(struct mt76x2_dev *dev, u32 offset, u32 mask, u32 val,
int timeout)
{
u32 cur;

timeout /= 10;
do {
cur = mt76_rr(dev, offset) & mask;
cur = mt76x2_rr(dev, offset) & mask;
if (cur == val)
return true;

Expand All @@ -32,14 +32,14 @@ bool mt76_poll(struct mt76_dev *dev, u32 offset, u32 mask, u32 val,
return false;
}

bool mt76_poll_msec(struct mt76_dev *dev, u32 offset, u32 mask, u32 val,
bool mt76x2_poll_msec(struct mt76x2_dev *dev, u32 offset, u32 mask, u32 val,
int timeout)
{
u32 cur;

timeout /= 10;
do {
cur = mt76_rr(dev, offset) & mask;
cur = mt76x2_rr(dev, offset) & mask;
if (cur == val)
return true;

Expand All @@ -49,34 +49,34 @@ bool mt76_poll_msec(struct mt76_dev *dev, u32 offset, u32 mask, u32 val,
return false;
}

void mt76_write_reg_pairs(struct mt76_dev *dev,
const struct mt76_reg_pair *data, int len)
void mt76x2_write_reg_pairs(struct mt76x2_dev *dev,
const struct mt76x2_reg_pair *data, int len)
{
while (len > 0) {
mt76_wr(dev, data->reg, data->value);
mt76x2_wr(dev, data->reg, data->value);
len--;
data++;
}
}

void mt76_set_irq_mask(struct mt76_dev *dev, u32 clear, u32 set)
void mt76x2_set_irq_mask(struct mt76x2_dev *dev, u32 clear, u32 set)
{
unsigned long flags;

spin_lock_irqsave(&dev->irq_lock, flags);
dev->irqmask &= ~clear;
dev->irqmask |= set;
mt76_wr(dev, MT_INT_MASK_CSR, dev->irqmask);
mt76x2_wr(dev, MT_INT_MASK_CSR, dev->irqmask);
spin_unlock_irqrestore(&dev->irq_lock, flags);
}

irqreturn_t mt76_irq_handler(int irq, void *dev_instance)
irqreturn_t mt76x2_irq_handler(int irq, void *dev_instance)
{
struct mt76_dev *dev = dev_instance;
struct mt76x2_dev *dev = dev_instance;
u32 intr;

intr = mt76_rr(dev, MT_INT_SOURCE_CSR);
mt76_wr(dev, MT_INT_SOURCE_CSR, intr);
intr = mt76x2_rr(dev, MT_INT_SOURCE_CSR);
mt76x2_wr(dev, MT_INT_SOURCE_CSR, intr);

if (!test_bit(MT76_STATE_INITIALIZED, &dev->state))
return IRQ_NONE;
Expand All @@ -86,17 +86,17 @@ irqreturn_t mt76_irq_handler(int irq, void *dev_instance)
intr &= dev->irqmask;

if (intr & MT_INT_TX_DONE_ALL) {
mt76_irq_disable(dev, MT_INT_TX_DONE_ALL);
mt76x2_irq_disable(dev, MT_INT_TX_DONE_ALL);
tasklet_schedule(&dev->tx_tasklet);
}

if (intr & MT_INT_RX_DONE(0)) {
mt76_irq_disable(dev, MT_INT_RX_DONE(0));
mt76x2_irq_disable(dev, MT_INT_RX_DONE(0));
napi_schedule(&dev->napi);
}

if (intr & MT_INT_RX_DONE(1)) {
mt76_irq_disable(dev, MT_INT_RX_DONE(1));
mt76x2_irq_disable(dev, MT_INT_RX_DONE(1));
tasklet_schedule(&dev->rx_tasklet);
}

Expand All @@ -105,26 +105,26 @@ irqreturn_t mt76_irq_handler(int irq, void *dev_instance)

/* send buffered multicast frames now */
if (intr & MT_INT_TBTT)
mt76_kick_queue(dev, &dev->q_tx[MT_TXQ_PSD]);
mt76x2_kick_queue(dev, &dev->q_tx[MT_TXQ_PSD]);

if (intr & MT_INT_TX_STAT) {
mt76_mac_poll_tx_status(dev, true);
mt76x2_mac_poll_tx_status(dev, true);
tasklet_schedule(&dev->tx_tasklet);
}

return IRQ_HANDLED;
}

int mt76_set_channel(struct mt76_dev *dev, struct cfg80211_chan_def *chandef)
int mt76x2_set_channel(struct mt76x2_dev *dev, struct cfg80211_chan_def *chandef)
{
int ret;

tasklet_disable(&dev->pre_tbtt_tasklet);
cancel_delayed_work_sync(&dev->cal_work);

mt76_mac_stop(dev, true);
ret = mt76_phy_set_channel(dev, chandef);
mt76_mac_resume(dev);
mt76x2_mac_stop(dev, true);
ret = mt76x2_phy_set_channel(dev, chandef);
mt76x2_mac_resume(dev);
tasklet_enable(&dev->pre_tbtt_tasklet);

return ret;
Expand Down
28 changes: 14 additions & 14 deletions debugfs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,30 +15,30 @@
#include "mt76.h"

static int
mt76_reg_set(void *data, u64 val)
mt76x2_reg_set(void *data, u64 val)
{
struct mt76_dev *dev = data;
struct mt76x2_dev *dev = data;

mt76_wr(dev, dev->debugfs_reg, val);
mt76x2_wr(dev, dev->debugfs_reg, val);
return 0;
}

static int
mt76_reg_get(void *data, u64 *val)
mt76x2_reg_get(void *data, u64 *val)
{
struct mt76_dev *dev = data;
struct mt76x2_dev *dev = data;

*val = mt76_rr(dev, dev->debugfs_reg);
*val = mt76x2_rr(dev, dev->debugfs_reg);
return 0;
}

DEFINE_SIMPLE_ATTRIBUTE(fops_regval, mt76_reg_get, mt76_reg_set, "0x%08llx\n");
DEFINE_SIMPLE_ATTRIBUTE(fops_regval, mt76x2_reg_get, mt76x2_reg_set, "0x%08llx\n");


static int
mt76_ampdu_stat_read(struct seq_file *file, void *data)
mt76x2_ampdu_stat_read(struct seq_file *file, void *data)
{
struct mt76_dev *dev = file->private;
struct mt76x2_dev *dev = file->private;
int i, j;

for (i = 0; i < 4; i++) {
Expand All @@ -60,9 +60,9 @@ mt76_ampdu_stat_read(struct seq_file *file, void *data)
}

static int
mt76_ampdu_stat_open(struct inode *inode, struct file *f)
mt76x2_ampdu_stat_open(struct inode *inode, struct file *f)
{
return single_open(f, mt76_ampdu_stat_read, inode->i_private);
return single_open(f, mt76x2_ampdu_stat_read, inode->i_private);
}

static void
Expand All @@ -78,7 +78,7 @@ seq_puts_array(struct seq_file *file, const char *str, s8 *val, int len)

static int read_txpower(struct seq_file *file, void *data)
{
struct mt76_dev *dev = dev_get_drvdata(file->private);
struct mt76x2_dev *dev = dev_get_drvdata(file->private);

seq_printf(file, "Target power: %d\n", dev->target_power);

Expand All @@ -96,13 +96,13 @@ static int read_txpower(struct seq_file *file, void *data)
}

static const struct file_operations fops_ampdu_stat = {
.open = mt76_ampdu_stat_open,
.open = mt76x2_ampdu_stat_open,
.read = seq_read,
.llseek = seq_lseek,
.release = single_release,
};

void mt76_init_debugfs(struct mt76_dev *dev)
void mt76x2_init_debugfs(struct mt76x2_dev *dev)
{
struct dentry *dir;

Expand Down
Loading

0 comments on commit 31c11fd

Please sign in to comment.