Changeset ba21938 in mainline

Timestamp:

2011-01-06T22:23:21Z (14 years ago)

Author:

martin@…>

Branches:

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

Children:

3d5e190, efa8aec6

Parents:

c2f3e0b (diff), d8d8bbd (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge I/O space handling improvements

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,
@@ -62 +63 @@
         
         /**
-         * Perform a bit test on the source argument and store the result into
-         * the destination argument.
+         * Write 1 byte from the source argument
+         * to the I/O space.
+         */
+        CMD_PIO_WRITE_A_8,
+        /**
+         * 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,
@@ -75 +93 @@
         /** 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 @@
 }
 
-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
         },
         {