Changes in uspace/srv/devman/main.c [9934f7d:431d6d6] in 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 <ns.h>
+#include <ipc/ns.h>
 #include <async.h>
 #include <stdio.h>
@@ -108 +108 @@
         fibril_mutex_lock(&driver->driver_mutex);
         
-        if (driver->sess) {
+        if (driver->phone >= 0) {
                 /* 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 session */
+                /* Should not happen since we do not have a connected phone */
                 assert(false);
         }
@@ -135 +135 @@
         log_msg(LVL_DEBUG, "Creating connection to the `%s' driver.",
             driver->name);
-        driver->sess = async_callback_receive(EXCHANGE_SERIALIZE);
-        if (!driver->sess) {
+        ipc_call_t call;
+        ipc_callid_t callid = async_get_call(&call);
+        if (IPC_GET_IMETHOD(call) != IPC_M_CONNECT_TO_ME) {
                 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);
         
@@ -428 +434 @@
         fibril_add_ready(fid);
         
-        while (true) {
-                ipc_call_t call;
-                ipc_callid_t callid = async_get_call(&call);
-                
-                if (!IPC_GET_IMETHOD(call))
-                        break;
+        ipc_callid_t callid;
+        ipc_call_t call;
+        bool cont = true;
+        while (cont) {
+                callid = async_get_call(&call);
                 
                 switch (IPC_GET_IMETHOD(call)) {
+                case IPC_M_PHONE_HUNGUP:
+                        cont = false;
+                        continue;
                 case DEVMAN_ADD_FUNCTION:
                         devman_add_function(callid, &call);
@@ -551 +559 @@
         async_answer_0(iid, EOK);
         
-        while (true) {
+        bool cont = true;
+        while (cont) {
                 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);
@@ -626 +635 @@
         if (driver == NULL) {
                 log_msg(LVL_ERROR, "IPC forwarding refused - " \
-                    "the device %" PRIun " is not in usable state.", handle);
+                    "the device %" PRIun "(%s) is not in usable state.",
+                    handle, dev->pfun->pathname);
                 async_answer_0(iid, ENOENT);
                 return;
@@ -637 +647 @@
                 method = DRIVER_CLIENT;
         
-        if (!driver->sess) {
-                log_msg(LVL_ERROR,
-                    "Could not forward to driver `%s'.", driver->name);
+        if (driver->phone < 0) {
+                log_msg(LVL_ERROR, 
+                    "Could not forward to driver `%s' (phone is %d).",
+                    driver->name, (int) driver->phone);
                 async_answer_0(iid, EINVAL);
                 return;
@@ -653 +664 @@
                     dev->pfun->pathname, driver->name);
         }
-        
-        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);
+
+        async_forward_fast(iid, driver->phone, method, fwd_h, 0, IPC_FF_NONE);
 }
 
@@ -678 +687 @@
         dev = fun->dev;
         
-        if ((dev->state != DEVICE_USABLE) || (!dev->drv->sess)) {
+        if (dev->state != DEVICE_USABLE || dev->drv->phone < 0) {
                 async_answer_0(iid, EINVAL);
                 return;
         }
         
-        async_exch_t *exch = async_exchange_begin(dev->drv->sess);
-        async_forward_fast(iid, exch, DRIVER_CLIENT, fun->handle, 0,
+        async_forward_fast(iid, dev->drv->phone, DRIVER_CLIENT, fun->handle, 0,
             IPC_FF_NONE);
-        async_exchange_end(exch);
-        
-        log_msg(LVL_DEBUG,
+        log_msg(LVL_DEBUG, 
             "Forwarding devmapper request for `%s' function to driver `%s'.",
             fun->pathname, dev->drv->name);
@@ -694 +700 @@
 
 /** Function for handling connections to device manager. */
-static void devman_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+static void devman_connection(ipc_callid_t iid, ipc_call_t *icall)
 {
         /* Select interface. */
@@ -780 +786 @@
 
         printf(NAME ": Accepting connections.\n");
-        task_retval(0);
         async_manager();