Changeset 45059d6b in mainline

Timestamp:

2011-08-19T16:31:47Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

107f2e0, 16f9782, 1c99eae

Parents:

0fe52ef

Message:

Set connection handler for callback session from devman to driver
(driver→sess). Now devman does not need to create a new connection
every time it actually has some request.

Location:

uspace

Files:

• lib/c/generic/devman.c (modified) (1 diff)
• lib/drv/generic/driver.c (modified) (1 diff)
• srv/devman/devman.c (modified) (6 diffs)
• srv/devman/devman.h (modified) (1 diff)

uspace/lib/c/generic/devman.c

@@ -195 +195 @@
         
         exch = devman_exchange_begin(DEVMAN_DRIVER);
-        async_connect_to_me(exch, 0, 0, 0, NULL, NULL);
+        async_connect_to_me(exch, 0, 0, 0, conn, NULL);
         devman_exchange_end(exch);
         

uspace/lib/drv/generic/driver.c

@@ -428 +428 @@
 static void driver_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
 {
+        sysarg_t conn_type;
+
+        if (iid == 0) {
+                /* Callback connection from devman */
+                /* XXX Use separate handler for this type of connection */
+                conn_type = DRIVER_DEVMAN;
+        } else {
+                conn_type = IPC_GET_ARG1(*icall);
+        }
+
         /* Select interface */
-        switch ((sysarg_t) (IPC_GET_ARG1(*icall))) {
+        switch (conn_type) {
         case DRIVER_DEVMAN:
                 /* Handle request from device manager */

uspace/srv/devman/devman.c

@@ -548 +548 @@
 
         fibril_mutex_lock(&driver->driver_mutex);
-        
-        async_exch_t *exch = async_exchange_begin(driver->sess);
-        async_sess_t *sess = async_connect_me_to(EXCHANGE_SERIALIZE, exch,
-            DRIVER_DEVMAN, 0, 0);
-        async_exchange_end(exch);
-
-        if (!sess) {
-                fibril_mutex_unlock(&driver->driver_mutex);
-                return;
-        }
 
         /*
@@ -583 +573 @@
                 fibril_mutex_unlock(&driver->driver_mutex);
 
-                add_device(sess, driver, dev, tree);
+                add_device(driver, dev, tree);
 
                 /*
@@ -603 +593 @@
                 link = driver->devices.head.next;
         }
-
-        async_hangup(sess);
 
         /*
@@ -718 +706 @@
  * @param node          The device's node in the device tree.
  */
-void add_device(async_sess_t *sess, driver_t *drv, dev_node_t *dev,
-    dev_tree_t *tree)
+void add_device(driver_t *drv, dev_node_t *dev, dev_tree_t *tree)
 {
         /*
@@ -736 +723 @@
         }
         
-        async_exch_t *exch = async_exchange_begin(sess);
+        async_exch_t *exch = async_exchange_begin(drv->sess);
         
         ipc_call_t answer;
@@ -806 +793 @@
         fibril_mutex_unlock(&drv->driver_mutex);
 
-        if (is_running) {
-                /* Notify the driver about the new device. */
-                async_exch_t *exch = async_exchange_begin(drv->sess);
-                async_sess_t *sess = async_connect_me_to(EXCHANGE_SERIALIZE, exch,
-                    DRIVER_DEVMAN, 0, 0);
-                async_exchange_end(exch);
-                
-                if (sess) {
-                        add_device(sess, drv, dev, tree);
-                        async_hangup(sess);
-                }
-        }
+        /* Notify the driver about the new device. */
+        if (is_running)
+                add_device(drv, dev, tree);
         
         return true;

uspace/srv/devman/devman.h

@@ -235 +235 @@
 extern void add_driver(driver_list_t *, driver_t *);
 extern void attach_driver(dev_node_t *, driver_t *);
-extern void add_device(async_sess_t *, driver_t *, dev_node_t *, dev_tree_t *);
+extern void add_device(driver_t *, dev_node_t *, dev_tree_t *);
 extern bool start_driver(driver_t *);