Changeset 6fc0edd in mainline for uspace/srv/hw/netif/dp8390/dp8390.c

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

File:

• uspace/srv/hw/netif/dp8390/dp8390.c (modified) (4 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;