Changeset 93fb170c in mainline for uspace/srv/devmap/devmap.c

Timestamp:

2011-01-08T18:51:31Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

15be932

Parents:

8f748215 (diff), a523af4 (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 from main branch

File:

• uspace/srv/devmap/devmap.c (modified) (14 diffs)

uspace/srv/devmap/devmap.c

@@ -46 +46 @@
 #include <str.h>
 #include <ipc/devmap.h>
+#include <assert.h>
 
 #define NAME          "devmap"
@@ -99 +100 @@
         /** Device driver handling this device */
         devmap_driver_t *driver;
+        /** Use this interface when forwarding to driver. */
+        sysarg_t forward_interface;
 } devmap_device_t;
 
@@ -206 +209 @@
 }
 
-/** Find namespace with given name.
- *
- * The devices_list_mutex should be already held when
- * calling this function.
- *
- */
+/** Find namespace with given name. */
 static devmap_namespace_t *devmap_namespace_find_name(const char *name)
 {
         link_t *item;
+        
+        assert(fibril_mutex_is_locked(&devices_list_mutex));
+        
         for (item = namespaces_list.next; item != &namespaces_list; item = item->next) {
                 devmap_namespace_t *namespace =
@@ -227 +228 @@
 /** Find namespace with given handle.
  *
- * The devices_list_mutex should be already held when
- * calling this function.
- *
  * @todo: use hash table
  *
@@ -236 +234 @@
 {
         link_t *item;
+        
+        assert(fibril_mutex_is_locked(&devices_list_mutex));
+        
         for (item = namespaces_list.next; item != &namespaces_list; item = item->next) {
                 devmap_namespace_t *namespace =
@@ -246 +247 @@
 }
 
-/** Find device with given name.
- *
- * The devices_list_mutex should be already held when
- * calling this function.
- *
- */
+/** Find device with given name. */
 static devmap_device_t *devmap_device_find_name(const char *ns_name,
     const char *name)
 {
         link_t *item;
+        
+        assert(fibril_mutex_is_locked(&devices_list_mutex));
+        
         for (item = devices_list.next; item != &devices_list; item = item->next) {
                 devmap_device_t *device =
@@ -269 +268 @@
 /** Find device with given handle.
  *
- * The devices_list_mutex should be already held when
- * calling this function.
- *
  * @todo: use hash table
  *
@@ -278 +274 @@
 {
         link_t *item;
+        
+        assert(fibril_mutex_is_locked(&devices_list_mutex));
+        
         for (item = devices_list.next; item != &devices_list; item = item->next) {
                 devmap_device_t *device =
@@ -288 +287 @@
 }
 
-/** Create a namespace (if not already present)
- *
- * The devices_list_mutex should be already held when
- * calling this function.
- *
- */
+/** Create a namespace (if not already present). */
 static devmap_namespace_t *devmap_namespace_create(const char *ns_name)
 {
-        devmap_namespace_t *namespace = devmap_namespace_find_name(ns_name);
+        devmap_namespace_t *namespace;
+        
+        assert(fibril_mutex_is_locked(&devices_list_mutex));
+        
+        namespace = devmap_namespace_find_name(ns_name);
         if (namespace != NULL)
                 return namespace;
@@ -321 +319 @@
 }
 
-/** Destroy a namespace (if it is no longer needed)
- *
- * The devices_list_mutex should be already held when
- * calling this function.
- *
- */
+/** Destroy a namespace (if it is no longer needed). */
 static void devmap_namespace_destroy(devmap_namespace_t *namespace)
 {
+        assert(fibril_mutex_is_locked(&devices_list_mutex));
+
         if (namespace->refcnt == 0) {
                 list_remove(&(namespace->namespaces));
@@ -337 +332 @@
 }
 
-/** Increase namespace reference count by including device
- *
- * The devices_list_mutex should be already held when
- * calling this function.
- *
- */
+/** Increase namespace reference count by including device. */
 static void devmap_namespace_addref(devmap_namespace_t *namespace,
     devmap_device_t *device)
 {
+        assert(fibril_mutex_is_locked(&devices_list_mutex));
+
         device->namespace = namespace;
         namespace->refcnt++;
 }
 
-/** Decrease namespace reference count
- *
- * The devices_list_mutex should be already held when
- * calling this function.
- *
- */
+/** Decrease namespace reference count. */
 static void devmap_namespace_delref(devmap_namespace_t *namespace)
 {
+        assert(fibril_mutex_is_locked(&devices_list_mutex));
+
         namespace->refcnt--;
         devmap_namespace_destroy(namespace);
 }
 
-/** Unregister device and free it
- *
- * The devices_list_mutex should be already held when
- * calling this function.
- *
- */
+/** Unregister device and free it. */
 static void devmap_device_unregister_core(devmap_device_t *device)
 {
+        assert(fibril_mutex_is_locked(&devices_list_mutex));
+
         devmap_namespace_delref(device->namespace);
         list_remove(&(device->devices));
@@ -517 +503 @@
         }
         
+        /* Set the interface, if any. */
+        device->forward_interface = IPC_GET_ARG1(*icall);
+
         /* Get fqdn */
         char *fqdn;
@@ -566 +555 @@
         /* Get unique device handle */
         device->handle = devmap_create_handle();
-        
+
         devmap_namespace_addref(namespace, device);
         device->driver = driver;
@@ -617 +606 @@
         }
         
-        ipc_forward_fast(callid, dev->driver->phone, dev->handle,
-            IPC_GET_ARG3(*call), 0, IPC_FF_NONE);
+        if (dev->forward_interface == 0) {
+                ipc_forward_fast(callid, dev->driver->phone,
+                    dev->handle, 0, 0,
+                    IPC_FF_NONE);
+        } else {
+                ipc_forward_fast(callid, dev->driver->phone,
+                    dev->forward_interface, dev->handle, 0,
+                    IPC_FF_NONE);
+        }
         
         fibril_mutex_unlock(&devices_list_mutex);