Changes in uspace/lib/usbdev/src/devdrv.c [b7fd2a0:5a6cc679] in mainline

File:

• uspace/lib/usbdev/src/devdrv.c (modified) (19 diffs)

uspace/lib/usbdev/src/devdrv.c

@@ -48 +48 @@
 #include <devman.h>
 #include <errno.h>
+#include <str_error.h>
 #include <stdlib.h>
 
@@ -56 +57 @@
         /** Connection to device on USB bus */
         usb_dev_session_t *bus_session;
-        
+
         /** devman handle */
         devman_handle_t handle;
-        
+
         /** The default control pipe. */
         usb_pipe_t ctrl_pipe;
-        
+
         /** Other endpoint pipes.
          *
@@ -69 +70 @@
          */
         usb_endpoint_mapping_t *pipes;
-        
+
         /** Number of other endpoint pipes. */
         size_t pipes_count;
-        
+
+        /** USB address of this device */
+        usb_address_t address;
+
+        /** Depth in the USB hub hiearchy */
+        unsigned depth;
+
+        /** USB speed of this device */
+        usb_speed_t speed;
+
         /** Current interface.
          *
@@ -79 +89 @@
          */
         int interface_no;
-        
+
         /** Alternative interfaces. */
         usb_alternate_interfaces_t alternate_interfaces;
-        
+
         /** Some useful descriptors for USB device. */
         usb_device_descriptors_t descriptors;
-        
+
         /** Generic DDF device backing this one. DO NOT TOUCH! */
         ddf_dev_t *ddf_dev;
-        
+
         /** Custom driver data.
          *
@@ -146 +156 @@
                 return rc;
         }
-        
+
         /* Change current alternative */
         usb_dev->alternate_interfaces.current = alternate_setting;
@@ -255 +265 @@
 
         /* Register created pipes. */
+        unsigned pipes_registered = 0;
         for (size_t i = 0; i < pipe_count; i++) {
                 if (pipes[i].present) {
-                        rc = usb_pipe_register(&pipes[i].pipe,
-                            pipes[i].descriptor->poll_interval);
+                        rc = usb_pipe_register(&pipes[i].pipe, pipes[i].descriptor, pipes[i].companion_descriptor);
                         if (rc != EOK) {
                                 goto rollback_unregister_endpoints;
                         }
                 }
+                pipes_registered++;
         }
 
@@ -277 +288 @@
          */
 rollback_unregister_endpoints:
-        for (size_t i = 0; i < pipe_count; i++) {
+        for (size_t i = 0; i < pipes_registered; i++) {
                 if (pipes[i].present) {
                         usb_pipe_unregister(&pipes[i].pipe);
@@ -296 +307 @@
         assert(usb_dev);
         assert(usb_dev->pipes || usb_dev->pipes_count == 0);
-        
+
         /* Destroy the pipes. */
+        int rc;
         for (size_t i = 0; i < usb_dev->pipes_count; ++i) {
-                usb_log_debug2("Unregistering pipe %zu: %spresent.\n",
+                usb_log_debug2("Unregistering pipe %zu: %spresent.",
                     i, usb_dev->pipes[i].present ? "" : "not ");
-                if (usb_dev->pipes[i].present)
-                        usb_pipe_unregister(&usb_dev->pipes[i].pipe);
-        }
-        
+
+                rc = usb_device_unmap_ep(usb_dev->pipes + i);
+                if (rc != EOK && rc != ENOENT)
+                        usb_log_warning("Unregistering pipe %zu failed: %s", i, str_error(rc));
+        }
+
         free(usb_dev->pipes);
         usb_dev->pipes = NULL;
@@ -327 +341 @@
 }
 
-usb_endpoint_mapping_t * usb_device_get_mapped_ep(
-    usb_device_t *usb_dev, usb_endpoint_t ep)
-{
-        assert(usb_dev);
-        for (unsigned i = 0; i < usb_dev->pipes_count; ++i) {
-                if (usb_dev->pipes[i].pipe.endpoint_no == ep)
-                        return &usb_dev->pipes[i];
-        }
-        return NULL;
-}
-
-int usb_device_get_iface_number(usb_device_t *usb_dev)
+int usb_device_unmap_ep(usb_endpoint_mapping_t *epm)
+{
+        assert(epm);
+
+        if (!epm->present)
+                return ENOENT;
+
+        const int rc = usb_pipe_unregister(&epm->pipe);
+        if (rc != EOK)
+                return rc;
+
+        epm->present = false;
+        return EOK;
+}
+
+usb_address_t usb_device_get_address(const usb_device_t *usb_dev)
+{
+        assert(usb_dev);
+        return usb_dev->depth;
+}
+
+unsigned usb_device_get_depth(const usb_device_t *usb_dev)
+{
+        assert(usb_dev);
+        return usb_dev->depth;
+}
+
+usb_speed_t usb_device_get_speed(const usb_device_t *usb_dev)
+{
+        assert(usb_dev);
+        return usb_dev->speed;
+}
+
+int usb_device_get_iface_number(const usb_device_t *usb_dev)
 {
         assert(usb_dev);
@@ -344 +380 @@
 }
 
-devman_handle_t usb_device_get_devman_handle(usb_device_t *usb_dev)
+devman_handle_t usb_device_get_devman_handle(const usb_device_t *usb_dev)
 {
         assert(usb_dev);
@@ -394 +430 @@
  */
 static errno_t usb_device_init(usb_device_t *usb_dev, ddf_dev_t *ddf_dev,
-    const usb_endpoint_description_t **endpoints, const char **errstr_ptr,
-    devman_handle_t handle, int interface_no)
+    const usb_endpoint_description_t **endpoints, const char **errstr_ptr)
 {
         assert(usb_dev != NULL);
@@ -403 +438 @@
 
         usb_dev->ddf_dev = ddf_dev;
-        usb_dev->handle = handle;
-        usb_dev->interface_no = interface_no;
         usb_dev->driver_data = NULL;
         usb_dev->descriptors.full_config = NULL;
@@ -411 +444 @@
         usb_dev->pipes = NULL;
 
-        usb_dev->bus_session = usb_dev_connect(handle);
+        usb_dev->bus_session = usb_dev_connect(usb_dev->handle);
 
         if (!usb_dev->bus_session) {
@@ -420 +453 @@
         /* This pipe was registered by the hub driver,
          * during device initialization. */
-        errno_t rc = usb_pipe_initialize_default_control(
-            &usb_dev->ctrl_pipe, usb_dev->bus_session);
+        errno_t rc = usb_pipe_initialize_default_control(&usb_dev->ctrl_pipe, usb_dev->bus_session);
         if (rc != EOK) {
                 usb_dev_disconnect(usb_dev->bus_session);
@@ -440 +472 @@
          * it makes no sense to speak about alternate interfaces when
          * controlling a device. */
-        rc = usb_alternate_interfaces_init(&usb_dev->alternate_interfaces,
+        usb_alternate_interfaces_init(&usb_dev->alternate_interfaces,
             usb_dev->descriptors.full_config,
             usb_dev->descriptors.full_config_size, usb_dev->interface_no);
@@ -457 +489 @@
 }
 
-static errno_t usb_device_get_info(async_sess_t *sess, devman_handle_t *handle,
-        int *iface_no)
-{
-        assert(handle);
-        assert(iface_no);
-        
+static errno_t usb_device_get_info(async_sess_t *sess, usb_device_t *dev)
+{
+        assert(dev);
+
         async_exch_t *exch = async_exchange_begin(sess);
         if (!exch)
                 return EPARTY;
-        
-        errno_t ret = usb_get_my_device_handle(exch, handle);
+
+        usb_device_desc_t dev_desc;
+        const errno_t ret = usb_get_my_description(exch, &dev_desc);
+
         if (ret == EOK) {
-                ret = usb_get_my_interface(exch, iface_no);
-                if (ret == ENOTSUP) {
-                        *iface_no = -1;
-                        ret = EOK;
-                }
-        }
-        
+                dev->address = dev_desc.address;
+                dev->depth = dev_desc.depth;
+                dev->speed = dev_desc.speed;
+                dev->handle = dev_desc.handle;
+                dev->interface_no = dev_desc.iface;
+        }
+
         async_exchange_end(exch);
         return ret;
@@ -485 +517 @@
         assert(ddf_dev);
         assert(err);
-
-        devman_handle_t h = 0;
-        int iface_no = -1;
 
         async_sess_t *sess = ddf_dev_parent_sess_get(ddf_dev);
         if (sess == NULL)
                 return ENOMEM;
-        const errno_t ret = usb_device_get_info(sess, &h, &iface_no);
-        if (ret != EOK)
-                return ret;
 
         usb_device_t *usb_dev =
@@ -502 +528 @@
                 return ENOMEM;
         }
-        
-        return usb_device_init(usb_dev, ddf_dev, desc, err, h, iface_no);
+
+        const errno_t ret = usb_device_get_info(sess, usb_dev);
+        if (ret != EOK)
+                return ret;
+
+        return usb_device_init(usb_dev, ddf_dev, desc, err);
 }
 
@@ -517 +547 @@
 usb_device_t * usb_device_create(devman_handle_t handle)
 {
-        devman_handle_t h = 0;
-        int iface_no = -1;
-
-        async_sess_t *sess = devman_device_connect(handle, IPC_FLAG_BLOCKING);
-        errno_t ret = usb_device_get_info(sess, &h, &iface_no);
-        if (sess)
-                async_hangup(sess);
-        if (ret != EOK)
-                return NULL;
-
         usb_device_t *usb_dev = malloc(sizeof(usb_device_t));
         if (!usb_dev)
                 return NULL;
 
+        async_sess_t *sess = devman_device_connect(handle, IPC_FLAG_BLOCKING);
+        errno_t ret = usb_device_get_info(sess, usb_dev);
+        if (sess)
+                async_hangup(sess);
+        if (ret != EOK) {
+                free(usb_dev);
+                return NULL;
+        }
+
         const char* dummy = NULL;
-        ret = usb_device_init(usb_dev, NULL, NULL, &dummy, handle, iface_no);
+        ret = usb_device_init(usb_dev, NULL, NULL, &dummy);
         if (ret != EOK) {
                 free(usb_dev);