Changeset cd0684d in mainline for uspace/drv/pciintel/pci.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/pciintel/pci.c (modified) (2 diffs)

uspace/drv/pciintel/pci.c

@@ -45 +45 @@
 #include <ctype.h>
 #include <macros.h>
+#include <str_error.h>
 
 #include <driver.h>
@@ -217 +218 @@
 void pci_fun_create_match_ids(pci_fun_t *fun)
 {
-        match_id_t *match_id = NULL;
         char *match_id_str;
-        
-        match_id = create_match_id();
-        if (match_id != NULL) {
-                asprintf(&match_id_str, "pci/ven=%04x&dev=%04x",
-                    fun->vendor_id, fun->device_id);
-                match_id->id = match_id_str;
-                match_id->score = 90;
-                add_match_id(&fun->fnode->match_ids, match_id);
+        int rc;
+        
+        asprintf(&match_id_str, "pci/ven=%04x&dev=%04x",
+            fun->vendor_id, fun->device_id);
+
+        if (match_id_str == NULL) {
+                printf(NAME ": out of memory creating match ID.\n");
+                return;
+        }
+
+        rc = ddf_fun_add_match_id(fun->fnode, match_id_str, 90);
+        if (rc != EOK) {
+                printf(NAME ": error adding match ID: %s\n",
+                    str_error(rc));
         }