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

Timestamp:

2011-01-11T01:33:13Z (13 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

8136102

Parents:

4fc2b3b

Message:

fetching of frames from the network card is still single-threaded, but sending the frames to NIL uses parallelism

File:

• uspace/srv/hw/netif/dp8390/ne2000.c (modified) (5 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;
@@ -92 +99 @@
                 /* Predicate for accepting the interrupt */
                 .cmd = CMD_PREDICATE,
-                .value = 3,
+                .value = 4,
                 .srcarg = 3
         },
@@ -111 +118 @@
         },
         {
+                /* Read Transmit Status Register */
+                .cmd = CMD_PIO_READ_8,
+                .addr = NULL,
+                .dstarg = 3
+        },
+        {
                 .cmd = CMD_ACCEPT
         }
@@ -125 +138 @@
 /** Handle the interrupt notification.
  *
- * This is the interrupt notification function.
+ * 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).
  *
  * @param[in] iid  Interrupt notification identifier.
@@ -148 +165 @@
         fibril_rwlock_read_unlock(&netif_globals.lock);
         
-        if (ne2k != NULL)
-                ne2k_interrupt(ne2k, IRQ_GET_ISR(*call), nil_phone, device_id);
+        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);
+                }
+        }
 }