Changes in uspace/lib/c/generic/devmap.c [991f645:47a7174f] in mainline

File:

• uspace/lib/c/generic/devmap.c (modified) (12 diffs)

uspace/lib/c/generic/devmap.c

@@ -107 +107 @@
         aid_t req = async_send_2(phone, DEVMAP_DRIVER_REGISTER, 0, 0, &answer);
         
-        ipcarg_t retval = async_data_write_start(phone, name, str_size(name));
+        sysarg_t retval = async_data_write_start(phone, name, str_size(name));
         if (retval != EOK) {
                 async_wait_for(req, NULL);
@@ -116 +116 @@
         async_set_client_connection(conn);
         
-        ipcarg_t callback_phonehash;
+        sysarg_t callback_phonehash;
         ipc_connect_to_me(phone, 0, 0, 0, &callback_phonehash);
         async_wait_for(req, &retval);
@@ -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);
-        
-        ipcarg_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)
@@ -181 +200 @@
             &answer);
         
-        ipcarg_t retval = async_data_write_start(phone, fqdn, str_size(fqdn));
+        sysarg_t retval = async_data_write_start(phone, fqdn, str_size(fqdn));
         if (retval != EOK) {
                 async_wait_for(req, NULL);
@@ -217 +236 @@
             &answer);
         
-        ipcarg_t retval = async_data_write_start(phone, name, str_size(name));
+        sysarg_t retval = async_data_write_start(phone, name, str_size(name));
         if (retval != EOK) {
                 async_wait_for(req, NULL);
@@ -247 +266 @@
                 return phone;
         
-        ipcarg_t type;
+        sysarg_t type;
         int retval = async_req_1_1(phone, DEVMAP_HANDLE_PROBE, handle, &type);
         if (retval != EOK)
@@ -277 +296 @@
                 return -1;
         
-        ipcarg_t null_id;
+        sysarg_t null_id;
         int retval = async_req_0_1(phone, DEVMAP_NULL_CREATE, &null_id);
         if (retval != EOK)
@@ -292 +311 @@
                 return;
         
-        async_req_1_0(phone, DEVMAP_NULL_DESTROY, (ipcarg_t) null_id);
+        async_req_1_0(phone, DEVMAP_NULL_DESTROY, (sysarg_t) null_id);
 }
 
 static size_t devmap_count_namespaces_internal(int phone)
 {
-        ipcarg_t count;
+        sysarg_t count;
         int retval = async_req_0_1(phone, DEVMAP_GET_NAMESPACE_COUNT, &count);
         if (retval != EOK)
@@ -307 +326 @@
 static size_t devmap_count_devices_internal(int phone, devmap_handle_t ns_handle)
 {
-        ipcarg_t count;
+        sysarg_t count;
         int retval = async_req_1_1(phone, DEVMAP_GET_DEVICE_COUNT, ns_handle, &count);
         if (retval != EOK)
@@ -375 +394 @@
                 }
                 
-                ipcarg_t retval;
+                sysarg_t retval;
                 async_wait_for(req, &retval);
                 async_serialize_end();
@@ -427 +446 @@
                 }
                 
-                ipcarg_t retval;
+                sysarg_t retval;
                 async_wait_for(req, &retval);
                 async_serialize_end();