Mirrors_Framework/ethercat
1
0
Fork 0
mirror of https://gitlab.com/etherlab.org/ethercat.git synced 2026-08-18 00:57:23 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed trailing spaces.

Browse Source
This commit is contained in:
Florian Pose
2012-09-06 20:22:24 +02:00
parent 669e6a0ed0
commit b0b7e6fde4
135 changed files with 922 additions and 928 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Doxyfile.in
+531 -531
View File
File diff suppressed because it is too large Load Diff
FEATURES
+1 -1
View File
@@ -65,7 +65,7 @@ General Features:
and configurable with standard tools.
* Implementation of the "Vendor-specific over EtherCAT" (VoE) mailbox protocol.
- Communication with vendor-specific mailbox protocols via the API.
- Communication with vendor-specific mailbox protocols via the API.
* Implementation of the "File Access over EtherCAT" (FoE) mailbox protocol.
- Loading and storing files via the command-line tool.
Kbuild.in
+1 -1
View File
@@ -20,7 +20,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
# ---
#
#
# The license mentioned above concerns the source code only. Using the
# EtherCAT technology and brand is only permitted in compliance with the
# industrial property and similar rights of Beckhoff Automation GmbH.
Makefile.am
+1 -1
View File
@@ -20,7 +20,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
# ---
#
#
# The license mentioned above concerns the source code only. Using the
# EtherCAT technology and brand is only permitted in compliance with the
# industrial property and similar rights of Beckhoff Automation GmbH.
bootstrap
+7 -7
View File
@@ -2,26 +2,26 @@
#----------------------------------------------------------------------------
#
# $Id$
#
#
# Copyright (C) 2006-2009 Florian Pose, Ingenieurgemeinschaft IgH
#
#
# This file is part of the IgH EtherCAT Master.
#
#
# The IgH EtherCAT Master is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License version 2, as
# published by the Free Software Foundation.
#
#
# The IgH EtherCAT Master is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
# Public License for more details.
#
#
# You should have received a copy of the GNU General Public License along
# with the IgH EtherCAT Master; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
#
# ---
#
#
# The license mentioned above concerns the source code only. Using the
# EtherCAT technology and brand is only permitted in compliance with the
# industrial property and similar rights of Beckhoff Automation GmbH.
devices/8139too-2.6.18-ethercat.c
+2 -2
View File
@@ -644,7 +644,7 @@ struct rtl8139_private {
struct mii_if_info mii;
unsigned int regs_len;
unsigned long fifo_copy_timeout;
ec_device_t *ecdev;
};
@@ -1068,7 +1068,7 @@ static int __devinit rtl8139_init_one (struct pci_dev *pdev,
tp->mii.reg_num_mask = 0x1f;
/* dev is fully set up and ready to use now */
// offer device to EtherCAT master module
tp->ecdev = ecdev_offer(dev, ec_poll, THIS_MODULE);
devices/8139too-2.6.19-ethercat.c
+2 -2
View File
@@ -644,7 +644,7 @@ struct rtl8139_private {
struct mii_if_info mii;
unsigned int regs_len;
unsigned long fifo_copy_timeout;
ec_device_t *ecdev;
};
@@ -1067,7 +1067,7 @@ static int __devinit rtl8139_init_one (struct pci_dev *pdev,
tp->mii.reg_num_mask = 0x1f;
/* dev is fully set up and ready to use now */
// offer device to EtherCAT master module
tp->ecdev = ecdev_offer(dev, ec_poll, THIS_MODULE);
devices/8139too-2.6.22-ethercat.c
+2 -2
View File
@@ -644,7 +644,7 @@ struct rtl8139_private {
struct mii_if_info mii;
unsigned int regs_len;
unsigned long fifo_copy_timeout;
ec_device_t *ecdev;
};
@@ -1067,7 +1067,7 @@ static int __devinit rtl8139_init_one (struct pci_dev *pdev,
tp->mii.reg_num_mask = 0x1f;
/* dev is fully set up and ready to use now */
// offer device to EtherCAT master module
tp->ecdev = ecdev_offer(dev, ec_poll, THIS_MODULE);
devices/8139too-2.6.24-ethercat.c
+2 -2
View File
@@ -653,7 +653,7 @@ struct rtl8139_private {
struct mii_if_info mii;
unsigned int regs_len;
unsigned long fifo_copy_timeout;
ec_device_t *ecdev;
};
@@ -1060,7 +1060,7 @@ static int __devinit rtl8139_init_one (struct pci_dev *pdev,
tp->mii.reg_num_mask = 0x1f;
/* dev is fully set up and ready to use now */
// offer device to EtherCAT master module
tp->ecdev = ecdev_offer(dev, ec_poll, THIS_MODULE);
devices/8139too-2.6.26-ethercat.c
+2 -2
View File
@@ -653,7 +653,7 @@ struct rtl8139_private {
struct mii_if_info mii;
unsigned int regs_len;
unsigned long fifo_copy_timeout;
ec_device_t *ecdev;
};
@@ -1060,7 +1060,7 @@ static int __devinit rtl8139_init_one (struct pci_dev *pdev,
tp->mii.reg_num_mask = 0x1f;
/* dev is fully set up and ready to use now */
// offer device to EtherCAT master module
tp->ecdev = ecdev_offer(dev, ec_poll, THIS_MODULE);
devices/8139too-2.6.27-ethercat.c
+2 -2
View File
@@ -653,7 +653,7 @@ struct rtl8139_private {
struct mii_if_info mii;
unsigned int regs_len;
unsigned long fifo_copy_timeout;
ec_device_t *ecdev;
};
@@ -1066,7 +1066,7 @@ static int __devinit rtl8139_init_one (struct pci_dev *pdev,
tp->mii.reg_num_mask = 0x1f;
/* dev is fully set up and ready to use now */
// offer device to EtherCAT master module
tp->ecdev = ecdev_offer(dev, ec_poll, THIS_MODULE);
devices/8139too-2.6.28-ethercat.c
+8 -8
View File
@@ -654,7 +654,7 @@ struct rtl8139_private {
struct mii_if_info mii;
unsigned int regs_len;
unsigned long fifo_copy_timeout;
ec_device_t *ecdev;
};
@@ -1066,7 +1066,7 @@ static int __devinit rtl8139_init_one (struct pci_dev *pdev,
tp->mii.reg_num_mask = 0x1f;
/* dev is fully set up and ready to use now */
// offer device to EtherCAT master module
tp->ecdev = ecdev_offer(dev, ec_poll, THIS_MODULE);
@@ -1811,24 +1811,24 @@ static int rtl8139_start_xmit (struct sk_buff *skb, struct net_device *dev)
wmb();
RTL_W32_F (TxStatus0 + (entry * sizeof (u32)),
tp->tx_flag | max(len, (unsigned int)ETH_ZLEN));
dev->trans_start = jiffies;
tp->cur_tx++;
} else {
spin_lock_irqsave(&tp->lock, flags);
wmb();
RTL_W32_F (TxStatus0 + (entry * sizeof (u32)),
tp->tx_flag | max(len, (unsigned int)ETH_ZLEN));
dev->trans_start = jiffies;
tp->cur_tx++;
if ((tp->cur_tx - NUM_TX_DESC) == tp->dirty_tx)
netif_stop_queue (dev);
spin_unlock_irqrestore(&tp->lock, flags);
if (netif_msg_tx_queued(tp))
printk (KERN_DEBUG "%s: Queued Tx packet size %u to slot %d.\n",
dev->name, len, entry);
devices/8139too-2.6.29-ethercat.c
+8 -8
View File
@@ -654,7 +654,7 @@ struct rtl8139_private {
struct mii_if_info mii;
unsigned int regs_len;
unsigned long fifo_copy_timeout;
ec_device_t *ecdev;
};
@@ -1066,7 +1066,7 @@ static int __devinit rtl8139_init_one (struct pci_dev *pdev,
tp->mii.reg_num_mask = 0x1f;
/* dev is fully set up and ready to use now */
// offer device to EtherCAT master module
tp->ecdev = ecdev_offer(dev, ec_poll, THIS_MODULE);
@@ -1811,24 +1811,24 @@ static int rtl8139_start_xmit (struct sk_buff *skb, struct net_device *dev)
wmb();
RTL_W32_F (TxStatus0 + (entry * sizeof (u32)),
tp->tx_flag | max(len, (unsigned int)ETH_ZLEN));
dev->trans_start = jiffies;
tp->cur_tx++;
} else {
spin_lock_irqsave(&tp->lock, flags);
wmb();
RTL_W32_F (TxStatus0 + (entry * sizeof (u32)),
tp->tx_flag | max(len, (unsigned int)ETH_ZLEN));
dev->trans_start = jiffies;
tp->cur_tx++;
if ((tp->cur_tx - NUM_TX_DESC) == tp->dirty_tx)
netif_stop_queue (dev);
spin_unlock_irqrestore(&tp->lock, flags);
if (netif_msg_tx_queued(tp))
printk (KERN_DEBUG "%s: Queued Tx packet size %u to slot %d.\n",
dev->name, len, entry);
devices/8139too-2.6.31-ethercat.c
+3 -3
View File
@@ -647,7 +647,7 @@ struct rtl8139_private {
struct mii_if_info mii;
unsigned int regs_len;
unsigned long fifo_copy_timeout;
ec_device_t *ecdev;
};
@@ -1799,9 +1799,9 @@ static int rtl8139_start_xmit (struct sk_buff *skb, struct net_device *dev)
wmb();
RTL_W32_F (TxStatus0 + (entry * sizeof (u32)),
tp->tx_flag | max(len, (unsigned int)ETH_ZLEN));
dev->trans_start = jiffies;
tp->cur_tx++;
} else {
spin_lock_irqsave(&tp->lock, flags);
devices/8139too-2.6.32-ethercat.c
+1 -1
View File
@@ -647,7 +647,7 @@ struct rtl8139_private {
struct mii_if_info mii;
unsigned int regs_len;
unsigned long fifo_copy_timeout;
ec_device_t *ecdev;
};
devices/8139too-2.6.34-ethercat.c
+3 -3
View File
@@ -648,7 +648,7 @@ struct rtl8139_private {
struct mii_if_info mii;
unsigned int regs_len;
unsigned long fifo_copy_timeout;
ec_device_t *ecdev;
};
@@ -1800,9 +1800,9 @@ static int rtl8139_start_xmit (struct sk_buff *skb, struct net_device *dev)
wmb();
RTL_W32_F (TxStatus0 + (entry * sizeof (u32)),
tp->tx_flag | max(len, (unsigned int)ETH_ZLEN));
dev->trans_start = jiffies;
tp->cur_tx++;
} else {
spin_lock_irqsave(&tp->lock, flags);
devices/8139too-2.6.35-ethercat.c
+2 -3
View File
@@ -648,7 +648,7 @@ struct rtl8139_private {
struct mii_if_info mii;
unsigned int regs_len;
unsigned long fifo_copy_timeout;
ec_device_t *ecdev;
};
@@ -1801,8 +1801,7 @@ static int rtl8139_start_xmit (struct sk_buff *skb, struct net_device *dev)
wmb();
RTL_W32_F (TxStatus0 + (entry * sizeof (u32)),
tp->tx_flag | max(len, (unsigned int)ETH_ZLEN));
tp->cur_tx++;
} else {
spin_lock_irqsave(&tp->lock, flags);
devices/Kbuild.in
+1 -1
View File
@@ -20,7 +20,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
# ---
#
#
# The license mentioned above concerns the source code only. Using the
# EtherCAT technology and brand is only permitted in compliance with the
# industrial property and similar rights of Beckhoff Automation GmbH.
devices/e100-2.6.24-ethercat.c
+1 -1
View File
@@ -2965,7 +2965,7 @@ static pci_ers_result_t e100_io_error_detected(struct pci_dev *pdev, pci_channel
/* Similar to calling e100_down(), but avoids adpater I/O. */
netdev->stop(netdev);
if (!nic->ecdev) {
/* Detach; put netif into state similar to hotplug unplug. */
napi_enable(&nic->napi);
devices/e100-2.6.29-ethercat.c
+2 -2
View File
@@ -1097,7 +1097,7 @@ static void e100_configure(struct nic *nic, struct cb *cb, struct sk_buff *skb)
config->multicast_all = 0x1; /* 1=accept, 0=no */
/* disable WoL when up */
if (nic->ecdev ||
if (nic->ecdev ||
(netif_running(nic->netdev) || !(nic->flags & wol_magic)))
config->magic_packet_disable = 0x1; /* 1=off, 0=on */
@@ -2997,7 +2997,7 @@ static int __init e100_init_module(void)
{
printk(KERN_INFO DRV_NAME " " DRV_DESCRIPTION " " DRV_VERSION
", master " EC_MASTER_VERSION "\n");
return pci_register_driver(&e100_driver);
}
devices/e100-2.6.31-ethercat.c
+2 -2
View File
@@ -1202,7 +1202,7 @@ static void e100_configure(struct nic *nic, struct cb *cb, struct sk_buff *skb)
config->multicast_all = 0x1; /* 1=accept, 0=no */
/* disable WoL when up */
if (nic->ecdev ||
if (nic->ecdev ||
(netif_running(nic->netdev) || !(nic->flags & wol_magic)))
config->magic_packet_disable = 0x1; /* 1=off, 0=on */
@@ -3216,7 +3216,7 @@ static int __init e100_init_module(void)
{
printk(KERN_INFO DRV_NAME " " DRV_DESCRIPTION " " DRV_VERSION
", master " EC_MASTER_VERSION "\n");
return pci_register_driver(&e100_driver);
}
devices/e100-2.6.32-ethercat.c
+2 -2
View File
@@ -1205,7 +1205,7 @@ static void e100_configure(struct nic *nic, struct cb *cb, struct sk_buff *skb)
config->multicast_all = 0x1; /* 1=accept, 0=no */
/* disable WoL when up */
if (nic->ecdev ||
if (nic->ecdev ||
(netif_running(nic->netdev) || !(nic->flags & wol_magic)))
config->magic_packet_disable = 0x1; /* 1=off, 0=on */
@@ -3239,7 +3239,7 @@ static int __init e100_init_module(void)
{
printk(KERN_INFO DRV_NAME " " DRV_DESCRIPTION " " DRV_VERSION
", master " EC_MASTER_VERSION "\n");
return pci_register_driver(&e100_driver);
}
devices/e100-2.6.33-ethercat.c
+2 -2
View File
@@ -1203,7 +1203,7 @@ static void e100_configure(struct nic *nic, struct cb *cb, struct sk_buff *skb)
config->multicast_all = 0x1; /* 1=accept, 0=no */
/* disable WoL when up */
if (nic->ecdev ||
if (nic->ecdev ||
(netif_running(nic->netdev) || !(nic->flags & wol_magic)))
config->magic_packet_disable = 0x1; /* 1=off, 0=on */
@@ -3247,7 +3247,7 @@ static int __init e100_init_module(void)
{
printk(KERN_INFO DRV_NAME " " DRV_DESCRIPTION " " DRV_VERSION
", master " EC_MASTER_VERSION "\n");
return pci_register_driver(&e100_driver);
}
devices/e100-2.6.35-ethercat.c
+1 -1
View File
@@ -1204,7 +1204,7 @@ static void e100_configure(struct nic *nic, struct cb *cb, struct sk_buff *skb)
config->multicast_all = 0x1; /* 1=accept, 0=no */
/* disable WoL when up */
if (nic->ecdev ||
if (nic->ecdev ||
(netif_running(nic->netdev) || !(nic->flags & wol_magic)))
config->magic_packet_disable = 0x1; /* 1=off, 0=on */
devices/e100-2.6.37-ethercat.c
+1 -1
View File
@@ -1204,7 +1204,7 @@ static void e100_configure(struct nic *nic, struct cb *cb, struct sk_buff *skb)
config->multicast_all = 0x1; /* 1=accept, 0=no */
/* disable WoL when up */
if (nic->ecdev ||
if (nic->ecdev ||
(netif_running(nic->netdev) || !(nic->flags & wol_magic)))
config->magic_packet_disable = 0x1; /* 1=off, 0=on */
devices/e1000/Kbuild.in
+1 -1
View File
@@ -20,7 +20,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
# ---
#
#
# The license mentioned above concerns the source code only. Using the
# EtherCAT technology and brand is only permitted in compliance with the
# industrial property and similar rights of Beckhoff Automation GmbH.
devices/e1000/e1000_main-2.6.18-ethercat.c
+1 -1
View File
@@ -2178,7 +2178,7 @@ e1000_leave_82542_rst(struct e1000_adapter *adapter)
/* No need to loop, because 82542 supports only 1 queue */
struct e1000_rx_ring *ring = &adapter->rx_ring[0];
e1000_configure_rx(adapter);
if (adapter->ecdev) {
if (adapter->ecdev) {
/* fill rx ring completely! */
adapter->alloc_rx_buf(adapter, ring, ring->count);
} else {
devices/e1000/e1000_main-2.6.20-ethercat.c
+2 -2
View File
@@ -23,7 +23,7 @@
Linux NICS <linux.nics@intel.com>
e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
vim: noexpandtab
*******************************************************************************/
@@ -2403,7 +2403,7 @@ e1000_leave_82542_rst(struct e1000_adapter *adapter)
/* No need to loop, because 82542 supports only 1 queue */
struct e1000_rx_ring *ring = &adapter->rx_ring[0];
e1000_configure_rx(adapter);
if (adapter->ecdev) {
if (adapter->ecdev) {
/* fill rx ring completely! */
adapter->alloc_rx_buf(adapter, ring, ring->count);
} else {
devices/e1000/e1000_main-2.6.22-ethercat.c
+1 -1
View File
@@ -2404,7 +2404,7 @@ e1000_leave_82542_rst(struct e1000_adapter *adapter)
/* No need to loop, because 82542 supports only 1 queue */
struct e1000_rx_ring *ring = &adapter->rx_ring[0];
e1000_configure_rx(adapter);
if (adapter->ecdev) {
if (adapter->ecdev) {
/* fill rx ring completely! */
adapter->alloc_rx_buf(adapter, ring, ring->count);
} else {
devices/e1000/e1000_main-2.6.24-ethercat.c
+3 -3
View File
@@ -2402,7 +2402,7 @@ e1000_leave_82542_rst(struct e1000_adapter *adapter)
/* No need to loop, because 82542 supports only 1 queue */
struct e1000_rx_ring *ring = &adapter->rx_ring[0];
e1000_configure_rx(adapter);
if (adapter->ecdev) {
if (adapter->ecdev) {
/* fill rx ring completely! */
adapter->alloc_rx_buf(adapter, ring, ring->count);
} else {
@@ -3849,7 +3849,7 @@ e1000_intr_msi(int irq, void *data)
struct e1000_adapter *adapter = netdev_priv(netdev);
struct e1000_hw *hw = &adapter->hw;
int i;
if (adapter->ecdev) {
#ifdef CONFIG_E1000_NAPI
int ec_work_done = 0;
@@ -4013,7 +4013,7 @@ e1000_intr(int irq, void *data)
atomic_inc(&adapter->irq_sem);
E1000_WRITE_REG(hw, IMC, ~0);
}
adapter->total_tx_bytes = 0;
adapter->total_rx_bytes = 0;
adapter->total_tx_packets = 0;
devices/e1000/e1000_main-2.6.26-ethercat.c
+4 -4
View File
@@ -672,7 +672,7 @@ e1000_down(struct e1000_adapter *adapter)
netdev->tx_queue_len = adapter->tx_queue_len;
adapter->link_speed = 0;
adapter->link_duplex = 0;
if (!adapter->ecdev) {
netif_carrier_off(netdev);
netif_stop_queue(netdev);
@@ -2467,7 +2467,7 @@ e1000_leave_82542_rst(struct e1000_adapter *adapter)
/* No need to loop, because 82542 supports only 1 queue */
struct e1000_rx_ring *ring = &adapter->rx_ring[0];
e1000_configure_rx(adapter);
if (adapter->ecdev) {
if (adapter->ecdev) {
/* fill rx ring completely! */
adapter->alloc_rx_buf(adapter, ring, ring->count);
} else {
@@ -3924,7 +3924,7 @@ e1000_intr_msi(int irq, void *data)
struct net_device *netdev = data;
struct e1000_adapter *adapter = netdev_priv(netdev);
struct e1000_hw *hw = &adapter->hw;
int i;
if (adapter->ecdev) {
@@ -4103,7 +4103,7 @@ e1000_intr(int irq, void *data)
#endif
}
return IRQ_HANDLED;
}
devices/e1000/e1000_main-2.6.27-ethercat.c
+3 -3
View File
@@ -269,7 +269,7 @@ static int e1000_request_irq(struct e1000_adapter *adapter)
if (adapter->ecdev)
return 0;
if (hw->mac_type >= e1000_82571) {
adapter->have_msi = !pci_enable_msi(adapter->pdev);
if (adapter->have_msi) {
@@ -331,7 +331,7 @@ static void e1000_irq_enable(struct e1000_adapter *adapter)
if (adapter->ecdev)
return;
ew32(IMS, IMS_ENABLE_MASK);
E1000_WRITE_FLUSH();
}
@@ -2440,7 +2440,7 @@ static void e1000_leave_82542_rst(struct e1000_adapter *adapter)
/* No need to loop, because 82542 supports only 1 queue */
struct e1000_rx_ring *ring = &adapter->rx_ring[0];
e1000_configure_rx(adapter);
if (adapter->ecdev) {
if (adapter->ecdev) {
/* fill rx ring completely! */
adapter->alloc_rx_buf(adapter, ring, ring->count);
} else {
devices/e1000/e1000_main-2.6.28-ethercat.c
+3 -3
View File
@@ -263,7 +263,7 @@ static int e1000_request_irq(struct e1000_adapter *adapter)
if (adapter->ecdev)
return 0;
if (hw->mac_type >= e1000_82571) {
adapter->have_msi = !pci_enable_msi(adapter->pdev);
if (adapter->have_msi) {
@@ -325,7 +325,7 @@ static void e1000_irq_enable(struct e1000_adapter *adapter)
if (adapter->ecdev)
return;
ew32(IMS, IMS_ENABLE_MASK);
E1000_WRITE_FLUSH();
}
@@ -2320,7 +2320,7 @@ static void e1000_leave_82542_rst(struct e1000_adapter *adapter)
/* No need to loop, because 82542 supports only 1 queue */
struct e1000_rx_ring *ring = &adapter->rx_ring[0];
e1000_configure_rx(adapter);
if (adapter->ecdev) {
if (adapter->ecdev) {
/* fill rx ring completely! */
adapter->alloc_rx_buf(adapter, ring, ring->count);
} else {
devices/e1000/e1000_main-2.6.29-ethercat.c
+3 -3
View File
@@ -261,7 +261,7 @@ static int e1000_request_irq(struct e1000_adapter *adapter)
if (adapter->ecdev)
return 0;
if (hw->mac_type >= e1000_82571) {
adapter->have_msi = !pci_enable_msi(adapter->pdev);
if (adapter->have_msi) {
@@ -323,7 +323,7 @@ static void e1000_irq_enable(struct e1000_adapter *adapter)
if (adapter->ecdev)
return;
ew32(IMS, IMS_ENABLE_MASK);
E1000_WRITE_FLUSH();
}
@@ -2296,7 +2296,7 @@ static void e1000_leave_82542_rst(struct e1000_adapter *adapter)
/* No need to loop, because 82542 supports only 1 queue */
struct e1000_rx_ring *ring = &adapter->rx_ring[0];
e1000_configure_rx(adapter);
if (adapter->ecdev) {
if (adapter->ecdev) {
/* fill rx ring completely! */
adapter->alloc_rx_buf(adapter, ring, ring->count);
} else {
devices/e1000/e1000_main-2.6.31-ethercat.c
+3 -3
View File
@@ -325,7 +325,7 @@ static void e1000_irq_enable(struct e1000_adapter *adapter)
if (adapter->ecdev)
return;
ew32(IMS, IMS_ENABLE_MASK);
E1000_WRITE_FLUSH();
}
@@ -2314,7 +2314,7 @@ static void e1000_leave_82542_rst(struct e1000_adapter *adapter)
/* No need to loop, because 82542 supports only 1 queue */
struct e1000_rx_ring *ring = &adapter->rx_ring[0];
e1000_configure_rx(adapter);
if (adapter->ecdev) {
if (adapter->ecdev) {
/* fill rx ring completely! */
adapter->alloc_rx_buf(adapter, ring, ring->count);
} else {
@@ -2541,7 +2541,7 @@ static void e1000_82547_tx_fifo_stall(unsigned long data)
adapter->tx_fifo_head = 0;
atomic_set(&adapter->tx_fifo_stall, 0);
if (!adapter->ecdev)
if (!adapter->ecdev)
netif_wake_queue(netdev);
} else {
if (!adapter->ecdev)
devices/e1000/e1000_main-2.6.32-ethercat.c
+2 -2
View File
@@ -2088,7 +2088,7 @@ static void e1000_leave_82542_rst(struct e1000_adapter *adapter)
/* No need to loop, because 82542 supports only 1 queue */
struct e1000_rx_ring *ring = &adapter->rx_ring[0];
e1000_configure_rx(adapter);
if (adapter->ecdev) {
if (adapter->ecdev) {
/* fill rx ring completely! */
adapter->alloc_rx_buf(adapter, ring, ring->count);
} else {
@@ -2291,7 +2291,7 @@ static void e1000_82547_tx_fifo_stall(unsigned long data)
atomic_set(&adapter->tx_fifo_stall, 0);
if (!adapter->ecdev) netif_wake_queue(netdev);
} else if (!test_bit(__E1000_DOWN, &adapter->flags)) {
if (!adapter->ecdev)
if (!adapter->ecdev)
mod_timer(&adapter->tx_fifo_stall_timer, jiffies + 1);
}
}
devices/e1000/e1000_main-2.6.33-ethercat.c
+3 -3
View File
@@ -317,7 +317,7 @@ static void e1000_irq_enable(struct e1000_adapter *adapter)
if (adapter->ecdev)
return;
ew32(IMS, IMS_ENABLE_MASK);
E1000_WRITE_FLUSH();
}
@@ -2095,7 +2095,7 @@ static void e1000_leave_82542_rst(struct e1000_adapter *adapter)
/* No need to loop, because 82542 supports only 1 queue */
struct e1000_rx_ring *ring = &adapter->rx_ring[0];
e1000_configure_rx(adapter);
if (adapter->ecdev) {
if (adapter->ecdev) {
/* fill rx ring completely! */
adapter->alloc_rx_buf(adapter, ring, ring->count);
} else {
@@ -2298,7 +2298,7 @@ static void e1000_82547_tx_fifo_stall(unsigned long data)
atomic_set(&adapter->tx_fifo_stall, 0);
if (!adapter->ecdev) netif_wake_queue(netdev);
} else if (!test_bit(__E1000_DOWN, &adapter->flags)) {
if (!adapter->ecdev)
if (!adapter->ecdev)
mod_timer(&adapter->tx_fifo_stall_timer, jiffies + 1);
}
}
devices/e1000/e1000_main-2.6.35-ethercat.c
+4 -4
View File
@@ -23,7 +23,7 @@
Linux NICS <linux.nics@intel.com>
e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
vim: noexpandtab
*******************************************************************************/
@@ -326,7 +326,7 @@ static void e1000_irq_enable(struct e1000_adapter *adapter)
if (adapter->ecdev)
return;
ew32(IMS, IMS_ENABLE_MASK);
E1000_WRITE_FLUSH();
}
@@ -2104,7 +2104,7 @@ static void e1000_leave_82542_rst(struct e1000_adapter *adapter)
/* No need to loop, because 82542 supports only 1 queue */
struct e1000_rx_ring *ring = &adapter->rx_ring[0];
e1000_configure_rx(adapter);
if (adapter->ecdev) {
if (adapter->ecdev) {
/* fill rx ring completely! */
adapter->alloc_rx_buf(adapter, ring, ring->count);
} else {
@@ -2301,7 +2301,7 @@ static void e1000_82547_tx_fifo_stall(unsigned long data)
if (!adapter->ecdev)
netif_wake_queue(netdev);
} else if (!test_bit(__E1000_DOWN, &adapter->flags)) {
if (!adapter->ecdev)
if (!adapter->ecdev)
mod_timer(&adapter->tx_fifo_stall_timer, jiffies + 1);
}
}
devices/e1000/e1000_main-2.6.37-ethercat.c
+3 -3
View File
@@ -23,7 +23,7 @@
Linux NICS <linux.nics@intel.com>
e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
vim: noexpandtab
*******************************************************************************/
@@ -332,7 +332,7 @@ static void e1000_irq_enable(struct e1000_adapter *adapter)
if (adapter->ecdev) {
return;
}
ew32(IMS, IMS_ENABLE_MASK);
E1000_WRITE_FLUSH();
}
@@ -2160,7 +2160,7 @@ static void e1000_leave_82542_rst(struct e1000_adapter *adapter)
/* No need to loop, because 82542 supports only 1 queue */
struct e1000_rx_ring *ring = &adapter->rx_ring[0];
e1000_configure_rx(adapter);
if (adapter->ecdev) {
if (adapter->ecdev) {
/* fill rx ring completely! */
adapter->alloc_rx_buf(adapter, ring, ring->count);
} else {
devices/e1000e/Kbuild.in
+1 -1
View File
@@ -20,7 +20,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
# ---
#
#
# The license mentioned above concerns the source code only. Using the
# EtherCAT technology and brand is only permitted in compliance with the
# industrial property and similar rights of Beckhoff Automation GmbH.
devices/e1000e/netdev-2.6.32-ethercat.c
+7 -7
View File
@@ -2929,7 +2929,7 @@ int e1000e_up(struct e1000_adapter *adapter)
clear_bit(__E1000_DOWN, &adapter->state);
if (!adapter->ecdev)
if (!adapter->ecdev)
napi_enable(&adapter->napi);
if (adapter->msix_entries)
@@ -2963,7 +2963,7 @@ void e1000e_down(struct e1000_adapter *adapter)
ew32(RCTL, rctl & ~E1000_RCTL_EN);
/* flush and sleep below */
if (!adapter->ecdev)
if (!adapter->ecdev)
netif_stop_queue(netdev);
/* disable transmits in the hardware */
@@ -3665,7 +3665,7 @@ static void e1000_watchdog_task(struct work_struct *work)
e1000_update_mng_vlan(adapter);
if (link) {
if ((adapter->ecdev && !ecdev_get_link(adapter->ecdev))
if ((adapter->ecdev && !ecdev_get_link(adapter->ecdev))
|| (!adapter->ecdev && !netif_carrier_ok(netdev))) {
bool txb2b = 1;
/* update snapshot of PHY registers on LSC */
@@ -3765,7 +3765,7 @@ static void e1000_watchdog_task(struct work_struct *work)
if (adapter->ecdev)
ecdev_set_link(adapter->ecdev, 1);
else
else
netif_carrier_on(netdev);
if (!adapter->ecdev && !test_bit(__E1000_DOWN, &adapter->state))
@@ -3773,7 +3773,7 @@ static void e1000_watchdog_task(struct work_struct *work)
round_jiffies(jiffies + 2 * HZ));
}
} else {
if ((adapter->ecdev && ecdev_get_link(adapter->ecdev))
if ((adapter->ecdev && ecdev_get_link(adapter->ecdev))
|| (!adapter->ecdev && netif_carrier_ok(netdev))) {
adapter->link_speed = 0;
adapter->link_duplex = 0;
@@ -3808,7 +3808,7 @@ link_up:
e1000e_update_adaptive(&adapter->hw);
if ((adapter->ecdev && !ecdev_get_link(adapter->ecdev))
if ((adapter->ecdev && !ecdev_get_link(adapter->ecdev))
|| (!adapter->ecdev && !netif_carrier_ok(netdev))) {
tx_pending = (e1000_desc_unused(tx_ring) + 1 <
tx_ring->count);
@@ -4857,7 +4857,7 @@ static void e1000_shutdown(struct pci_dev *pdev)
bool wake = false;
struct net_device *netdev = pci_get_drvdata(pdev);
struct e1000_adapter *adapter = netdev_priv(netdev);
if (adapter->ecdev)
return;
devices/e1000e/netdev-2.6.33-ethercat.c
+7 -7
View File
@@ -2913,7 +2913,7 @@ int e1000e_up(struct e1000_adapter *adapter)
clear_bit(__E1000_DOWN, &adapter->state);
if (!adapter->ecdev)
if (!adapter->ecdev)
napi_enable(&adapter->napi);
if (adapter->msix_entries)
@@ -2947,7 +2947,7 @@ void e1000e_down(struct e1000_adapter *adapter)
ew32(RCTL, rctl & ~E1000_RCTL_EN);
/* flush and sleep below */
if (!adapter->ecdev)
if (!adapter->ecdev)
netif_stop_queue(netdev);
/* disable transmits in the hardware */
@@ -3654,7 +3654,7 @@ static void e1000_watchdog_task(struct work_struct *work)
e1000_update_mng_vlan(adapter);
if (link) {
if ((adapter->ecdev && !ecdev_get_link(adapter->ecdev))
if ((adapter->ecdev && !ecdev_get_link(adapter->ecdev))
|| (!adapter->ecdev && !netif_carrier_ok(netdev))) {
bool txb2b = 1;
/* update snapshot of PHY registers on LSC */
@@ -3754,7 +3754,7 @@ static void e1000_watchdog_task(struct work_struct *work)
if (adapter->ecdev)
ecdev_set_link(adapter->ecdev, 1);
else
else
netif_carrier_on(netdev);
if (!adapter->ecdev && !test_bit(__E1000_DOWN, &adapter->state))
@@ -3762,7 +3762,7 @@ static void e1000_watchdog_task(struct work_struct *work)
round_jiffies(jiffies + 2 * HZ));
}
} else {
if ((adapter->ecdev && ecdev_get_link(adapter->ecdev))
if ((adapter->ecdev && ecdev_get_link(adapter->ecdev))
|| (!adapter->ecdev && netif_carrier_ok(netdev))) {
adapter->link_speed = 0;
adapter->link_duplex = 0;
@@ -3797,7 +3797,7 @@ link_up:
e1000e_update_adaptive(&adapter->hw);
if ((adapter->ecdev && !ecdev_get_link(adapter->ecdev))
if ((adapter->ecdev && !ecdev_get_link(adapter->ecdev))
|| (!adapter->ecdev && !netif_carrier_ok(netdev))) {
tx_pending = (e1000_desc_unused(tx_ring) + 1 <
tx_ring->count);
@@ -4859,7 +4859,7 @@ static void e1000_shutdown(struct pci_dev *pdev)
bool wake = false;
struct net_device *netdev = pci_get_drvdata(pdev);
struct e1000_adapter *adapter = netdev_priv(netdev);
if (adapter->ecdev)
return;
devices/e1000e/netdev-2.6.34-ethercat.c
+7 -7
View File
@@ -2892,7 +2892,7 @@ int e1000e_up(struct e1000_adapter *adapter)
clear_bit(__E1000_DOWN, &adapter->state);
if (!adapter->ecdev)
if (!adapter->ecdev)
napi_enable(&adapter->napi);
if (adapter->msix_entries)
@@ -2926,7 +2926,7 @@ void e1000e_down(struct e1000_adapter *adapter)
ew32(RCTL, rctl & ~E1000_RCTL_EN);
/* flush and sleep below */
if (!adapter->ecdev)
if (!adapter->ecdev)
netif_stop_queue(netdev);
/* disable transmits in the hardware */
@@ -3634,7 +3634,7 @@ static void e1000_watchdog_task(struct work_struct *work)
e1000_update_mng_vlan(adapter);
if (link) {
if ((adapter->ecdev && !ecdev_get_link(adapter->ecdev))
if ((adapter->ecdev && !ecdev_get_link(adapter->ecdev))
|| (!adapter->ecdev && !netif_carrier_ok(netdev))) {
bool txb2b = 1;
/* update snapshot of PHY registers on LSC */
@@ -3728,7 +3728,7 @@ static void e1000_watchdog_task(struct work_struct *work)
if (adapter->ecdev)
ecdev_set_link(adapter->ecdev, 1);
else
else
netif_carrier_on(netdev);
if (!adapter->ecdev && !test_bit(__E1000_DOWN, &adapter->state))
@@ -3736,7 +3736,7 @@ static void e1000_watchdog_task(struct work_struct *work)
round_jiffies(jiffies + 2 * HZ));
}
} else {
if ((adapter->ecdev && ecdev_get_link(adapter->ecdev))
if ((adapter->ecdev && ecdev_get_link(adapter->ecdev))
|| (!adapter->ecdev && netif_carrier_ok(netdev))) {
adapter->link_speed = 0;
adapter->link_duplex = 0;
@@ -3771,7 +3771,7 @@ link_up:
e1000e_update_adaptive(&adapter->hw);
if ((adapter->ecdev && !ecdev_get_link(adapter->ecdev))
if ((adapter->ecdev && !ecdev_get_link(adapter->ecdev))
|| (!adapter->ecdev && !netif_carrier_ok(netdev))) {
tx_pending = (e1000_desc_unused(tx_ring) + 1 <
tx_ring->count);
@@ -4855,7 +4855,7 @@ static void e1000_shutdown(struct pci_dev *pdev)
bool wake = false;
struct net_device *netdev = pci_get_drvdata(pdev);
struct e1000_adapter *adapter = netdev_priv(netdev);
if (adapter->ecdev)
return;
devices/e1000e/netdev-2.6.35-ethercat.c
+6 -6
View File
@@ -3306,7 +3306,7 @@ void e1000e_down(struct e1000_adapter *adapter)
ew32(RCTL, rctl & ~E1000_RCTL_EN);
/* flush and sleep below */
if (!adapter->ecdev)
if (!adapter->ecdev)
netif_stop_queue(netdev);
/* disable transmits in the hardware */
@@ -4044,7 +4044,7 @@ static void e1000_watchdog_task(struct work_struct *work)
e1000_update_mng_vlan(adapter);
if (link) {
if ((adapter->ecdev && !ecdev_get_link(adapter->ecdev))
if ((adapter->ecdev && !ecdev_get_link(adapter->ecdev))
|| (!adapter->ecdev && !netif_carrier_ok(netdev))) {
bool txb2b = 1;
@@ -4142,7 +4142,7 @@ static void e1000_watchdog_task(struct work_struct *work)
if (adapter->ecdev)
ecdev_set_link(adapter->ecdev, 1);
else
else
netif_carrier_on(netdev);
if (!adapter->ecdev && !test_bit(__E1000_DOWN, &adapter->state))
@@ -4150,7 +4150,7 @@ static void e1000_watchdog_task(struct work_struct *work)
round_jiffies(jiffies + 2 * HZ));
}
} else {
if ((adapter->ecdev && ecdev_get_link(adapter->ecdev))
if ((adapter->ecdev && ecdev_get_link(adapter->ecdev))
|| (!adapter->ecdev && netif_carrier_ok(netdev))) {
adapter->link_speed = 0;
adapter->link_duplex = 0;
@@ -4188,7 +4188,7 @@ link_up:
e1000e_update_adaptive(&adapter->hw);
if ((adapter->ecdev && !ecdev_get_link(adapter->ecdev))
if ((adapter->ecdev && !ecdev_get_link(adapter->ecdev))
|| (!adapter->ecdev && !netif_carrier_ok(netdev))) {
tx_pending = (e1000_desc_unused(tx_ring) + 1 <
tx_ring->count);
@@ -5359,7 +5359,7 @@ static void e1000_shutdown(struct pci_dev *pdev)
bool wake = false;
struct net_device *netdev = pci_get_drvdata(pdev);
struct e1000_adapter *adapter = netdev_priv(netdev);
if (adapter->ecdev)
return;
devices/e1000e/netdev-2.6.37-ethercat.c
+6 -6
View File
@@ -3414,7 +3414,7 @@ void e1000e_down(struct e1000_adapter *adapter)
ew32(RCTL, rctl & ~E1000_RCTL_EN);
/* flush and sleep below */
if (!adapter->ecdev)
if (!adapter->ecdev)
netif_stop_queue(netdev);
/* disable transmits in the hardware */
@@ -4236,7 +4236,7 @@ static void e1000_watchdog_task(struct work_struct *work)
e1000_update_mng_vlan(adapter);
if (link) {
if ((adapter->ecdev && !ecdev_get_link(adapter->ecdev))
if ((adapter->ecdev && !ecdev_get_link(adapter->ecdev))
|| (!adapter->ecdev && !netif_carrier_ok(netdev))) {
bool txb2b = 1;
@@ -4334,7 +4334,7 @@ static void e1000_watchdog_task(struct work_struct *work)
if (adapter->ecdev)
ecdev_set_link(adapter->ecdev, 1);
else
else
netif_carrier_on(netdev);
if (!adapter->ecdev && !test_bit(__E1000_DOWN, &adapter->state))
@@ -4342,7 +4342,7 @@ static void e1000_watchdog_task(struct work_struct *work)
round_jiffies(jiffies + 2 * HZ));
}
} else {
if ((adapter->ecdev && ecdev_get_link(adapter->ecdev))
if ((adapter->ecdev && ecdev_get_link(adapter->ecdev))
|| (!adapter->ecdev && netif_carrier_ok(netdev))) {
adapter->link_speed = 0;
adapter->link_duplex = 0;
@@ -4380,7 +4380,7 @@ link_up:
e1000e_update_adaptive(&adapter->hw);
if ((adapter->ecdev && !ecdev_get_link(adapter->ecdev))
if ((adapter->ecdev && !ecdev_get_link(adapter->ecdev))
|| (!adapter->ecdev && !netif_carrier_ok(netdev))) {
tx_pending = (e1000_desc_unused(tx_ring) + 1 <
tx_ring->count);
@@ -5564,7 +5564,7 @@ static void e1000_shutdown(struct pci_dev *pdev)
bool wake = false;
struct net_device *netdev = pci_get_drvdata(pdev);
struct e1000_adapter *adapter = netdev_priv(netdev);
if (adapter->ecdev)
return;
devices/e1000e/netdev-3.2-ethercat.c
+6 -6
View File
@@ -3575,7 +3575,7 @@ void e1000e_down(struct e1000_adapter *adapter)
ew32(RCTL, rctl & ~E1000_RCTL_EN);
/* flush and sleep below */
if (!adapter->ecdev)
if (!adapter->ecdev)
netif_stop_queue(netdev);
/* disable transmits in the hardware */
@@ -4391,7 +4391,7 @@ static void e1000_watchdog_task(struct work_struct *work)
e1000_update_mng_vlan(adapter);
if (link) {
if ((adapter->ecdev && !ecdev_get_link(adapter->ecdev))
if ((adapter->ecdev && !ecdev_get_link(adapter->ecdev))
|| (!adapter->ecdev && !netif_carrier_ok(netdev))) {
bool txb2b = 1;
@@ -4489,7 +4489,7 @@ static void e1000_watchdog_task(struct work_struct *work)
if (adapter->ecdev)
ecdev_set_link(adapter->ecdev, 1);
else
else
netif_carrier_on(netdev);
if (!adapter->ecdev && !test_bit(__E1000_DOWN, &adapter->state))
@@ -4497,7 +4497,7 @@ static void e1000_watchdog_task(struct work_struct *work)
round_jiffies(jiffies + 2 * HZ));
}
} else {
if ((adapter->ecdev && ecdev_get_link(adapter->ecdev))
if ((adapter->ecdev && ecdev_get_link(adapter->ecdev))
|| (!adapter->ecdev && netif_carrier_ok(netdev))) {
adapter->link_speed = 0;
adapter->link_duplex = 0;
@@ -4537,7 +4537,7 @@ link_up:
e1000e_update_adaptive(&adapter->hw);
if ((adapter->ecdev && !ecdev_get_link(adapter->ecdev))
if ((adapter->ecdev && !ecdev_get_link(adapter->ecdev))
|| (!adapter->ecdev && (!netif_carrier_ok(netdev) &&
(e1000_desc_unused(tx_ring) + 1 < tx_ring->count)))) {
/*
@@ -5767,7 +5767,7 @@ static void e1000_shutdown(struct pci_dev *pdev)
bool wake = false;
struct net_device *netdev = pci_get_drvdata(pdev);
struct e1000_adapter *adapter = netdev_priv(netdev);
if (adapter->ecdev)
return;
devices/r8169-2.6.31-ethercat.c
+2 -2
View File
@@ -3910,7 +3910,7 @@ static int rtl8169_suspend(struct device *device)
struct pci_dev *pdev = to_pci_dev(device);
struct net_device *dev = pci_get_drvdata(pdev);
struct rtl8169_private *tp = netdev_priv(dev);
if (tp->ecdev)
return -EBUSY;
@@ -3924,7 +3924,7 @@ static int rtl8169_resume(struct device *device)
struct pci_dev *pdev = to_pci_dev(device);
struct net_device *dev = pci_get_drvdata(pdev);
struct rtl8169_private *tp = netdev_priv(dev);
if (tp->ecdev)
return -EBUSY;
devices/r8169-2.6.32-ethercat.c
+2 -4
View File
@@ -2704,7 +2704,7 @@ static void rtl8169_phy_timer(unsigned long __opaque)
if (!tp->ecdev)
spin_lock_irq(&tp->lock);
if (tp->phy_reset_pending(ioaddr)) {
/*
* A busy loop could burn quite a few cycles on nowadays CPU.
@@ -3319,7 +3319,6 @@ static int rtl8169_open(struct net_device *dev)
goto err_release_ring_2;
napi_enable(&tp->napi);
}
rtl_hw_start(dev);
@@ -4765,7 +4764,6 @@ static void rtl8169_down(struct net_device *dev)
netif_stop_queue(dev);
napi_disable(&tp->napi);
}
core_down:
@@ -4925,7 +4923,7 @@ static int rtl8169_suspend(struct device *device)
struct pci_dev *pdev = to_pci_dev(device);
struct net_device *dev = pci_get_drvdata(pdev);
struct rtl8169_private *tp = netdev_priv(dev);
if (tp->ecdev)
return -EBUSY;
devices/r8169-2.6.33-ethercat.c
+2 -3
View File
@@ -2709,7 +2709,7 @@ static void rtl8169_phy_timer(unsigned long __opaque)
if (!tp->ecdev)
spin_lock_irq(&tp->lock);
if (tp->phy_reset_pending(ioaddr)) {
/*
* A busy loop could burn quite a few cycles on nowadays CPU.
@@ -3339,7 +3339,6 @@ static int rtl8169_open(struct net_device *dev)
goto err_release_ring_2;
napi_enable(&tp->napi);
}
rtl_hw_start(dev);
@@ -4943,7 +4942,7 @@ static int rtl8169_suspend(struct device *device)
struct pci_dev *pdev = to_pci_dev(device);
struct net_device *dev = pci_get_drvdata(pdev);
struct rtl8169_private *tp = netdev_priv(dev);
if (tp->ecdev)
return -EBUSY;
devices/r8169-2.6.36-ethercat.c
+2 -4
View File
@@ -2733,7 +2733,7 @@ static void rtl8169_phy_timer(unsigned long __opaque)
if (!tp->ecdev)
spin_lock_irq(&tp->lock);
if (tp->phy_reset_pending(ioaddr)) {
/*
* A busy loop could burn quite a few cycles on nowadays CPU.
@@ -3354,7 +3354,6 @@ static int rtl8169_open(struct net_device *dev)
goto err_release_ring_2;
napi_enable(&tp->napi);
}
rtl_hw_start(dev);
@@ -4809,7 +4808,6 @@ static void rtl8169_down(struct net_device *dev)
netif_stop_queue(dev);
napi_disable(&tp->napi);
}
core_down:
@@ -4970,7 +4968,7 @@ static int rtl8169_suspend(struct device *device)
struct pci_dev *pdev = to_pci_dev(device);
struct net_device *dev = pci_get_drvdata(pdev);
struct rtl8169_private *tp = netdev_priv(dev);
if (tp->ecdev)
return -EBUSY;

Some files were not shown because too many files have changed in this diff Show More