Changeset cd0684d in mainline for uspace/drv/isa/isa.c

Timestamp:

2011-02-14T22:14:52Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

659ca07

Parents:

97a62fe

Message:

Remove register_function_wrapper() since it became practically useless.
Provide ddf_fun_add_match_id() instead.

File:

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

uspace/drv/isa/isa.c

@@ -44 +44 @@
 #include <stdlib.h>
 #include <str.h>
+#include <str_error.h>
 #include <ctype.h>
 #include <macros.h>
@@ -324 +325 @@
         int score = 0;
         char *end = NULL;
+        int rc;
 
         val = skip_spaces(val);
@@ -334 +336 @@
         }
 
-        match_id_t *match_id = create_match_id();
-        if (match_id == NULL) {
-                printf(NAME " : failed to allocate match id for function %s.\n",
-                    fun->fnode->name);
-                return;
-        }
-
         val = skip_spaces(end);
         get_match_id(&id, val);
@@ -346 +341 @@
                 printf(NAME " : error - could not read match id for "
                     "function %s.\n", fun->fnode->name);
-                delete_match_id(match_id);
                 return;
         }
-
-        match_id->id = id;
-        match_id->score = score;
 
         printf(NAME ": adding match id '%s' with score %d to function %s\n", id,
             score, fun->fnode->name);
-        add_match_id(&fun->fnode->match_ids, match_id);
+
+        rc = ddf_fun_add_match_id(fun->fnode, id, score);
+        if (rc != EOK)
+                printf(NAME ": error adding match ID: %s\n", str_error(rc));
 }