← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/linux-backports-modules-2.6.28/jaunty-proposed

« back to all changes in this revision

Viewing changes to updates/compat-wireless-2.6/drivers/net/wireless/rt2x00/rt2400pci.c

  • Committer: Bazaar Package Importer
  • Author(s): Tim Gardner, Tim Gardner
  • Date: 2009-02-09 17:48:22 UTC
  • Revision ID: james.westby@ubuntu.com-20090209174822-6chmiumgtavrmzgv
Tags: 2.6.28-7.5
[Tim Gardner]

* Update to master-2009-02-09
* Convert 'git-log' to 'git log'

Show diffs side-by-side

added added

removed removed

Lines of Context:
updates/compat-wireless-2.6/drivers/net/wireless/rt2x00/rt2400pci.c
1
1
/*
2
 
        Copyright (C) 2004 - 2008 rt2x00 SourceForge Project
 
2
        Copyright (C) 2004 - 2009 rt2x00 SourceForge Project
3
3
        <http://rt2x00.serialmonkey.com>
4
4
 
5
5
        This program is free software; you can redistribute it and/or modify
934
934
 
935
935
static void rt2400pci_disable_radio(struct rt2x00_dev *rt2x00dev)
936
936
{
937
 
        u32 reg;
938
 
 
 
937
        /*
 
938
         * Disable power
 
939
         */
939
940
        rt2x00pci_register_write(rt2x00dev, PWRCSR0, 0);
940
 
 
941
 
        /*
942
 
         * Disable synchronisation.
943
 
         */
944
 
        rt2x00pci_register_write(rt2x00dev, CSR14, 0);
945
 
 
946
 
        /*
947
 
         * Cancel RX and TX.
948
 
         */
949
 
        rt2x00pci_register_read(rt2x00dev, TXCSR0, &reg);
950
 
        rt2x00_set_field32(&reg, TXCSR0_ABORT, 1);
951
 
        rt2x00pci_register_write(rt2x00dev, TXCSR0, reg);
952
941
}
953
942
 
954
943
static int rt2400pci_set_state(struct rt2x00_dev *rt2x00dev,
1145
1134
        rt2x00pci_register_write(rt2x00dev, TXCSR0, reg);
1146
1135
}
1147
1136
 
 
1137
static void rt2400pci_kill_tx_queue(struct rt2x00_dev *rt2x00dev,
 
1138
                                    const enum data_queue_qid qid)
 
1139
{
 
1140
        u32 reg;
 
1141
 
 
1142
        if (qid == QID_BEACON) {
 
1143
                rt2x00pci_register_write(rt2x00dev, CSR14, 0);
 
1144
        } else {
 
1145
                rt2x00pci_register_read(rt2x00dev, TXCSR0, &reg);
 
1146
                rt2x00_set_field32(&reg, TXCSR0_ABORT, 1);
 
1147
                rt2x00pci_register_write(rt2x00dev, TXCSR0, reg);
 
1148
        }
 
1149
}
 
1150
 
1148
1151
/*
1149
1152
 * RX control handlers
1150
1153
 */
1395
1398
        value = rt2x00_get_field16(eeprom, EEPROM_ANTENNA_LED_MODE);
1396
1399
 
1397
1400
        rt2400pci_init_led(rt2x00dev, &rt2x00dev->led_radio, LED_TYPE_RADIO);
1398
 
        if (value == LED_MODE_TXRX_ACTIVITY || value == LED_MODE_DEFAULT)
 
1401
        if (value == LED_MODE_TXRX_ACTIVITY ||
 
1402
            value == LED_MODE_DEFAULT ||
 
1403
            value == LED_MODE_ASUS)
1399
1404
                rt2400pci_init_led(rt2x00dev, &rt2x00dev->led_qual,
1400
1405
                                   LED_TYPE_ACTIVITY);
1401
1406
#endif /* CONFIG_RT2X00_LIB_LEDS */
1604
1609
        .write_tx_data          = rt2x00pci_write_tx_data,
1605
1610
        .write_beacon           = rt2400pci_write_beacon,
1606
1611
        .kick_tx_queue          = rt2400pci_kick_tx_queue,
 
1612
        .kill_tx_queue          = rt2400pci_kill_tx_queue,
1607
1613
        .fill_rxdone            = rt2400pci_fill_rxdone,
1608
1614
        .config_filter          = rt2400pci_config_filter,
1609
1615
        .config_intf            = rt2400pci_config_intf,