Changeset e160bfe8 in mainline for uspace/srv/devman/client_conn.c

Timestamp:

2017-10-23T18:51:34Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

327f147

Parents:

31cca4f3 (diff), 367db39a (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 (again) to fix build

Perhaps it wasn't so good idea to start merging mainline in these unstable times

File:

• uspace/srv/devman/client_conn.c (modified) (2 diffs)

uspace/srv/devman/client_conn.c

@@ -726 +726 @@
 }
 
+/** Unload a driver by user request. */
+static void devman_driver_unload(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 = stop_driver(drv);
+        fibril_mutex_unlock(&drv->driver_mutex);
+
+        async_answer_0(iid, rc);
+}
+
 /** Function for handling connections from a client to the device manager. */
 void devman_connection_client(ipc_callid_t iid, ipc_call_t *icall, void *arg)
@@ -794 +813 @@
                         devman_driver_load(callid, &call);
                         break;
+                case DEVMAN_DRIVER_UNLOAD:
+                        devman_driver_unload(callid, &call);
+                        break;
                 default:
                         async_answer_0(callid, ENOENT);