Changeset 00aece0 in mainline for uspace/lib/c/generic/devman.c

Timestamp:

2012-02-18T16:47:38Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4449c6c

Parents:

bd5f3b7 (diff), f943dd3 (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/lib/c/generic/devman.c (modified) (4 diffs)

uspace/lib/c/generic/devman.c

@@ -177 +177 @@
 
 /** Register running driver with device manager. */
-int devman_driver_register(const char *name, async_client_conn_t conn)
+int devman_driver_register(const char *name)
 {
         async_exch_t *exch = devman_exchange_begin_blocking(DEVMAN_DRIVER);
@@ -192 +192 @@
         }
         
-        async_set_client_connection(conn);
-        
         exch = devman_exchange_begin(DEVMAN_DRIVER);
-        async_connect_to_me(exch, 0, 0, 0, conn, NULL);
+        async_connect_to_me(exch, 0, 0, 0, NULL, NULL);
         devman_exchange_end(exch);
         
@@ -327 +325 @@
 }
 
+int devman_drv_fun_online(devman_handle_t funh)
+{
+        async_exch_t *exch = devman_exchange_begin(DEVMAN_DRIVER);
+        if (exch == NULL)
+                return ENOMEM;
+        
+        sysarg_t retval = async_req_1_0(exch, DEVMAN_DRV_FUN_ONLINE, funh);
+        
+        devman_exchange_end(exch);
+        return (int) retval;
+}
+
+int devman_drv_fun_offline(devman_handle_t funh)
+{
+        async_exch_t *exch = devman_exchange_begin(DEVMAN_DRIVER);
+        if (exch == NULL)
+                return ENOMEM;
+        
+        sysarg_t retval = async_req_1_0(exch, DEVMAN_DRV_FUN_OFFLINE, funh);
+        
+        devman_exchange_end(exch);
+        return (int) retval;
+}
+
 async_sess_t *devman_parent_device_connect(exch_mgmt_t mgmt,
     devman_handle_t handle, unsigned int flags)
@@ -430 +452 @@
 }
 
+int devman_fun_online(devman_handle_t funh)
+{
+        async_exch_t *exch = devman_exchange_begin(DEVMAN_CLIENT);
+        if (exch == NULL)
+                return ENOMEM;
+        
+        sysarg_t retval = async_req_1_0(exch, DEVMAN_FUN_ONLINE, funh);
+        
+        devman_exchange_end(exch);
+        return (int) retval;
+}
+
+int devman_fun_offline(devman_handle_t funh)
+{
+        async_exch_t *exch = devman_exchange_begin(DEVMAN_CLIENT);
+        if (exch == NULL)
+                return ENOMEM;
+        
+        sysarg_t retval = async_req_1_0(exch, DEVMAN_FUN_OFFLINE, funh);
+        
+        devman_exchange_end(exch);
+        return (int) retval;
+}
+
 static int devman_get_handles_once(sysarg_t method, sysarg_t arg1,
     devman_handle_t *handle_buf, size_t buf_size, size_t *act_size)