Changes in uspace/srv/hw/netif/dp8390/ne2000.c [7300c37:3c106e88] in mainline

File:

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

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

@@ -68 +68 @@
 #define IRQ_GET_ISR(call)  ((int) IPC_GET_ARG2(call))
 
-/** Return the TSR from the interrupt call.
- *
- * @param[in] call The interrupt call.
- *
- */
-#define IRQ_GET_TSR(call)  ((int) IPC_GET_ARG3(call))
-
 static int irc_service = 0;
 static int irc_phone = -1;
@@ -83 +76 @@
 static irq_cmd_t ne2k_cmds[] = {
         {
-                /* Read Interrupt Status Register */
                 .cmd = CMD_PIO_READ_8,
                 .addr = NULL,
@@ -89 +81 @@
         },
         {
-                /* Mask supported interrupt causes */
                 .cmd = CMD_BTEST,
-                .value = (ISR_PRX | ISR_PTX | ISR_RXE | ISR_TXE | ISR_OVW |
-                    ISR_CNT | ISR_RDC),
+                .value = 0x7f,
                 .srcarg = 2,
                 .dstarg = 3,
         },
         {
-                /* Predicate for accepting the interrupt */
                 .cmd = CMD_PREDICATE,
-                .value = 4,
+                .value = 2,
                 .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,
@@ -118 +97 @@
         },
         {
-                /* Read Transmit Status Register */
-                .cmd = CMD_PIO_READ_8,
-                .addr = NULL,
-                .dstarg = 3
-        },
-        {
                 .cmd = CMD_ACCEPT
         }
@@ -138 +111 @@
 /** Handle the interrupt notification.
  *
- * This is the interrupt notification function. It is quarantied
- * that there is only a single instance of this notification
- * function running at one time until the return from the
- * ne2k_interrupt() function (where the interrupts are unmasked
- * again).
+ * This is the interrupt notification function.
  *
  * @param[in] iid  Interrupt notification identifier.
@@ -165 +134 @@
         fibril_rwlock_read_unlock(&netif_globals.lock);
         
-        if (ne2k != NULL) {
-                link_t *frames =
-                    ne2k_interrupt(ne2k, IRQ_GET_ISR(*call), IRQ_GET_TSR(*call));
-                
-                if (frames != NULL) {
-                        while (!list_empty(frames)) {
-                                frame_t *frame =
-                                    list_get_instance(frames->next, frame_t, link);
-                                
-                                list_remove(&frame->link);
-                                nil_received_msg(nil_phone, device_id, frame->packet,
-                                    SERVICE_NONE);
-                                free(frame);
-                        }
-                        
-                        free(frames);
-                }
-        }
+        if (ne2k != NULL)
+                ne2k_interrupt(ne2k, IRQ_GET_ISR(*call), nil_phone, device_id);
 }
 
@@ -312 +265 @@
                 
                 ne2k_cmds[0].addr = ne2k->port + DP_ISR;
-                ne2k_cmds[3].addr = ne2k->port + DP_IMR;
-                ne2k_cmds[4].addr = ne2k_cmds[0].addr;
+                ne2k_cmds[3].addr = ne2k_cmds[0].addr;
                 
                 int rc = ipc_register_irq(ne2k->irq, device->device_id,
@@ -326 +278 @@
                 }
                 
-                change_state(device, NETIF_ACTIVE);
-                
                 if (irc_service)
                         async_msg_1(irc_phone, IRC_ENABLE_INTERRUPT, ne2k->irq);
+                
+                change_state(device, NETIF_ACTIVE);
         }