Changes in uspace/lib/c/generic/devman.c [d0dd7b5:b72efe8] in mainline

File:

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

uspace/lib/c/generic/devman.c

@@ -271 +271 @@
 }
 
-int devman_add_device_to_category(devman_handle_t devman_handle,
-    const char *cat_name)
+int devman_add_device_to_class(devman_handle_t devman_handle,
+    const char *class_name)
 {
         async_exch_t *exch = devman_exchange_begin_blocking(DEVMAN_DRIVER);
         
         ipc_call_t answer;
-        aid_t req = async_send_1(exch, DEVMAN_ADD_DEVICE_TO_CATEGORY,
+        aid_t req = async_send_1(exch, DEVMAN_ADD_DEVICE_TO_CLASS,
             devman_handle, &answer);
-        sysarg_t retval = async_data_write_start(exch, cat_name,
-            str_size(cat_name));
+        sysarg_t retval = async_data_write_start(exch, class_name,
+            str_size(class_name));
         
         devman_exchange_end(exch);
@@ -308 +308 @@
 }
 
-/** Remove function from device.
- *
- * Request devman to remove function owned by this driver task.
- * @param funh      Devman handle of the function
- *
- * @return EOK on success or negative error code.
- */
-int devman_remove_function(devman_handle_t funh)
-{
-        async_exch_t *exch;
-        sysarg_t retval;
-        
-        exch = devman_exchange_begin_blocking(DEVMAN_DRIVER);
-        retval = async_req_1_0(exch, DEVMAN_REMOVE_FUNCTION, (sysarg_t) funh);
-        devman_exchange_end(exch);
-        
-        return (int) retval;
-}
-
 async_sess_t *devman_parent_device_connect(exch_mgmt_t mgmt,
     devman_handle_t handle, unsigned int flags)
@@ -352 +333 @@
                 exch = devman_exchange_begin(DEVMAN_CLIENT);
                 if (exch == NULL)
-                        return ENOMEM;
+                        return errno;
         }
         
@@ -383 +364 @@
 }
 
+int devman_device_get_handle_by_class(const char *classname,
+    const char *devname, devman_handle_t *handle, unsigned int flags)
+{
+        async_exch_t *exch;
+        
+        if (flags & IPC_FLAG_BLOCKING)
+                exch = devman_exchange_begin_blocking(DEVMAN_CLIENT);
+        else {
+                exch = devman_exchange_begin(DEVMAN_CLIENT);
+                if (exch == NULL)
+                        return errno;
+        }
+        
+        ipc_call_t answer;
+        aid_t req = async_send_1(exch, DEVMAN_DEVICE_GET_HANDLE_BY_CLASS,
+            flags, &answer);
+        sysarg_t retval = async_data_write_start(exch, classname,
+            str_size(classname));
+        
+        if (retval != EOK) {
+                devman_exchange_end(exch);
+                async_wait_for(req, NULL);
+                return retval;
+        }
+        
+        retval = async_data_write_start(exch, devname,
+            str_size(devname));
+        
+        devman_exchange_end(exch);
+        
+        if (retval != EOK) {
+                async_wait_for(req, NULL);
+                return retval;
+        }
+        
+        async_wait_for(req, &retval);
+        
+        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;
+}
+
 int devman_get_device_path(devman_handle_t handle, char *path, size_t path_size)
 {
         async_exch_t *exch = devman_exchange_begin(DEVMAN_CLIENT);
         if (exch == NULL)
-                return ENOMEM;
+                return errno;
         
         ipc_call_t answer;
@@ -432 +463 @@
 }
 
-int devman_fun_sid_to_handle(service_id_t sid, devman_handle_t *handle)
-{
-        async_exch_t *exch = devman_exchange_begin(DEVMAN_CLIENT);
-        if (exch == NULL)
-                return ENOMEM;
-        
-        sysarg_t retval = async_req_1_1(exch, DEVMAN_FUN_SID_TO_HANDLE,
-            sid, handle);
-        
-        devman_exchange_end(exch);
-        return (int) retval;
-}
-
 /** @}
  */