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

Timestamp:

2012-11-06T21:03:44Z (11 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

338810f

Parents:

de73242 (diff), 94795812 (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) (18 diffs)

uspace/drv/bus/isa/isa.c

@@ -73 +73 @@
 #define CHILD_FUN_CONF_PATH "/drv/isa/isa.dev"
 
-/** Obtain soft-state from device node */
-#define ISA_BUS(dev) ((isa_bus_t *) ((dev)->driver_data))
-
-/** Obtain soft-state from function node */
-#define ISA_FUN(fun) ((isa_fun_t *) ((fun)->driver_data))
-
 #define ISA_MAX_HW_RES 5
 
@@ -95 +89 @@
 } isa_fun_t;
 
+/** Obtain soft-state from device node */
+static isa_bus_t *isa_bus(ddf_dev_t *dev)
+{
+        return ddf_dev_data_get(dev);
+}
+
+/** Obtain soft-state from function node */
+static isa_fun_t *isa_fun(ddf_fun_t *fun)
+{
+        return ddf_fun_data_get(fun);
+}
+
 static hw_resource_list_t *isa_get_fun_resources(ddf_fun_t *fnode)
 {
-        isa_fun_t *fun = ISA_FUN(fnode);
+        isa_fun_t *fun = isa_fun(fnode);
         assert(fun != NULL);
 
@@ -107 +113 @@
         /* This is an old ugly way, copied from pci driver */
         assert(fnode);
-        isa_fun_t *isa_fun = fnode->driver_data;
+        isa_fun_t *fun = isa_fun(fnode);
 
         sysarg_t apic;
@@ -123 +129 @@
                 return false;
 
-        assert(isa_fun);
-        const hw_resource_list_t *res = &isa_fun->hw_resources;
+        const hw_resource_list_t *res = &fun->hw_resources;
         assert(res);
         for (size_t i = 0; i < res->count; ++i) {
@@ -150 +155 @@
 {
         assert(fnode);
-        isa_fun_t *isa_fun = fnode->driver_data;
-        const hw_resource_list_t *res = &isa_fun->hw_resources;
+        isa_fun_t *fun = isa_fun(fnode);
+        const hw_resource_list_t *res = &fun->hw_resources;
         assert(res);
         
@@ -339 +344 @@
 
                 ddf_msg(LVL_NOTE, "Added irq 0x%x to function %s", irq,
-                    fun->fnode->name);
+                    ddf_fun_get_name(fun->fnode));
         }
 }
@@ -355 +360 @@
                         fun->hw_resources.count++;
                         ddf_msg(LVL_NOTE, "Added dma 0x%x to function %s", dma,
-                            fun->fnode->name);
+                            ddf_fun_get_name(fun->fnode));
                         
                         return;
@@ -366 +371 @@
                         fun->hw_resources.count++;
                         ddf_msg(LVL_NOTE, "Added dma 0x%x to function %s", dma,
-                            fun->fnode->name);
+                            ddf_fun_get_name(fun->fnode));
                         
                         return;
@@ -372 +377 @@
                 
                 ddf_msg(LVL_WARN, "Skipped dma 0x%x for function %s", dma,
-                    fun->fnode->name);
+                    ddf_fun_get_name(fun->fnode));
         }
 }
@@ -391 +396 @@
                 ddf_msg(LVL_NOTE, "Added io range (addr=0x%x, size=0x%x) to "
                     "function %s", (unsigned int) addr, (unsigned int) len,
-                    fun->fnode->name);
+                    ddf_fun_get_name(fun->fnode));
         }
 }
@@ -463 +468 @@
         if (val == end) {
                 ddf_msg(LVL_ERROR, "Cannot read match score for function "
-                    "%s.", fun->fnode->name);
+                    "%s.", ddf_fun_get_name(fun->fnode));
                 return;
         }
@@ -471 +476 @@
         if (id == NULL) {
                 ddf_msg(LVL_ERROR, "Cannot read match ID for function %s.",
-                    fun->fnode->name);
+                    ddf_fun_get_name(fun->fnode));
                 return;
         }
 
         ddf_msg(LVL_DEBUG, "Adding match id '%s' with score %d to "
-            "function %s", id, score, fun->fnode->name);
+            "function %s", id, score, ddf_fun_get_name(fun->fnode));
 
         rc = ddf_fun_add_match_id(fun->fnode, id, score);
@@ -579 +584 @@
 
         /* Set device operations to the device. */
-        fun->fnode->ops = &isa_fun_ops;
-
-        ddf_msg(LVL_DEBUG, "Binding function %s.", fun->fnode->name);
+        ddf_fun_set_ops(fun->fnode, &isa_fun_ops);
+
+        ddf_msg(LVL_DEBUG, "Binding function %s.", ddf_fun_get_name(fun->fnode));
 
         /* XXX Handle error */
@@ -614 +619 @@
 
         ddf_msg(LVL_DEBUG, "isa_dev_add, device handle = %d",
-            (int) dev->handle);
+            (int) ddf_dev_get_handle(dev));
 
         isa = ddf_dev_data_alloc(dev, sizeof(isa_bus_t));
@@ -652 +657 @@
 static int isa_dev_remove(ddf_dev_t *dev)
 {
-        isa_bus_t *isa = ISA_BUS(dev);
+        isa_bus_t *isa = isa_bus(dev);
         int rc;
 
@@ -664 +669 @@
                 if (rc != EOK) {
                         fibril_mutex_unlock(&isa->mutex);
-                        ddf_msg(LVL_ERROR, "Failed offlining %s", fun->fnode->name);
+                        ddf_msg(LVL_ERROR, "Failed offlining %s", ddf_fun_get_name(fun->fnode));
                         return rc;
                 }
@@ -671 +676 @@
                 if (rc != EOK) {
                         fibril_mutex_unlock(&isa->mutex);
-                        ddf_msg(LVL_ERROR, "Failed unbinding %s", fun->fnode->name);
+                        ddf_msg(LVL_ERROR, "Failed unbinding %s", ddf_fun_get_name(fun->fnode));
                         return rc;
                 }
@@ -707 +712 @@
 static void isa_init()
 {
-        ddf_log_init(NAME, LVL_ERROR);
+        ddf_log_init(NAME);
         isa_fun_ops.interfaces[HW_RES_DEV_IFACE] = &isa_fun_hw_res_ops;
 }