Changeset 7969087 in mainline for uspace/lib/c

Timestamp:

2013-09-11T10:35:49Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

43dd8028

Parents:

e5556e4a

Message:

devctl load-drv to manually load a driver.

Location:

uspace/lib/c

Files:

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

uspace/lib/c/generic/devman.c

@@ -598 +598 @@
 }
 
+int devman_driver_get_handle(const char *drvname, devman_handle_t *handle)
+{
+        async_exch_t *exch;
+
+        exch = devman_exchange_begin(DEVMAN_CLIENT);
+        if (exch == NULL)
+                return ENOMEM;
+        
+        ipc_call_t answer;
+        aid_t req = async_send_0(exch, DEVMAN_DRIVER_GET_HANDLE, &answer);
+        sysarg_t retval = async_data_write_start(exch, drvname,
+            str_size(drvname));
+        
+        devman_exchange_end(exch);
+        
+        if (retval != EOK) {
+                async_forget(req);
+                return retval;
+        }
+        
+        async_wait_for(req, &retval);
+        
+        if (retval != EOK) {
+                if (handle != NULL)
+                        *handle = (devman_handle_t) -1;
+                
+                return retval;
+        }
+        
+        if (handle != NULL)
+                *handle = (devman_handle_t) IPC_GET_ARG1(answer);
+        
+        return retval;
+}
+
 int devman_driver_get_name(devman_handle_t handle, char *buf, size_t buf_size)
 {
@@ -622 +657 @@
 }
 
+int devman_driver_load(devman_handle_t drvh)
+{
+        async_exch_t *exch = devman_exchange_begin(DEVMAN_CLIENT);
+        if (exch == NULL)
+                return ENOMEM;
+        
+        int rc = async_req_1_0(exch, DEVMAN_DRIVER_LOAD, drvh);
+        
+        devman_exchange_end(exch);
+        return rc;
+}
+
 /** @}
  */

uspace/lib/c/include/devman.h

@@ -72 +72 @@
 extern int devman_fun_sid_to_handle(service_id_t, devman_handle_t *);
 extern int devman_get_drivers(devman_handle_t **, size_t *);
+extern int devman_driver_get_handle(const char *, devman_handle_t *);
 extern int devman_driver_get_name(devman_handle_t, char *, size_t);
 extern int devman_driver_get_state(devman_handle_t, driver_state_t *);
+extern int devman_driver_load(devman_handle_t);
 
 #endif

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

@@ -177 +177 @@
         DEVMAN_FUN_SID_TO_HANDLE,
         DEVMAN_GET_DRIVERS,
+        DEVMAN_DRIVER_GET_HANDLE,
         DEVMAN_DRIVER_GET_NAME,
-        DEVMAN_DRIVER_GET_STATE
+        DEVMAN_DRIVER_GET_STATE,
+        DEVMAN_DRIVER_LOAD
 } client_to_devman_t;