Changeset abe95c9 in mainline for uspace/srv/hw/netif/dp8390/ne2000.c

Timestamp:

2011-01-10T22:49:14Z (13 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

43b4314

Parents:

6643a19

Message:

avoid multiple overlapped interrupt request handling by handling interrupts one at a time
(using the Interrupt Mask Register)

File:

• uspace/srv/hw/netif/dp8390/ne2000.c (modified) (3 diffs)

uspace/srv/hw/netif/dp8390/ne2000.c

@@ -76 +76 @@
 static irq_cmd_t ne2k_cmds[] = {
         {
+                /* Read Interrupt Status Register */
                 .cmd = CMD_PIO_READ_8,
                 .addr = NULL,
@@ -81 +82 @@
         },
         {
+                /* Mask supported interrupt causes */
                 .cmd = CMD_BTEST,
-                .value = 0x7f,
+                .value = (ISR_PRX | ISR_PTX | ISR_RXE | ISR_TXE | ISR_OVW |
+                    ISR_CNT | ISR_RDC),
                 .srcarg = 2,
                 .dstarg = 3,
         },
         {
+                /* Predicate for accepting the interrupt */
                 .cmd = CMD_PREDICATE,
-                .value = 2,
+                .value = 3,
                 .srcarg = 3
         },
         {
+                /*
+                 * Mask future interrupts via
+                 * Interrupt Mask Register
+                 */
+                .cmd = CMD_PIO_WRITE_8,
+                .addr = NULL,
+                .value = 0
+        },
+        {
+                /* Acknowledge the current interrupt */
                 .cmd = CMD_PIO_WRITE_A_8,
                 .addr = NULL,
@@ -265 +279 @@
                 
                 ne2k_cmds[0].addr = ne2k->port + DP_ISR;
-                ne2k_cmds[3].addr = ne2k_cmds[0].addr;
+                ne2k_cmds[3].addr = ne2k->port + DP_IMR;
+                ne2k_cmds[4].addr = ne2k_cmds[0].addr;
                 
                 int rc = ipc_register_irq(ne2k->irq, device->device_id,