Changeset 41811af in mainline for uspace/srv/devman/main.c

Timestamp:

2011-06-10T10:14:26Z (14 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

ab547063

Parents:

9536e6e (diff), 390d80d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline

File:

• uspace/srv/devman/main.c (modified) (12 diffs)

uspace/srv/devman/main.c

@@ -39 +39 @@
 #include <assert.h>
 #include <ipc/services.h>
-#include <ipc/ns.h>
+#include <ns.h>
 #include <async.h>
 #include <stdio.h>
@@ -108 +108 @@
         fibril_mutex_lock(&driver->driver_mutex);
         
-        if (driver->phone >= 0) {
+        if (driver->sess) {
                 /* We already have a connection to the driver. */
                 log_msg(LVL_ERROR, "Driver '%s' already started.\n",
@@ -128 +128 @@
                 break;
         case DRIVER_RUNNING:
-                /* Should not happen since we do not have a connected phone */
+                /* Should not happen since we do not have a connected session */
                 assert(false);
         }
@@ -135 +135 @@
         log_msg(LVL_DEBUG, "Creating connection to the `%s' driver.",
             driver->name);
-        ipc_call_t call;
-        ipc_callid_t callid = async_get_call(&call);
-        if (IPC_GET_IMETHOD(call) != IPC_M_CONNECT_TO_ME) {
+        driver->sess = async_callback_receive(EXCHANGE_SERIALIZE);
+        if (!driver->sess) {
                 fibril_mutex_unlock(&driver->driver_mutex);
-                async_answer_0(callid, ENOTSUP);
                 async_answer_0(iid, ENOTSUP);
                 return NULL;
         }
         
-        /* Remember driver's phone. */
-        driver->phone = IPC_GET_ARG5(call);
-        
         fibril_mutex_unlock(&driver->driver_mutex);
         
-        log_msg(LVL_NOTE, 
+        log_msg(LVL_NOTE,
             "The `%s' driver was successfully registered as running.",
             driver->name);
         
-        async_answer_0(callid, EOK);
         async_answer_0(iid, EOK);
         
@@ -434 +428 @@
         fibril_add_ready(fid);
         
-        ipc_callid_t callid;
-        ipc_call_t call;
-        bool cont = true;
-        while (cont) {
-                callid = async_get_call(&call);
+        while (true) {
+                ipc_call_t call;
+                ipc_callid_t callid = async_get_call(&call);
+                
+                if (!IPC_GET_IMETHOD(call))
+                        break;
                 
                 switch (IPC_GET_IMETHOD(call)) {
-                case IPC_M_PHONE_HUNGUP:
-                        cont = false;
-                        continue;
                 case DEVMAN_ADD_FUNCTION:
                         devman_add_function(callid, &call);
@@ -515 +507 @@
 }
 
+/** 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. */
@@ -522 +551 @@
         async_answer_0(iid, EOK);
         
-        bool cont = true;
-        while (cont) {
+        while (true) {
                 ipc_call_t call;
                 ipc_callid_t callid = async_get_call(&call);
                 
+                if (!IPC_GET_IMETHOD(call))
+                        break;
+                
                 switch (IPC_GET_IMETHOD(call)) {
-                case IPC_M_PHONE_HUNGUP:
-                        cont = false;
-                        continue;
                 case DEVMAN_DEVICE_GET_HANDLE:
                         devman_function_get_handle(callid, &call);
@@ -536 +564 @@
                 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:
@@ -606 +637 @@
                 method = DRIVER_CLIENT;
         
-        if (driver->phone < 0) {
-                log_msg(LVL_ERROR, 
-                    "Could not forward to driver `%s' (phone is %d).",
-                    driver->name, (int) driver->phone);
+        if (!driver->sess) {
+                log_msg(LVL_ERROR,
+                    "Could not forward to driver `%s'.", driver->name);
                 async_answer_0(iid, EINVAL);
                 return;
@@ -623 +653 @@
                     dev->pfun->pathname, driver->name);
         }
-
-        async_forward_fast(iid, driver->phone, method, fwd_h, 0, IPC_FF_NONE);
+        
+        async_exch_t *exch = async_exchange_begin(driver->sess);
+        async_forward_fast(iid, exch, method, fwd_h, 0, IPC_FF_NONE);
+        async_exchange_end(exch);
 }
 
@@ -646 +678 @@
         dev = fun->dev;
         
-        if (dev->state != DEVICE_USABLE || dev->drv->phone < 0) {
+        if ((dev->state != DEVICE_USABLE) || (!dev->drv->sess)) {
                 async_answer_0(iid, EINVAL);
                 return;
         }
         
-        async_forward_fast(iid, dev->drv->phone, DRIVER_CLIENT, fun->handle, 0,
+        async_exch_t *exch = async_exchange_begin(dev->drv->sess);
+        async_forward_fast(iid, exch, DRIVER_CLIENT, fun->handle, 0,
             IPC_FF_NONE);
-        log_msg(LVL_DEBUG, 
+        async_exchange_end(exch);
+        
+        log_msg(LVL_DEBUG,
             "Forwarding devmapper request for `%s' function to driver `%s'.",
             fun->pathname, dev->drv->name);
@@ -745 +780 @@
 
         printf(NAME ": Accepting connections.\n");
+        task_retval(0);
         async_manager();