linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / usb / net / pegasus.h

diff --git a/drivers/usb/net/pegasus.h b/drivers/usb/net/pegasus.h
index 7bc24d9..9fbd59b 100644 (file)
--- a/drivers/usb/net/pegasus.h
+++ b/drivers/usb/net/pegasus.h
@@ -29,7 +29,6 @@
 #define        DEFAULT_GPIO_SET        0x26
 
 #define        PEGASUS_PRESENT         0x00000001
-#define        PEGASUS_RUNNING         0x00000002
 #define        PEGASUS_TX_BUSY         0x00000004
 #define        PEGASUS_RX_BUSY         0x00000008
 #define        CTRL_URB_RUNNING        0x00000010
@@ -76,6 +75,7 @@ enum pegasus_registers {
        EthTxStat0 = 0x2b,
        EthTxStat1 = 0x2c,
        EthRxStat = 0x2d,
+       WakeupControl = 0x78,
        Reg7b = 0x7b,
        Gpio0 = 0x7e,
        Gpio1 = 0x7f,
@@ -85,14 +85,18 @@ enum pegasus_registers {
 
 typedef struct pegasus {
        struct usb_device       *usb;
+       struct usb_interface    *intf;
        struct net_device       *net;
        struct net_device_stats stats;
        struct mii_if_info      mii;
        unsigned                flags;
        unsigned                features;
+       u32                     msg_enable;
+       u32                     wolopts;
        int                     dev_index;
        int                     intr_interval;
        struct tasklet_struct   rx_tl;
+       struct work_struct      carrier_check;
        struct urb              *ctrl_urb, *rx_urb, *tx_urb, *intr_urb;
        struct sk_buff          *rx_pool[RX_SKBS];
        struct sk_buff          *rx_skb;
@@ -177,6 +181,8 @@ PEGASUS_DEV( "Accton USB 10/100 Ethernet Adapter", VENDOR_ACCTON, 0x1046,
                DEFAULT_GPIO_RESET )
 PEGASUS_DEV( "SpeedStream USB 10/100 Ethernet", VENDOR_ACCTON, 0x5046,
                DEFAULT_GPIO_RESET | PEGASUS_II )
+PEGASUS_DEV( "Philips USB 10/100 Ethernet", VENDOR_ACCTON, 0xb004,
+               DEFAULT_GPIO_RESET | PEGASUS_II )
 PEGASUS_DEV( "ADMtek ADM8511 \"Pegasus II\" USB Ethernet",
                VENDOR_ADMTEK, 0x8511,
                DEFAULT_GPIO_RESET | PEGASUS_II | HAS_HOME_PNA )
@@ -245,6 +251,8 @@ PEGASUS_DEV( "Kingston KNU101TX Ethernet", VENDOR_KINGSTON, 0x000a,
                DEFAULT_GPIO_RESET)
 PEGASUS_DEV( "LANEED USB Ethernet LD-USB/TX", VENDOR_LANEED, 0x4002,
                DEFAULT_GPIO_RESET )
+PEGASUS_DEV( "LANEED USB Ethernet LD-USBL/TX", VENDOR_LANEED, 0x4005,
+               DEFAULT_GPIO_RESET | PEGASUS_II)
 PEGASUS_DEV( "LANEED USB Ethernet LD-USB/TX", VENDOR_LANEED, 0x400b,
                DEFAULT_GPIO_RESET | PEGASUS_II )
 PEGASUS_DEV( "LANEED USB Ethernet LD-USB/T", VENDOR_LANEED, 0xabc1,