Changeset 2489353 in mainline

Timestamp:

2018-01-13T20:47:58Z (6 years ago)

Author:

Petr Manek <petr.manek@…>

Branches:

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

Children:

7dddd7b

Parents:

1ed3eb4

git-author:

Petr Manek <petr.manek@…> (2018-01-13 18:38:22)

git-committer:

Petr Manek <petr.manek@…> (2018-01-13 20:47:58)

Message:

usbdev: driver can destroy endpoint mappings

Location:

uspace/lib/usbdev

Files:

• include/usb/dev/device.h (modified) (1 diff)
• src/devdrv.c (modified) (3 diffs)

uspace/lib/usbdev/include/usb/dev/device.h

@@ -88 +88 @@
 usb_endpoint_mapping_t * usb_device_get_mapped_ep(usb_device_t *,
     usb_endpoint_t);
+int usb_device_unmap_ep(usb_endpoint_mapping_t *);
 
 int usb_device_get_iface_number(usb_device_t *);

uspace/lib/usbdev/src/devdrv.c

@@ -48 +48 @@
 #include <devman.h>
 #include <errno.h>
+#include <str_error.h>
 #include <stdlib.h>
 
@@ -299 +300 @@
 
         /* Destroy the pipes. */
+        int rc;
         for (size_t i = 0; i < usb_dev->pipes_count; ++i) {
                 usb_log_debug2("Unregistering pipe %zu: %spresent.\n",
                     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));
         }
 
@@ -337 +341 @@
         }
         return NULL;
+}
+
+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;
 }