Changeset e280857 in mainline for uspace/lib

Timestamp:

2011-08-18T12:35:59Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

99ac5cf

Parents:

12f9f0d0

Message:

Remove class infrastructure from devman.

Location:

uspace/lib

Files:

• c/generic/devman.c (modified) (3 diffs)
• c/include/devman.h (modified) (2 diffs)
• c/include/ipc/devman.h (modified) (1 diff)
• usb/include/usb/hc.h (modified) (2 diffs)
• usb/src/hc.c (modified) (1 diff)
• usb/src/resolve.c (modified) (2 diffs)

uspace/lib/c/generic/devman.c

@@ -333 +333 @@
                 exch = devman_exchange_begin(DEVMAN_CLIENT);
                 if (exch == NULL)
-                        return errno;
+                        return ENOMEM;
         }
         
@@ -364 +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 errno;
+                return ENOMEM;
         
         ipc_call_t answer;
@@ -463 +413 @@
 }
 
+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;
+}
+
 /** @}
  */

uspace/lib/c/include/devman.h

@@ -38 +38 @@
 
 #include <ipc/devman.h>
+#include <ipc/loc.h>
 #include <async.h>
 #include <bool.h>
@@ -56 +57 @@
 extern int devman_device_get_handle(const char *, devman_handle_t *,
     unsigned int);
-extern int devman_device_get_handle_by_class(const char *, const char *,
-    devman_handle_t *, unsigned int);
 extern int devman_get_device_path(devman_handle_t, char *, size_t);
 
 extern int devman_add_device_to_class(devman_handle_t, const char *);
+extern int devman_fun_sid_to_handle(service_id_t, devman_handle_t *);
 
 #endif

uspace/lib/c/include/ipc/devman.h

@@ -149 +149 @@
 typedef enum {
         DEVMAN_DEVICE_GET_HANDLE = IPC_FIRST_USER_METHOD,
-        DEVMAN_DEVICE_GET_HANDLE_BY_CLASS,
-        DEVMAN_DEVICE_GET_DEVICE_PATH
+        DEVMAN_DEVICE_GET_DEVICE_PATH,
+        DEVMAN_FUN_SID_TO_HANDLE
 } client_to_devman_t;
 

uspace/lib/usb/include/usb/hc.h

@@ -38 +38 @@
 #include <sys/types.h>
 #include <ipc/devman.h>
+#include <ipc/loc.h>
 #include <ddf/driver.h>
 #include <bool.h>
@@ -68 +69 @@
     devman_handle_t *);
 
-int usb_ddf_get_hc_handle_by_class(size_t, devman_handle_t *);
+int usb_ddf_get_hc_handle_by_sid(service_id_t, devman_handle_t *);
 
 

uspace/lib/usb/src/hc.c

@@ -201 +201 @@
 /** Get host controller handle by its class index.
  *
- * @param class_index Class index for the host controller.
+ * @param sid Service ID of the HC function.
  * @param hc_handle Where to store the HC handle
  *      (can be NULL for existence test only).
  * @return Error code.
  */
-int usb_ddf_get_hc_handle_by_class(size_t class_index,
-    devman_handle_t *hc_handle)
-{
-        char *class_index_str;
-        devman_handle_t hc_handle_tmp;
+int usb_ddf_get_hc_handle_by_sid(service_id_t sid, devman_handle_t *hc_handle)
+{
+        devman_handle_t handle;
         int rc;
-
-        rc = asprintf(&class_index_str, "%zu", class_index);
-        if (rc < 0) {
-                return ENOMEM;
-        }
-        rc = devman_device_get_handle_by_class("usbhc", class_index_str,
-            &hc_handle_tmp, 0);
-        free(class_index_str);
-        if (rc != EOK) {
-                return rc;
-        }
-
-        if (hc_handle != NULL) {
-                *hc_handle = hc_handle_tmp;
-        }
-
-        return EOK;
+        
+        rc = devman_fun_sid_to_handle(sid, &handle);
+        if (hc_handle != NULL)
+                *hc_handle = handle;
+        
+        return rc;
 }
 

uspace/lib/usb/src/resolve.c

@@ -46 +46 @@
     devman_handle_t *out_hc_handle, usb_address_t *out_device_address)
 {
-        size_t class_index;
+        uint64_t sid;
         size_t address;
         int rc;
         char *ptr;
 
-        rc = str_size_t(path, &ptr, 10, false, &class_index);
+        rc = str_uint64(path, &ptr, 10, false, &sid);
         if (rc != EOK) {
                 return false;
@@ -64 +64 @@
                 return false;
         }
-        rc = usb_ddf_get_hc_handle_by_class(class_index, out_hc_handle);
+        rc = usb_ddf_get_hc_handle_by_sid(sid, out_hc_handle);
         if (rc != EOK) {
                 return false;