Changeset 66babbd in mainline for uspace/srv

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/srv

Files:

• devman/main.c (modified) (3 diffs)
• drivers/root/root.c (modified) (3 diffs)

uspace/srv/devman/main.c

@@ -120 +120 @@
 }
 
+static int devman_receive_match_id(match_id_list_t *match_ids) {
+        
+        match_id_t *match_id = create_match_id();
+        ipc_callid_t callid;
+        ipc_call_t call;
+        int rc = 0;
+        
+        callid = async_get_call(&call);
+        if (DEVMAN_ADD_MATCH_ID != IPC_GET_METHOD(call)) {
+                printf(NAME ": ERROR: devman_receive_match_id - invalid protocol.\n");
+                ipc_answer_0(callid, EINVAL); 
+                delete_match_id(match_id);
+                return EINVAL;
+        }
+        
+        if (NULL == match_id) {
+                printf(NAME ": ERROR: devman_receive_match_id - failed to allocate match id.\n");
+                ipc_answer_0(callid, ENOMEM);
+                return ENOMEM;
+        }
+        
+        match_id->score = IPC_GET_ARG1(call);
+        
+        rc = async_string_receive(&match_id->id, DEVMAN_NAME_MAXLEN, NULL);     
+        if (EOK != rc) {
+                delete_match_id(match_id);
+                return rc;
+        }
+        
+        list_append(&match_id->link, &match_ids->ids);
+        return rc;
+}
+
+static int devman_receive_match_ids(ipcarg_t match_count, match_id_list_t *match_ids) 
+{
+        int ret = EOK;
+        int i;
+        for (i = 0; i < match_count; i++) {
+                if (EOK != (ret = devman_receive_match_id(match_ids))) {
+                        return ret;
+                }
+        }
+        return ret;
+}
+
 static void devman_add_child(ipc_callid_t callid, ipc_call_t *call, driver_t *driver)
 {
         printf(NAME ": devman_add_child\n");
-
+        
         device_handle_t parent_handle = IPC_GET_ARG1(*call);
+        ipcarg_t match_count = IPC_GET_ARG2(*call);
+        
         node_t *parent =  find_dev_node(&device_tree, parent_handle);
         
@@ -130 +177 @@
                 ipc_answer_0(callid, ENOENT);
                 return;
-        }
+        }       
         
         char *dev_name = NULL;
         int rc = async_string_receive(&dev_name, DEVMAN_NAME_MAXLEN, NULL);     
-        if (rc != EOK) {
+        if (EOK != rc) {
                 ipc_answer_0(callid, rc);
                 return;
@@ -147 +194 @@
         }       
         
-        // TODO match ids
+        devman_receive_match_ids(match_count, &node->match_ids);
         
         // return device handle to parent's driver

uspace/srv/drivers/root/root.c

@@ -55 +55 @@
 static bool root_init();
 
+/** The root device driver's standard operations.
+ */
 static driver_ops_t root_ops = {
         .add_device = &root_add_device
 };
 
+/** The root device driver structure. 
+ */
 static driver_t root_driver = {
         .name = NAME,
@@ -64 +68 @@
 };
 
+/** Create the device which represents the root of HW device tree. 
+ * @param parent parent of the newly created device.
+ */
 static bool add_platform_child(device_t *parent) {
         printf(NAME ": adding new child for platform device.\n");
@@ -107 +114 @@
 }
 
+/** Get the root device.
+ * @param dev the device which is root of the whole device tree (both of HW and pseudo devices).
+ */
 static bool root_add_device(device_t *dev) 
 {