Changeset 47a7174f in mainline for uspace/srv/devmap/devmap.c

Timestamp:

2010-12-17T22:03:15Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

7551706b

Parents:

0bff73a

Message:

Devmap drivers can customize forwarded connections

It is possible to set an extra parameter for forwarded connections through
devmap. The change shall ensure backward compatibility and allows to connect
to devman-style drivers through their devmap path.

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) {
+                /* The IPC_GET_ARG3(*icall) would be always zero,
+                 * wouldn't it? So why to pass it at all?
+                 */
+                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);