Changeset 97a62fe in mainline for uspace/drv/isa/isa.c

Timestamp:

2011-02-14T21:41:50Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

cd0684d

Parents:

7df0477e

Message:

Refactor create_function(), delete_function() and register_function() into
ddf_fun_create(), ddf_fun_destroy() and ddf_fun_bind(). This is not just
a rename.

File:

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

uspace/drv/isa/isa.c

@@ -106 +106 @@
 };
 
-static isa_fun_t *isa_fun_create()
+static isa_fun_t *isa_fun_create(device_t *dev, const char *name)
 {
         isa_fun_t *fun = calloc(1, sizeof(isa_fun_t));
@@ -112 +112 @@
                 return NULL;
 
-        function_t *fnode = create_function();
+        function_t *fnode = ddf_fun_create(dev, fun_inner, name);
         if (fnode == NULL) {
                 free(fun);
@@ -417 +417 @@
                 return NULL;
 
-        isa_fun_t *fun = isa_fun_create();
+        isa_fun_t *fun = isa_fun_create(dev, fun_name);
         if (fun == NULL) {
                 free(fun_name);
                 return NULL;
         }
-
-        function_t *fnode = fun->fnode;
-        fnode->name = fun_name;
-        fnode->ftype = fun_inner;
 
         /* Allocate buffer for the list of hardware resources of the device. */
@@ -447 +443 @@
 
         /* Set device operations to the device. */
-        fnode->ops = &isa_fun_ops;
-
-        printf(NAME ": register_function(fun, dev); function is %s.\n",
-            fnode->name);
-        register_function(fnode, dev);
+        fun->fnode->ops = &isa_fun_ops;
+
+        printf(NAME ": Binding function %s.\n", fun->fnode->name);
+
+        /* XXX Handle error */
+        (void) ddf_fun_bind(fun->fnode);
 
         return fun_conf;
@@ -482 +479 @@
         printf(NAME ": adding a 'ctl' function\n");
 
-        function_t *ctl = create_function();
-        ctl->ftype = fun_exposed;
-        ctl->name = "ctl";
-        register_function(ctl, dev);
+        function_t *ctl = ddf_fun_create(dev, fun_exposed, "ctl");
+        if (ctl == NULL) {
+                printf(NAME ": Error creating control function.\n");
+                return EXDEV;
+        }
+
+        if (ddf_fun_bind(ctl) != EOK) {
+                printf(NAME ": Error binding control function.\n");
+                return EXDEV;
+        }
 
         /* Add functions as specified in the configuration file. */