Changeset 0ca16307 in mainline

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.

Location:

uspace

Files:

• drv/root/root.c (modified) (3 diffs)
• lib/drv/generic/driver.c (modified) (1 diff)
• lib/drv/include/driver.h (modified) (1 diff)

uspace/drv/root/root.c

@@ -1 +1 @@
 /*
  * Copyright (c) 2010 Lenka Trochtova
+ * Copyright (c) 2010 Vojtech Horky
  * All rights reserved.
  *
@@ -52 +53 @@
 #define NAME "root"
 
+#define PLATFORM_DEVICE_NAME "hw"
+#define PLATFORM_DEVICE_MATCH_ID STRING(UARCH)
+#define PLATFORM_DEVICE_MATCH_SCORE 100
+
 static int root_add_device(device_t *dev);
 
@@ -73 +78 @@
 {
         printf(NAME ": adding new child for platform device.\n");
+        printf(NAME ":   device node is `%s' (%d %s)\n", PLATFORM_DEVICE_NAME,
+            PLATFORM_DEVICE_MATCH_SCORE, PLATFORM_DEVICE_MATCH_ID);
         
-        int res = EOK;
-        device_t *platform = NULL;
-        match_id_t *match_id = NULL;
-        
-        /* Create new device. */
-        platform = create_device();
-        if (NULL == platform) {
-                res = ENOMEM;
-                goto failure;
-        }       
-        
-        platform->name = "hw";
-        printf(NAME ": the new device's name is %s.\n", platform->name);
-        
-        /* Initialize match id list. */
-        match_id = create_match_id();
-        if (NULL == match_id) {
-                res = ENOMEM;
-                goto failure;
-        }
-        
-        /* TODO - replace this with some better solution (sysinfo ?) */
-        match_id->id = STRING(UARCH);
-        match_id->score = 100;
-        add_match_id(&platform->match_ids, match_id);
-        
-        /* Register child device. */
-        res = child_device_register(platform, parent);
-        if (EOK != res)
-                goto failure;
-        
-        return res;
-        
-failure:
-        if (NULL != match_id)
-                match_id->id = NULL;
-        
-        if (NULL != platform) {
-                platform->name = NULL;
-                delete_device(platform);
-        }
-        
+        int res = child_device_register_wrapper(parent, PLATFORM_DEVICE_NAME,
+            PLATFORM_DEVICE_MATCH_ID, PLATFORM_DEVICE_MATCH_SCORE);
+
         return res;
 }

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)
 {

uspace/lib/drv/include/driver.h

@@ -199 +199 @@
 
 int child_device_register(device_t *, device_t *);
+int child_device_register_wrapper(device_t *, const char *, const char *, int);