Changeset 6fc0edd in mainline

Timestamp:

2011-01-06T16:37:53Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

b590c21

Parents:

0777f4c5

Message:

more robust interrupt processing

Location:

uspace/srv/hw/netif/dp8390

Files:

• dp8390.c (modified) (4 diffs)
• dp8390.h (modified) (1 diff)
• dp8390_drv.h (modified) (1 diff)
• dp8390_module.c (modified) (6 diffs)

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

@@ -478 +478 @@
 }
 
-void dp_check_ints(dpeth_t *dep)
-{
-        int isr, tsr;
+void dp_check_ints(dpeth_t *dep, int isr)
+{
+        int tsr;
         int size, sendq_tail;
         
@@ -486 +486 @@
                 fprintf(stderr, "dp8390: got premature interrupt\n");
         
-        for (;;) {
-                isr = inb_reg0(dep, DP_ISR);
-                if (!isr)
-                        break;
-                
+        for (; isr; isr = inb_reg0(dep, DP_ISR)) {
                 outb_reg0(dep, DP_ISR, isr);
                 
@@ -524 +520 @@
                         
                         if (!(dep->de_sendq[sendq_tail].sq_filled)) {
-                                /* Software bug? */
-                                assert(false);
-                                
                                 /* Or hardware bug? */
                                 printf("%s: transmit interrupt, but not sending\n", dep->de_name);
@@ -601 +594 @@
 }
 
-/*===========================================================================*
- *                              dp_recv                                      *
- *===========================================================================*/
-static void dp_recv(dep)
-dpeth_t *dep;
+static void dp_recv(dpeth_t *dep)
 {
         dp_rcvhdr_t header;

uspace/srv/hw/netif/dp8390/dp8390.h

@@ -263 +263 @@
         phys_bytes de_linmem;
         int de_irq;
-        int de_int_pending;
-        dp_initf_t de_initf; 
-        dp_stopf_t de_stopf; 
+        dp_initf_t de_initf;
+        dp_stopf_t de_stopf;
         char de_name[sizeof("dp8390#n")];
         

uspace/srv/hw/netif/dp8390/dp8390_drv.h

@@ -56 +56 @@
  *  @param[in,out] dep The network interface structure.
  */
-void dp_check_ints(dpeth_t *dep);
+void dp_check_ints(dpeth_t *dep, int isr);
 
 /** Probes and initializes the network interface.

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

@@ -58 +58 @@
 #define NAME  "dp8390"
 
-/** Returns the device from the interrupt call.
+/** Return the device from the interrupt call.
+ *
  *  @param[in] call The interrupt call.
- */
-#define IRQ_GET_DEVICE(call)  (device_id_t) IPC_GET_IMETHOD(*call)
+ *
+ */
+#define IRQ_GET_DEVICE(call)  ((device_id_t) IPC_GET_IMETHOD(call))
+
+/** Return the ISR from the interrupt call.
+ *
+ *  @param[in] call The interrupt call.
+ *
+ */
+#define IRQ_GET_ISR(call)  ((int) IPC_GET_ARG2(call))
 
 /** DP8390 kernel interrupt command sequence.
@@ -72 +81 @@
         },
         {
+                .cmd = CMD_BTEST,
+                .value = 0x7f,
+                .srcarg = 2,
+                .dstarg = 3,
+        },
+        {
                 .cmd = CMD_PREDICATE,
-                .value = 1,
-                .srcarg = 2
+                .value = 2,
+                .srcarg = 3
+        },
+        {
+                .cmd = CMD_PIO_WRITE_8,
+                .addr = NULL,
+                .value = 0xff
         },
         {
@@ -101 +121 @@
         int phone;
         
-        device_id = IRQ_GET_DEVICE(call);
+        device_id = IRQ_GET_DEVICE(*call);
         fibril_rwlock_write_lock(&netif_globals.lock);
         
@@ -117 +137 @@
         assert(dep->de_flags & DEF_ENABLED);
         
-        dep->de_int_pending = 0;
-        dp_check_ints(dep);
+        dp_check_ints(dep, IRQ_GET_ISR(*call));
         
         if (dep->received_queue) {
@@ -279 +298 @@
                 
                 if (do_pwrite(dep, packet, false) != EBUSY)
-                        netif_pq_release(packet_get_id(packet));\
+                        netif_pq_release(packet_get_id(packet));
                 
                 packet = next;
@@ -295 +314 @@
                 dep = (dpeth_t *) device->specific;
                 dp8390_cmds[0].addr = (void *) (uintptr_t) (dep->de_dp8390_port + DP_ISR);
-                dp8390_cmds[2].addr = dp8390_cmds[0].addr;
+                dp8390_cmds[3].addr = dp8390_cmds[0].addr;
                 
                 rc = ipc_register_irq(dep->de_irq, device->device_id, device->device_id, &dp8390_code);