Changeset 431d6d6 in mainline

Timestamp:

2011-05-07T11:10:17Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

e5165a3

Parents:

8594505

Message:

Devman can tell device path by its handle

This patch might go into mainline rightaway.

Location:

uspace

Files:

• lib/c/generic/devman.c (modified) (1 diff)
• lib/c/include/devman.h (modified) (1 diff)
• lib/c/include/ipc/devman.h (modified) (1 diff)
• srv/devman/main.c (modified) (2 diffs)

uspace/lib/c/generic/devman.c

@@ -374 +374 @@
 }
 
+int devman_get_device_path(devman_handle_t handle, char *path, size_t path_size)
+{
+        int phone = devman_get_phone(DEVMAN_CLIENT, 0);
+
+        if (phone < 0)
+                return phone;
+
+        async_serialize_start();
+
+        ipc_call_t answer;
+        aid_t req = async_send_1(phone, DEVMAN_DEVICE_GET_DEVICE_PATH,
+            handle, &answer);
+
+        ipc_call_t data_request_call;
+        aid_t data_request = async_data_read(phone, path, path_size,
+            &data_request_call);
+        if (data_request == 0) {
+                async_wait_for(req, NULL);
+                async_serialize_end();
+                return ENOMEM;
+        }
+
+        sysarg_t data_request_rc;
+        sysarg_t opening_request_rc;
+        async_wait_for(data_request, &data_request_rc);
+        async_wait_for(req, &opening_request_rc);
+
+        async_serialize_end();
+
+        if (data_request_rc != EOK) {
+                /* Prefer the return code of the opening request. */
+                if (opening_request_rc != EOK) {
+                        return (int) opening_request_rc;
+                } else {
+                        return (int) data_request_rc;
+                }
+        }
+        if (opening_request_rc != EOK) {
+                return (int) opening_request_rc;
+        }
+
+        path[path_size - 1] = 0;
+
+        if (IPC_GET_ARG2(data_request_call) >= path_size) {
+                return ELIMIT;
+        }
+
+        return EOK;
+}
+
 
 /** @}

uspace/lib/c/include/devman.h

@@ -55 +55 @@
 extern int devman_device_get_handle_by_class(const char *, const char *,
     devman_handle_t *, unsigned int);
+extern int devman_get_device_path(devman_handle_t, char *, size_t);
 
 extern int devman_add_device_to_class(devman_handle_t, const char *);

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

@@ -149 +149 @@
 typedef enum {
         DEVMAN_DEVICE_GET_HANDLE = IPC_FIRST_USER_METHOD,
-        DEVMAN_DEVICE_GET_HANDLE_BY_CLASS
+        DEVMAN_DEVICE_GET_HANDLE_BY_CLASS,
+        DEVMAN_DEVICE_GET_DEVICE_PATH
 } client_to_devman_t;
 

uspace/srv/devman/main.c

@@ -515 +515 @@
 }
 
+/** Find device path by its handle. */
+static void devman_get_device_path_by_handle(ipc_callid_t iid,
+    ipc_call_t *icall)
+{
+        devman_handle_t handle = IPC_GET_ARG1(*icall);
+
+        fun_node_t *fun = find_fun_node(&device_tree, handle);
+        if (fun == NULL) {
+                async_answer_0(iid, ENOMEM);
+                return;
+        }
+
+        ipc_callid_t data_callid;
+        size_t data_len;
+        if (!async_data_read_receive(&data_callid, &data_len)) {
+                async_answer_0(iid, EINVAL);
+                return;
+        }
+
+        void *buffer = malloc(data_len);
+        if (buffer == NULL) {
+                async_answer_0(data_callid, ENOMEM);
+                async_answer_0(iid, ENOMEM);
+                return;
+        }
+
+        size_t sent_length = str_size(fun->pathname);
+        if (sent_length > data_len) {
+                sent_length = data_len;
+        }
+
+        async_data_read_finalize(data_callid, fun->pathname, sent_length);
+        async_answer_0(iid, EOK);
+
+        free(buffer);
+}
+
 
 /** Function for handling connections from a client to the device manager. */
@@ -536 +573 @@
                 case DEVMAN_DEVICE_GET_HANDLE_BY_CLASS:
                         devman_function_get_handle_by_class(callid, &call);
+                        break;
+                case DEVMAN_DEVICE_GET_DEVICE_PATH:
+                        devman_get_device_path_by_handle(callid, &call);
                         break;
                 default: