Changeset 9f6c5ef0 in mainline

Timestamp:

2010-12-10T16:15:17Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

0995cd6

Parents:

a880374

Message:

Add child device wrapper tells devman handle

Location:

uspace

Files:

• drv/root/root.c (modified) (2 diffs)
• drv/rootvirt/rootvirt.c (modified) (1 diff)
• drv/test1/test1.c (modified) (1 diff)
• drv/test2/test2.c (modified) (1 diff)
• lib/drv/generic/driver.c (modified) (2 diffs)
• lib/drv/include/driver.h (modified) (1 diff)

uspace/drv/root/root.c

@@ -87 +87 @@
 
         int res = child_device_register_wrapper(parent, VIRTUAL_DEVICE_NAME,
-            VIRTUAL_DEVICE_MATCH_ID, VIRTUAL_DEVICE_MATCH_SCORE);
+            VIRTUAL_DEVICE_MATCH_ID, VIRTUAL_DEVICE_MATCH_SCORE,
+            NULL);
 
         return res;
@@ -104 +105 @@
         
         int res = child_device_register_wrapper(parent, PLATFORM_DEVICE_NAME,
-            PLATFORM_DEVICE_MATCH_ID, PLATFORM_DEVICE_MATCH_SCORE);
+            PLATFORM_DEVICE_MATCH_ID, PLATFORM_DEVICE_MATCH_SCORE,
+            NULL);
 
         return res;

uspace/drv/rootvirt/rootvirt.c

@@ -84 +84 @@
 
         int rc = child_device_register_wrapper(parent, virt_dev->name,
-            virt_dev->match_id, 10);
+            virt_dev->match_id, 10, NULL);
 
         if (rc == EOK) {

uspace/drv/test1/test1.c

@@ -64 +64 @@
 
         int rc = child_device_register_wrapper(parent, name,
-            match_id, match_score);
+            match_id, match_score, NULL);
 
         if (rc == EOK) {

uspace/drv/test2/test2.c

@@ -64 +64 @@
 
         int rc = child_device_register_wrapper(parent, name,
-            match_id, match_score);
+            match_id, match_score, NULL);
 
         if (rc == EOK) {

uspace/lib/drv/generic/driver.c

@@ -390 +390 @@
  */
 int child_device_register_wrapper(device_t *parent, const char *child_name,
-    const char *child_match_id, int child_match_score)
+    const char *child_match_id, int child_match_score,
+    devman_handle_t *child_handle)
 {
         device_t *child = NULL;
@@ -418 +419 @@
                 goto failure;
 
+        if (child_handle != NULL) {
+                *child_handle = child->handle;
+        }
         return EOK;
 

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);
+int child_device_register_wrapper(device_t *, const char *, const char *, int,
+    devman_handle_t *);