Changes in uspace/lib/usbdev/src/pipesinit.c [5a6cc679:1a2227d] in mainline

File:

• uspace/lib/usbdev/src/pipesinit.c (modified) (6 diffs)

uspace/lib/usbdev/src/pipesinit.c

@@ -146 +146 @@
                 if (interface_number_fits
                     && interface_setting_fits
-                    && endpoint_descriptions_fits) {
+                    && endpoint_descriptions_fits
+                    && !mapping->present) {
                         return mapping;
                 }
@@ -153 +154 @@
                 mapping_count--;
         }
+
         return NULL;
 }
@@ -165 +167 @@
  * @return Error code.
  */
-static errno_t process_endpoint(
+static int process_endpoint(
     usb_endpoint_mapping_t *mapping, size_t mapping_count,
     usb_standard_interface_descriptor_t *interface,
@@ -200 +202 @@
         }
 
-        errno_t err = usb_pipe_initialize(&ep_mapping->pipe, bus_session);
+        int err = usb_pipe_initialize(&ep_mapping->pipe, bus_session);
         if (err)
                 return err;
@@ -221 +223 @@
  * @return Error code.
  */
-static errno_t process_interface(
+static int process_interface(
     usb_endpoint_mapping_t *mapping, size_t mapping_count,
     const usb_dp_parser_t *parser, const usb_dp_parser_data_t *parser_data,
@@ -291 +293 @@
  * @return Error code.
  */
-errno_t usb_pipe_initialize_from_configuration(
+int usb_pipe_initialize_from_configuration(
     usb_endpoint_mapping_t *mapping, size_t mapping_count,
     const uint8_t *config_descriptor, size_t config_descriptor_size,