Changeset 7969087 in mainline

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

Files:

• app/devctl/devctl.c (modified) (3 diffs)
• lib/c/generic/devman.c (modified) (2 diffs)
• lib/c/include/devman.h (modified) (1 diff)
• lib/c/include/ipc/devman.h (modified) (1 diff)
• srv/devman/client_conn.c (modified) (4 diffs)

uspace/app/devctl/devctl.c

@@ -199 +199 @@
 }
 
+static int drv_load(const char *drvname)
+{
+        int rc;
+        devman_handle_t drvh;
+
+        rc = devman_driver_get_handle(drvname, &drvh);
+        if (rc != EOK) {
+                printf("Failed resolving driver '%s' (%d).\n", drvname, rc);
+                return rc;
+        }
+
+        rc = devman_driver_load(drvh);
+        if (rc != EOK) {
+                printf("Failed loading driver '%s' (%d).\n", drvname, rc);
+                return rc;
+        }
+
+        return EOK;
+}
+
 static void print_syntax(void)
 {
@@ -206 +226 @@
         printf("\tdevctl offline <function>]\n");
         printf("\tdevctl list-drv\n");
+        printf("\tdevctl load-drv <driver-name>\n");
 }
 
@@ -242 +263 @@
                 if (rc != EOK)
                         return 2;
+        } else if (str_cmp(argv[1], "load-drv") == 0) {
+                if (argc < 3) {
+                        printf(NAME ": Argument missing.\n");
+                        print_syntax();
+                        return 1;
+                }
+
+                rc = drv_load(argv[2]);
+                if (rc != EOK)
+                        return 2;
         } else {
                 printf(NAME ": Invalid argument '%s'.\n", argv[1]);

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;
 

uspace/srv/devman/client_conn.c

@@ -450 +450 @@
 }
 
+/** Find driver by name. */
+static void devman_driver_get_handle(ipc_callid_t iid, ipc_call_t *icall)
+{
+        char *drvname;
+        
+        int rc = async_data_write_accept((void **) &drvname, true, 0, 0, 0, 0);
+        if (rc != EOK) {
+                async_answer_0(iid, rc);
+                return;
+        }
+        
+        driver_t *driver = driver_find_by_name(&drivers_list, drvname);
+        
+        free(drvname);
+        
+        if (driver == NULL) {
+                async_answer_0(iid, ENOENT);
+                return;
+        }
+        
+        async_answer_1(iid, EOK, driver->handle);
+}
+
 /** Get driver name. */
 static void devman_driver_get_name(ipc_callid_t iid, ipc_call_t *icall)
@@ -502 +525 @@
         
         async_answer_1(iid, EOK, (sysarg_t) drv->state);
+}
+
+/** Forcibly load a driver. */
+static void devman_driver_load(ipc_callid_t iid, ipc_call_t *icall)
+{
+        driver_t *drv;
+        int rc;
+        
+        drv = driver_find(&drivers_list, IPC_GET_ARG1(*icall));
+        if (drv == NULL) {
+                async_answer_0(iid, ENOENT);
+                return;
+        }
+        
+        fibril_mutex_lock(&drv->driver_mutex);
+        rc = start_driver(drv) ? EOK : EIO;
+        fibril_mutex_unlock(&drv->driver_mutex);
+
+        async_answer_0(iid, rc);
 }
 
@@ -548 +590 @@
                         devman_get_drivers(callid, &call);
                         break;
+                case DEVMAN_DRIVER_GET_HANDLE:
+                        devman_driver_get_handle(callid, &call);
+                        break;
                 case DEVMAN_DRIVER_GET_NAME:
                         devman_driver_get_name(callid, &call);
@@ -553 +598 @@
                 case DEVMAN_DRIVER_GET_STATE:
                         devman_driver_get_state(callid, &call);
+                        break;
+                case DEVMAN_DRIVER_LOAD:
+                        devman_driver_load(callid, &call);
                         break;
                 default: