Changeset b5ba8f6 in mainline for uspace/drv/bus/isa/isa.c

Timestamp:

2013-09-13T13:11:53Z (11 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

1eaa3cf

Parents:

95027b5 (diff), 1c5f6f8 (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) (9 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>
@@ -104 +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;
 }
 
@@ -116 +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;
@@ -133 +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) {
@@ -159 +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);
 
@@ -182 +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);
 
@@ -201 +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,
@@ -207 +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,
 };
 
@@ -414 +429 @@
                 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;