Changeset f568ee7 in mainline for uspace/lib/c/generic/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/lib/c/generic/devmap.c (modified) (2 diffs)

uspace/lib/c/generic/devmap.c

@@ -127 +127 @@
 /** Register new device.
  *
- * @param namespace Namespace name.
+ * The @p interface is used when forwarding connection to the driver.
+ * If not 0, the first argument is the interface and the second argument
+ * is the devmap handle of the device.
+ * When the interface is zero (default), the first argument is directly
+ * the handle (to ensure backward compatibility).
+ *
+ * @param fqdn Fully qualified device name.
+ * @param[out] handle Handle to the created instance of device.
+ * @param interface Interface when forwarding.
+ *
+ */
+int devmap_device_register_with_iface(const char *fqdn,
+    devmap_handle_t *handle, sysarg_t interface)
+{
+        int phone = devmap_get_phone(DEVMAP_DRIVER, IPC_FLAG_BLOCKING);
+        
+        if (phone < 0)
+                return phone;
+        
+        async_serialize_start();
+        
+        ipc_call_t answer;
+        aid_t req = async_send_2(phone, DEVMAP_DEVICE_REGISTER, interface, 0,
+            &answer);
+        
+        sysarg_t retval = async_data_write_start(phone, fqdn, str_size(fqdn));
+        if (retval != EOK) {
+                async_wait_for(req, NULL);
+                async_serialize_end();
+                return retval;
+        }
+        
+        async_wait_for(req, &retval);
+        
+        async_serialize_end();
+        
+        if (retval != EOK) {
+                if (handle != NULL)
+                        *handle = -1;
+                return retval;
+        }
+        
+        if (handle != NULL)
+                *handle = (devmap_handle_t) IPC_GET_ARG1(answer);
+        
+        return retval;
+}
+
+/** Register new device.
+ *
  * @param fqdn      Fully qualified device name.
  * @param handle    Output: Handle to the created instance of device.
@@ -134 +183 @@
 int devmap_device_register(const char *fqdn, devmap_handle_t *handle)
 {
-        int phone = devmap_get_phone(DEVMAP_DRIVER, IPC_FLAG_BLOCKING);
-        
-        if (phone < 0)
-                return phone;
-        
-        async_serialize_start();
-        
-        ipc_call_t answer;
-        aid_t req = async_send_2(phone, DEVMAP_DEVICE_REGISTER, 0, 0,
-            &answer);
-        
-        sysarg_t retval = async_data_write_start(phone, fqdn, str_size(fqdn));
-        if (retval != EOK) {
-                async_wait_for(req, NULL);
-                async_serialize_end();
-                return retval;
-        }
-        
-        async_wait_for(req, &retval);
-        
-        async_serialize_end();
-        
-        if (retval != EOK) {
-                if (handle != NULL)
-                        *handle = -1;
-                return retval;
-        }
-        
-        if (handle != NULL)
-                *handle = (devmap_handle_t) IPC_GET_ARG1(answer);
-        
-        return retval;
-}
+        return devmap_device_register_with_iface(fqdn, handle, 0);
+}
+
 
 int devmap_device_get_handle(const char *fqdn, devmap_handle_t *handle, unsigned int flags)