Changeset a1b7e80 in mainline for uspace/lib/c

Timestamp:

2011-09-02T16:54:18Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

f480d7e

Parents:

7a72ce1a (diff), 224c0e7 (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 basic infrastructure for anticipated device removal from
lp:~jsvoboda/helenos/devrem

Location:

uspace/lib/c

Files:

• generic/devman.c (modified) (2 diffs)
• include/devman.h (modified) (2 diffs)
• include/ipc/devman.h (modified) (2 diffs)

uspace/lib/c/generic/devman.c

@@ -327 +327 @@
 }
 
+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 +454 @@
 }
 
+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)

uspace/lib/c/include/devman.h

@@ -50 +50 @@
     devman_handle_t, devman_handle_t *);
 extern int devman_remove_function(devman_handle_t);
+extern int devman_drv_fun_online(devman_handle_t);
+extern int devman_drv_fun_offline(devman_handle_t);
 
 extern async_sess_t *devman_device_connect(exch_mgmt_t, devman_handle_t,
@@ -63 +65 @@
 extern int devman_fun_get_name(devman_handle_t, char *, size_t);
 extern int devman_fun_get_path(devman_handle_t, char *, size_t);
+extern int devman_fun_online(devman_handle_t);
+extern int devman_fun_offline(devman_handle_t);
 
 extern int devman_add_device_to_category(devman_handle_t, const char *);

uspace/lib/c/include/ipc/devman.h

@@ -139 +139 @@
         DEVMAN_ADD_MATCH_ID,
         DEVMAN_ADD_DEVICE_TO_CATEGORY,
+        DEVMAN_DRV_FUN_ONLINE,
+        DEVMAN_DRV_FUN_OFFLINE,
         DEVMAN_REMOVE_FUNCTION
 } driver_to_devman_t;
 
 typedef enum {
-        DRIVER_ADD_DEVICE = IPC_FIRST_USER_METHOD
+        DRIVER_DEV_ADD = IPC_FIRST_USER_METHOD,
+        DRIVER_DEV_REMOVE,
+        DRIVER_FUN_ONLINE,
+        DRIVER_FUN_OFFLINE,
 
 } devman_to_driver_t;
@@ -152 +157 @@
         DEVMAN_FUN_GET_CHILD,
         DEVMAN_FUN_GET_NAME,
+        DEVMAN_FUN_ONLINE,
+        DEVMAN_FUN_OFFLINE,
         DEVMAN_FUN_GET_PATH,
         DEVMAN_FUN_SID_TO_HANDLE