Changeset 62f4212 in mainline for uspace/lib/usb/src/recognise.c

Timestamp:

2011-03-22T10:07:53Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

f8e4cb6

Parents:

18b3cfd (diff), b01995b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merged changes from development

File:

• uspace/lib/usb/src/recognise.c (modified) (7 diffs)

uspace/lib/usb/src/recognise.c

@@ -247 +247 @@
 #undef VENDOR_ONLY_FMT
 #undef VENDOR_ONLY_ARGS
+
+        /* As a last resort, try fallback driver. */
+        ADD_MATCHID_OR_RETURN(matches, 10, "usb&interface&fallback");
 
         return EOK;
@@ -291 +294 @@
         }
         
+        /* As a last resort, try fallback driver. */
+        ADD_MATCHID_OR_RETURN(matches, 10, "usb&fallback");
+
         return EOK;
 }
@@ -305 +311 @@
  * @return Error code.
  */
-int usb_device_create_match_ids(usb_endpoint_pipe_t *ctrl_pipe,
+int usb_device_create_match_ids(usb_pipe_t *ctrl_pipe,
     match_id_list_t *matches)
 {
@@ -357 +363 @@
         int rc;
         usb_device_connection_t dev_connection;
-        usb_endpoint_pipe_t ctrl_pipe;
+        usb_pipe_t ctrl_pipe;
 
         rc = usb_device_connection_initialize(&dev_connection, hc_handle, address);
@@ -364 +370 @@
         }
 
-        rc = usb_endpoint_pipe_initialize_default_control(&ctrl_pipe,
+        rc = usb_pipe_initialize_default_control(&ctrl_pipe,
             &dev_connection);
         if (rc != EOK) {
                 goto failure;
         }
-        rc = usb_endpoint_pipe_probe_default_control(&ctrl_pipe);
+        rc = usb_pipe_probe_default_control(&ctrl_pipe);
         if (rc != EOK) {
                 goto failure;
@@ -398 +404 @@
         child->driver_data = dev_data;
 
-        rc = usb_endpoint_pipe_start_session(&ctrl_pipe);
+        rc = usb_pipe_start_session(&ctrl_pipe);
         if (rc != EOK) {
                 goto failure;
@@ -408 +414 @@
         }
 
-        rc = usb_endpoint_pipe_end_session(&ctrl_pipe);
+        rc = usb_pipe_end_session(&ctrl_pipe);
         if (rc != EOK) {
                 goto failure;