Changeset 2211125e in mainline

Timestamp:

2011-03-20T23:35:08Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

00c18bc, 9cf1c5a

Parents:

2c1f24c

Message:

USB fallback works for interfaces as well

Location:

uspace

Files:

• drv/usbflbk/main.c (modified) (1 diff)
• drv/usbflbk/usbflbk.ma (modified) (1 diff)
• lib/usb/src/recognise.c (modified) (1 diff)

uspace/drv/usbflbk/main.c

@@ -64 +64 @@
         }
 
-        usb_log_info("Pretending to control device `%s'" \
+        usb_log_info("Pretending to control %s `%s'" \
             " (node `%s', handle %llu).\n",
+            dev->interface_no < 0 ? "device" : "interface",
             dev->ddf_dev->name, fun_name, dev->ddf_dev->handle);
 

uspace/drv/usbflbk/usbflbk.ma

@@ -1 +1 @@
 10 usb&fallback
+10 usb&interface&fallback

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;