Changes in uspace/drv/bus/isa/isa.c [9e470c0:0a428943] in mainline

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>
@@ -105 +104 @@
 }
 
-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;
+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;
 }
 
@@ -117 +116 @@
         /* This is an old ugly way, copied from pci driver */
         assert(fnode);
-        isa_fun_t *fun = isa_fun(fnode);
-        assert(fun);
+        isa_fun_t *isa = isa_fun(fnode);
+        assert(isa);
 
         sysarg_t apic;
@@ -134 +133 @@
                 return false;
 
-        const hw_resource_list_t *res = &fun->hw_resources;
+        const hw_resource_list_t *res = &isa->hw_resources;
         assert(res);
         for (size_t i = 0; i < res->count; ++i) {
@@ -160 +159 @@
 {
         assert(fnode);
-        isa_fun_t *fun = isa_fun(fnode);
-        assert(fun);
-        const hw_resource_list_t *res = &fun->hw_resources;
+        isa_fun_t *isa = isa_fun(fnode);
+        assert(isa);
+        const hw_resource_list_t *res = &isa->hw_resources;
         assert(res);
 
@@ -183 +182 @@
         assert(size);
         assert(fnode);
-        isa_fun_t *fun = isa_fun(fnode);
-        assert(fun);
-        const hw_resource_list_t *res = &fun->hw_resources;
+        isa_fun_t *isa = isa_fun(fnode);
+        assert(isa);
+        const hw_resource_list_t *res = &isa->hw_resources;
         assert(res);
 
@@ -202 +201 @@
 
 static hw_res_ops_t isa_fun_hw_res_ops = {
-        .get_resource_list = isa_fun_get_resources,
+        .get_resource_list = isa_get_fun_resources,
         .enable_interrupt = isa_fun_enable_interrupt,
         .dma_channel_setup = isa_fun_setup_dma,
@@ -208 +207 @@
 };
 
-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,
 };
 
@@ -429 +414 @@
                 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;