Changes in / [ba21938:c2f3e0b] in mainline

Files:

• kernel/generic/include/ddi/irq.h (modified) (3 diffs)
• kernel/generic/src/ipc/irq.c (modified) (1 diff)
• uspace/srv/hw/netif/dp8390/dp8390.c (modified) (2 diffs)
• uspace/srv/hw/netif/dp8390/dp8390_drv.h (modified) (1 diff)
• uspace/srv/hw/netif/dp8390/dp8390_module.c (modified) (1 diff)

kernel/generic/include/ddi/irq.h

@@ -54 +54 @@
         /** Read 4 bytes from the I/O space. */
         CMD_PIO_READ_32,
-        
         /** Write 1 byte to the I/O space. */
         CMD_PIO_WRITE_8,
@@ -63 +62 @@
         
         /**
-         * Write 1 byte from the source argument
-         * to the I/O space.
-         */
-        CMD_PIO_WRITE_A_8,
+         * Perform a bit test on the source argument and store the result into
+         * the destination argument.
+         */
+        CMD_BTEST,
+        
         /**
-         * Write 2 bytes from the source argument
-         * to the I/O space.
-         */
-        CMD_PIO_WRITE_A_16,
-        /**
-         * Write 4 bytes from the source argument
-         * to the I/O space.
-         */
-        CMD_PIO_WRITE_A_32,
-        
-        /**
-         * Perform a bit masking on the source argument
-         * and store the result into the destination argument.
-         */
-        CMD_BTEST,
-        
-        /**
-         * Predicate the execution of the following
-         * N commands by the boolean value of the source
-         * argument.
+         * Predicate the execution of the following N commands by the boolean
+         * value of the source argument.
          */
         CMD_PREDICATE,
@@ -93 +75 @@
         /** Accept the interrupt. */
         CMD_ACCEPT,
-        
         /** Decline the interrupt. */
         CMD_DECLINE,

kernel/generic/src/ipc/irq.c

@@ -404 +404 @@
                             (uint32_t) code->cmds[i].value);
                         break;
-                case CMD_PIO_WRITE_A_8:
-                        if (srcarg) {
-                                pio_write_8((ioport8_t *) code->cmds[i].addr,
-                                    (uint8_t) scratch[srcarg]);
-                        }
-                        break;
-                case CMD_PIO_WRITE_A_16:
-                        if (srcarg) {
-                                pio_write_16((ioport16_t *) code->cmds[i].addr,
-                                    (uint16_t) scratch[srcarg]);
-                        }
-                        break;
-                case CMD_PIO_WRITE_A_32:
-                        if (srcarg) {
-                                pio_write_32((ioport32_t *) code->cmds[i].addr,
-                                    (uint32_t) scratch[srcarg]);
-                        }
-                        break;
                 case CMD_BTEST:
                         if ((srcarg) && (dstarg)) {

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

@@ -375 +375 @@
 }
 
-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)
+void dp_check_ints(int nil_phone, device_id_t device_id, dpeth_t *dep, int isr)
 {
         int tsr;
@@ -392 +383 @@
                 fprintf(stderr, "dp8390: got premature interrupt\n");
         
-        for (; isr != 0; isr = isr_acknowledge(dep)) {
+        for (; isr; isr = inb_reg0(dep, DP_ISR)) {
+                outb_reg0(dep, DP_ISR, isr);
+                
                 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, uint8_t isr);
+void dp_check_ints(int nil_phone, device_id_t device_id, dpeth_t *dep, int isr);
 
 /** Probes and initializes the network interface.

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

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