Changeset 0a428943 in mainline

Timestamp:

2013-09-11T17:35:48Z (11 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

26bc0fd1

Parents:

6dbc500

Message:

PIO_WINDOW_DEV_IFACE support for isa.

File:

• uspace/drv/bus/isa/isa.c (modified) (5 diffs)

uspace/drv/bus/isa/isa.c

@@ -67 +67 @@
 
 #include <device/hw_res.h>
+#include <device/pio_window.h>
 
 #include "i8237.h"
@@ -79 +80 @@
         ddf_dev_t *dev;
         ddf_fun_t *fctl;
+        pio_window_t pio_win;
         list_t functions;
 } isa_bus_t;
@@ -405 +407 @@
         hw_resource_t *resources = fun->hw_resources.resources;
 
+        isa_bus_t *isa = isa_bus(ddf_fun_get_dev(fun->fnode));
+
         if (count < ISA_MAX_HW_RES) {
                 resources[count].type = IO_RANGE;
                 resources[count].res.io_range.address = addr;
+                resources[count].res.io_range.address += isa->pio_win.io.base;
                 resources[count].res.io_range.size = len;
                 resources[count].res.io_range.endianness = LITTLE_ENDIAN;
@@ -604 +609 @@
 static int isa_dev_add(ddf_dev_t *dev)
 {
+        async_sess_t *sess;
+        int rc;
+
         ddf_msg(LVL_DEBUG, "isa_dev_add, device handle = %d",
             (int) ddf_dev_get_handle(dev));
@@ -614 +622 @@
         isa->dev = dev;
         list_initialize(&isa->functions);
+
+        sess = ddf_dev_parent_sess_create(dev, EXCHANGE_SERIALIZE);
+        if (sess == NULL) {
+                ddf_msg(LVL_ERROR, "isa_dev_add failed to connect to the "
+                    "parent driver.");
+                return ENOENT;
+        }
+
+        rc = pio_window_get(sess, &isa->pio_win);
+        if (rc != EOK) {
+                ddf_msg(LVL_ERROR, "isa_dev_add failed to get PIO window "
+                    "for the device.");
+                return rc;
+        }       
 
         /* Make the bus device more visible. Does not do anything. */