Changeset 1affcdf3 in mainline for uspace/srv/devmap/devmap.c

Timestamp:

2011-06-10T19:33:41Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

1878386

Parents:

13ecdac9 (diff), 79a141a (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 changes

File:

• uspace/srv/devmap/devmap.c (modified) (9 diffs)

uspace/srv/devmap/devmap.c

@@ -37 +37 @@
 
 #include <ipc/services.h>
-#include <ipc/ns.h>
+#include <ns.h>
 #include <async.h>
 #include <stdio.h>
@@ -59 +59 @@
         /** Pointers to previous and next drivers in linked list */
         link_t drivers;
+        
         /** Pointer to the linked list of devices controlled by this driver */
         link_t devices;
-        /** Phone asociated with this driver */
-        sysarg_t phone;
+        
+        /** Session asociated with this driver */
+        async_sess_t *sess;
+        
         /** Device driver name */
         char *name;
+        
         /** Fibril mutex for list of devices owned by this driver */
         fibril_mutex_t devices_mutex;
@@ -75 +79 @@
         /** Pointer to the previous and next device in the list of all namespaces */
         link_t namespaces;
+        
         /** Unique namespace identifier */
         devmap_handle_t handle;
+        
         /** Namespace name */
         char *name;
+        
         /** Reference count */
         size_t refcnt;
@@ -405 +412 @@
          * Create connection to the driver
          */
-        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) {
                 free(driver->name);
                 free(driver);
-                async_answer_0(callid, ENOTSUP);
                 async_answer_0(iid, ENOTSUP);
                 return NULL;
         }
-        
-        driver->phone = IPC_GET_ARG5(call);
-        async_answer_0(callid, EOK);
         
         /*
@@ -462 +463 @@
         fibril_mutex_lock(&drivers_list_mutex);
         
-        if (driver->phone != 0)
-                async_hangup(driver->phone);
+        if (driver->sess)
+                async_hangup(driver->sess);
         
         /* Remove it from list of drivers */
@@ -607 +608 @@
         devmap_device_t *dev = devmap_device_find_handle(handle);
         
-        if ((dev == NULL) || (dev->driver == NULL) || (dev->driver->phone == 0)) {
+        if ((dev == NULL) || (dev->driver == NULL) || (!dev->driver->sess)) {
                 fibril_mutex_unlock(&devices_list_mutex);
                 async_answer_0(callid, ENOENT);
@@ -613 +614 @@
         }
         
-        if (dev->forward_interface == 0) {
-                async_forward_fast(callid, dev->driver->phone,
-                    dev->handle, 0, 0,
-                    IPC_FF_NONE);
-        } else {
-                async_forward_fast(callid, dev->driver->phone,
-                    dev->forward_interface, dev->handle, 0,
-                    IPC_FF_NONE);
-        }
+        async_exch_t *exch = async_exchange_begin(dev->driver->sess);
+        
+        if (dev->forward_interface == 0)
+                async_forward_fast(callid, exch, dev->handle, 0, 0, IPC_FF_NONE);
+        else
+                async_forward_fast(callid, exch, dev->forward_interface,
+                    dev->handle, 0, IPC_FF_NONE);
+        
+        async_exchange_end(exch);
         
         fibril_mutex_unlock(&devices_list_mutex);
@@ -1029 +1030 @@
                 return;
         
-        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 DEVMAP_DRIVER_UNREGISTER:
                         if (NULL == driver)
@@ -1080 +1080 @@
         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 DEVMAP_DEVICE_GET_HANDLE:
                         devmap_device_get_handle(callid, &call);