Changeset d8d8bbd in mainline

Timestamp:

2011-01-06T22:22:37Z (14 years ago)

Author:

martin@…>

Branches:

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

Children:

ba21938

Parents:

9cdac5a

Message:

improve ISR handling

Location:

uspace/srv/hw/netif/dp8390

Files:

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

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

@@ -375 +375 @@
 }
 
-void dp_check_ints(int nil_phone, device_id_t device_id, dpeth_t *dep, int isr)
+static uint8_t isr_acknowledge(dpeth_t *dep)
+{
+        uint8_t isr = inb_reg0(dep, DP_ISR) & 0x7f;
+        if (isr != 0)
+                outb_reg0(dep, DP_ISR, isr);
+        
+        return isr;
+}
+
+void dp_check_ints(int nil_phone, device_id_t device_id, dpeth_t *dep, uint8_t isr)
 {
         int tsr;
@@ -383 +392 @@
                 fprintf(stderr, "dp8390: got premature interrupt\n");
         
-        for (; isr; isr = inb_reg0(dep, DP_ISR)) {
-                outb_reg0(dep, DP_ISR, isr);
-                
+        for (; isr != 0; isr = isr_acknowledge(dep)) {
                 if (isr & (ISR_PTX | ISR_TXE)) {
                         if (isr & ISR_TXE)

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

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

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

@@ -92 +92 @@
         },
         {
-                .cmd = CMD_PIO_WRITE_8,
+                .cmd = CMD_PIO_WRITE_A_8,
                 .addr = NULL,
-                .value = 0xff
+                .srcarg = 3
         },
         {