Changes in uspace/lib/c/generic/devman.c [e72fb34:8b1e15ac] in mainline

File:

• uspace/lib/c/generic/devman.c (modified) (4 diffs)

uspace/lib/c/generic/devman.c

@@ -147 +147 @@
                 ret = devman_send_match_id(phone, match_id);
                 if (ret != EOK) {
+                        printf("Driver failed to send match id, error %d\n",
+                            ret);
                         return ret;
                 }
@@ -193 +195 @@
         }
         
-        int match_ids_rc = devman_send_match_ids(phone, match_ids);
+        devman_send_match_ids(phone, match_ids);
         
         async_wait_for(req, &retval);
@@ -199 +201 @@
         async_serialize_end();
         
-        /* Prefer the answer to DEVMAN_ADD_FUNCTION in case of errors. */
-        if ((match_ids_rc != EOK) && (retval == EOK)) {
-                retval = match_ids_rc;
-        }
-
         if (retval == EOK)
                 fun_handle = (int) IPC_GET_ARG1(answer);
@@ -329 +326 @@
 }
 
-int devman_device_get_handle_by_class(const char *classname,
-    const char *devname, devman_handle_t *handle, unsigned int flags)
-{
-        int phone = devman_get_phone(DEVMAN_CLIENT, flags);
-
-        if (phone < 0)
-                return phone;
-
-        async_serialize_start();
-
-        ipc_call_t answer;
-        aid_t req = async_send_1(phone, DEVMAN_DEVICE_GET_HANDLE_BY_CLASS,
-            flags, &answer);
-
-        sysarg_t retval = async_data_write_start(phone, classname,
-            str_size(classname));
-        if (retval != EOK) {
-                async_wait_for(req, NULL);
-                async_serialize_end();
-                return retval;
-        }
-        retval = async_data_write_start(phone, devname,
-            str_size(devname));
-        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 = (devman_handle_t) -1;
-                return retval;
-        }
-
-        if (handle != NULL)
-                *handle = (devman_handle_t) IPC_GET_ARG1(answer);
-
-        return retval;
-}
-
 
 /** @}