Changeset f568ee7 in mainline for uspace/srv/devmap/devmap.c

Timestamp:

2010-12-19T10:34:19Z (14 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

e080332

Parents:

6e5dc07 (diff), 557c7d0 (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 with /usb/development

File:

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

uspace/srv/devmap/devmap.c

@@ -99 +99 @@
         /** Device driver handling this device */
         devmap_driver_t *driver;
+        /** Use this interface when forwarding to driver. */
+        sysarg_t forward_interface;
 } devmap_device_t;
 
@@ -517 +519 @@
         }
         
+        /* Set the interface, if any. */
+        device->forward_interface = IPC_GET_ARG1(*icall);
+
         /* Get fqdn */
         char *fqdn;
@@ -566 +571 @@
         /* Get unique device handle */
         device->handle = devmap_create_handle();
-        
+
         devmap_namespace_addref(namespace, device);
         device->driver = driver;
@@ -617 +622 @@
         }
         
-        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);