Changeset 66babbd in mainline for uspace/lib

Timestamp:

2010-03-25T09:55:09Z (15 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

a087f2e

Parents:

d347b53

Message:

child device registration - match ids

Location:

uspace/lib

Files:

• libc/generic/devman.c (modified) (5 diffs)
• libc/include/ipc/devman.h (modified) (2 diffs)
• libdrv/generic/driver.c (modified) (2 diffs)

uspace/lib/libc/generic/devman.c

@@ -39 +39 @@
 #include <malloc.h>
 #include <bool.h>
+#include <adt/list.h>
 
 static int devman_phone_driver = -1;
@@ -106 +107 @@
 }
 
+static int devman_send_match_id(int phone, match_id_t *match_id) \
+{
+        ipc_call_t answer;
+        async_send_1(phone, DEVMAN_ADD_MATCH_ID, match_id->score, &answer);
+        int retval = async_data_write_start(phone, match_id->id, str_size(match_id->id));
+        return retval;  
+}
+
+
+static int devman_send_match_ids(int phone, match_id_list_t *match_ids) 
+{
+        link_t *link = match_ids->ids.next;
+        match_id_t *match_id = NULL;
+        int ret = EOK;
+        
+        while (link != &match_ids->ids) {
+                match_id = list_get_instance(link, match_id_t, link); 
+                if (EOK != (ret = devman_send_match_id(phone, match_id))) 
+                {
+                        printf("Driver failed to send match id, error number = %d\n", ret);
+                        return ret;                     
+                }
+                link = link->next;
+        }
+        return ret;     
+}
+
 int devman_child_device_register(
         const char *name, match_id_list_t *match_ids, device_handle_t parent_handle, device_handle_t *handle)
@@ -116 +144 @@
         async_serialize_start();
         
+        int match_count = list_count(&match_ids->ids);  
         ipc_call_t answer;
-        aid_t req = async_send_1(phone, DEVMAN_ADD_CHILD_DEVICE, parent_handle, &answer);
+        aid_t req = async_send_2(phone, DEVMAN_ADD_CHILD_DEVICE, parent_handle, match_count, &answer);
 
         ipcarg_t retval = async_data_write_start(phone, name, str_size(name));
@@ -126 +155 @@
         }
         
-        // TODO match ids
+        devman_send_match_ids(phone, match_ids);
         
         async_wait_for(req, &retval);
@@ -141 +170 @@
         if (handle != NULL)
                 *handle = (int) IPC_GET_ARG1(answer);   
+                
+        return retval;
 }
 

uspace/lib/libc/include/ipc/devman.h

@@ -51 +51 @@
         /** Id of device model.
          */
-        const char *id;
+        char *id;
         /** Relevancy of device-to-driver match.
          * The higher is the product of scores specified for the device by the bus driver and by the leaf driver,
@@ -121 +121 @@
 typedef enum {
         DEVMAN_DRIVER_REGISTER = IPC_FIRST_USER_METHOD,
-        DEVMAN_ADD_CHILD_DEVICE
+        DEVMAN_ADD_CHILD_DEVICE,
+        DEVMAN_ADD_MATCH_ID
 
 } driver_to_devman_t;

uspace/lib/libdrv/generic/driver.c

@@ -47 +47 @@
 #include <string.h>
 #include <ctype.h>
+#include <errno.h>
 
 #include <devman.h>
@@ -153 +154 @@
         assert(NULL != child->name);
         
-        if (devman_child_device_register(child->name, &child->match_ids, parent->handle, &child->handle)) {
-                // TODO initialize child device
+        if (EOK == devman_child_device_register(child->name, &child->match_ids, parent->handle, &child->handle)) {
                 return true;
         }