Changeset 0ca16307 in mainline for uspace/lib/drv/generic/driver.c

Timestamp:

2010-11-29T23:52:22Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

6f9e7fea

Parents:

0d6915f

Message:

Add wrapper for adding child device with single match id

The mentioned wrapper neatly wraps calls for creating new device, new match
id and registering such device at devman.

This call is now used in root driver.

File:

• uspace/lib/drv/generic/driver.c (modified) (1 diff)

uspace/lib/drv/generic/driver.c

@@ -381 +381 @@
 }
 
+/** Wrapper for child_device_register for devices with single match id.
+ *
+ * @param parent Parent device.
+ * @param child_name Child device name.
+ * @param child_match_id Child device match id.
+ * @param child_match_score Child device match score.
+ * @return Error code.
+ */
+int child_device_register_wrapper(device_t *parent, const char *child_name,
+    const char *child_match_id, int child_match_score)
+{
+        device_t *child = NULL;
+        match_id_t *match_id = NULL;
+        int rc;
+
+        child = create_device();
+        if (child == NULL) {
+                rc = ENOMEM;
+                goto failure;
+        }
+
+        child->name = child_name;
+
+        match_id = create_match_id();
+        if (match_id == NULL) {
+                rc = ENOMEM;
+                goto failure;
+        }
+
+        match_id->id = child_match_id;
+        match_id->score = child_match_score;
+        add_match_id(&child->match_ids, match_id);
+
+        rc = child_device_register(child, parent);
+        if (EOK != rc)
+                goto failure;
+
+        goto leave;
+
+failure:
+        if (match_id != NULL) {
+                match_id->id = NULL;
+                delete_match_id(match_id);
+        }
+
+        if (child != NULL) {
+                child->name = NULL;
+                delete_device(child);
+        }
+
+leave:
+        return rc;
+}
+
 int driver_main(driver_t *drv)
 {