Changeset 0c2d9bb in mainline for uspace/drv/bus/isa/isa.c

Timestamp:

2013-12-25T22:54:29Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

b51cf2c

Parents:

f7a33de (diff), ac36aed (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 mainline changes

File:

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

uspace/drv/bus/isa/isa.c

@@ -65 +65 @@
 #include <ddf/log.h>
 #include <ops/hw_res.h>
+#include <ops/pio_window.h>
 
 #include <device/hw_res.h>
+#include <device/pio_window.h>
 
 #include "i8237.h"
@@ -79 +81 @@
         ddf_dev_t *dev;
         ddf_fun_t *fctl;
+        pio_window_t pio_win;
         list_t functions;
 } isa_bus_t;
@@ -102 +105 @@
 }
 
-static hw_resource_list_t *isa_get_fun_resources(ddf_fun_t *fnode)
-{
-        isa_fun_t *isa = isa_fun(fnode);
-        assert(isa);
-
-        return &isa->hw_resources;
+static hw_resource_list_t *isa_fun_get_resources(ddf_fun_t *fnode)
+{
+        isa_fun_t *fun = isa_fun(fnode);
+        assert(fun);
+
+        return &fun->hw_resources;
 }
 
@@ -114 +117 @@
         /* This is an old ugly way, copied from pci driver */
         assert(fnode);
-        isa_fun_t *isa = isa_fun(fnode);
-        assert(isa);
+        isa_fun_t *fun = isa_fun(fnode);
+        assert(fun);
 
         sysarg_t apic;
@@ -131 +134 @@
                 return false;
 
-        const hw_resource_list_t *res = &isa->hw_resources;
+        const hw_resource_list_t *res = &fun->hw_resources;
         assert(res);
         for (size_t i = 0; i < res->count; ++i) {
@@ -157 +160 @@
 {
         assert(fnode);
-        isa_fun_t *isa = isa_fun(fnode);
-        assert(isa);
-        const hw_resource_list_t *res = &isa->hw_resources;
+        isa_fun_t *fun = isa_fun(fnode);
+        assert(fun);
+        const hw_resource_list_t *res = &fun->hw_resources;
         assert(res);
 
@@ -180 +183 @@
         assert(size);
         assert(fnode);
-        isa_fun_t *isa = isa_fun(fnode);
-        assert(isa);
-        const hw_resource_list_t *res = &isa->hw_resources;
+        isa_fun_t *fun = isa_fun(fnode);
+        assert(fun);
+        const hw_resource_list_t *res = &fun->hw_resources;
         assert(res);
 
@@ -199 +202 @@
 
 static hw_res_ops_t isa_fun_hw_res_ops = {
-        .get_resource_list = isa_get_fun_resources,
+        .get_resource_list = isa_fun_get_resources,
         .enable_interrupt = isa_fun_enable_interrupt,
         .dma_channel_setup = isa_fun_setup_dma,
@@ -205 +208 @@
 };
 
+static pio_window_t *isa_fun_get_pio_window(ddf_fun_t *fnode)
+{
+        ddf_dev_t *dev = ddf_fun_get_dev(fnode);
+        isa_bus_t *isa = isa_bus(dev);
+        assert(isa);
+
+        return &isa->pio_win;
+}
+
+static pio_window_ops_t isa_fun_pio_window_ops = {
+        .get_pio_window = isa_fun_get_pio_window
+};
+
 static ddf_dev_ops_t isa_fun_ops= {
         .interfaces[HW_RES_DEV_IFACE] = &isa_fun_hw_res_ops,
+        .interfaces[PIO_WINDOW_DEV_IFACE] = &isa_fun_pio_window_ops,
 };
 
@@ -405 +422 @@
         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.relative = false;
                 resources[count].res.io_range.endianness = LITTLE_ENDIAN;
 
@@ -604 +625 @@
 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 +638 @@
         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. */