bkinnightskytw
/
ethercat
mirror of https://gitlab.com/bkinnightskytw/ethercat.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow disabling interrupts on e100, because they are enabled after hardware reset.

This commit is contained in:
Florian Pose 2008-11-20 12:36:19 +00:00
parent 44382e303f
commit 40ca0b10c5
3 changed files with 18 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
devices/e100-2.6.20-ethercat.c
View File

@ -659,15 +659,14 @@ static void e100_enable_irq(struct nic *nic)
static void e100_disable_irq(struct nic *nic)
{
unsigned long flags;
unsigned long flags = 0;
if (nic->ecdev)
return;
spin_lock_irqsave(&nic->cmd_lock, flags);
if (!nic->ecdev)
spin_lock_irqsave(&nic->cmd_lock, flags);
writeb(irq_mask_all, &nic->csr->scb.cmd_hi);
e100_write_flush(nic);
spin_unlock_irqrestore(&nic->cmd_lock, flags);
if (!nic->ecdev)
spin_unlock_irqrestore(&nic->cmd_lock, flags);
}
static void e100_hw_reset(struct nic *nic)
@ -2095,7 +2094,7 @@ void e100_ec_poll(struct net_device *netdev)
{
struct nic *nic = netdev_priv(netdev);
e100_rx_clean(nic, NULL, 100); // FIXME
e100_rx_clean(nic, NULL, 100);
e100_tx_clean(nic);
if (jiffies - nic->ec_watchdog_jiffies >= 2 * HZ) {
@ -2132,9 +2131,6 @@ static void e100_netpoll(struct net_device *netdev)
{
struct nic *nic = netdev_priv(netdev);
if (nic->ecdev)
return;
e100_disable_irq(nic);
e100_intr(nic->pdev->irq, netdev);
e100_tx_clean(nic);

16
devices/e100-2.6.24-ethercat.c
View File

@ -669,15 +669,14 @@ static void e100_enable_irq(struct nic *nic)
static void e100_disable_irq(struct nic *nic)
{
unsigned long flags;
unsigned long flags = 0;
if (nic->ecdev)
return;
spin_lock_irqsave(&nic->cmd_lock, flags);
if (!nic->ecdev)
spin_lock_irqsave(&nic->cmd_lock, flags);
iowrite8(irq_mask_all, &nic->csr->scb.cmd_hi);
e100_write_flush(nic);
spin_unlock_irqrestore(&nic->cmd_lock, flags);
if (!nic->ecdev)
spin_unlock_irqrestore(&nic->cmd_lock, flags);
}
static void e100_hw_reset(struct nic *nic)
@ -2114,7 +2113,7 @@ void e100_ec_poll(struct net_device *netdev)
{
struct nic *nic = netdev_priv(netdev);
e100_rx_clean(nic, NULL, 100); // FIXME
e100_rx_clean(nic, NULL, 100);
e100_tx_clean(nic);
if (jiffies - nic->ec_watchdog_jiffies >= 2 * HZ) {
@ -2147,9 +2146,6 @@ static void e100_netpoll(struct net_device *netdev)
{
struct nic *nic = netdev_priv(netdev);
if (nic->ecdev)
return;
e100_disable_irq(nic);
e100_intr(nic->pdev->irq, netdev);
e100_tx_clean(nic);

16
devices/e100-2.6.26-ethercat.c
View File

@ -677,15 +677,14 @@ static void e100_enable_irq(struct nic *nic)
static void e100_disable_irq(struct nic *nic)
{
unsigned long flags;
unsigned long flags = 0;
if (nic->ecdev)
return;
spin_lock_irqsave(&nic->cmd_lock, flags);
if (!nic->ecdev)
spin_lock_irqsave(&nic->cmd_lock, flags);
iowrite8(irq_mask_all, &nic->csr->scb.cmd_hi);
e100_write_flush(nic);
spin_unlock_irqrestore(&nic->cmd_lock, flags);
if (!nic->ecdev)
spin_unlock_irqrestore(&nic->cmd_lock, flags);
}
static void e100_hw_reset(struct nic *nic)
@ -2185,7 +2184,7 @@ void e100_ec_poll(struct net_device *netdev)
{
struct nic *nic = netdev_priv(netdev);
e100_rx_clean(nic, NULL, 100); // FIXME
e100_rx_clean(nic, NULL, 100);
e100_tx_clean(nic);
if (jiffies - nic->ec_watchdog_jiffies >= 2 * HZ) {
@ -2218,9 +2217,6 @@ static void e100_netpoll(struct net_device *netdev)
{
struct nic *nic = netdev_priv(netdev);
if (nic->ecdev)
return;
e100_disable_irq(nic);
e100_intr(nic->pdev->irq, netdev);
e100_tx_clean(nic);